deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-03-22 13:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Guarded AppIndicator includes and GTK3 tray integration so Windows builds skip libappindicator, while Windows uses the status icon tray backend instead.

Browse Source 
Enabled Windows tray menu handling paths to match the status icon backend on WIN32, even when GTK3 is enabled.
This commit is contained in:
deepend
2026-02-03 11:52:22 -07:00
parent 995cba88ff
commit 11b11c9166
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/fe-gtk/plugin-tray.c
View File

@@ -36,15 +36,17 @@
#if defined(GTK_DISABLE_DEPRECATED) #if defined(GTK_DISABLE_DEPRECATED)
typedef struct _GtkStatusIcon GtkStatusIcon; typedef struct _GtkStatusIcon GtkStatusIcon;
#endif #endif
#ifndef WIN32
#if defined(HAVE_AYATANA_APPINDICATOR) #if defined(HAVE_AYATANA_APPINDICATOR)
#include <libayatana-appindicator/app-indicator.h> #include <libayatana-appindicator/app-indicator.h>
#else #else
#include <libappindicator/app-indicator.h> #include <libappindicator/app-indicator.h>
#endif #endif
#endif
#define ICON_TRAY_PREFERENCES "preferences-system" #define ICON_TRAY_PREFERENCES "preferences-system"
#define ICON_TRAY_QUIT "application-exit" #define ICON_TRAY_QUIT "application-exit"
#endif #endif
#if !HAVE_GTK3 #if !HAVE_GTK3 || defined(WIN32)
#define ICON_TRAY_PREFERENCES GTK_STOCK_PREFERENCES #define ICON_TRAY_PREFERENCES GTK_STOCK_PREFERENCES
#define ICON_TRAY_QUIT GTK_STOCK_QUIT #define ICON_TRAY_QUIT GTK_STOCK_QUIT
#endif #endif
@@ -71,7 +73,7 @@ typedef enum
WS_HIDDEN WS_HIDDEN
} WinStatus; } WinStatus;
#if HAVE_GTK3 #if HAVE_GTK3 && !defined(WIN32)
/* GTK3: use AppIndicator/StatusNotifier item for tray integration. */ /* GTK3: use AppIndicator/StatusNotifier item for tray integration. */
typedef GIcon *TrayIcon; typedef GIcon *TrayIcon;
typedef GIcon *TrayCustomIcon; typedef GIcon *TrayCustomIcon;
@@ -93,7 +95,7 @@ static TrayIcon tray_icon_file;
#define ICON_FILE tray_icon_file #define ICON_FILE tray_icon_file
#endif #endif
#if !HAVE_GTK3 #if !HAVE_GTK3 || defined(WIN32)
typedef GdkPixbuf* TrayIcon; typedef GdkPixbuf* TrayIcon;
typedef GdkPixbuf* TrayCustomIcon; typedef GdkPixbuf* TrayCustomIcon;
#define tray_icon_from_file(f) gdk_pixbuf_new_from_file(f,NULL) #define tray_icon_from_file(f) gdk_pixbuf_new_from_file(f,NULL)
@@ -113,10 +115,10 @@ static void tray_init (void);
static void tray_set_icon_state (TrayIcon icon, TrayIconState state); static void tray_set_icon_state (TrayIcon icon, TrayIconState state);
static void tray_menu_restore_cb (GtkWidget *item, gpointer userdata); static void tray_menu_restore_cb (GtkWidget *item, gpointer userdata);
static void tray_menu_notify_cb (GObject *tray, GParamSpec *pspec, gpointer user_data); static void tray_menu_notify_cb (GObject *tray, GParamSpec *pspec, gpointer user_data);
#if HAVE_GTK3 #if HAVE_GTK3 && !defined(WIN32)
static void tray_menu_show_cb (GtkWidget *menu, gpointer userdata); static void tray_menu_show_cb (GtkWidget *menu, gpointer userdata);
#endif #endif
#if !HAVE_GTK3 #if !HAVE_GTK3 || defined(WIN32)
static void tray_menu_cb (GtkWidget *widget, guint button, guint time, gpointer userdata); static void tray_menu_cb (GtkWidget *widget, guint button, guint time, gpointer userdata);
#endif #endif
@@ -129,11 +131,11 @@ typedef struct
void (*cleanup)(void); void (*cleanup)(void);
} TrayBackendOps; } TrayBackendOps;
#if HAVE_GTK3 #if HAVE_GTK3 && !defined(WIN32)
static AppIndicator *tray_indicator; static AppIndicator *tray_indicator;
static GtkWidget *tray_menu; static GtkWidget *tray_menu;
#endif #endif
#if !HAVE_GTK3 #if !HAVE_GTK3 || defined(WIN32)
static GtkStatusIcon *tray_status_icon; static GtkStatusIcon *tray_status_icon;
#endif #endif
static gboolean tray_backend_active = FALSE; static gboolean tray_backend_active = FALSE;
@@ -142,7 +144,7 @@ static gint flash_tag;
static TrayIconState tray_icon_state; static TrayIconState tray_icon_state;
static TrayIcon tray_flash_icon; static TrayIcon tray_flash_icon;
static TrayIconState tray_flash_state; static TrayIconState tray_flash_state;
#if !HAVE_GTK3 && defined(WIN32) #if defined(WIN32)
static guint tray_menu_timer; static guint tray_menu_timer;
static gint64 tray_menu_inactivetime; static gint64 tray_menu_inactivetime;
#endif #endif
@@ -157,7 +159,7 @@ static int tray_hilight_count = 0;
static int tray_file_count = 0; static int tray_file_count = 0;
static int tray_restore_timer = 0; static int tray_restore_timer = 0;
#if HAVE_GTK3 #if HAVE_GTK3 && !defined(WIN32)
static TrayCustomIcon static TrayCustomIcon
tray_icon_from_file (const char *filename) tray_icon_from_file (const char *filename)
{ {
@@ -422,7 +424,7 @@ static const TrayBackendOps tray_backend_ops = {
}; };
#endif #endif
#if !HAVE_GTK3 #if !HAVE_GTK3 || defined(WIN32)
static void static void
tray_status_icon_set_icon (TrayIcon icon) tray_status_icon_set_icon (TrayIcon icon)
{ {
@@ -494,7 +496,7 @@ tray_backend_init (void)
if (!tray_backend_ops.init) if (!tray_backend_ops.init)
return FALSE; return FALSE;
#if HAVE_GTK3 #if HAVE_GTK3 && !defined(WIN32)
tray_gtk3_icons_init (); tray_gtk3_icons_init ();
if (!tray_gtk3_icon_theme) if (!tray_gtk3_icon_theme)
tray_gtk3_icon_theme = gtk_icon_theme_get_default (); tray_gtk3_icon_theme = gtk_icon_theme_get_default ();
@@ -540,7 +542,7 @@ tray_backend_cleanup (void)
if (tray_backend_ops.cleanup) if (tray_backend_ops.cleanup)
tray_backend_ops.cleanup (); tray_backend_ops.cleanup ();
#if HAVE_GTK3 #if HAVE_GTK3 && !defined(WIN32)
if (tray_gtk3_icon_theme && tray_gtk3_icon_theme_changed_handler) if (tray_gtk3_icon_theme && tray_gtk3_icon_theme_changed_handler)
{ {
g_signal_handler_disconnect (tray_gtk3_icon_theme, g_signal_handler_disconnect (tray_gtk3_icon_theme,
@@ -976,7 +978,7 @@ blink_item (unsigned int *setting, GtkWidget *menu, char *label)
} }
#endif #endif
#if !HAVE_GTK3 #if !HAVE_GTK3 || defined(WIN32)
static void static void
tray_menu_destroy (GtkWidget *menu, gpointer userdata) tray_menu_destroy (GtkWidget *menu, gpointer userdata)
{ {
@@ -1076,7 +1078,7 @@ tray_menu_populate (GtkWidget *menu)
mg_create_icon_item (_("_Quit"), ICON_TRAY_QUIT, menu, tray_menu_quit_cb, NULL); mg_create_icon_item (_("_Quit"), ICON_TRAY_QUIT, menu, tray_menu_quit_cb, NULL);
} }
#if HAVE_GTK3 #if HAVE_GTK3 && !defined(WIN32)
static void static void
tray_menu_clear (GtkWidget *menu) tray_menu_clear (GtkWidget *menu)
{ {
@@ -1099,7 +1101,7 @@ tray_menu_show_cb (GtkWidget *menu, gpointer userdata)
} }
#endif #endif
#if !HAVE_GTK3 #if !HAVE_GTK3 || defined(WIN32)
static void static void
tray_menu_cb (GtkWidget *widget, guint button, guint time, gpointer userdata) tray_menu_cb (GtkWidget *widget, guint button, guint time, gpointer userdata)
{ {