2007-07-30 [colin] 2.10.0cvs78

	* src/prefs_account.c
		Fix a deprecated widget. Patch by
		Andrej

diff --git a/ChangeLog b/ChangeLog
index eec3a500d51984ff51cd6b6da2de84810d51bdb1..6a9df3bd077f84072aa3a568d6433bd916b0f6ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-30 [colin]     2.10.0cvs78
+
+       * src/prefs_account.c
+               Fix a deprecated widget. Patch by
+               Andrej
+

 2007-07-27 [paul]      2.10.0cvs77
 
        * src/matcher_parser_parse.y
 2007-07-27 [paul]      2.10.0cvs77
 
        * src/matcher_parser_parse.y

diff --git a/PATCHSETS b/PATCHSETS
index 9cf24069588ac7f76059f6be87b3e2b9b79bebda..6be60c08b9d085622f8144b709db2c544b59e9d1 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2731,3 +2731,4 @@
 ( cvs diff -u -r 1.274.2.203 -r 1.274.2.204 src/mainwindow.c;  cvs diff -u -r 1.11.2.12 -r 1.11.2.13 src/manual.c;  cvs diff -u -r 1.8.2.8 -r 1.8.2.9 src/manual.h;  cvs diff -u -r 1.5.2.61 -r 1.5.2.62 src/gtk/gtkutils.c;  ) > 2.10.0cvs75.patchset
 ( cvs diff -u -r 1.382.2.396 -r 1.382.2.397 src/compose.c;  ) > 2.10.0cvs76.patchset
 ( cvs diff -u -r 1.25.2.31 -r 1.25.2.32 src/matcher_parser_parse.y;  cvs diff -u -r 1.1.4.38 -r 1.1.4.39 src/prefs_filtering_action.c;  cvs diff -u -r 1.43.2.59 -r 1.43.2.60 src/prefs_matcher.c;  ) > 2.10.0cvs77.patchset
 ( cvs diff -u -r 1.274.2.203 -r 1.274.2.204 src/mainwindow.c;  cvs diff -u -r 1.11.2.12 -r 1.11.2.13 src/manual.c;  cvs diff -u -r 1.8.2.8 -r 1.8.2.9 src/manual.h;  cvs diff -u -r 1.5.2.61 -r 1.5.2.62 src/gtk/gtkutils.c;  ) > 2.10.0cvs75.patchset
 ( cvs diff -u -r 1.382.2.396 -r 1.382.2.397 src/compose.c;  ) > 2.10.0cvs76.patchset
 ( cvs diff -u -r 1.25.2.31 -r 1.25.2.32 src/matcher_parser_parse.y;  cvs diff -u -r 1.1.4.38 -r 1.1.4.39 src/prefs_filtering_action.c;  cvs diff -u -r 1.43.2.59 -r 1.43.2.60 src/prefs_matcher.c;  ) > 2.10.0cvs77.patchset

+( cvs diff -u -r 1.105.2.103 -r 1.105.2.104 src/prefs_account.c;  ) > 2.10.0cvs78.patchset

diff --git a/configure.ac b/configure.ac
index a4788bc0d6f5ba481d039c34bfb08bfc64ff2d74..5aa7543771862b90834e94905c6dc61cb2d5bae1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=77
+EXTRA_VERSION=78

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 738f890a54625a15c5cbc9e15af9f7f4287b32cb..aa9a6126a6be6e63f9a4071790ad35d0d896d493 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -1291,8 +1291,8 @@ static void receive_create_widget_func(PrefsPage * _page,
        GtkWidget *local_inbox_btn;
 
        GtkWidget *optmenu;
        GtkWidget *local_inbox_btn;
 
        GtkWidget *optmenu;

-       GtkWidget *optmenu_menu;
-       GtkWidget *menuitem;
+       GtkListStore *menu;
+       GtkTreeIter iter;

        GtkWidget *recvatgetall_checkbtn;
 
        GtkWidget *hbox2;
        GtkWidget *recvatgetall_checkbtn;
 
        GtkWidget *hbox2;


@@ -1459,19 +1459,17 @@ static void receive_create_widget_func(PrefsPage * _page,
        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 = gtk_option_menu_new ();
+
+       optmenu = gtkut_sc_combobox_create(NULL, FALSE);
+       menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu)));

        gtk_widget_show (optmenu);
        gtk_box_pack_start (GTK_BOX (hbox1), optmenu, FALSE, FALSE, 0);
 
        gtk_widget_show (optmenu);
        gtk_box_pack_start (GTK_BOX (hbox1), optmenu, FALSE, FALSE, 0);
 

-       optmenu_menu = gtk_menu_new ();
-
-       MENUITEM_ADD (optmenu_menu, menuitem, _("Automatic"), 0);
-       MENUITEM_ADD (optmenu_menu, menuitem, "LOGIN", IMAP_AUTH_LOGIN);
-       MENUITEM_ADD (optmenu_menu, menuitem, "CRAM-MD5", IMAP_AUTH_CRAM_MD5);
-       MENUITEM_ADD (optmenu_menu, menuitem, "ANONYMOUS", IMAP_AUTH_ANON);
-       MENUITEM_ADD (optmenu_menu, menuitem, "GSSAPI", IMAP_AUTH_GSSAPI);
-
-       gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu), optmenu_menu);
+       COMBOBOX_ADD (menu, _("Automatic"), 0);
+       COMBOBOX_ADD (menu, "LOGIN", IMAP_AUTH_LOGIN);
+       COMBOBOX_ADD (menu, "CRAM-MD5", IMAP_AUTH_CRAM_MD5);
+       COMBOBOX_ADD (menu, "ANONYMOUS", IMAP_AUTH_ANON);
+       COMBOBOX_ADD (menu, "GSSAPI", IMAP_AUTH_GSSAPI);

 
        hbox1 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox1);
 
        hbox1 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox1);


@@ -3532,43 +3530,16 @@ static void prefs_account_protocol_set_optmenu(PrefParam *pparam)
 
 static void prefs_account_imap_auth_type_set_data_from_optmenu(PrefParam *pparam)
 {
 
 static void prefs_account_imap_auth_type_set_data_from_optmenu(PrefParam *pparam)
 {

-       GtkWidget *menu;
-       GtkWidget *menuitem;
-
-       menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(*pparam->widget));
-       menuitem = gtk_menu_get_active(GTK_MENU(menu));
-       *((RecvProtocol *)pparam->data) = GPOINTER_TO_INT
-               (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
+       *((RecvProtocol *)pparam->data) =
+                       combobox_get_active_data(GTK_COMBO_BOX(*pparam->widget));

 }
 
 static void prefs_account_imap_auth_type_set_optmenu(PrefParam *pparam)
 {
        IMAPAuthType type = *((IMAPAuthType *)pparam->data);
 }
 
 static void prefs_account_imap_auth_type_set_optmenu(PrefParam *pparam)
 {
        IMAPAuthType type = *((IMAPAuthType *)pparam->data);

-       GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget);
-       GtkWidget *menu;
-       GtkWidget *menuitem;
-
-       switch (type) {
-       case IMAP_AUTH_LOGIN:
-               gtk_option_menu_set_history(optmenu, 1);
-               break;
-       case IMAP_AUTH_CRAM_MD5:
-               gtk_option_menu_set_history(optmenu, 2);
-               break;
-       case IMAP_AUTH_ANON:
-               gtk_option_menu_set_history(optmenu, 3);
-               break;
-       case IMAP_AUTH_GSSAPI:
-               gtk_option_menu_set_history(optmenu, 4);
-               break;
-       case 0:
-       default:
-               gtk_option_menu_set_history(optmenu, 0);
-       }
+       GtkComboBox *optmenu = GTK_COMBO_BOX(*pparam->widget);

 
 

-       menu = gtk_option_menu_get_menu(optmenu);
-       menuitem = gtk_menu_get_active(GTK_MENU(menu));
-       gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
+       combobox_select_by_data(optmenu, type);

 }
 
 static void prefs_account_smtp_auth_type_set_data_from_optmenu(PrefParam *pparam)
 }
 
 static void prefs_account_smtp_auth_type_set_data_from_optmenu(PrefParam *pparam)