2007-08-04 [colin] 2.10.0cvs89

	* src/prefs_summaries.c
	* src/summary_search.c
		Replace deprecated widgets. Patch by
		Andrej.

diff --git a/ChangeLog b/ChangeLog
index 1849ad05848df6de0448138b8b980c4f8aa32911..8b3ec245de95bb6e795cee9fe934293656eb7ff8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-04 [colin]     2.10.0cvs89
+
+       * src/prefs_summaries.c
+       * src/summary_search.c
+               Replace deprecated widgets. Patch by
+               Andrej.
+
 2007-08-04 [colin]     2.10.0cvs88
 
        * src/mh.c

diff --git a/PATCHSETS b/PATCHSETS
index fad935ef63670edf67e2d7eea67ffe1c82496958..713c6b0bef461792c6d94b01c7e56ed9f33729a3 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2742,3 +2742,4 @@
 ( cvs diff -u -r 1.382.2.397 -r 1.382.2.398 src/compose.c;  cvs diff -u -r 1.50.2.38 -r 1.50.2.39 src/compose.h;  cvs diff -u -r 1.213.2.152 -r 1.213.2.153 src/folder.c;  ) > 2.10.0cvs86.patchset
 ( cvs diff -u -r 1.105.2.104 -r 1.105.2.105 src/prefs_account.c;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/gtk/combobox.h;  cvs diff -u -r 1.5.2.63 -r 1.5.2.64 src/gtk/gtkutils.c;  ) > 2.10.0cvs87.patchset
 ( cvs diff -u -r 1.79.2.58 -r 1.79.2.59 src/mh.c;  ) > 2.10.0cvs88.patchset
+( cvs diff -u -r 1.1.2.46 -r 1.1.2.47 src/prefs_summaries.c;  cvs diff -u -r 1.15.2.51 -r 1.15.2.52 src/summary_search.c;  ) > 2.10.0cvs89.patchset

diff --git a/configure.ac b/configure.ac
index d3f4436d712f47cd3fc9f51af1948dffbb0c506a..35e8b49ba0751915036203ebcbf114c8b4b6ca13 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=88
+EXTRA_VERSION=89
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c
index 837897cd3284fa2a9bfeb2bf04478c4b2e126ea2..4c0ab30f998ed69db34df34431905169e488346b 100644 (file)
--- a/src/prefs_summaries.c
+++ b/src/prefs_summaries.c
@@ -44,6 +44,7 @@
 #include "gtk/menu.h"
 #include "gtk/gtkutils.h"
 #include "gtk/prefswindow.h"
+#include "gtk/combobox.h"
 
 #include "manage_window.h"
 
@@ -335,8 +336,8 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkWidget *checkbtn_ask_mark_all_read;
        GtkTooltips *immedexec_tooltip;
        GtkWidget *label, *label_fill;
-       GtkWidget *menu;
-       GtkWidget *menuitem;
+       GtkListStore *menu;
+       GtkTreeIter iter;
        GtkWidget *optmenu_nextunreadmsgdialog;
        GtkWidget *folderview_frame;
        GtkWidget *summaryview_frame;
@@ -360,15 +361,15 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_widget_show (label);
        gtk_box_pack_start(GTK_BOX(hbox0), label, FALSE, FALSE, 0);
 
-       optmenu_folder_unread = gtk_option_menu_new ();
-       gtk_widget_show (optmenu_folder_unread);
+       optmenu_folder_unread = gtkut_sc_combobox_create(NULL, FALSE);
+       menu = GTK_LIST_STORE(gtk_combo_box_get_model(
+                               GTK_COMBO_BOX(optmenu_folder_unread)));
+       gtk_widget_show (optmenu_folder_unread);
        
-       menu = gtk_menu_new ();
-       MENUITEM_ADD (menu, menuitem, _("No"), 0);
-       MENUITEM_ADD (menu, menuitem, _("Unread messages"), 1);
-       MENUITEM_ADD (menu, menuitem, _("Unread and Total messages"), 2);
+       COMBOBOX_ADD (menu, _("No"), 0);
+       COMBOBOX_ADD (menu, _("Unread messages"), 1);
+       COMBOBOX_ADD (menu, _("Unread and Total messages"), 2);
 
-       gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_folder_unread), menu);
        gtk_box_pack_start(GTK_BOX(hbox0), optmenu_folder_unread, FALSE, FALSE, 0);
 
        hbox1 = gtk_hbox_new (FALSE, 8);
@@ -435,17 +436,15 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_widget_show (label);
        gtk_box_pack_start(GTK_BOX(hbox1), label, FALSE, FALSE, 0);
        
-       optmenu_nextunreadmsgdialog = gtk_option_menu_new ();
-       gtk_widget_show (optmenu_nextunreadmsgdialog);
+       optmenu_nextunreadmsgdialog = gtkut_sc_combobox_create(NULL, FALSE);
+       menu = GTK_LIST_STORE(gtk_combo_box_get_model(
+                               GTK_COMBO_BOX(optmenu_nextunreadmsgdialog)));
+       gtk_widget_show (optmenu_nextunreadmsgdialog);
 
-       menu = gtk_menu_new ();
-       MENUITEM_ADD (menu, menuitem, _("Always"), NEXTUNREADMSGDIALOG_ALWAYS);
-       MENUITEM_ADD (menu, menuitem, _("Assume 'Yes'"), 
-                     NEXTUNREADMSGDIALOG_ASSUME_YES);
-       MENUITEM_ADD (menu, menuitem, _("Assume 'No'"), 
-                     NEXTUNREADMSGDIALOG_ASSUME_NO);
+       COMBOBOX_ADD (menu, _("Always"), NEXTUNREADMSGDIALOG_ALWAYS);
+       COMBOBOX_ADD (menu, _("Assume 'Yes'"), NEXTUNREADMSGDIALOG_ASSUME_YES);
+       COMBOBOX_ADD (menu, _("Assume 'No'"), NEXTUNREADMSGDIALOG_ASSUME_NO);
 
-       gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_nextunreadmsgdialog), menu);
        gtk_box_pack_start(GTK_BOX(hbox1), optmenu_nextunreadmsgdialog, FALSE, FALSE, 0);
 
        PACK_CHECK_BUTTON
@@ -557,7 +556,7 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
        
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_transhdr),
                        prefs_common.trans_hdr);
-       gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu_folder_unread),
+       combobox_select_by_data(GTK_COMBO_BOX(optmenu_folder_unread),
                        prefs_common.display_folder_unread);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_useaddrbook),
                        prefs_common.use_addr_book);
@@ -581,7 +580,7 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_ask_mark_all_read),
                        prefs_common.ask_mark_all_read);
 
-       gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu_nextunreadmsgdialog),
+       combobox_select_by_data(GTK_COMBO_BOX(optmenu_nextunreadmsgdialog),
                        prefs_common.next_unread_msg_dialog);
 
        prefs_summaries->checkbtn_transhdr = checkbtn_transhdr;
@@ -605,16 +604,13 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
 static void prefs_summaries_save(PrefsPage *_page)
 {
        SummariesPage *page = (SummariesPage *) _page;
-       GtkWidget *menu;
-       GtkWidget *menuitem;
 
        prefs_common.trans_hdr = gtk_toggle_button_get_active(
                        GTK_TOGGLE_BUTTON(page->checkbtn_transhdr));
 
-       menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(page->optmenu_folder_unread));
-       menuitem = gtk_menu_get_active(GTK_MENU(menu));
-       prefs_common.display_folder_unread = GPOINTER_TO_INT
-               (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
+
+       prefs_common.display_folder_unread = combobox_get_active_data(
+                       GTK_COMBO_BOX(page->optmenu_folder_unread));
 
        prefs_common.use_addr_book = gtk_toggle_button_get_active(
                        GTK_TOGGLE_BUTTON(page->checkbtn_useaddrbook));
@@ -640,10 +636,8 @@ static void prefs_summaries_save(PrefsPage *_page)
        prefs_common.mark_as_read_delay = gtk_spin_button_get_value_as_int(
                        GTK_SPIN_BUTTON(page->spinbtn_mark_as_read_delay));
 
-       menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(page->optmenu_nextunreadmsgdialog));
-       menuitem = gtk_menu_get_active(GTK_MENU(menu));
-       prefs_common.next_unread_msg_dialog = GPOINTER_TO_INT
-               (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
+       prefs_common.next_unread_msg_dialog = combobox_get_active_data(
+                       GTK_COMBO_BOX(page->optmenu_nextunreadmsgdialog));
        main_window_reflect_prefs_all();
 }
 

diff --git a/src/summary_search.c b/src/summary_search.c
index 576da0f484aa4fb769b1b2ddaa7e64aa259e937c..48f927b2922fde12f21b2a7cb4b80ef0e8d69262 100644 (file)
--- a/src/summary_search.c
+++ b/src/summary_search.c
@@ -194,8 +194,8 @@ static void summary_search_create(void)
        GtkWidget *vbox1;
        GtkWidget *bool_hbox;
        GtkWidget *bool_optmenu;
-       GtkWidget *bool_menu;
-       GtkWidget *menuitem;
+       GtkListStore *menu;
+       GtkTreeIter iter;
        GtkWidget *clear_btn;
 
        GtkWidget *table1;
@@ -248,14 +248,14 @@ static void summary_search_create(void)
        gtk_widget_show(bool_hbox);
        gtk_box_pack_start(GTK_BOX(vbox1), bool_hbox, FALSE, FALSE, 0);
 
-       bool_optmenu = gtk_option_menu_new();
+       bool_optmenu = gtkut_sc_combobox_create(NULL, FALSE);
+       menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(bool_optmenu)));
        gtk_widget_show(bool_optmenu);
        gtk_box_pack_start(GTK_BOX(bool_hbox), bool_optmenu, FALSE, FALSE, 0);
 
-       bool_menu = gtk_menu_new();
-       MENUITEM_ADD(bool_menu, menuitem, _("Match any of the following"), 0);
-       MENUITEM_ADD(bool_menu, menuitem, _("Match all of the following"), 1);
-       gtk_option_menu_set_menu(GTK_OPTION_MENU(bool_optmenu), bool_menu);
+       COMBOBOX_ADD(menu, _("Match any of the following"), 0);
+       gtk_combo_box_set_active_iter(GTK_COMBO_BOX(bool_optmenu), &iter);
+       COMBOBOX_ADD(menu, _("Match all of the following"), 1);
 
        clear_btn = gtk_button_new_from_stock(GTK_STOCK_CLEAR);
        gtk_widget_show(clear_btn);
@@ -439,7 +439,7 @@ static void summary_search_create(void)
        gtk_box_pack_start (GTK_BOX (vbox1), confirm_area, FALSE, FALSE, 0);
        gtk_widget_grab_default(next_btn);
 
-       SET_TOGGLE_SENSITIVITY_REVERSE(adv_search_checkbtn, bool_menu)
+       SET_TOGGLE_SENSITIVITY_REVERSE(adv_search_checkbtn, bool_optmenu)
        SET_TOGGLE_SENSITIVITY_REVERSE(adv_search_checkbtn, from_entry)
        SET_TOGGLE_SENSITIVITY_REVERSE(adv_search_checkbtn, to_entry)
        SET_TOGGLE_SENSITIVITY_REVERSE(adv_search_checkbtn, subject_entry)
@@ -549,9 +549,8 @@ static void summary_search_execute(gboolean backward, gboolean search_all)
                        return;
                }
        } else {
-               bool_and = GPOINTER_TO_INT
-                       (menu_get_option_menu_active_user_data
-                               (GTK_OPTION_MENU(search_window.bool_optmenu)));
+               bool_and = combobox_get_active_data(
+                               GTK_COMBO_BOX(search_window.bool_optmenu));
                case_sens = gtk_toggle_button_get_active
                        (GTK_TOGGLE_BUTTON(search_window.case_checkbtn));