1 files changed, 59 insertions, 28 deletions

diff --git a/src/plugins/stats/functions.c b/src/plugins/stats/functions.c
index 937f7f61..a7d2134c 100644
--- a/src/plugins/stats/functions.c
+++ b/src/plugins/stats/functions.c
@@ -491,9 +491,7 @@ updateDaemonStatus (void *delta)
   static GtkWidget *statusConnexionsLabel;
   static GtkWidget *statusConnexionsPic;
 #if GTK_CHECK_VERSION (2,10,0)
-  static GdkPixbuf *iconNoDaemon;
-  static GdkPixbuf *iconDisconnected;
-  static GdkPixbuf *iconConnected;
+  static GtkStatusIcon *trayIcon;
 #endif
 
   if (once)
@@ -505,11 +503,15 @@ updateDaemonStatus (void *delta)
         glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
                               "statusConnexionsPic");
 #if GTK_CHECK_VERSION (2,10,0)
-      char *iconFile;
+      GtkIconSet *iconSet;
+      GtkIconSource *iconSource;
+      char *iconPath;
       char *finalPath;
       char *instDir;
       char *dataDir;
 
+      trayIcon = GNUNET_GTK_get_trayIcon ();
+
       instDir = GNUNET_get_installation_path (GNUNET_IPK_DATADIR);
       dataDir = g_strconcat (instDir, "/../gnunet-gtk/", NULL);
 #if MINGW
@@ -520,18 +522,48 @@ updateDaemonStatus (void *delta)
 #endif
       GNUNET_free (instDir);
       g_free (dataDir);
-      iconFile =
+      iconSource = gtk_icon_source_new ();
+
+      iconSet = gtk_icon_set_new ();
+      iconPath =
         g_strconcat (finalPath, "gnunet-gtk-status-nodaemon.svg", NULL);
-      iconNoDaemon = gdk_pixbuf_new_from_file (iconFile, NULL);
-      g_free (iconFile);
-      iconFile =
+      gtk_icon_source_set_filename (iconSource, iconPath);
+      g_free (iconPath);
+      gtk_icon_source_set_size_wildcarded (iconSource, TRUE);
+      gtk_icon_set_add_source (iconSet, iconSource);
+      iconPath =
+        g_strconcat (finalPath, "gnunet-gtk-status-nodaemon.png", NULL);
+      gtk_icon_source_set_filename (iconSource, iconPath);
+      g_free (iconPath);
+      gtk_icon_source_set_size_wildcarded (iconSource, FALSE);
+      gtk_icon_set_add_source (iconSet, iconSource);
+
+      gtk_icon_factory_add (GNUNET_GTK_get_iconFactory(),
+                            "gnunet-gtk-status-nodaemon",
+                            iconSet);
+      gtk_icon_set_unref (iconSet);
+
+      iconSet = gtk_icon_set_new ();
+      iconPath =
         g_strconcat (finalPath, "gnunet-gtk-status-disconnected.svg", NULL);
-      iconDisconnected = gdk_pixbuf_new_from_file (iconFile, NULL);
-      g_free (iconFile);
-      iconFile =
-        g_strconcat (finalPath, "gnunet-gtk-status-connected.svg", NULL);
-      iconConnected = gdk_pixbuf_new_from_file (iconFile, NULL);
-      g_free (iconFile);
+      gtk_icon_source_set_filename (iconSource, iconPath);
+      g_free (iconPath);
+      gtk_icon_source_set_size_wildcarded (iconSource, TRUE);
+      gtk_icon_set_add_source (iconSet, iconSource);
+      iconPath =
+        g_strconcat (finalPath, "gnunet-gtk-status-disconnected.png", NULL);
+      gtk_icon_source_set_filename (iconSource, iconPath);
+      g_free (iconPath);
+      gtk_icon_source_set_size_wildcarded (iconSource, FALSE);
+      gtk_icon_set_add_source (iconSet, iconSource);
+
+      gtk_icon_factory_add (GNUNET_GTK_get_iconFactory(),
+                            "gnunet-gtk-status-disconnected",
+                            iconSet);
+      gtk_icon_set_unref (iconSet);
+
+
+      gtk_icon_source_free (iconSource);
       GNUNET_free (finalPath);
 #endif
 
@@ -552,10 +584,10 @@ updateDaemonStatus (void *delta)
               gtk_image_set_from_stock (GTK_IMAGE (statusConnexionsPic),
                                         GTK_STOCK_DIALOG_ERROR, 1);
 #if GTK_CHECK_VERSION (2,10,0)
-              gtk_status_icon_set_tooltip (GNUNET_GTK_get_trayIcon (),
+              gtk_status_icon_set_tooltip (trayIcon,
                                            _("Unknown status"));
-              gtk_status_icon_set_from_pixbuf (GNUNET_GTK_get_trayIcon (),
-                                               iconNoDaemon);
+              gtk_status_icon_set_from_stock (trayIcon,
+                                              "gnunet-gtk-status-nodaemon");
 #endif
               last_status = -1;
             }
@@ -569,7 +601,7 @@ updateDaemonStatus (void *delta)
                   gtk_label_set_text (GTK_LABEL (statusConnexionsLabel),
                                       _("Connected to 1 peer"));
 #if GTK_CHECK_VERSION (2,10,0)
-                  gtk_status_icon_set_tooltip (GNUNET_GTK_get_trayIcon (),
+                  gtk_status_icon_set_tooltip (trayIcon,
                                                _
                                                ("GNUnet - Connected to 1 peer"));
 #endif
@@ -585,14 +617,13 @@ updateDaemonStatus (void *delta)
                   label =
                     g_strdup_printf (_("GNUnet - Connected to %Lu peers"),
                                      connected_peers);
-                  gtk_status_icon_set_tooltip (GNUNET_GTK_get_trayIcon (),
-                                               label);
+                  gtk_status_icon_set_tooltip (trayIcon, label);
                   g_free (label);
 #endif
                 }
 #if GTK_CHECK_VERSION (2,10,0)
-              gtk_status_icon_set_from_pixbuf (GNUNET_GTK_get_trayIcon (),
-                                               iconConnected);
+              gtk_status_icon_set_from_stock (trayIcon,
+                                              "gnunet-gtk-status-connected");
 #endif
               gtk_image_set_from_stock (GTK_IMAGE (statusConnexionsPic),
                                         GTK_STOCK_NETWORK, 1);
@@ -606,10 +637,10 @@ updateDaemonStatus (void *delta)
           gtk_image_set_from_stock (GTK_IMAGE (statusConnexionsPic),
                                     GTK_STOCK_DISCONNECT, 1);
 #if GTK_CHECK_VERSION (2,10,0)
-          gtk_status_icon_set_tooltip (GNUNET_GTK_get_trayIcon (),
+          gtk_status_icon_set_tooltip (trayIcon,
                                        _("GNUnet - Disconnected"));
-          gtk_status_icon_set_from_pixbuf (GNUNET_GTK_get_trayIcon (),
-                                           iconDisconnected);
+          gtk_status_icon_set_from_stock (trayIcon,
+                                          "gnunet-gtk-status-disconnected");
 #endif
           last_status = 0;
         }
@@ -621,10 +652,10 @@ updateDaemonStatus (void *delta)
       gtk_image_set_from_stock (GTK_IMAGE (statusConnexionsPic),
                                 GTK_STOCK_NO, 1);
 #if GTK_CHECK_VERSION (2,10,0)
-      gtk_status_icon_set_tooltip (GNUNET_GTK_get_trayIcon (),
+      gtk_status_icon_set_tooltip (trayIcon,
                                    _("GNUnet - Daemon not running"));
-      gtk_status_icon_set_from_pixbuf (GNUNET_GTK_get_trayIcon (),
-                                       iconNoDaemon);
+      gtk_status_icon_set_from_stock (trayIcon,
+                                      "gnunet-gtk-status-nodaemon");
 #endif
       last_status = -2;
     }