2007-08-14 [ticho] 2.10.0cvs122

	* src/prefs_logging.c
		Changed GtkOptionMenu in logging preferences to GtkComboBox.

diff --git a/ChangeLog b/ChangeLog
index efeb740c56c5d6c48a19d3979654a109b96d66b5..891e85959fa9e7639bd2915b274d264cf8b2b089 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-14 [ticho]     2.10.0cvs122
+
+       * src/prefs_logging.c
+               Changed GtkOptionMenu in logging preferences to GtkComboBox.
+
 2007-08-14 [wwp]       2.10.0cvs121
 
        * tools/Makefile.am

diff --git a/PATCHSETS b/PATCHSETS
index c5cb5f1a44b8b8136369aa07d1d7f547bab60863..25dbc567dd3e98458212755cd9e53ad976d5eecd 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2776,3 +2776,4 @@
 ( cvs diff -u -r 1.27.2.38 -r 1.27.2.39 src/addr_compl.c;  cvs diff -u -r 1.60.2.93 -r 1.60.2.94 src/addressbook.c;  cvs diff -u -r 1.28.2.28 -r 1.28.2.29 src/addrindex.c;  cvs diff -u -r 1.382.2.400 -r 1.382.2.401 src/compose.c;  cvs diff -u -r 1.60.2.36 -r 1.60.2.37 src/filtering.c;  cvs diff -u -r 1.207.2.173 -r 1.207.2.174 src/folderview.c;  cvs diff -u -r 1.149.2.78 -r 1.149.2.79 src/inc.c;  cvs diff -u -r 1.75.2.45 -r 1.75.2.46 src/matcher.c;  cvs diff -u -r 1.79.2.59 -r 1.79.2.60 src/mh.c;  cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/partial_download.c;  cvs diff -u -r 1.10.2.33 -r 1.10.2.34 src/prefs_gtk.c;  cvs diff -u -r 1.150.2.101 -r 1.150.2.102 src/procmsg.c;  cvs diff -u -r 1.25.2.45 -r 1.25.2.46 src/stock_pixmap.c;  cvs diff -u -r 1.395.2.318 -r 1.395.2.319 src/summaryview.c;  cvs diff -u -r 1.36.2.108 -r 1.36.2.109 src/common/utils.c;  cvs diff -u -r 1.9.2.52 -r 1.9.2.53 src/gtk/gtkaspell.c;  cvs diff -u -r 1.5.2.23 -r 1.5.2.24 src/gtk/menu.c;  ) > 2.10.0cvs119.patchset
 ( cvs diff -u -r 1.382.2.401 -r 1.382.2.402 src/compose.c;  cvs diff -u -r 1.204.2.145 -r 1.204.2.146 src/prefs_common.c;  cvs diff -u -r 1.103.2.91 -r 1.103.2.92 src/prefs_common.h;  cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/prefs_receive.c;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/prefs_send.c;  cvs diff -u -r 1.17.2.39 -r 1.17.2.40 src/send_message.c;  ) > 2.10.0cvs120.patchset
 ( cvs diff -u -r 1.25.2.20 -r 1.25.2.21 tools/Makefile.am;  cvs diff -u -r 1.30.2.22 -r 1.30.2.23 tools/README;  diff -u /dev/null tools/popfile-link.sh;  ) > 2.10.0cvs121.patchset
+( cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/prefs_logging.c;  ) > 2.10.0cvs122.patchset

diff --git a/configure.ac b/configure.ac
index a15f6b4063a1fc0e4ad55e89e32f051c80aafc09..dbe291438a31b7be07823472449c40db0f340e04 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=121
+EXTRA_VERSION=122
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_logging.c b/src/prefs_logging.c
index f17d05c4250e9de968848da35efbc1f500501754..634beef1ed9a3f8b0178d6b7438b807e33381c49 100644 (file)
--- a/src/prefs_logging.c
+++ b/src/prefs_logging.c
@@ -41,6 +41,7 @@
 #include "manage_window.h"
 
 #include "log.h"
+#include "combobox.h"
 
 typedef struct _LoggingPage
 {
@@ -103,8 +104,8 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkWidget *hbox_filtering_log_level;
        GtkWidget *label_filtering_log_level;
        GtkWidget *optmenu_filtering_log_level;
-       GtkWidget *menu;
-       GtkWidget *menuitem;
+       GtkListStore *menu;
+       GtkTreeIter iter;
        GtkTooltips *filtering_log_level_tooltip;
        GtkWidget *frame_disc_log;
        GtkWidget *vbox_disc_log;
@@ -218,15 +219,15 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_widget_show (label_filtering_log_level);
        gtk_box_pack_start(GTK_BOX(hbox_filtering_log_level), label_filtering_log_level, FALSE, FALSE, 0);
 
-       optmenu_filtering_log_level = gtk_option_menu_new ();
+       optmenu_filtering_log_level = gtkut_sc_combobox_create(NULL, FALSE);
        gtk_widget_show (optmenu_filtering_log_level);
        
-       menu = gtk_menu_new ();
-       MENUITEM_ADD (menu, menuitem, _("Low"), 0);
-       MENUITEM_ADD (menu, menuitem, _("Medium"), 1);
-       MENUITEM_ADD (menu, menuitem, _("High"), 2);
+       menu = GTK_LIST_STORE(gtk_combo_box_get_model(
+                               GTK_COMBO_BOX(optmenu_filtering_log_level)));
+       COMBOBOX_ADD (menu, _("Low"), 0);
+       COMBOBOX_ADD (menu, _("Medium"), 1);
+       COMBOBOX_ADD (menu, _("High"), 2);
 
-       gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_filtering_log_level), menu);
        gtk_box_pack_start(GTK_BOX(hbox_filtering_log_level), optmenu_filtering_log_level, FALSE, FALSE, 0);
 
        filtering_log_level_tooltip = gtk_tooltips_new();
@@ -341,7 +342,7 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbtn_filtering_log_length),
                prefs_common.filtering_debug_loglength);
 
-       gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu_filtering_log_level),
+       combobox_select_by_data(GTK_COMBO_BOX(optmenu_filtering_log_level),
                        prefs_common.filtering_debug_level);
 
        prefs_logging->checkbtn_clip_network_log = checkbtn_clip_network_log;
@@ -368,13 +369,9 @@ static void prefs_logging_save(PrefsPage *_page)
        LoggingPage *page = (LoggingPage *) _page;
        MainWindow *mainwindow;
        gboolean filtering_debug_enabled;
-       GtkWidget *menu;
-       GtkWidget *menuitem;
 
-       menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(page->optmenu_filtering_log_level));
-       menuitem = gtk_menu_get_active(GTK_MENU(menu));
-       prefs_common.filtering_debug_level = GPOINTER_TO_INT
-                       (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
+       prefs_common.filtering_debug_level =
+               combobox_get_active_data(GTK_COMBO_BOX(page->optmenu_filtering_log_level));
 
        prefs_common.cliplog = gtk_toggle_button_get_active(
                GTK_TOGGLE_BUTTON(page->checkbtn_clip_network_log));