aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-07-17 17:44:11 +0100
committerRoss Burton <ross.burton@intel.com>2013-09-26 16:20:27 +0100
commit5a50b1ee8b3a1f00be98ffd8ff1233e9940d10d5 (patch)
treed131ab057f64d52bdbc289ab1ba1f6bf9e5958fd
parent2e3f0cb1f3083d5e568caf10319e7f8c88d7ec73 (diff)
downloadmatchbox-panel-2-gtk3.tar.gz
matchbox-panel-2-gtk3.tar.bz2
matchbox-panel-2-gtk3.zip
showdesktop: port to use scaling-image2gtk3
-rw-r--r--applets/showdesktop/showdesktop.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/applets/showdesktop/showdesktop.c b/applets/showdesktop/showdesktop.c
index f4dc6f0..8057135 100644
--- a/applets/showdesktop/showdesktop.c
+++ b/applets/showdesktop/showdesktop.c
@@ -11,11 +11,11 @@
#include <gdk/gdkx.h>
#include <X11/Xatom.h>
#include <matchbox-panel/mb-panel.h>
-#include <matchbox-panel/mb-panel-scaling-image.h>
+#include <matchbox-panel/mb-panel-scaling-image2.h>
typedef struct {
GtkButton *button;
- MBPanelScalingImage *image;
+ MBPanelScalingImage2 *image;
gboolean active;
@@ -45,15 +45,11 @@ show_desktop_applet_free (ShowDesktopApplet *applet)
static void
set_active (ShowDesktopApplet *applet, gboolean active)
{
- const char *icon;
-
applet->active = active;
/* TODO: remove this function and instead use a toggle button? */
- icon = "panel-user-desktop";
-
- mb_panel_scaling_image_set_icon (applet->image, icon);
+ mb_panel_scaling_image2_set_icon (applet->image, "panel-user-desktop");
}
/* Sync @applet with the _NET_SHOWING_DESKTOP root window property */
@@ -200,8 +196,8 @@ mb_panel_applet_create (const char *id,
gtk_widget_set_name (button, "MatchboxPanelShowDesktop");
- image = mb_panel_scaling_image_new (orientation, NULL);
- applet->image = MB_PANEL_SCALING_IMAGE (image);
+ image = mb_panel_scaling_image2_new (orientation, NULL);
+ applet->image = MB_PANEL_SCALING_IMAGE2 (image);
gtk_container_add (GTK_CONTAINER (button), image);