[Xfce4-commits] <xfce4-power-manager:master> Patch from Jerome to fix compilation issue cause by libxfcegui4 removal.

[Ali Abdallah]

Updating branch refs/heads/master
         to 8722d56f4731afa2ef593975603f0162d4ebdb95 (commit)
       from e02894947b3a5e2ac4e7789d97798a83a4aa59e8 (commit)

commit 8722d56f4731afa2ef593975603f0162d4ebdb95
Author: Ali Abdallah <aliov at xfce.org>
Date:   Thu Apr 8 20:18:50 2010 +0200

    Patch from Jerome to fix compilation issue cause by libxfcegui4 removal.

 panel-plugins/brightness/Makefile.am         |    4 ++--
 panel-plugins/brightness/brightness-button.c |   20 ++++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/panel-plugins/brightness/Makefile.am b/panel-plugins/brightness/Makefile.am
index 4832205..c849096 100644
--- a/panel-plugins/brightness/Makefile.am
+++ b/panel-plugins/brightness/Makefile.am
@@ -12,14 +12,14 @@ xfce4_brightness_plugin_CFLAGS =		\
 	-DLOCALEDIR=\"$(localedir)\"  		\
 	$(LIBXFCE4PANEL_CFLAGS)       		\
 	$(LIBXFCE4UTIL_CFLAGS)        		\
-	$(LIBXFCE4GUI_CFLAGS)			\
+	$(LIBXFCE4UI_CFLAGS)			\
 	$(GTK_CFLAGS)			      	\
 	$(GLIB_CFLAGS)
 
 xfce4_brightness_plugin_LDADD =			\
 	$(top_builddir)/common/libxfpmcommon.la \
 	$(LIBXFCE4PANEL_LIBS)   		\
-	$(LIBXFCE4GUI_LIBS)			\
+	$(LIBXFCE4UI_LIBS)			\
 	$(LIBXFCE4UTIL_LIBS)			\
 	$(GTK_LIBS)   				\
 	$(GLIB_LIBS)
diff --git a/panel-plugins/brightness/brightness-button.c b/panel-plugins/brightness/brightness-button.c
index b6e1893..8c4998b 100644
--- a/panel-plugins/brightness/brightness-button.c
+++ b/panel-plugins/brightness/brightness-button.c
@@ -558,18 +558,22 @@ brightness_button_set_icon (BrightnessButton *button, gint width)
     gboolean hw_found;
     GdkPixbuf *pixbuf;
     const gchar *icon_name;
-    
+
     hw_found = xfpm_brightness_has_hw (button->priv->brightness);
-    
+
     icon_name = hw_found ? XFPM_DISPLAY_BRIGHTNESS_ICON : XFPM_DISPLAY_BRIGHTNESS_INVALID_ICON;
-    
-    pixbuf = xfce_themed_icon_load (icon_name, width);
-    
+
+    pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
+                                       icon_name,
+                                       width,
+                                       GTK_ICON_LOOKUP_FORCE_SIZE,
+                                       NULL);
+
     if ( pixbuf )
     {
-	gtk_image_set_from_pixbuf (GTK_IMAGE (button->priv->image), pixbuf);
-	g_object_unref (pixbuf);
-	return TRUE;
+        gtk_image_set_from_pixbuf (GTK_IMAGE (button->priv->image), pixbuf);
+        g_object_unref (pixbuf);
+        return TRUE;
     }
     return FALSE;
 }