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

Updated tray tooltip handling to use GTK3 tooltip-text property while keeping GTK2-only tooltip API calls behind #if !HAVE_GTK3.

Browse Source 
Switched GTK3 embedded checks to use the embedded property instead of GTK2-only API calls, preserving the restore timer behavior.
This commit is contained in:
deepend
2026-01-30 19:26:34 -07:00
parent 328c85e6b3
commit 4bd67e4933
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -192,7 +192,12 @@ void
fe_tray_set_tooltip (const char *text) fe_tray_set_tooltip (const char *text)
{ {
if (sticon) if (sticon)
#if HAVE_GTK3
g_object_set (G_OBJECT (sticon), "tooltip-text", text, NULL);
#endif
#if !HAVE_GTK3
gtk_status_icon_set_tooltip_text (sticon, text); gtk_status_icon_set_tooltip_text (sticon, text);
#endif
} }
static void static void
@@ -430,9 +435,19 @@ tray_menu_restore_cb (GtkWidget *item, gpointer userdata)
static void static void
tray_menu_notify_cb (GObject *tray, GParamSpec *pspec, gpointer user_data) tray_menu_notify_cb (GObject *tray, GParamSpec *pspec, gpointer user_data)
{ {
#if HAVE_GTK3
gboolean embedded = FALSE;
#endif
if (sticon) if (sticon)
{ {
#if HAVE_GTK3
g_object_get (G_OBJECT (sticon), "embedded", &embedded, NULL);
if (!embedded)
#endif
#if !HAVE_GTK3
if (!gtk_status_icon_is_embedded (sticon)) if (!gtk_status_icon_is_embedded (sticon))
#endif
{ {
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);
} }