commit 5e625862107295854be31f0a42daa0bff8228923
parent 388838601da898001d05e3530ab974ed482eeb8a
Author: Colin Leroy <colin@colino.net>
Date: Sun, 10 Apr 2011 08:52:01 +0000
2011-04-10 [colin] 3.7.9cvs4
* src/compose.c
* src/editaddress_other_attributes_ldap.c
* src/message_search.c
* src/prefs_display_header.c
* src/prefs_filtering_action.c
* src/prefs_other.c
* src/prefs_toolbar.c
* src/summary_search.c
* src/gtk/combobox.c
* src/gtk/gtkutils.h
gtk_combo_box_*_text() is deprecated, and
gtk_combo_box_text_*() is the new hotness.
Diffstat:
13 files changed, 55 insertions(+), 30 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,18 @@
+2011-04-10 [colin] 3.7.9cvs4
+
+ * src/compose.c
+ * src/editaddress_other_attributes_ldap.c
+ * src/message_search.c
+ * src/prefs_display_header.c
+ * src/prefs_filtering_action.c
+ * src/prefs_other.c
+ * src/prefs_toolbar.c
+ * src/summary_search.c
+ * src/gtk/combobox.c
+ * src/gtk/gtkutils.h
+ gtk_combo_box_*_text() is deprecated, and
+ gtk_combo_box_text_*() is the new hotness.
+
2011-04-10 [colin] 3.7.9cvs3
* src/addr_compl.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4155,3 +4155,4 @@
( cvs diff -u -r 1.1.2.65 -r 1.1.2.66 src/prefs_summaries.c; ) > 3.7.9cvs1.patchset
( cvs diff -u -r 1.274.2.321 -r 1.274.2.322 src/mainwindow.c; ) > 3.7.9cvs2.patchset
( cvs diff -u -r 1.27.2.50 -r 1.27.2.51 src/addr_compl.c; cvs diff -u -r 1.60.2.140 -r 1.60.2.141 src/addressbook.c; cvs diff -u -r 1.2.4.25 -r 1.2.4.26 src/browseldap.c; cvs diff -u -r 1.382.2.570 -r 1.382.2.571 src/compose.c; cvs diff -u -r 1.213.2.201 -r 1.213.2.202 src/folder.c; cvs diff -u -r 1.207.2.219 -r 1.207.2.220 src/folderview.c; cvs diff -u -r 1.5.2.20 -r 1.5.2.21 src/gtk/gtkvscrollbutton.c; cvs diff -u -r 1.3.2.3 -r 1.3.2.4 src/gtk/gtkvscrollbutton.h; ) > 3.7.9cvs3.patchset
+( cvs diff -u -r 1.382.2.571 -r 1.382.2.572 src/compose.c; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/editaddress_other_attributes_ldap.c; cvs diff -u -r 1.3.12.35 -r 1.3.12.36 src/message_search.c; cvs diff -u -r 1.16.2.39 -r 1.16.2.40 src/prefs_display_header.c; cvs diff -u -r 1.1.4.65 -r 1.1.4.66 src/prefs_filtering_action.c; cvs diff -u -r 1.1.2.38 -r 1.1.2.39 src/prefs_other.c; cvs diff -u -r 1.30.2.63 -r 1.30.2.64 src/prefs_toolbar.c; cvs diff -u -r 1.15.2.61 -r 1.15.2.62 src/summary_search.c; cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/gtk/combobox.c; cvs diff -u -r 1.4.2.52 -r 1.4.2.53 src/gtk/gtkutils.h; ) > 3.7.9cvs4.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
MICRO_VERSION=9
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=3
+EXTRA_VERSION=4
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/compose.c b/src/compose.c
@@ -4714,7 +4714,7 @@ static void compose_select_account(Compose *compose, PrefsAccount *account,
}
header_entry = (ComposeHeaderEntry *) compose->header_list->data;
- header = gtk_combo_box_get_active_text(GTK_COMBO_BOX(header_entry->combo));
+ header = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX(header_entry->combo));
if (header && !strlen(gtk_entry_get_text(GTK_ENTRY(header_entry->entry)))) {
if (account->protocol == A_NNTP) {
@@ -8705,7 +8705,7 @@ static void compose_attach_property_create(gboolean *cancelled)
for (mime_type_list = strlist; mime_type_list != NULL;
mime_type_list = mime_type_list->next) {
- gtk_combo_box_append_text(GTK_COMBO_BOX(mimetype_entry), mime_type_list->data);
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX(mimetype_entry), mime_type_list->data);
g_free(mime_type_list->data);
}
g_list_free(strlist);
diff --git a/src/editaddress_other_attributes_ldap.c b/src/editaddress_other_attributes_ldap.c
@@ -359,7 +359,7 @@ void addressbook_edit_person_page_attrib_ldap(PersonEditDlg *dialog, gint pageNu
attribute++;
continue;
}
- gtk_combo_box_append_text(GTK_COMBO_BOX(combo_box), *attribute++);
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX(combo_box), *attribute++);
}
gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box), 0);
diff --git a/src/gtk/combobox.c b/src/gtk/combobox.c
@@ -50,10 +50,10 @@ GtkWidget *combobox_text_new(const gboolean with_entry, const gchar *text, ...)
combo = gtk_combo_box_new_text();
gtk_widget_show(combo);
- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), text);
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX(combo), text);
va_start(args, text);
while ((string = va_arg(args, gchar*)) != NULL)
- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), string);
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX(combo), string);
va_end(args);
gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
@@ -160,7 +160,7 @@ void combobox_unset_popdown_strings(GtkComboBox *combobox)
model = gtk_combo_box_get_model(combobox);
count = gtk_tree_model_iter_n_children(model, NULL);
for (i = 0; i < count; i++)
- gtk_combo_box_remove_text(combobox, 0);
+ gtk_combo_box_text_remove(combobox, 0);
}
void combobox_set_popdown_strings(GtkComboBox *combobox,
@@ -171,7 +171,7 @@ void combobox_set_popdown_strings(GtkComboBox *combobox,
cm_return_if_fail(combobox != NULL);
for (cur = list; cur != NULL; cur = g_list_next(cur))
- gtk_combo_box_append_text(combobox, (const gchar*) cur->data);
+ gtk_combo_box_text_append_text(combobox, (const gchar*) cur->data);
}
gboolean combobox_set_value_from_arrow_key(GtkComboBox *combobox,
@@ -204,7 +204,7 @@ gboolean combobox_set_value_from_arrow_key(GtkComboBox *combobox,
/* if current text is in list, get prev or next one */
if (keyval == GDK_Up) {
- gchar *text = gtk_combo_box_get_active_text(combobox);
+ gchar *text = gtk_combo_box_text_get_active_text(combobox);
if (!text)
text = gtk_editable_get_chars(GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(combobox))),0,-1);
valid = gtkut_tree_model_text_iter_prev(model, &iter, text);
diff --git a/src/gtk/gtkutils.h b/src/gtk/gtkutils.h
@@ -233,6 +233,15 @@ claws_input_add (gint source,
gtk_tooltips_set_tip(GTK_TOOLTIPS(tips), widget, \
tip, NULL); \
}
+#endif
+#if !GTK_CHECK_VERSION(2,24,0)
+#define gtk_combo_box_text_new gtk_combo_box_new_text
+#define gtk_combo_box_text_append_text gtk_combo_box_append_text
+#define gtk_combo_box_text_insert_text gtk_combo_box_insert_text
+#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
#endif
+
#endif /* __GTKUTILS_H__ */
diff --git a/src/message_search.c b/src/message_search.c
@@ -275,7 +275,7 @@ static void message_search_execute(gboolean backward)
gboolean all_searched = FALSE;
gchar *body_str;
- body_str = gtk_combo_box_get_active_text(GTK_COMBO_BOX(search_window.body_entry));
+ body_str = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX(search_window.body_entry));
if (!body_str)
body_str = gtk_editable_get_chars(
GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(search_window.body_entry))),0,-1);
diff --git a/src/prefs_display_header.c b/src/prefs_display_header.c
@@ -276,7 +276,7 @@ static void prefs_display_header_create(void)
hdr_combo = gtk_combo_box_entry_new_text();
for(i=0; i < 9 ; i++)
- gtk_combo_box_append_text(GTK_COMBO_BOX (hdr_combo),
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX (hdr_combo),
(*defaults[i] == '-') ? defaults[i]+1 : defaults[i]);
gtk_combo_box_set_active(GTK_COMBO_BOX(hdr_combo), 0);
gtk_widget_show (hdr_combo);
@@ -578,7 +578,7 @@ static void prefs_display_header_list_view_set_row(gboolean hidden)
gchar *entry_text;
GtkTreeModel *model;
- entry_text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(dispheader.hdr_combo));
+ entry_text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX(dispheader.hdr_combo));
if (!entry_text)
entry_text = gtk_editable_get_chars(
GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(dispheader.hdr_combo))),0,-1);
diff --git a/src/prefs_filtering_action.c b/src/prefs_filtering_action.c
@@ -467,14 +467,14 @@ static void prefs_filtering_action_create(void)
gtk_table_attach(GTK_TABLE(table), hbox1, 1, 2, 1, 2,
GTK_FILL | GTK_EXPAND, GTK_SHRINK, 0, 0);
- account_combo = gtk_combo_box_new_text ();
+ account_combo = gtk_combo_box_text_new ();
gtk_size_group_add_widget(size_action, account_combo);
for (accounts = account_get_list() ; accounts != NULL;
accounts = accounts->next) {
PrefsAccount *ac = (PrefsAccount *)accounts->data;
gchar *name = g_strdup(ac->account_name);
- gtk_combo_box_append_text(GTK_COMBO_BOX(account_combo), (gpointer) name);
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX(account_combo), (gpointer) name);
g_free(name);
}
@@ -517,7 +517,7 @@ static void prefs_filtering_action_create(void)
tmp = tmp->next) {
gchar *name = g_strdup(tags_get_tag(GPOINTER_TO_INT(tmp->data)));
- gtk_combo_box_append_text(GTK_COMBO_BOX(tags_combo), (gpointer) name);
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX(tags_combo), (gpointer) name);
g_free(name);
}
@@ -932,7 +932,7 @@ static FilteringAction * prefs_filtering_action_dialog_to_action(gboolean alert)
break;
case ACTION_SET_TAG:
case ACTION_UNSET_TAG:
- destination = gtk_combo_box_get_active_text(GTK_COMBO_BOX(filtering_action.tags_combo));
+ destination = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX(filtering_action.tags_combo));
if (!destination || *destination == '\0') {
if (alert)
alertpanel_error(_("Tag name is empty."));
diff --git a/src/prefs_other.c b/src/prefs_other.c
@@ -397,7 +397,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
{"<Actions>/Menu/Edit/Advanced/DelForwWord", "<alt>D"},
};
- text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(keybind.combo));
+ text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX(keybind.combo));
if (!strcmp(text, _("Default"))) {
menurc = default_menurc;
diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
@@ -370,7 +370,7 @@ static void prefs_toolbar_set_displayed(ToolbarPage *prefs_toolbar)
static void add_item_to_plugin_combo(gpointer key, gpointer data, gpointer combo_box)
{
- gtk_combo_box_append_text(GTK_COMBO_BOX(combo_box), (const gchar*)key);
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX(combo_box), (const gchar*)key);
}
static void prefs_toolbar_populate(ToolbarPage *prefs_toolbar)
@@ -389,7 +389,7 @@ static void prefs_toolbar_populate(ToolbarPage *prefs_toolbar)
act = (gchar *)cur->data;
get_action_name(act, &act_name);
- gtk_combo_box_append_text(
+ gtk_combo_box_text_append_text(
GTK_COMBO_BOX(prefs_toolbar->item_action_combo),
act_name);
@@ -512,7 +512,7 @@ static void prefs_toolbar_register(GtkButton *button, ToolbarPage *prefs_toolbar
}
if (item_type == ITEM_FUNCTION) {
- event = gtk_combo_box_get_active_text(GTK_COMBO_BOX(
+ event = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX(
prefs_toolbar->item_func_combo));
if (is_duplicate(prefs_toolbar, event)) {
@@ -598,7 +598,7 @@ static void prefs_toolbar_substitute(GtkButton *button, ToolbarPage *prefs_toolb
-1);
if (item_type == ITEM_FUNCTION) {
- icon_event = gtk_combo_box_get_active_text(GTK_COMBO_BOX(
+ icon_event = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX(
prefs_toolbar->item_func_combo));
if (is_duplicate(prefs_toolbar, icon_event)
@@ -792,7 +792,7 @@ static void item_type_changed(GtkComboBox *item_type_combo,
static void action_selection_changed(GtkComboBox *action_combo,
ToolbarPage *prefs_toolbar)
{
- gchar *text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(
+ gchar *text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX(
prefs_toolbar->item_action_combo));
if(text != NULL) { /* action */
@@ -804,7 +804,7 @@ static void action_selection_changed(GtkComboBox *action_combo,
static void plugin_selection_changed(GtkComboBox *action_combo,
ToolbarPage *prefs_toolbar)
{
- gchar *text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(prefs_toolbar->item_plugin_combo));
+ gchar *text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX(prefs_toolbar->item_plugin_combo));
if (text != NULL) { /* action */
gtk_entry_set_text(GTK_ENTRY(prefs_toolbar->item_text_entry), text);
@@ -815,7 +815,7 @@ static void plugin_selection_changed(GtkComboBox *action_combo,
static void func_selection_changed(GtkComboBox *action_combo,
ToolbarPage *prefs_toolbar)
{
- gchar *text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(
+ gchar *text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX(
prefs_toolbar->item_func_combo));
if(text != NULL) { /* action */
diff --git a/src/summary_search.c b/src/summary_search.c
@@ -520,7 +520,7 @@ static void summary_search_execute(gboolean backward, gboolean search_all)
search_window.matcher_list = NULL;
}
if (adv_search) {
- adv_condition = gtk_combo_box_get_active_text(GTK_COMBO_BOX(search_window.adv_condition_entry));
+ adv_condition = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX(search_window.adv_condition_entry));
if (!adv_condition)
adv_condition = gtk_editable_get_chars(
GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(search_window.adv_condition_entry))),0,-1);
@@ -550,10 +550,10 @@ static void summary_search_execute(gboolean backward, gboolean search_all)
case_sens = gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON(search_window.case_checkbtn));
- from_str = gtk_combo_box_get_active_text(GTK_COMBO_BOX(search_window.from_entry));
- to_str = gtk_combo_box_get_active_text(GTK_COMBO_BOX(search_window.to_entry));
- subject_str = gtk_combo_box_get_active_text(GTK_COMBO_BOX(search_window.subject_entry));
- body_str = gtk_combo_box_get_active_text(GTK_COMBO_BOX(search_window.body_entry));
+ from_str = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX(search_window.from_entry));
+ to_str = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX(search_window.to_entry));
+ subject_str = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX(search_window.subject_entry));
+ body_str = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX(search_window.body_entry));
if (!from_str)
from_str = gtk_editable_get_chars(
@@ -819,7 +819,7 @@ static void adv_condition_btn_clicked(GtkButton *button, gpointer data)
/* re-use the current search value if it's a condition expression,
otherwise ignore it silently */
- cond_str = gtk_combo_box_get_active_text(GTK_COMBO_BOX(search_window.adv_condition_entry));
+ cond_str = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX(search_window.adv_condition_entry));
if (cond_str && *cond_str != '\0') {
matchers = matcher_parser_get_cond((gchar*)cond_str, NULL);
}
