[geany/geany-plugins] 13027b: Merge pull request #86 from b4n/addons/systray-fix

[Frank Lanitz]

Branch:      refs/heads/master
Author:      Frank Lanitz <frank at frank.uvena.de>
Committer:   Frank Lanitz <frank at frank.uvena.de>
Date:        Thu, 21 Feb 2013 13:25:08 UTC
Commit:      13027b4b1b83094ce7cce9ed5d15aa1bda39f0e0
             https://github.com/geany/geany-plugins/commit/13027b4b1b83094ce7cce9ed5d15aa1bda39f0e0

Log Message:
-----------
Merge pull request #86 from b4n/addons/systray-fix

Addons: Fix system tray icon with Geany 1.23


Modified Paths:
--------------
    addons/src/ao_systray.c

Modified: addons/src/ao_systray.c
12 files changed, 9 insertions(+), 3 deletions(-)
===================================================================
@@ -186,9 +186,15 @@ static void ao_systray_init(AoSystray *self)
 #if GTK_CHECK_VERSION(2, 10, 0)
 	AoSystrayPrivate *priv = AO_SYSTRAY_GET_PRIVATE(self);
 	GtkWidget *item;
-
-	priv->icon = gtk_status_icon_new_from_pixbuf(gtk_window_get_icon(
-		GTK_WINDOW(geany->main_widgets->window)));
+	const gchar *icon_name;
+
+	priv->icon = gtk_status_icon_new();
+	icon_name = gtk_window_get_icon_name(GTK_WINDOW(geany->main_widgets->window));
+	if (icon_name) /* Geany >= 1.23 */
+		gtk_status_icon_set_from_icon_name(priv->icon, icon_name);
+	else /* Geany <= 1.23 */
+		gtk_status_icon_set_from_pixbuf(priv->icon, gtk_window_get_icon(
+			GTK_WINDOW(geany->main_widgets->window)));
 
 #if GTK_CHECK_VERSION(2, 16, 0)
 	gtk_status_icon_set_tooltip_text(priv->icon, "Geany");



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).