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

Documented the GTK3 tray backend choice and added GTK3-safe tooltip property handling with a title fallback while keeping GTK2 APIs gated behind build flags.

Browse Source 
Guarded embedded notification handling by GTK version to avoid GTK2-only APIs on GTK3 builds.
This commit is contained in:
deepend
2026-01-30 19:37:29 -07:00
parent 907211a733
commit d1e1ef3a82
1 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,6 +63,7 @@ typedef enum
} WinStatus; } WinStatus;
#if HAVE_GTK3 #if HAVE_GTK3
/* GTK3: keep GtkStatusIcon and use tooltip/text properties for tray tooltips. */
typedef const char *TrayIcon; typedef const char *TrayIcon;
typedef char *TrayCustomIcon; typedef char *TrayCustomIcon;
#define tray_icon_from_file(f) g_strdup(f) #define tray_icon_from_file(f) g_strdup(f)
@@ -192,7 +193,20 @@ static void
tray_set_tooltip_text (GtkStatusIcon *icon, const char *text) tray_set_tooltip_text (GtkStatusIcon *icon, const char *text)
{ {
#if HAVE_GTK3 #if HAVE_GTK3
g_object_set (G_OBJECT (icon), "tooltip-text", text, NULL); GObjectClass *klass;
if (!icon)
return;
klass = G_OBJECT_GET_CLASS (icon);
if (klass && g_object_class_find_property (klass, "tooltip-text"))
{
g_object_set (G_OBJECT (icon), "tooltip-text", text, NULL);
}
else if (klass && g_object_class_find_property (klass, "title"))
{
g_object_set (G_OBJECT (icon), "title", text, NULL);
}
#endif #endif
#if !HAVE_GTK3 #if !HAVE_GTK3
gtk_status_icon_set_tooltip_text (icon, text); gtk_status_icon_set_tooltip_text (icon, text);
@@ -223,8 +237,14 @@ tray_is_embedded (GtkStatusIcon *icon)
void void
fe_tray_set_tooltip (const char *text) fe_tray_set_tooltip (const char *text)
{ {
if (sticon) if (!sticon)
tray_set_tooltip_text (sticon, text); return;
#if HAVE_GTK3
tray_set_tooltip_text (sticon, text);
#endif
#if !HAVE_GTK3
tray_set_tooltip_text (sticon, text);
#endif
} }
static void static void
@@ -464,6 +484,16 @@ tray_menu_notify_cb (GObject *tray, GParamSpec *pspec, gpointer user_data)
{ {
if (sticon) if (sticon)
{ {
#if HAVE_GTK3
if (!tray_is_embedded (sticon))
tray_restore_timer = g_timeout_add(500, (GSourceFunc)tray_menu_try_restore, NULL);
else if (tray_restore_timer)
{
g_source_remove (tray_restore_timer);
tray_restore_timer = 0;
}
#endif
#if !HAVE_GTK3
if (!tray_is_embedded (sticon)) if (!tray_is_embedded (sticon))
{ {
tray_restore_timer = g_timeout_add(500, (GSourceFunc)tray_menu_try_restore, NULL); tray_restore_timer = g_timeout_add(500, (GSourceFunc)tray_menu_try_restore, NULL);
@@ -476,6 +506,7 @@ tray_menu_notify_cb (GObject *tray, GParamSpec *pspec, gpointer user_data)
tray_restore_timer = 0; tray_restore_timer = 0;
} }
} }
#endif
} }
} }