From d004f1f314aca46c379c86e6e587e0918cc2cf36 Mon Sep 17 00:00:00 2001 From: hiro Date: Fri, 20 Jan 2006 05:31:00 +0000 Subject: fixed style modification of folder property dialog. git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@912 ee746299-78ed-0310-b773-934348b2243d --- ChangeLog | 8 +++++++- ChangeLog.ja | 9 ++++++++- src/prefs_folder_item.c | 9 ++++----- src/prefs_folder_item.h | 2 +- src/prefs_search_folder.c | 9 +++++---- src/prefs_search_folder.h | 2 +- 6 files changed, 26 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 10328b92..9e72bd61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,13 @@ -2006-01-19 +2006-01-20 * version 2.2.0beta5 +2006-01-20 + + * src/prefs_search_folder.c + src/prefs_folder_item.c: use gtk_widget_modify_base() instead of + copying style. Realize window before getting style. + 2006-01-19 * src/summaryview.c: summary_qsearch_reset(), summary_qsearch(): clear diff --git a/ChangeLog.ja b/ChangeLog.ja index 1d0f0219..bab41c08 100644 --- a/ChangeLog.ja +++ b/ChangeLog.ja @@ -1,7 +1,14 @@ -2006-01-19 +2006-01-20 * version 2.2.0beta5 +2006-01-20 + + * src/prefs_search_folder.c + src/prefs_folder_item.c: style をコピーする代わりに + gtk_widget_modify_base() を使用。 style を取得する前にウィンドウを + realize するようにした。 + 2006-01-19 * src/summaryview.c: summary_qsearch_reset(), summary_qsearch(): 無効 diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c index 37ad6be2..a6d67220 100644 --- a/src/prefs_folder_item.c +++ b/src/prefs_folder_item.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2003 Hiroyuki Yamamoto + * Copyright (C) 1999-2006 Hiroyuki Yamamoto * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -159,9 +159,6 @@ static void prefs_folder_item_general_create(PrefsFolderItemDialog *dialog) GtkWidget *trim_compose_subj_chkbtn; GtkStyle *style; - style = gtk_style_copy(gtk_widget_get_style(dialog->dialog->window)); - style->base[GTK_STATE_NORMAL] = style->bg[GTK_STATE_NORMAL]; - vbox = gtk_vbox_new(FALSE, VSPACING); gtk_container_add(GTK_CONTAINER(dialog->dialog->notebook), vbox); gtk_container_set_border_width(GTK_CONTAINER (vbox), VBOX_BORDER); @@ -179,7 +176,9 @@ static void prefs_folder_item_general_create(PrefsFolderItemDialog *dialog) name_entry = gtk_entry_new(); gtk_editable_set_editable(GTK_EDITABLE(name_entry), FALSE); gtk_widget_set_size_request(name_entry, 200, -1); - gtk_widget_set_style(name_entry, style); + style = gtk_widget_get_style(dialog->dialog->window); + gtk_widget_modify_base(name_entry, GTK_STATE_NORMAL, + &style->bg[GTK_STATE_NORMAL]); gtk_table_attach(GTK_TABLE(table), name_entry, 1, 2, 0, 1, GTK_EXPAND | GTK_SHRINK | GTK_FILL, GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0); diff --git a/src/prefs_folder_item.h b/src/prefs_folder_item.h index d6daa873..f68d1c06 100644 --- a/src/prefs_folder_item.h +++ b/src/prefs_folder_item.h @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2002 Hiroyuki Yamamoto + * Copyright (C) 1999-2006 Hiroyuki Yamamoto * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/prefs_search_folder.c b/src/prefs_search_folder.c index fa7e7c44..c44309c4 100644 --- a/src/prefs_search_folder.c +++ b/src/prefs_search_folder.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2005 Hiroyuki Yamamoto + * Copyright (C) 1999-2006 Hiroyuki Yamamoto * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -153,6 +153,7 @@ static PrefsSearchFolderDialog *prefs_search_folder_create(FolderItem *item) g_free(title); gtk_notebook_set_show_border(GTK_NOTEBOOK(dialog->notebook), FALSE); gtk_notebook_set_show_tabs(GTK_NOTEBOOK(dialog->notebook), FALSE); + gtk_widget_realize(dialog->window); g_signal_connect(G_OBJECT(dialog->window), "delete_event", G_CALLBACK(prefs_search_folder_delete_cb), new_dialog); @@ -179,9 +180,9 @@ static PrefsSearchFolderDialog *prefs_search_folder_create(FolderItem *item) gtk_editable_set_editable(GTK_EDITABLE(name_entry), FALSE); gtk_box_pack_start(GTK_BOX(name_hbox), name_entry, TRUE, TRUE, 0); - style = gtk_style_copy(gtk_widget_get_style(dialog->window)); - style->base[GTK_STATE_NORMAL] = style->bg[GTK_STATE_NORMAL]; - gtk_widget_set_style(name_entry, style); + style = gtk_widget_get_style(dialog->window); + gtk_widget_modify_base(name_entry, GTK_STATE_NORMAL, + &style->bg[GTK_STATE_NORMAL]); bool_hbox = gtk_hbox_new(FALSE, 12); gtk_widget_show(bool_hbox); diff --git a/src/prefs_search_folder.h b/src/prefs_search_folder.h index 579f3d0f..2592888b 100644 --- a/src/prefs_search_folder.h +++ b/src/prefs_search_folder.h @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2005 Hiroyuki Yamamoto + * Copyright (C) 1999-2006 Hiroyuki Yamamoto * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by -- cgit v1.2.3