commit 1b991ce1f05877ccd2d872da56cb55d1e1b0a3d1
parent 3459aff5b7bbabc9fcc84f1446dab8415716e566
Author: Paul <paul@claws-mail.org>
Date: Tue, 11 Jun 2013 13:39:45 +0100
fix a bunch of combobox related warnings
Diffstat:
8 files changed, 113 insertions(+), 15 deletions(-)
diff --git a/src/compose.c b/src/compose.c
@@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -930,11 +930,20 @@ static void compose_set_save_to(Compose *compose, const gchar *folderidentifier)
{
GtkEditable *entry;
if (folderidentifier) {
+#if !GTK_CHECK_VERSION(2, 24, 0)
combobox_unset_popdown_strings(GTK_COMBO_BOX(compose->savemsg_combo));
+#else
+ combobox_unset_popdown_strings(GTK_COMBO_BOX_TEXT(compose->savemsg_combo));
+#endif
prefs_common.compose_save_to_history = add_history(
prefs_common.compose_save_to_history, folderidentifier);
+#if !GTK_CHECK_VERSION(2, 24, 0)
combobox_set_popdown_strings(GTK_COMBO_BOX(compose->savemsg_combo),
prefs_common.compose_save_to_history);
+#else
+ combobox_set_popdown_strings(GTK_COMBO_BOX_TEXT(compose->savemsg_combo),
+ prefs_common.compose_save_to_history);
+#endif
}
entry = GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(compose->savemsg_combo)));
@@ -952,11 +961,20 @@ static gchar *compose_get_save_to(Compose *compose)
result = gtk_editable_get_chars(entry, 0, -1);
if (result) {
+#if !GTK_CHECK_VERSION(2, 24, 0)
combobox_unset_popdown_strings(GTK_COMBO_BOX(compose->savemsg_combo));
+#else
+ combobox_unset_popdown_strings(GTK_COMBO_BOX_TEXT(compose->savemsg_combo));
+#endif
prefs_common.compose_save_to_history = add_history(
prefs_common.compose_save_to_history, result);
+#if !GTK_CHECK_VERSION(2, 24, 0)
combobox_set_popdown_strings(GTK_COMBO_BOX(compose->savemsg_combo),
prefs_common.compose_save_to_history);
+#else
+ combobox_set_popdown_strings(GTK_COMBO_BOX_TEXT(compose->savemsg_combo),
+ prefs_common.compose_save_to_history);
+#endif
}
return result;
}
@@ -6709,7 +6727,7 @@ static void compose_create_header_entry(Compose *compose)
GtkCellRenderer *cell = gtk_cell_renderer_text_new();
gtk_cell_renderer_set_alignment(cell, 0.0, 0.5);
gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), cell, TRUE);
- gtk_combo_box_set_entry_text_column(combo, 0);
+ gtk_combo_box_set_entry_text_column(GTK_COMBO_BOX(combo), 0);
#endif
gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
g_signal_connect(G_OBJECT(gtk_bin_get_child(GTK_BIN(combo))), "grab_focus",
@@ -7077,9 +7095,13 @@ static GtkWidget *compose_create_others(Compose *compose)
gtk_widget_show(savemsg_combo);
if (prefs_common.compose_save_to_history)
+#if !GTK_CHECK_VERSION(2, 24, 0)
combobox_set_popdown_strings(GTK_COMBO_BOX(savemsg_combo),
prefs_common.compose_save_to_history);
-
+#else
+ combobox_set_popdown_strings(GTK_COMBO_BOX_TEXT(savemsg_combo),
+ prefs_common.compose_save_to_history);
+#endif
gtk_table_attach(GTK_TABLE(table), savemsg_combo, 1, 2, rowcount, rowcount + 1, GTK_FILL|GTK_EXPAND, GTK_SHRINK, 0, 0);
gtk_widget_set_sensitive(GTK_WIDGET(savemsg_combo), prefs_common.savemsg);
g_signal_connect_after(G_OBJECT(savemsg_combo), "grab_focus",
diff --git a/src/editaddress.c b/src/editaddress.c
@@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -1366,9 +1366,13 @@ static void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl )
#endif
gtk_combo_box_set_active(GTK_COMBO_BOX(entry_name), -1);
if (prefs_common.addressbook_custom_attributes)
+#if !GTK_CHECK_VERSION(2, 24, 0)
combobox_set_popdown_strings(GTK_COMBO_BOX(entry_name),
prefs_common.addressbook_custom_attributes);
-
+#else
+ combobox_set_popdown_strings(GTK_COMBO_BOX_TEXT(entry_name),
+ prefs_common.addressbook_custom_attributes);
+#endif
/* Button box */
vboxb = gtk_vbox_new( FALSE, 4 );
gtk_box_pack_start(GTK_BOX(hbox), vboxb, FALSE, FALSE, 2);
@@ -1760,10 +1764,19 @@ no_img:
void addressbook_edit_reload_attr_list( void )
{
if (personeditdlg.entry_atname) {
+#if !GTK_CHECK_VERSION(2, 24, 0)
combobox_unset_popdown_strings(GTK_COMBO_BOX(personeditdlg.entry_atname));
+#else
+ combobox_unset_popdown_strings(GTK_COMBO_BOX_TEXT(personeditdlg.entry_atname));
+#endif
if (prefs_common.addressbook_custom_attributes)
+#if !GTK_CHECK_VERSION(2, 24, 0)
combobox_set_popdown_strings(GTK_COMBO_BOX(personeditdlg.entry_atname),
prefs_common.addressbook_custom_attributes);
+#else
+ combobox_set_popdown_strings(GTK_COMBO_BOX_TEXT(personeditdlg.entry_atname),
+ prefs_common.addressbook_custom_attributes);
+#endif
}
}
diff --git a/src/gtk/inputdialog.c b/src/gtk/inputdialog.c
@@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -197,10 +197,13 @@ gchar *input_dialog_combo_remember(const gchar *title, const gchar *message,
gtk_widget_show(icon_q);
gtk_widget_hide(icon_p);
is_pass = FALSE;
-
+#if !GTK_CHECK_VERSION(2, 24, 0)
combobox_unset_popdown_strings(GTK_COMBO_BOX(combo));
combobox_set_popdown_strings(GTK_COMBO_BOX(combo), list);
-
+#else
+ combobox_unset_popdown_strings(GTK_COMBO_BOX_TEXT(combo));
+ combobox_set_popdown_strings(GTK_COMBO_BOX_TEXT(combo), list);
+#endif
return input_dialog_open(title, message, NULL, default_string, FALSE, remember);
}
diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Colin Leroy <colin@colino.net>
+ * Copyright (C) 1999-2013 Colin Leroy <colin@colino.net>
* and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
@@ -208,14 +208,23 @@ static void quicksearch_set_popdown_strings(QuickSearch *quicksearch)
{
GtkWidget *search_string_entry = quicksearch->search_string_entry;
+#if !GTK_CHECK_VERSION(2, 24, 0)
combobox_unset_popdown_strings(GTK_COMBO_BOX(search_string_entry));
-
if (prefs_common.summary_quicksearch_type == ADVANCED_SEARCH_EXTENDED)
combobox_set_popdown_strings(GTK_COMBO_BOX(search_string_entry),
quicksearch->extended_search_strings);
else
combobox_set_popdown_strings(GTK_COMBO_BOX(search_string_entry),
quicksearch->normal_search_strings);
+#else
+ combobox_unset_popdown_strings(GTK_COMBO_BOX_TEXT(search_string_entry));
+ if (prefs_common.summary_quicksearch_type == ADVANCED_SEARCH_EXTENDED)
+ combobox_set_popdown_strings(GTK_COMBO_BOX_TEXT(search_string_entry),
+ quicksearch->extended_search_strings);
+ else
+ combobox_set_popdown_strings(GTK_COMBO_BOX_TEXT(search_string_entry),
+ quicksearch->normal_search_strings);
+#endif
}
static void update_extended_buttons (QuickSearch *quicksearch)
diff --git a/src/message_search.c b/src/message_search.c
@@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -193,8 +193,13 @@ static void message_search_create(void)
#endif
gtk_combo_box_set_active(GTK_COMBO_BOX(body_entry), -1);
if (prefs_common.message_search_history)
+#if !GTK_CHECK_VERSION(2, 24, 0)
combobox_set_popdown_strings(GTK_COMBO_BOX(body_entry),
prefs_common.message_search_history);
+#else
+ combobox_set_popdown_strings(GTK_COMBO_BOX_TEXT(body_entry),
+ prefs_common.message_search_history);
+#endif
gtk_widget_show (body_entry);
gtk_box_pack_start (GTK_BOX (hbox1), body_entry, TRUE, TRUE, 0);
g_signal_connect(G_OBJECT(body_entry), "changed",
@@ -290,11 +295,20 @@ static void message_search_execute(gboolean backward)
if (!body_str || *body_str == '\0') return;
/* add to history */
+#if !GTK_CHECK_VERSION(2, 24, 0)
combobox_unset_popdown_strings(GTK_COMBO_BOX(search_window.body_entry));
+#else
+ combobox_unset_popdown_strings(GTK_COMBO_BOX_TEXT(search_window.body_entry));
+#endif
prefs_common.message_search_history = add_history(
prefs_common.message_search_history, body_str);
+#if !GTK_CHECK_VERSION(2, 24, 0)
combobox_set_popdown_strings(GTK_COMBO_BOX(search_window.body_entry),
prefs_common.message_search_history);
+#else
+ combobox_set_popdown_strings(GTK_COMBO_BOX_TEXT(search_window.body_entry),
+ prefs_common.message_search_history);
+#endif
case_sens = gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON(search_window.case_checkbtn));
diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
@@ -655,7 +655,7 @@ static void prefs_matcher_create(void)
GtkCellRenderer *cell = gtk_cell_renderer_text_new();
gtk_cell_renderer_set_alignment(cell, 0.0, 0.5);
gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(headers_combo), cell, TRUE);
- gtk_combo_box_set_entry_text_column(headers_combo, 0);
+ gtk_combo_box_set_entry_text_column(GTK_COMBO_BOX(headers_combo), 0);
#endif
gtk_widget_set_size_request(headers_combo, 100, -1);
gtk_box_pack_start(GTK_BOX(upper_hbox), headers_combo, TRUE, TRUE, 0);
diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
@@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2012 Hiroyuki Yamamoto & the Claws Mail team
+ * Copyright (C) 2002-2013 Hiroyuki Yamamoto & the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -382,8 +382,13 @@ static void prefs_toolbar_populate(ToolbarPage *prefs_toolbar)
GHashTable **hash;
prefs_toolbar->combo_action_list = toolbar_get_action_items(prefs_toolbar->source);
+#if !GTK_CHECK_VERSION(2, 24, 0)
combobox_set_popdown_strings(GTK_COMBO_BOX(prefs_toolbar->item_func_combo),
prefs_toolbar->combo_action_list);
+#else
+ combobox_set_popdown_strings(GTK_COMBO_BOX_TEXT(prefs_toolbar->item_func_combo),
+ prefs_toolbar->combo_action_list);
+#endif
/* get currently defined sylpheed actions */
if (prefs_common.actions_list != NULL) {
diff --git a/src/summary_search.c b/src/summary_search.c
@@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -181,10 +181,17 @@ static gchar* add_history_get(GtkWidget *from, GList **history)
if (result && result[0] != '\0') {
/* add to history */
-
+#if !GTK_CHECK_VERSION(2, 24, 0)
combobox_unset_popdown_strings(GTK_COMBO_BOX(from));
+#else
+ combobox_unset_popdown_strings(GTK_COMBO_BOX_TEXT(from));
+#endif
*history = add_history(*history, result);
+#if !GTK_CHECK_VERSION(2, 24, 0)
combobox_set_popdown_strings(GTK_COMBO_BOX(from), *history);
+#else
+ combobox_set_popdown_strings(GTK_COMBO_BOX_TEXT(from), *history);
+#endif
return result;
} else {
@@ -311,8 +318,13 @@ static void summary_search_create(void)
#endif
gtk_combo_box_set_active(GTK_COMBO_BOX(from_entry), -1);
if (prefs_common.summary_search_from_history)
+#if !GTK_CHECK_VERSION(2, 24, 0)
combobox_set_popdown_strings(GTK_COMBO_BOX(from_entry),
prefs_common.summary_search_from_history);
+#else
+ combobox_set_popdown_strings(GTK_COMBO_BOX_TEXT(from_entry),
+ prefs_common.summary_search_from_history);
+#endif
gtk_widget_show (from_entry);
gtk_table_attach (GTK_TABLE (table1), from_entry, 1, 3, 0, 1,
GTK_EXPAND|GTK_FILL, 0, 0, 0);
@@ -330,8 +342,13 @@ static void summary_search_create(void)
#endif
gtk_combo_box_set_active(GTK_COMBO_BOX(to_entry), -1);
if (prefs_common.summary_search_to_history)
+#if !GTK_CHECK_VERSION(2, 24, 0)
combobox_set_popdown_strings(GTK_COMBO_BOX(to_entry),
prefs_common.summary_search_to_history);
+#else
+ combobox_set_popdown_strings(GTK_COMBO_BOX_TEXT(to_entry),
+ prefs_common.summary_search_to_history);
+#endif
gtk_widget_show (to_entry);
gtk_table_attach (GTK_TABLE (table1), to_entry, 1, 3, 1, 2,
GTK_EXPAND|GTK_FILL, 0, 0, 0);
@@ -349,8 +366,13 @@ static void summary_search_create(void)
#endif
gtk_combo_box_set_active(GTK_COMBO_BOX(subject_entry), -1);
if (prefs_common.summary_search_subject_history)
+#if !GTK_CHECK_VERSION(2, 24, 0)
combobox_set_popdown_strings(GTK_COMBO_BOX(subject_entry),
prefs_common.summary_search_subject_history);
+#else
+ combobox_set_popdown_strings(GTK_COMBO_BOX_TEXT(subject_entry),
+ prefs_common.summary_search_subject_history);
+#endif
gtk_widget_show (subject_entry);
gtk_table_attach (GTK_TABLE (table1), subject_entry, 1, 3, 2, 3,
GTK_EXPAND|GTK_FILL, 0, 0, 0);
@@ -368,8 +390,13 @@ static void summary_search_create(void)
#endif
gtk_combo_box_set_active(GTK_COMBO_BOX(body_entry), -1);
if (prefs_common.summary_search_body_history)
+#if !GTK_CHECK_VERSION(2, 24, 0)
combobox_set_popdown_strings(GTK_COMBO_BOX(body_entry),
prefs_common.summary_search_body_history);
+#else
+ combobox_set_popdown_strings(GTK_COMBO_BOX_TEXT(body_entry),
+ prefs_common.summary_search_body_history);
+#endif
gtk_widget_show (body_entry);
gtk_table_attach (GTK_TABLE (table1), body_entry, 1, 3, 3, 4,
GTK_EXPAND|GTK_FILL, 0, 0, 0);
@@ -387,8 +414,13 @@ static void summary_search_create(void)
#endif
gtk_combo_box_set_active(GTK_COMBO_BOX(adv_condition_entry), -1);
if (prefs_common.summary_search_adv_condition_history)
+#if !GTK_CHECK_VERSION(2, 24, 0)
combobox_set_popdown_strings(GTK_COMBO_BOX(adv_condition_entry),
prefs_common.summary_search_adv_condition_history);
+#else
+ combobox_set_popdown_strings(GTK_COMBO_BOX_TEXT(adv_condition_entry),
+ prefs_common.summary_search_adv_condition_history);
+#endif
gtk_widget_show (adv_condition_entry);
gtk_table_attach (GTK_TABLE (table1), adv_condition_entry, 1, 2, 4, 5,
GTK_EXPAND|GTK_FILL, 0, 0, 0);
