From: Colin Leroy Date: Sun, 10 Apr 2011 15:20:49 +0000 (+0000) Subject: 2011-04-10 [colin] 3.7.9cvs7 X-Git-Tag: rel_3_7_10~48 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=88a94bbfd8e9a5d9a4e931a0256478ae70c810ad 2011-04-10 [colin] 3.7.9cvs7 * src/addr_compl.c * src/addressbook.c * 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/colorlabel.c * src/gtk/combobox.c * src/gtk/gtkcmoptionmenu.c * src/gtk/gtkutils.h More comboboxtext undeprecation --- diff --git a/ChangeLog b/ChangeLog index 8055d0775..5f8cbc23a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2011-04-10 [colin] 3.7.9cvs7 + + * src/addr_compl.c + * src/addressbook.c + * 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/colorlabel.c + * src/gtk/combobox.c + * src/gtk/gtkcmoptionmenu.c + * src/gtk/gtkutils.h + More comboboxtext undeprecation + 2011-04-10 [colin] 3.7.9cvs6 * src/messageview.c diff --git a/PATCHSETS b/PATCHSETS index 0a7af8f0a..ed3370dc2 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -4158,3 +4158,4 @@ ( 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 ( cvs diff -u -r 1.94.2.214 -r 1.94.2.215 src/messageview.c; ) > 3.7.9cvs5.patchset ( 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 diff --git a/configure.ac b/configure.ac index d95245534..dc9002107 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=7 MICRO_VERSION=9 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=6 +EXTRA_VERSION=7 EXTRA_RELEASE= EXTRA_GTK2_VERSION= @@ -140,7 +140,7 @@ AM_CONDITIONAL(CYGWIN, test x"$env_cygwin" = x"yes") if test "$GCC" = "yes" then - CFLAGS="$CFLAGS -Wno-unused-function -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED" + CFLAGS="$CFLAGS -Wno-unused-function" fi AC_MSG_CHECKING([if gcc supports -Wno-pointer-sign]) @@ -156,8 +156,7 @@ fi CFLAGS="$CFLAGS -Wall -Wno-pointer-sign" if test $USE_MAINTAINER_MODE = yes; then - CFLAGS="-g -Wall -Wno-pointer-sign" -# CFLAGS="-g -Wall -Wno-pointer-sign -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES" + CFLAGS="-g -Wall -Wno-pointer-sign -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES" fi pthread_name= diff --git a/src/addr_compl.c b/src/addr_compl.c index d27fd0bde..03b9581d8 100644 --- a/src/addr_compl.c +++ b/src/addr_compl.c @@ -850,7 +850,7 @@ static void addrcompl_resize_window( CompletionWindow *cw ) { /* Get current geometry of window */ gdk_window_get_geometry( cw->window->window, &x, &y, &width, &height, &depth ); - gtk_widget_hide_all( cw->window ); + gtk_widget_hide( cw->window ); gtk_widget_show_all( cw->window ); gtk_widget_size_request( cw->list_view, &r ); diff --git a/src/addressbook.c b/src/addressbook.c index 07c99e77e..e1e74fef0 100644 --- a/src/addressbook.c +++ b/src/addressbook.c @@ -1491,7 +1491,8 @@ static void addressbook_del_clicked(GtkButton *button, gpointer data) item = node->data; node = g_list_next( node ); aio = ( AddrItemObject * ) item->addressItem; - if( aio->type == ADDR_ITEM_PERSON || aio->type == ADDR_ITEM_EMAIL ) { + if(aio->type == ADDR_ITEM_PERSON || + aio->type == ADDR_ITEM_EMAIL ) { group_delete = FALSE; break; } diff --git a/src/compose.c b/src/compose.c index 4a60ea243..2a773b51d 100644 --- a/src/compose.c +++ b/src/compose.c @@ -4714,7 +4714,8 @@ static void compose_select_account(Compose *compose, PrefsAccount *account, } header_entry = (ComposeHeaderEntry *) compose->header_list->data; - header = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX(header_entry->combo)); + header = gtk_combo_box_text_get_active_text( + GTK_COMBO_BOX_TEXT(header_entry->combo)); if (header && !strlen(gtk_entry_get_text(GTK_ENTRY(header_entry->entry)))) { if (account->protocol == A_NNTP) { @@ -8705,7 +8706,9 @@ 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_text_append_text(GTK_COMBO_BOX(mimetype_entry), mime_type_list->data); + gtk_combo_box_text_append_text( + GTK_COMBO_BOX_TEXT(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 index d7f2d2b11..f30dd4b59 100644 --- a/src/editaddress_other_attributes_ldap.c +++ b/src/editaddress_other_attributes_ldap.c @@ -359,7 +359,8 @@ void addressbook_edit_person_page_attrib_ldap(PersonEditDlg *dialog, gint pageNu attribute++; continue; } - gtk_combo_box_text_append_text(GTK_COMBO_BOX(combo_box), *attribute++); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_box), + *attribute++); } gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box), 0); diff --git a/src/gtk/colorlabel.c b/src/gtk/colorlabel.c index 22233c615..75807e0f9 100644 --- a/src/gtk/colorlabel.c +++ b/src/gtk/colorlabel.c @@ -356,7 +356,7 @@ static void refresh_menu (GtkWidget *menushell, gpointer data) { GtkMenu *menu = (GtkMenu *)data; GtkWidget *widget = gtk_menu_get_attach_widget(menu); - gtk_widget_hide_all(widget); + gtk_widget_hide(widget); gtk_widget_unrealize(widget); gtk_widget_show_all(widget); gtk_widget_queue_draw(widget); diff --git a/src/gtk/combobox.c b/src/gtk/combobox.c index e01b7ac9f..5514b480a 100644 --- 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_text_append_text(GTK_COMBO_BOX(combo), text); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), text); va_start(args, text); while ((string = va_arg(args, gchar*)) != NULL) - gtk_combo_box_text_append_text(GTK_COMBO_BOX(combo), string); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(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_text_remove(combobox, 0); + gtk_combo_box_text_remove(GTK_COMBO_BOX_TEXT(combobox), 0); } void combobox_set_popdown_strings(GtkComboBox *combobox, @@ -171,7 +171,8 @@ 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_text_append_text(combobox, (const gchar*) cur->data); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combobox), + (const gchar*) cur->data); } gboolean combobox_set_value_from_arrow_key(GtkComboBox *combobox, @@ -204,7 +205,8 @@ 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_text_get_active_text(combobox); + gchar *text = gtk_combo_box_text_get_active_text( + GTK_COMBO_BOX_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/gtkcmoptionmenu.c b/src/gtk/gtkcmoptionmenu.c index dd6d8e2b5..ff974f6a2 100644 --- a/src/gtk/gtkcmoptionmenu.c +++ b/src/gtk/gtkcmoptionmenu.c @@ -968,7 +968,7 @@ gtk_cmoption_menu_hide_all (GtkWidget *widget) container = GTK_CONTAINER (widget); gtk_widget_hide (widget); - gtk_container_foreach (container, (GtkCallback) gtk_widget_hide_all, NULL); + gtk_container_foreach (container, (GtkCallback) gtk_widget_hide, NULL); } static gboolean diff --git a/src/gtk/gtkutils.h b/src/gtk/gtkutils.h index 962b1ba76..a496d3d7f 100644 --- a/src/gtk/gtkutils.h +++ b/src/gtk/gtkutils.h @@ -236,6 +236,7 @@ claws_input_add (gint source, #endif #if !GTK_CHECK_VERSION(2,24,0) +#define GTK_COMBO_BOX_TEXT GTK_COMBO_BOX #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 diff --git a/src/message_search.c b/src/message_search.c index 59646eadc..ef0d61b19 100644 --- 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_text_get_active_text(GTK_COMBO_BOX(search_window.body_entry)); + body_str = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(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 index c1f09b7f6..fd5168ae0 100644 --- 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_text_append_text(GTK_COMBO_BOX (hdr_combo), + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(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,8 @@ static void prefs_display_header_list_view_set_row(gboolean hidden) gchar *entry_text; GtkTreeModel *model; - entry_text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX(dispheader.hdr_combo)); + entry_text = gtk_combo_box_text_get_active_text( + GTK_COMBO_BOX_TEXT(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 index 4da307645..1282e5886 100644 --- a/src/prefs_filtering_action.c +++ b/src/prefs_filtering_action.c @@ -474,7 +474,9 @@ static void prefs_filtering_action_create(void) accounts = accounts->next) { PrefsAccount *ac = (PrefsAccount *)accounts->data; gchar *name = g_strdup(ac->account_name); - gtk_combo_box_text_append_text(GTK_COMBO_BOX(account_combo), (gpointer) name); + gtk_combo_box_text_append_text( + GTK_COMBO_BOX_TEXT(account_combo), + (gpointer) name); g_free(name); } @@ -517,7 +519,8 @@ 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_text_append_text(GTK_COMBO_BOX(tags_combo), (gpointer) name); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(tags_combo), + (gpointer) name); g_free(name); } @@ -932,7 +935,8 @@ static FilteringAction * prefs_filtering_action_dialog_to_action(gboolean alert) break; case ACTION_SET_TAG: case ACTION_UNSET_TAG: - destination = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX(filtering_action.tags_combo)); + destination = gtk_combo_box_text_get_active_text( + GTK_COMBO_BOX_TEXT(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 index f67fe5505..6a10846e2 100644 --- a/src/prefs_other.c +++ b/src/prefs_other.c @@ -397,7 +397,8 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget) {"/Menu/Edit/Advanced/DelForwWord", "D"}, }; - text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX(keybind.combo)); + text = gtk_combo_box_text_get_active_text( + GTK_COMBO_BOX_TEXT(keybind.combo)); if (!strcmp(text, _("Default"))) { menurc = default_menurc; diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c index f7e008390..1eecc6b25 100644 --- a/src/prefs_toolbar.c +++ b/src/prefs_toolbar.c @@ -370,7 +370,9 @@ 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_text_append_text(GTK_COMBO_BOX(combo_box), (const gchar*)key); + gtk_combo_box_text_append_text( + GTK_COMBO_BOX_TEXT(combo_box), + (const gchar*)key); } static void prefs_toolbar_populate(ToolbarPage *prefs_toolbar) @@ -390,7 +392,7 @@ static void prefs_toolbar_populate(ToolbarPage *prefs_toolbar) get_action_name(act, &act_name); gtk_combo_box_text_append_text( - GTK_COMBO_BOX(prefs_toolbar->item_action_combo), + GTK_COMBO_BOX_TEXT(prefs_toolbar->item_action_combo), act_name); g_free(act_name); @@ -512,8 +514,8 @@ static void prefs_toolbar_register(GtkButton *button, ToolbarPage *prefs_toolbar } if (item_type == ITEM_FUNCTION) { - event = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX( - prefs_toolbar->item_func_combo)); + event = gtk_combo_box_text_get_active_text( + GTK_COMBO_BOX_TEXT(prefs_toolbar->item_func_combo)); if (is_duplicate(prefs_toolbar, event)) { alertpanel_error(ERROR_MSG); @@ -598,8 +600,8 @@ static void prefs_toolbar_substitute(GtkButton *button, ToolbarPage *prefs_toolb -1); if (item_type == ITEM_FUNCTION) { - icon_event = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX( - prefs_toolbar->item_func_combo)); + icon_event = gtk_combo_box_text_get_active_text( + GTK_COMBO_BOX_TEXT(prefs_toolbar->item_func_combo)); if (is_duplicate(prefs_toolbar, icon_event) && g_utf8_collate(icon_event, set_event) != 0){ @@ -792,7 +794,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_text_get_active_text(GTK_COMBO_BOX( + gchar *text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT( prefs_toolbar->item_action_combo)); if(text != NULL) { /* action */ @@ -804,7 +806,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_text_get_active_text(GTK_COMBO_BOX(prefs_toolbar->item_plugin_combo)); + gchar *text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(prefs_toolbar->item_plugin_combo)); if (text != NULL) { /* action */ gtk_entry_set_text(GTK_ENTRY(prefs_toolbar->item_text_entry), text); @@ -815,7 +817,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_text_get_active_text(GTK_COMBO_BOX( + gchar *text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT( prefs_toolbar->item_func_combo)); if(text != NULL) { /* action */ diff --git a/src/summary_search.c b/src/summary_search.c index 76fea8d35..cb6fd2262 100644 --- a/src/summary_search.c +++ b/src/summary_search.c @@ -520,7 +520,8 @@ static void summary_search_execute(gboolean backward, gboolean search_all) search_window.matcher_list = NULL; } if (adv_search) { - adv_condition = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX(search_window.adv_condition_entry)); + adv_condition = gtk_combo_box_text_get_active_text( + GTK_COMBO_BOX_TEXT(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 +551,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_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)); + from_str = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(search_window.from_entry)); + to_str = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(search_window.to_entry)); + subject_str = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(search_window.subject_entry)); + body_str = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(search_window.body_entry)); if (!from_str) from_str = gtk_editable_get_chars( @@ -819,7 +820,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_text_get_active_text(GTK_COMBO_BOX(search_window.adv_condition_entry)); + cond_str = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(search_window.adv_condition_entry)); if (cond_str && *cond_str != '\0') { matchers = matcher_parser_get_cond((gchar*)cond_str, NULL); }