[Xfce4-commits] [apps/gigolo] 06/26: Replace deprecated gtk_menu_popup

noreply at xfce.org noreply at xfce.org
Thu Oct 25 08:03:58 CEST 2018


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 5788669405abf2543a78e7df8399217f4bb7691d
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Tue Oct 16 20:40:09 2018 -0400

    Replace deprecated gtk_menu_popup
---
 TODO                     |  7 -------
 src/bookmarkdialog.c     |  4 ++--
 src/browsenetworkpanel.c |  4 ++--
 src/window.c             | 12 ++++++------
 4 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/TODO b/TODO
index 014a5d8..669932f 100644
--- a/TODO
+++ b/TODO
@@ -3,13 +3,6 @@
 - split GigoloApp from GigoloWindow
 - Samba mounts with set credentials can fail
 
-=== GtkMenu deprecations ===
-window.c:204:3: warning: ‘gtk_menu_popup’ is deprecated: Use '(gtk_menu_popup_at_widget, gtk_menu_popup_at_pointer, gtk_menu_popup_at_rect)' instead
-window.c:831:4: warning: ‘gtk_menu_popup’ is deprecated: Use '(gtk_menu_popup_at_widget, gtk_menu_popup_at_pointer, gtk_menu_popup_at_rect)' instead
-window.c:872:4: warning: ‘gtk_menu_popup’ is deprecated: Use '(gtk_menu_popup_at_widget, gtk_menu_popup_at_pointer, gtk_menu_popup_at_rect)' instead
-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
-
 === 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 eecc379..15c4f97 100644
--- a/src/bookmarkdialog.c
+++ b/src/bookmarkdialog.c
@@ -255,8 +255,8 @@ static gboolean tree_button_press_event_cb(G_GNUC_UNUSED GtkWidget *widget,
 		gtk_widget_set_sensitive(priv->edit_item, have_sel);
 		gtk_widget_set_sensitive(priv->delete_item, have_sel);
 
-		gtk_menu_popup(GTK_MENU(priv->popup_menu), NULL, NULL, NULL, NULL,
-																event->button, event->time);
+		gtk_menu_popup_at_pointer (GTK_MENU(priv->popup_menu),
+								   (GdkEvent *)event);
 		return TRUE;
 	}
 	return FALSE;
diff --git a/src/browsenetworkpanel.c b/src/browsenetworkpanel.c
index 1c4a303..d3a0acc 100644
--- a/src/browsenetworkpanel.c
+++ b/src/browsenetworkpanel.c
@@ -279,8 +279,8 @@ static gboolean tree_button_release_event(G_GNUC_UNUSED GtkWidget *widget, GdkEv
 	if (event->button == 3)
 	{
 		GigoloBrowseNetworkPanelPrivate *priv = GIGOLO_BROWSE_NETWORK_PANEL_GET_PRIVATE(panel);
-		gtk_menu_popup(GTK_MENU(priv->popup_menu), NULL, NULL, NULL, NULL,
-															event->button, event->time);
+		gtk_menu_popup_at_pointer (GTK_MENU(priv->popup_menu),
+								   (GdkEvent *)event);
 		return TRUE;
 	}
 	return FALSE;
diff --git a/src/window.c b/src/window.c
index 49438be..7b623b3 100644
--- a/src/window.c
+++ b/src/window.c
@@ -201,8 +201,8 @@ static void systray_icon_popup_menu_cb(G_GNUC_UNUSED GtkStatusIcon *status_icon,
 	GigoloWindowPrivate *priv = GIGOLO_WINDOW_GET_PRIVATE(window);
 
 	if (button == 3)
-		gtk_menu_popup(GTK_MENU(priv->systray_icon_popup_menu), NULL, NULL, NULL, NULL,
-			button, activate_time);
+		gtk_menu_popup_at_pointer (GTK_MENU(priv->systray_icon_popup_menu),
+								   NULL);
 }
 
 
@@ -828,8 +828,8 @@ static gboolean tree_button_press_event_cb(G_GNUC_UNUSED GtkWidget *widget,
 		gboolean have_sel = (gtk_tree_selection_count_selected_rows(treesel) > 0);
 
 		if (have_sel)
-			gtk_menu_popup(GTK_MENU(priv->tree_popup_menu), NULL, NULL, NULL, NULL,
-																event->button, event->time);
+			gtk_menu_popup_at_pointer (GTK_MENU(priv->tree_popup_menu),
+									   (GdkEvent*)event);
 	}
 	return FALSE;
 }
@@ -869,8 +869,8 @@ static gboolean iconview_button_press_event_cb(GtkWidget *widget, GdkEventButton
 		g_list_free(items);
 
 		if (have_sel)
-			gtk_menu_popup(GTK_MENU(priv->tree_popup_menu), NULL, NULL, NULL, NULL,
-																event->button, event->time);
+			gtk_menu_popup_at_pointer (GTK_MENU(priv->tree_popup_menu),
+									   (GdkEvent *)event);
 	}
 	return FALSE;
 }

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


More information about the Xfce4-commits mailing list