[Xfce4-commits] [apps/gigolo] 04/26: Resolve GtkImageMenuItem deprecations

[noreply at xfce.org]

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

l   a   n   d   r   y       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/gigolo.

commit 17da91de01e384dcbe0148553f3c6227a1d3188f
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Tue Oct 16 20:06:23 2018 -0400

    Resolve GtkImageMenuItem deprecations
---
 TODO                     | 11 -----------
 src/bookmarkdialog.c     |  6 +++---
 src/browsenetworkpanel.c |  7 ++-----
 src/menubuttonaction.c   |  4 ++--
 4 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/TODO b/TODO
index 731611c..f50c7bd 100644
--- a/TODO
+++ b/TODO
@@ -10,17 +10,6 @@ window.c:872:4: warning: ‘gtk_menu_popup’ is deprecated: Use '(gtk_menu_popu
 browsenetworkpanel.c:282:3: warning: ‘gtk_menu_popup’ is deprecated: Use '(gtk_menu_popup_at_widget, gtk_menu_popup_at_pointer, gtk_menu_popup_at_rect)' instead
 bookmarkdialog.c:258:3: warning: ‘gtk_menu_popup’ is deprecated: Use '(gtk_menu_popup_at_widget, gtk_menu_popup_at_pointer, gtk_menu_popup_at_rect)' instead
 
-=== GtkImageMenuItem deprecations ===
-menubuttonaction.c:68:2: warning: ‘gtk_image_menu_item_get_type’ is deprecated: Use 'gtk_menu_item_get_type' instead
-menubuttonaction.c:189:2: warning: ‘gtk_image_menu_item_get_type’ is deprecated: Use 'gtk_menu_item_get_type' instead
-bookmarkdialog.c:376:2: warning: ‘gtk_image_menu_item_new_from_stock’ is deprecated: Use 'gtk_menu_item_new' instead
-bookmarkdialog.c:383:2: warning: ‘gtk_image_menu_item_new_from_stock’ is deprecated: Use 'gtk_menu_item_new' instead
-bookmarkdialog.c:390:2: warning: ‘gtk_image_menu_item_new_from_stock’ is deprecated: Use 'gtk_menu_item_new' instead
-browsenetworkpanel.c:445:2: warning: ‘gtk_image_menu_item_new_from_stock’ is deprecated: Use 'gtk_menu_item_new' instead
-browsenetworkpanel.c:452:2: warning: ‘gtk_image_menu_item_new_with_mnemonic’ is deprecated: Use 'gtk_menu_item_new_with_mnemonic' instead
-browsenetworkpanel.c:453:2: warning: ‘gtk_image_menu_item_get_type’ is deprecated: Use 'gtk_menu_item_get_type' instead
-browsenetworkpanel.c:453:2: warning: ‘gtk_image_menu_item_set_image’ is deprecated
-
 === GObject deprecations ===
 window.c:182:2: warning: ‘g_type_class_add_private’ is deprecated
 bookmark.c:93:2: warning: ‘g_type_class_add_private’ is deprecated
diff --git a/src/bookmarkdialog.c b/src/bookmarkdialog.c
index ffca3ef..eecc379 100644
--- a/src/bookmarkdialog.c
+++ b/src/bookmarkdialog.c
@@ -372,21 +372,21 @@ static void tree_prepare(GigoloBookmarkDialog *dialog)
 
 	priv->popup_menu = gtk_menu_new();
 
-	item = gtk_image_menu_item_new_from_stock("gtk-add", NULL);
+	item = gtk_menu_item_new_with_mnemonic (_("_Add"));
 	g_object_set_data(G_OBJECT(item), "dialog", dialog);
 	gtk_widget_show(item);
 	gtk_container_add(GTK_CONTAINER(priv->popup_menu), item);
 	g_signal_connect(item, "activate", G_CALLBACK(tree_popup_activate_cb),
 		GINT_TO_POINTER(ACTION_ADD));
 
-	priv->edit_item = gtk_image_menu_item_new_from_stock("gtk-edit", NULL);
+	priv->edit_item = gtk_menu_item_new_with_mnemonic (_("_Edit"));
 	g_object_set_data(G_OBJECT(priv->edit_item), "dialog", dialog);
 	gtk_widget_show(priv->edit_item);
 	gtk_container_add(GTK_CONTAINER(priv->popup_menu), priv->edit_item);
 	g_signal_connect(priv->edit_item, "activate", G_CALLBACK(tree_popup_activate_cb),
 		GINT_TO_POINTER(ACTION_EDIT));
 
-	priv->delete_item = gtk_image_menu_item_new_from_stock("gtk-delete", NULL);
+	priv->delete_item = gtk_menu_item_new_with_mnemonic (_("_Delete"));
 	g_object_set_data(G_OBJECT(priv->delete_item), "dialog", dialog);
 	gtk_widget_show(priv->delete_item);
 	gtk_container_add(GTK_CONTAINER(priv->popup_menu), priv->delete_item);
diff --git a/src/browsenetworkpanel.c b/src/browsenetworkpanel.c
index c8882bc..1c4a303 100644
--- a/src/browsenetworkpanel.c
+++ b/src/browsenetworkpanel.c
@@ -442,17 +442,14 @@ static void tree_prepare(GigoloBrowseNetworkPanel *panel)
 	/* popup menu */
 	menu = gtk_menu_new();
 
-	priv->item_connect = item = gtk_image_menu_item_new_from_stock("gtk-connect", NULL);
+	priv->item_connect = item = gtk_menu_item_new_with_mnemonic(_("_Connect"));
 	g_object_set_data(G_OBJECT(item), "panel", panel);
 	gtk_widget_show(item);
 	gtk_container_add(GTK_CONTAINER(menu), item);
 	g_signal_connect(item, "activate", G_CALLBACK(tree_popup_activate_cb),
 		GINT_TO_POINTER(ACTION_CONNECT));
 
-	priv->item_bookmark = item = gtk_image_menu_item_new_with_mnemonic(_("Create _Bookmark"));
-	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item),
-		gtk_image_new_from_icon_name(
-			gigolo_find_icon_name("bookmark-new", "gtk-edit"), GTK_ICON_SIZE_BUTTON));
+	priv->item_bookmark = item = gtk_menu_item_new_with_mnemonic(_("Create _Bookmark"));
 	g_object_set_data(G_OBJECT(item), "panel", panel);
 	gtk_widget_show(item);
 	gtk_container_add(GTK_CONTAINER(menu), item);
diff --git a/src/menubuttonaction.c b/src/menubuttonaction.c
index afd9439..531d2f3 100644
--- a/src/menubuttonaction.c
+++ b/src/menubuttonaction.c
@@ -65,7 +65,7 @@ static GtkWidget *gigolo_menu_button_action_create_menu_item(G_GNUC_UNUSED GtkAc
 {
 	GtkWidget *menuitem;
 
-	menuitem = g_object_new(GTK_TYPE_IMAGE_MENU_ITEM, NULL);
+	menuitem = g_object_new(GTK_TYPE_MENU_ITEM, NULL);
 
 	return menuitem;
 }
@@ -186,7 +186,7 @@ static void gigolo_menu_button_action_class_init(GigoloMenubuttonActionClass *kl
 	action_class->connect_proxy = gigolo_menu_button_action_connect_proxy;
 	action_class->create_menu_item = gigolo_menu_button_action_create_menu_item;
 	action_class->create_tool_item = gigolo_menu_button_action_create_tool_item;
-	action_class->menu_item_type = GTK_TYPE_IMAGE_MENU_ITEM;
+	action_class->menu_item_type = GTK_TYPE_MENU_ITEM;
 	action_class->toolbar_item_type = GTK_TYPE_MENU_TOOL_BUTTON;
 
 	g_object_class_install_property(g_object_class,

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