[Xfce4-commits] [apps/gigolo] 07/35: Migrate to newer GTkComboBoxText API

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

landry pushed a commit to branch master
in repository apps/gigolo.

commit 93c0e138f0c6d5283d613fd6da8e45f5ff56c663
Author: Landry Breuil <landry at xfce.org>
Date:   Fri Jun 17 22:46:22 2016 +0200

    Migrate to newer GTkComboBoxText API
---
 src/bookmarkeditdialog.c |  4 ++--
 src/preferencesdialog.c  | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/bookmarkeditdialog.c b/src/bookmarkeditdialog.c
index 4de244c..031b6d4 100644
--- a/src/bookmarkeditdialog.c
+++ b/src/bookmarkeditdialog.c
@@ -945,7 +945,7 @@ static void browse_host_finished_cb(G_GNUC_UNUSED GigoloBackendGVFS *bnd, GSList
 		GSList *node;
 		for (node = shares; node != NULL; node = node->next)
 		{
-			gtk_combo_box_append_text(GTK_COMBO_BOX(priv->share_combo), node->data);
+			gtk_combo_box_text_append(GTK_COMBO_BOX(priv->share_combo), NULL, node->data);
 		}
 		gtk_combo_box_set_active(GTK_COMBO_BOX(priv->share_combo), 0);
 
@@ -1091,7 +1091,7 @@ static void gigolo_bookmark_edit_dialog_init(GigoloBookmarkEditDialog *dialog)
 		_("This is not used for the actual mount, only necessary for opening the mount point in a file browser"));
 	priv->user_entry = gtk_entry_new();
 	priv->domain_entry = gtk_entry_new();
-	priv->share_combo = gtk_combo_box_entry_new_text();
+	priv->share_combo = gtk_combo_box_new_with_entry();
 	priv->share_entry = gtk_bin_get_child(GTK_BIN(priv->share_combo));
 
 	priv->uri_label = gtk_label_new_with_mnemonic(_("_Location (URI):"));
diff --git a/src/preferencesdialog.c b/src/preferencesdialog.c
index 33d2122..46ff20c 100644
--- a/src/preferencesdialog.c
+++ b/src/preferencesdialog.c
@@ -142,11 +142,11 @@ static GtkWidget *add_toolbar_style_combo(GigoloSettings *settings, const gchar
 
 	g_object_get(settings, property, &value, NULL);
 
-	widget = gtk_combo_box_new_text();
-	gtk_combo_box_append_text(GTK_COMBO_BOX(widget), _("Icons"));
-	gtk_combo_box_append_text(GTK_COMBO_BOX(widget), _("Text"));
-	gtk_combo_box_append_text(GTK_COMBO_BOX(widget), _("Both"));
-	gtk_combo_box_append_text(GTK_COMBO_BOX(widget), _("Both horizontal"));
+	widget = gtk_combo_box_text_new();
+	gtk_combo_box_text_append(GTK_COMBO_BOX(widget), NULL, _("Icons"));
+	gtk_combo_box_text_append(GTK_COMBO_BOX(widget), NULL, _("Text"));
+	gtk_combo_box_text_append(GTK_COMBO_BOX(widget), NULL, _("Both"));
+	gtk_combo_box_text_append(GTK_COMBO_BOX(widget), NULL, _("Both horizontal"));
 
 	gtk_combo_box_set_active(GTK_COMBO_BOX(widget), value);
 
@@ -164,9 +164,9 @@ static GtkWidget *add_toolbar_orientation_combo(GigoloSettings *settings, const
 
 	g_object_get(settings, property, &value, NULL);
 
-	widget = gtk_combo_box_new_text();
-	gtk_combo_box_append_text(GTK_COMBO_BOX(widget), _("Horizontal"));
-	gtk_combo_box_append_text(GTK_COMBO_BOX(widget), _("Vertical"));
+	widget = gtk_combo_box_text_new();
+	gtk_combo_box_text_append(GTK_COMBO_BOX(widget), NULL, _("Horizontal"));
+	gtk_combo_box_text_append(GTK_COMBO_BOX(widget), NULL, _("Vertical"));
 
 	gtk_combo_box_set_active(GTK_COMBO_BOX(widget), value);
 
@@ -184,9 +184,9 @@ static GtkWidget *add_view_mode_combo(GigoloSettings *settings, const gchar *pro
 
 	g_object_get(settings, property, &value, NULL);
 
-	widget = gtk_combo_box_new_text();
-	gtk_combo_box_append_text(GTK_COMBO_BOX(widget), _("Symbols"));
-	gtk_combo_box_append_text(GTK_COMBO_BOX(widget), _("Detailed List"));
+	widget = gtk_combo_box_text_new();
+	gtk_combo_box_text_append(GTK_COMBO_BOX(widget), NULL, _("Symbols"));
+	gtk_combo_box_text_append(GTK_COMBO_BOX(widget), NULL, _("Detailed List"));
 
 	gtk_combo_box_set_active(GTK_COMBO_BOX(widget), value);
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.