[yocto] [matchbox-panel-2][PATCH 2/4] battery: Port to ScalingImage2

[Jussi Kukkonen]

Signed-off-by: Jussi Kukkonen <jussi.kukkonen at intel.com>
---
 applets/battery/battery-acpi.c |  1 +
 applets/battery/battery.c      | 10 ++++++----
 applets/battery/battery.h      |  2 --
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/applets/battery/battery-acpi.c b/applets/battery/battery-acpi.c
index c44dd12..8431127 100644
--- a/applets/battery/battery-acpi.c
+++ b/applets/battery/battery-acpi.c
@@ -5,6 +5,7 @@
  */
 
 #include "battery.h"
+#include <glib.h>
 #include <libacpi.h>
 
 global_t global;
diff --git a/applets/battery/battery.c b/applets/battery/battery.c
index ade3ff6..c755856 100644
--- a/applets/battery/battery.c
+++ b/applets/battery/battery.c
@@ -7,9 +7,11 @@
  */
 
 #include "battery.h"
+#include <matchbox-panel/mb-panel.h>
+#include <matchbox-panel/mb-panel-scaling-image2.h>
 
 typedef struct {
-        MBPanelScalingImage *image;
+        MBPanelScalingImage2 *image;
         const char *last_icon;
         guint timeout_id;
 } BatteryApplet;
@@ -38,7 +40,7 @@ timeout (BatteryApplet *applet)
 
         applet->last_icon = icon;
 
-        mb_panel_scaling_image_set_icon (applet->image, icon);
+        mb_panel_scaling_image2_set_icon (applet->image, icon);
 
         /* Keep going */
         return TRUE;
@@ -59,8 +61,8 @@ mb_panel_applet_create (const char    *id,
 
         applet->last_icon = NULL;
 
-        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_widget_set_name (image, "MatchboxPanelBatteryMonitor");
 
diff --git a/applets/battery/battery.h b/applets/battery/battery.h
index 29a44ca..cf23431 100644
--- a/applets/battery/battery.h
+++ b/applets/battery/battery.h
@@ -8,8 +8,6 @@
 #define MB_APPLET_BATTERY_H
 
 #include <string.h>
-#include <matchbox-panel/mb-panel.h>
-#include <matchbox-panel/mb-panel-scaling-image.h>
 
 int pm_support(void);
 const char* pm_battery_icon(void);
-- 
2.8.1