2011-04-10 [colin] 3.7.9cvs9
authorColin Leroy <colin@colino.net>
Sun, 10 Apr 2011 16:25:32 +0000 (16:25 +0000)
committerColin Leroy <colin@colino.net>
Sun, 10 Apr 2011 16:25:32 +0000 (16:25 +0000)
* src/compose.c
* src/editaddress.c
* src/editaddress_other_attributes_ldap.c
* src/main.c
* src/message_search.c
* src/prefs_display_header.c
* src/prefs_matcher.c
* src/prefs_toolbar.c
* src/summary_search.c
* src/gtk/combobox.c
* src/gtk/gtkutils.h
* src/gtk/inputdialog.c
* src/gtk/quicksearch.c
Finish fun with combo boxes. (hopefully)

16 files changed:
ChangeLog
PATCHSETS
configure.ac
src/compose.c
src/editaddress.c
src/editaddress_other_attributes_ldap.c
src/gtk/combobox.c
src/gtk/gtkutils.h
src/gtk/inputdialog.c
src/gtk/quicksearch.c
src/main.c
src/message_search.c
src/prefs_display_header.c
src/prefs_matcher.c
src/prefs_toolbar.c
src/summary_search.c

index b7b85b5..043aaec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2011-04-10 [colin]     3.7.9cvs9
+
+       * src/compose.c
+       * src/editaddress.c
+       * src/editaddress_other_attributes_ldap.c
+       * src/main.c
+       * src/message_search.c
+       * src/prefs_display_header.c
+       * src/prefs_matcher.c
+       * src/prefs_toolbar.c
+       * src/summary_search.c
+       * src/gtk/combobox.c
+       * src/gtk/gtkutils.h
+       * src/gtk/inputdialog.c
+       * src/gtk/quicksearch.c
+               Finish fun with combo boxes. (hopefully)
+
 2011-04-10 [colin]     3.7.9cvs8
 
        * src/compose.c
index ea66b9f..482c551 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.94.2.215 -r 1.94.2.216 src/messageview.c;  ) > 3.7.9cvs6.patchset
 ( cvs diff -u -r 1.27.2.51 -r 1.27.2.52 src/addr_compl.c;  cvs diff -u -r 1.60.2.141 -r 1.60.2.142 src/addressbook.c;  cvs diff -u -r 1.382.2.572 -r 1.382.2.573 src/compose.c;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/editaddress_other_attributes_ldap.c;  cvs diff -u -r 1.3.12.36 -r 1.3.12.37 src/message_search.c;  cvs diff -u -r 1.16.2.40 -r 1.16.2.41 src/prefs_display_header.c;  cvs diff -u -r 1.1.4.66 -r 1.1.4.67 src/prefs_filtering_action.c;  cvs diff -u -r 1.1.2.39 -r 1.1.2.40 src/prefs_other.c;  cvs diff -u -r 1.30.2.64 -r 1.30.2.65 src/prefs_toolbar.c;  cvs diff -u -r 1.15.2.62 -r 1.15.2.63 src/summary_search.c;  cvs diff -u -r 1.2.2.31 -r 1.2.2.32 src/gtk/colorlabel.c;  cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/gtk/combobox.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/gtk/gtkcmoptionmenu.c;  cvs diff -u -r 1.4.2.53 -r 1.4.2.54 src/gtk/gtkutils.h;  ) > 3.7.9cvs7.patchset
 ( cvs diff -u -r 1.382.2.573 -r 1.382.2.574 src/compose.c;  cvs diff -u -r 1.1.4.67 -r 1.1.4.68 src/prefs_filtering_action.c;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/gtk/combobox.c;  cvs diff -u -r 1.1.4.14 -r 1.1.4.15 src/gtk/gtkshruler.c;  cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/gtk/gtkshruler.h;  ) > 3.7.9cvs8.patchset
+( cvs diff -u -r 1.382.2.574 -r 1.382.2.575 src/compose.c;  cvs diff -u -r 1.14.2.58 -r 1.14.2.59 src/editaddress.c;  cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/editaddress_other_attributes_ldap.c;  cvs diff -u -r 1.115.2.235 -r 1.115.2.236 src/main.c;  cvs diff -u -r 1.3.12.37 -r 1.3.12.38 src/message_search.c;  cvs diff -u -r 1.16.2.41 -r 1.16.2.42 src/prefs_display_header.c;  cvs diff -u -r 1.43.2.87 -r 1.43.2.88 src/prefs_matcher.c;  cvs diff -u -r 1.30.2.65 -r 1.30.2.66 src/prefs_toolbar.c;  cvs diff -u -r 1.15.2.63 -r 1.15.2.64 src/summary_search.c;  cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/gtk/combobox.c;  cvs diff -u -r 1.4.2.54 -r 1.4.2.55 src/gtk/gtkutils.h;  cvs diff -u -r 1.2.2.40 -r 1.2.2.41 src/gtk/inputdialog.c;  cvs diff -u -r 1.1.2.100 -r 1.1.2.101 src/gtk/quicksearch.c;  ) > 3.7.9cvs9.patchset
index b0f6d4e..2c4171b 100644 (file)
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=9
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=8
+EXTRA_VERSION=9
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 95c5daf..cfa629e 100644 (file)
@@ -6492,7 +6492,7 @@ static void compose_create_header_entry(Compose *compose)
 
        /* Combo box */
        model = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
-       combo = gtk_combo_box_entry_new_with_model(GTK_TREE_MODEL(model), 0);
+       combo = gtk_combo_box_new_with_model_and_entry(GTK_TREE_MODEL(model));
        COMBOBOX_ADD(model, prefs_common_translated_header_name("To:"),
                        COMPOSE_TO);
        COMBOBOX_ADD(model, prefs_common_translated_header_name("Cc:"),
@@ -6845,7 +6845,7 @@ static GtkWidget *compose_create_others(Compose *compose)
        g_signal_connect(G_OBJECT(savemsg_checkbtn), "toggled",
                         G_CALLBACK(compose_savemsg_checkbtn_cb), compose);
 
-       savemsg_combo = gtk_combo_box_entry_new_text();
+       savemsg_combo = gtk_combo_box_new_with_entry();
        compose->savemsg_checkbtn = savemsg_checkbtn;
        compose->savemsg_combo = savemsg_combo;
        gtk_widget_show(savemsg_combo);
@@ -8695,7 +8695,7 @@ static void compose_attach_property_create(gboolean *cancelled)
        gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, (0 + 1), 
                         GTK_FILL, 0, 0, 0); 
        gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); 
-       mimetype_entry = gtk_combo_box_entry_new_text(); 
+       mimetype_entry = gtk_combo_box_new_with_entry();
        gtk_table_attach(GTK_TABLE(table), mimetype_entry, 1, 2, 0, (0 + 1), 
                         GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
                         
index 2322406..a8c1f9f 100644 (file)
@@ -1327,7 +1327,7 @@ static void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl )
        gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
        gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 
-       entry_name = gtk_combo_box_entry_new_text ();
+       entry_name = gtk_combo_box_new_with_entry();
        gtk_table_attach(GTK_TABLE(table), entry_name, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
 
        /* Next row */
index f30dd4b..9e26167 100644 (file)
@@ -352,7 +352,7 @@ void addressbook_edit_person_page_attrib_ldap(PersonEditDlg *dialog, gint pageNu
 
        gchar **attribute = (gchar **) ATTRIBUTE;
 
-       combo_box = gtk_combo_box_new_text();
+       combo_box = gtk_combo_box_text_new();
 
        while (*attribute) {
                if (!strcmp(*attribute, "jpegPhoto")) {
index 785ec8a..52d9e3f 100644 (file)
@@ -44,12 +44,9 @@ GtkWidget *combobox_text_new(const gboolean with_entry, const gchar *text, ...)
        if(text == NULL)
                return NULL;
        
-       if (with_entry) {
-               GtkListStore *store = gtk_list_store_new (1, G_TYPE_STRING);
-               combo = gtk_combo_box_entry_new_with_model (
-                                       GTK_TREE_MODEL(store), 0);
-               g_object_unref (store);
-       } else
+       if (with_entry)
+               combo = gtk_combo_box_new_with_entry();
+       else
                combo = gtk_combo_box_text_new();
        gtk_widget_show(combo);
 
index a496d3d..a1ff057 100644 (file)
@@ -243,6 +243,9 @@ claws_input_add    (gint          source,
 #define gtk_combo_box_text_prepend_text gtk_combo_box_prepend_text
 #define gtk_combo_box_text_get_active_text gtk_combo_box_get_active_text
 #define gtk_combo_box_text_remove gtk_combo_box_remove_text
+#define gtk_combo_box_new_with_entry gtk_combo_box_entry_new_text
+#define gtk_combo_box_new_with_model_and_entry(x) \
+               gtk_combo_box_entry_new_with_model((x), 0)
 #endif
 
 #endif /* __GTKUTILS_H__ */
index 4b0c463..272dd57 100644 (file)
@@ -374,7 +374,7 @@ static void input_dialog_create(gboolean is_password)
        g_signal_connect(G_OBJECT(entry), "activate",
                         G_CALLBACK(entry_activated), NULL);
 
-       combo = gtk_combo_box_entry_new_text();
+       combo = gtk_combo_box_new_with_entry();
        gtk_box_pack_start(GTK_BOX(vbox), combo, FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT(gtk_bin_get_child(GTK_BIN((combo)))), "activate",
                         G_CALLBACK(combo_activated), NULL);
index 248c4a2..3a90e66 100644 (file)
@@ -784,7 +784,7 @@ QuickSearch *quicksearch_new()
 
        gtk_widget_show(search_type);
 
-       search_string_entry = gtk_combo_box_entry_new_text ();
+       search_string_entry = gtk_combo_box_new_with_entry ();
        gtk_combo_box_set_active(GTK_COMBO_BOX(search_string_entry), -1);
 
        vbox = gtk_vbox_new(TRUE, 0);
index 61509ca..706f11f 100644 (file)
@@ -1077,7 +1077,6 @@ int main(int argc, char *argv[])
 
 #ifdef CRASH_DIALOG
        if (cmd.crash) {
-               gtk_set_locale();
                gtk_init(&argc, &argv);
                crash_main(cmd.crash_params);
 #ifdef G_OS_WIN32
@@ -1114,7 +1113,6 @@ int main(int argc, char *argv[])
        if (!g_thread_supported())
                g_thread_init(NULL);
 
-       gtk_set_locale();
        gtk_init(&argc, &argv);
 
 #ifdef G_OS_WIN32
index ef0d61b..1814c53 100644 (file)
@@ -186,7 +186,7 @@ static void message_search_create(void)
        gtk_widget_show (body_label);
        gtk_box_pack_start (GTK_BOX (hbox1), body_label, FALSE, FALSE, 0);
 
-       body_entry = gtk_combo_box_entry_new_text ();
+       body_entry = gtk_combo_box_new_with_entry();
        gtk_combo_box_set_active(GTK_COMBO_BOX(body_entry), -1);
        if (prefs_common.message_search_history)
                combobox_set_popdown_strings(GTK_COMBO_BOX(body_entry),
index fd5168a..64ad76a 100644 (file)
@@ -274,7 +274,7 @@ static void prefs_display_header_create(void)
        gtk_widget_show (hdr_label);
        gtk_box_pack_start (GTK_BOX (hbox1), hdr_label, FALSE, FALSE, 0);
 
-       hdr_combo = gtk_combo_box_entry_new_text();
+       hdr_combo = gtk_combo_box_new_with_entry();
        for(i=0; i < 9 ; i++)
                gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(hdr_combo),
                        (*defaults[i] == '-') ? defaults[i]+1 : defaults[i]);
index dedd70c..79e4bc0 100644 (file)
@@ -630,7 +630,7 @@ static void prefs_matcher_create(void)
        gtk_box_pack_start(GTK_BOX(upper_hbox), criteria_label2, FALSE, FALSE, 0);
 
        /* headers combo box entry */
-       headers_combo = gtk_combo_box_entry_new_with_model(matcher.model_headers, 0);
+       headers_combo = gtk_combo_box_new_with_model_and_entry(matcher.model_headers);
        gtk_widget_set_size_request(headers_combo, 100, -1);
        gtk_box_pack_start(GTK_BOX(upper_hbox), headers_combo, TRUE, TRUE, 0);
        header_entry = gtk_bin_get_child(GTK_BIN((headers_combo)));
index 1eecc6b..b83be45 100644 (file)
@@ -925,21 +925,21 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
                          (GtkAttachOptions) (GTK_FILL),
                          (GtkAttachOptions) (0), 0, 0);
 
-       item_action_combo = gtk_combo_box_new_text();
+       item_action_combo = gtk_combo_box_text_new();
        gtk_widget_set_size_request(item_action_combo, 200, -1);
        gtk_table_attach (GTK_TABLE (table), item_action_combo, 1, 3, 1, 2,
                          (GtkAttachOptions) (GTK_FILL),
                          (GtkAttachOptions) (0), 0, 0);
                          
        /* available internal functions */
-       item_func_combo = gtk_combo_box_new_text();
+       item_func_combo = gtk_combo_box_text_new();
        gtk_widget_set_size_request(item_func_combo, 200, -1);
        gtk_table_attach (GTK_TABLE (table), item_func_combo, 1, 3, 1, 2,
                          (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                          (GtkAttachOptions) (0), 0, 0);
        
        /* plugin-registered items */
-       item_plugin_combo = gtk_combo_box_new_text();
+       item_plugin_combo = gtk_combo_box_text_new();
        gtk_widget_set_size_request(item_plugin_combo, 200, -1);
        gtk_table_attach(GTK_TABLE(table), item_plugin_combo, 1, 3, 1, 2,
                         (GtkAttachOptions) (GTK_FILL),
index cb6fd22..78eec9c 100644 (file)
@@ -264,7 +264,7 @@ static void summary_search_create(void)
        gtk_table_set_row_spacings (GTK_TABLE (table1), 8);
        gtk_table_set_col_spacings (GTK_TABLE (table1), 8);
 
-       from_entry = gtk_combo_box_entry_new_text ();
+       from_entry = gtk_combo_box_new_with_entry ();
        gtk_combo_box_set_active(GTK_COMBO_BOX(from_entry), -1);
        if (prefs_common.summary_search_from_history)
                combobox_set_popdown_strings(GTK_COMBO_BOX(from_entry),
@@ -279,7 +279,7 @@ static void summary_search_create(void)
        g_signal_connect(G_OBJECT(gtk_bin_get_child(GTK_BIN((from_entry)))),
                         "focus_out_event", G_CALLBACK(from_entry_focus_evt_out), NULL);
 
-       to_entry = gtk_combo_box_entry_new_text ();
+       to_entry = gtk_combo_box_new_with_entry ();
        gtk_combo_box_set_active(GTK_COMBO_BOX(to_entry), -1);
        if (prefs_common.summary_search_to_history)
                combobox_set_popdown_strings(GTK_COMBO_BOX(to_entry),
@@ -294,7 +294,7 @@ static void summary_search_create(void)
        g_signal_connect(G_OBJECT(gtk_bin_get_child(GTK_BIN((to_entry)))),
                         "focus_out_event", G_CALLBACK(to_entry_focus_evt_out), NULL);
 
-       subject_entry = gtk_combo_box_entry_new_text ();
+       subject_entry = gtk_combo_box_new_with_entry ();
        gtk_combo_box_set_active(GTK_COMBO_BOX(subject_entry), -1);
        if (prefs_common.summary_search_subject_history)
                combobox_set_popdown_strings(GTK_COMBO_BOX(subject_entry),
@@ -309,7 +309,7 @@ static void summary_search_create(void)
        g_signal_connect(G_OBJECT(gtk_bin_get_child(GTK_BIN((subject_entry)))),
                         "focus_out_event", G_CALLBACK(subject_entry_focus_evt_out), NULL);
 
-       body_entry = gtk_combo_box_entry_new_text ();
+       body_entry = gtk_combo_box_new_with_entry ();
        gtk_combo_box_set_active(GTK_COMBO_BOX(body_entry), -1);
        if (prefs_common.summary_search_body_history)
                combobox_set_popdown_strings(GTK_COMBO_BOX(body_entry),
@@ -324,7 +324,7 @@ static void summary_search_create(void)
        g_signal_connect(G_OBJECT(gtk_bin_get_child(GTK_BIN((body_entry)))),
                         "focus_out_event", G_CALLBACK(body_entry_focus_evt_out), NULL);
 
-       adv_condition_entry = gtk_combo_box_entry_new_text ();
+       adv_condition_entry = gtk_combo_box_new_with_entry ();
        gtk_combo_box_set_active(GTK_COMBO_BOX(adv_condition_entry), -1);
        if (prefs_common.summary_search_adv_condition_history)
                combobox_set_popdown_strings(GTK_COMBO_BOX(adv_condition_entry),