From 345bf975a496493161baf455af07977d57cbf709 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Thu, 25 Oct 2012 14:13:07 +0200 Subject: [src] replace deprecated GtkComboBox text APIs with GtkComboBoxText [src] don't use GtkComboBox text APIs (#632651) They got replaced by GtkComboBoxText. Thanks to Mathias Clasen and Flo Gravo. http://git.gnome.org/browse/nautilus/commit/?id=f123f99bee1005cd279783f9d441f538fcf85542 --- src/caja-file-management-properties.c | 21 +++++++++++---------- src/caja-query-editor.c | 4 ++-- src/caja-view-as-action.c | 8 ++++---- src/file-manager/fm-properties-window.c | 10 +++++----- 4 files changed, 22 insertions(+), 21 deletions(-) (limited to 'src') diff --git a/src/caja-file-management-properties.c b/src/caja-file-management-properties.c index 824e6798..ef532d72 100644 --- a/src/caja-file-management-properties.c +++ b/src/caja-file-management-properties.c @@ -307,7 +307,7 @@ free_column_names_array (GPtrArray *column_names) } static void -create_icon_caption_combo_box_items (GtkComboBox *combo_box, +create_icon_caption_combo_box_items (GtkComboBoxText *combo_box, GList *columns) { GList *l; @@ -316,7 +316,7 @@ create_icon_caption_combo_box_items (GtkComboBox *combo_box, column_names = g_ptr_array_new (); /* Translators: this is referred to captions under icons. */ - gtk_combo_box_append_text (combo_box, _("None")); + gtk_combo_box_text_append_text (combo_box, _("None")); g_ptr_array_add (column_names, g_strdup ("none")); for (l = columns; l != NULL; l = l->next) @@ -339,7 +339,7 @@ create_icon_caption_combo_box_items (GtkComboBox *combo_box, continue; } - gtk_combo_box_append_text (combo_box, label); + gtk_combo_box_text_append_text (combo_box, label); g_ptr_array_add (column_names, name); g_free (label); @@ -472,7 +472,7 @@ caja_file_management_properties_dialog_setup_icon_caption_page (GtkBuilder *buil combo_box = GTK_WIDGET (gtk_builder_get_object (builder, icon_captions_components[i])); - create_icon_caption_combo_box_items (GTK_COMBO_BOX (combo_box), columns); + create_icon_caption_combo_box_items (GTK_COMBO_BOX_TEXT (combo_box), columns); gtk_widget_set_sensitive (combo_box, writable); g_signal_connect (combo_box, "changed", @@ -488,27 +488,28 @@ caja_file_management_properties_dialog_setup_icon_caption_page (GtkBuilder *buil static void create_date_format_menu (GtkBuilder *builder) { - GtkWidget *combo_box; + GtkComboBoxText *combo_box; gchar *date_string; time_t now_raw; struct tm* now; - combo_box = GTK_WIDGET (gtk_builder_get_object (builder, - CAJA_FILE_MANAGEMENT_PROPERTIES_DATE_FORMAT_WIDGET)); + combo_box = GTK_COMBO_BOX_TEXT + (gtk_builder_get_object (builder, + CAJA_FILE_MANAGEMENT_PROPERTIES_DATE_FORMAT_WIDGET)); now_raw = time (NULL); now = localtime (&now_raw); date_string = eel_strdup_strftime ("%c", now); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), date_string); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), date_string); g_free (date_string); date_string = eel_strdup_strftime ("%Y-%m-%d %H:%M:%S", now); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), date_string); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), date_string); g_free (date_string); date_string = eel_strdup_strftime (_("today at %-I:%M:%S %p"), now); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), date_string); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), date_string); g_free (date_string); } diff --git a/src/caja-query-editor.c b/src/caja-query-editor.c index 7beb13d0..1b7ea10f 100644 --- a/src/caja-query-editor.c +++ b/src/caja-query-editor.c @@ -967,11 +967,11 @@ caja_query_editor_add_row (CajaQueryEditor *editor, gtk_widget_show (hbox); gtk_box_pack_start (GTK_BOX (editor->details->visible_vbox), hbox, FALSE, FALSE, 0); - combo = gtk_combo_box_new_text (); + combo = gtk_combo_box_text_new (); row->combo = combo; for (i = 0; i < CAJA_QUERY_EDITOR_ROW_LAST; i++) { - gtk_combo_box_append_text (GTK_COMBO_BOX (combo), gettext (row_type[i].name)); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), gettext (row_type[i].name)); } gtk_widget_show (combo); gtk_box_pack_start (GTK_BOX (hbox), combo, FALSE, FALSE, 0); diff --git a/src/caja-view-as-action.c b/src/caja-view-as-action.c index 645d8057..87785855 100644 --- a/src/caja-view-as-action.c +++ b/src/caja-view-as-action.c @@ -134,7 +134,7 @@ view_as_changed_callback (CajaWindow *window, node = node->next, ++index) { info = caja_view_factory_lookup (node->data); - gtk_combo_box_append_text (combo_box, _(info->view_combo_label)); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), _(info->view_combo_label)); if (caja_window_slot_content_view_matches_iid (slot, (char *)node->data)) { @@ -149,8 +149,8 @@ view_as_changed_callback (CajaWindow *window, id = caja_window_slot_get_content_view_id (slot); info = caja_view_factory_lookup (id); - gtk_combo_box_append_text (combo_box, - _(info->view_combo_label)); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), + _(info->view_combo_label)); selected_index = index; } @@ -179,7 +179,7 @@ connect_proxy (GtkAction *action, gtk_container_set_border_width (GTK_CONTAINER (item), 4); gtk_container_add (GTK_CONTAINER (item), view_as_menu_vbox); - view_as_combo_box = gtk_combo_box_new_text (); + view_as_combo_box = gtk_combo_box_text_new (); gtk_combo_box_set_focus_on_click (GTK_COMBO_BOX (view_as_combo_box), FALSE); gtk_box_pack_end (GTK_BOX (view_as_menu_vbox), view_as_combo_box, TRUE, FALSE, 0); diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c index b79436af..ea07b1c4 100644 --- a/src/file-manager/fm-properties-window.c +++ b/src/file-manager/fm-properties-window.c @@ -1635,7 +1635,7 @@ changed_group_callback (GtkComboBox *combo_box, CajaFile *file) g_assert (GTK_IS_COMBO_BOX (combo_box)); g_assert (CAJA_IS_FILE (file)); - group = gtk_combo_box_get_active_text (combo_box); + group = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (combo_box)); cur_group = caja_file_get_group_name (file); if (group != NULL && strcmp (group, cur_group) != 0) { @@ -1790,7 +1790,7 @@ synch_groups_combo_box (GtkComboBox *combo_box, CajaFile *file) for (node = groups, group_index = 0; node != NULL; node = node->next, ++group_index) { group_name = (const char *)node->data; - gtk_combo_box_append_text (combo_box, group_name); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), group_name); } } @@ -1804,10 +1804,10 @@ synch_groups_combo_box (GtkComboBox *combo_box, CajaFile *file) if (current_group_index < 0 && current_group_name != NULL) { if (groups != NULL) { /* add separator */ - gtk_combo_box_prepend_text (combo_box, "-"); + gtk_combo_box_text_prepend_text (GTK_COMBO_BOX_TEXT (combo_box), "-"); } - gtk_combo_box_prepend_text (combo_box, current_group_name); + gtk_combo_box_text_prepend_text (GTK_COMBO_BOX_TEXT (combo_box), current_group_name); current_group_index = 0; } gtk_combo_box_set_active (combo_box, current_group_index); @@ -1849,7 +1849,7 @@ attach_combo_box (GtkTable *table, GtkWidget *aligner; if (!two_columns) { - combo_box = gtk_combo_box_new_text (); + combo_box = gtk_combo_box_text_new (); } else { GtkTreeModel *model; GtkCellRenderer *renderer; -- cgit v1.2.1