mirror of
https://github.com/ZoiteChat/zoitechat.git
synced 2026-03-15 02:00:20 +00:00
build: GTK deprecation cleanup + follow-up warning fixes
This commit is contained in:
@@ -123,7 +123,7 @@ static void tray_set_icon_state (TrayIcon icon, TrayIconState state);
|
||||
static void tray_menu_restore_cb (GtkWidget *item, gpointer userdata);
|
||||
static void tray_menu_notify_cb (GObject *tray, GParamSpec *pspec, gpointer user_data);
|
||||
#if HAVE_APPINDICATOR_BACKEND
|
||||
static void tray_menu_show_cb (GtkWidget *menu, gpointer userdata);
|
||||
static void tray_menu_show_cb (GtkWidget *menu, gpointer userdata) G_GNUC_UNUSED;
|
||||
#endif
|
||||
#if !HAVE_APPINDICATOR_BACKEND
|
||||
static void tray_menu_cb (GtkWidget *widget, guint button, guint time, gpointer userdata);
|
||||
@@ -1118,7 +1118,7 @@ tray_menu_clear (GtkWidget *menu)
|
||||
g_list_free (children);
|
||||
}
|
||||
|
||||
static void
|
||||
static void G_GNUC_UNUSED
|
||||
tray_menu_show_cb (GtkWidget *menu, gpointer userdata)
|
||||
{
|
||||
(void)userdata;
|
||||
@@ -1134,7 +1134,9 @@ tray_menu_cb (GtkWidget *widget, guint button, guint time, gpointer userdata)
|
||||
{
|
||||
static GtkWidget *menu;
|
||||
|
||||
(void)widget;
|
||||
(void)button;
|
||||
(void)time;
|
||||
(void)userdata;
|
||||
|
||||
/* close any old menu */
|
||||
if (G_IS_OBJECT (menu))
|
||||
@@ -1160,8 +1162,15 @@ tray_menu_cb (GtkWidget *widget, guint button, guint time, gpointer userdata)
|
||||
tray_menu_timer = g_timeout_add (500, (GSourceFunc)tray_check_hide, menu);
|
||||
#endif
|
||||
|
||||
gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL,
|
||||
userdata, button, time);
|
||||
if (widget && GTK_IS_WIDGET (widget))
|
||||
gtk_menu_popup_at_widget (GTK_MENU (menu), widget, GDK_GRAVITY_SOUTH_WEST, GDK_GRAVITY_NORTH_WEST, NULL);
|
||||
else
|
||||
{
|
||||
GdkEvent *event = gtk_get_current_event ();
|
||||
gtk_menu_popup_at_pointer (GTK_MENU (menu), event);
|
||||
if (event)
|
||||
gdk_event_free (event);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user