* src/prefs_summaries.c
* src/summary_search.c
Replace deprecated widgets. Patch by
Andrej.
+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
2007-08-04 [colin] 2.10.0cvs88
* src/mh.c
( 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.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
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
#include "gtk/menu.h"
#include "gtk/gtkutils.h"
#include "gtk/prefswindow.h"
#include "gtk/menu.h"
#include "gtk/gtkutils.h"
#include "gtk/prefswindow.h"
+#include "gtk/combobox.h"
#include "manage_window.h"
#include "manage_window.h"
GtkWidget *checkbtn_ask_mark_all_read;
GtkTooltips *immedexec_tooltip;
GtkWidget *label, *label_fill;
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;
GtkWidget *optmenu_nextunreadmsgdialog;
GtkWidget *folderview_frame;
GtkWidget *summaryview_frame;
gtk_widget_show (label);
gtk_box_pack_start(GTK_BOX(hbox0), label, FALSE, FALSE, 0);
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);
gtk_box_pack_start(GTK_BOX(hbox0), optmenu_folder_unread, FALSE, FALSE, 0);
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (label);
gtk_box_pack_start(GTK_BOX(hbox1), label, FALSE, FALSE, 0);
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
gtk_box_pack_start(GTK_BOX(hbox1), optmenu_nextunreadmsgdialog, FALSE, FALSE, 0);
PACK_CHECK_BUTTON
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_transhdr),
prefs_common.trans_hdr);
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);
prefs_common.display_folder_unread);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_useaddrbook),
prefs_common.use_addr_book);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_ask_mark_all_read),
prefs_common.ask_mark_all_read);
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;
prefs_common.next_unread_msg_dialog);
prefs_summaries->checkbtn_transhdr = checkbtn_transhdr;
static void prefs_summaries_save(PrefsPage *_page)
{
SummariesPage *page = (SummariesPage *) _page;
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));
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));
prefs_common.use_addr_book = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(page->checkbtn_useaddrbook));
prefs_common.mark_as_read_delay = gtk_spin_button_get_value_as_int(
GTK_SPIN_BUTTON(page->spinbtn_mark_as_read_delay));
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();
}
main_window_reflect_prefs_all();
}
GtkWidget *vbox1;
GtkWidget *bool_hbox;
GtkWidget *bool_optmenu;
GtkWidget *vbox1;
GtkWidget *bool_hbox;
GtkWidget *bool_optmenu;
- GtkWidget *bool_menu;
- GtkWidget *menuitem;
+ GtkListStore *menu;
+ GtkTreeIter iter;
GtkWidget *clear_btn;
GtkWidget *table1;
GtkWidget *clear_btn;
GtkWidget *table1;
gtk_widget_show(bool_hbox);
gtk_box_pack_start(GTK_BOX(vbox1), bool_hbox, FALSE, FALSE, 0);
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);
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);
clear_btn = gtk_button_new_from_stock(GTK_STOCK_CLEAR);
gtk_widget_show(clear_btn);
gtk_box_pack_start (GTK_BOX (vbox1), confirm_area, FALSE, FALSE, 0);
gtk_widget_grab_default(next_btn);
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)
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)
- 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));
case_sens = gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON(search_window.case_checkbtn));