[Goodies-commits] r3801 - xfce4-fsguard-plugin/trunk/panel-plugin

[Mike Massonnet]

Author: mmassonnet
Date: 2008-01-13 15:00:05 +0000 (Sun, 13 Jan 2008)
New Revision: 3801

Modified:
   xfce4-fsguard-plugin/trunk/panel-plugin/fsguard.c
Log:
	* panel-plugin/fsguard.c(fsguard_set_icon): Replace xfce_themed_icon with gtk_icon_theme.


Modified: xfce4-fsguard-plugin/trunk/panel-plugin/fsguard.c
===================================================================
--- xfce4-fsguard-plugin/trunk/panel-plugin/fsguard.c	2008-01-12 13:33:36 UTC (rev 3800)
+++ xfce4-fsguard-plugin/trunk/panel-plugin/fsguard.c	2008-01-13 15:00:05 UTC (rev 3801)
@@ -132,6 +132,7 @@
 static void
 fsguard_set_icon (FsGuard *fsguard, gint id)
 {
+    GtkIconTheme       *icon_theme;
     GdkPixbuf          *pixbuf;
     gint                size;
 
@@ -140,24 +141,25 @@
 
     fsguard->icon_id = id;
     size = xfce_panel_plugin_get_size (fsguard->plugin);
-    size = size - (2 * MAX (fsguard->btn_panel->style->xthickness,
-                            fsguard->btn_panel->style->ythickness));
+    size -= 2 * MAX (fsguard->btn_panel->style->xthickness,
+                     fsguard->btn_panel->style->ythickness);
 
-    switch (id) {
-      default:
-      case ICON_NORMAL:
-        pixbuf = xfce_themed_icon_load ("xfce4-fsguard-plugin", size);
-        break;
-      case ICON_WARNING:
-        pixbuf = xfce_themed_icon_load ("xfce4-fsguard-plugin-warning", size);
-        break;
-      case ICON_URGENT:
-        pixbuf = xfce_themed_icon_load ("xfce4-fsguard-plugin-urgent", size);
-        break;
+    icon_theme = gtk_icon_theme_get_default ();
+    if (id == ICON_URGENT) {
+        pixbuf = gtk_icon_theme_load_icon (icon_theme, "xfce4-fsguard-plugin-urgent", size, 0, NULL);
+    } else if (id == ICON_WARNING) {
+        pixbuf = gtk_icon_theme_load_icon (icon_theme, "xfce4-fsguard-plugin-warning", size, 0, NULL);
+    } else {
+        pixbuf = gtk_icon_theme_load_icon (icon_theme, "xfce4-fsguard-plugin", size, 0, NULL);
     }
 
+    if (G_UNLIKELY (NULL == pixbuf)) {
+        pixbuf = gtk_icon_theme_load_icon (icon_theme, GTK_STOCK_HARDDISK, size, 0, NULL);
+    }
+    g_return_if_fail (G_LIKELY (NULL != pixbuf));
+
+    gtk_image_set_from_pixbuf (GTK_IMAGE (fsguard->icon_panel), pixbuf);
     gtk_widget_set_sensitive (fsguard->icon_panel, id != ICON_INSENSITIVE);
-    gtk_image_set_from_pixbuf (GTK_IMAGE (fsguard->icon_panel), pixbuf);
     g_object_unref (G_OBJECT (pixbuf));
 }