[Xfce4-commits] <xfce4-battery-plugin:master> Port from libxfcegui4 to libxfce4ui

[Landry Breuil]

Updating branch refs/heads/master
         to a24e726bcc0133a6a8a54db4bcfc74b99258d9a9 (commit)
       from 1a45c5301f018ac89cdfb8479c3d29fd0e1412b4 (commit)

commit a24e726bcc0133a6a8a54db4bcfc74b99258d9a9
Author: Mike Massonnet <mmassonnet at xfce.org>
Date:   Tue Nov 1 16:32:34 2011 +0100

    Port from libxfcegui4 to libxfce4ui
    
    Bump dependencies:
    - GTK 2.20
    - Xfce 4.8
    
    Signed-off-by: Landry Breuil <landry at xfce.org>

 configure.ac.in          |   10 +++++-----
 panel-plugin/Makefile.am |    4 ++--
 panel-plugin/battery.c   |   10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index e7152a9..8e46f76 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -59,11 +59,11 @@ XDT_I18N([@LINGUAS@])
 dnl ***********************************
 dnl *** Check for required packages ***
 dnl ***********************************
-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
-XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.90.2])
-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90.2])
-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.90.2])
+XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0])
+XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.24.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0])
 
 dnl ***********************************
 dnl *** Check for debugging support ***
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 135ee8e..681a449 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -22,14 +22,14 @@ xfce4_battery_plugin_SOURCES =						\
 
 xfce4_battery_plugin_CFLAGS =						\
 	$(LIBXFCE4PANEL_CFLAGS)						\
-	$(LIBXFCEGUI4_CFLAGS)						\
+	$(LIBXFCE4UI_CFLAGS)						\
 	$(LIBXFCE4UTIL_CFLAGS)						\
 	$(GTK_CFLAGS)							\
 	$(PLATFORM_CFLAGS)
 
 xfce4_battery_plugin_LDADD =						\
 	$(LIBXFCE4PANEL_LIBS)						\
-	$(LIBXFCEGUI4_LIBS)						\
+	$(LIBXFCE4UI_LIBS)						\
 	$(LIBXFCE4UTIL_LIBS)						\
 	$(GTK_LIBS)
 
diff --git a/panel-plugin/battery.c b/panel-plugin/battery.c
index 36d0042..f6323ef 100644
--- a/panel-plugin/battery.c
+++ b/panel-plugin/battery.c
@@ -47,10 +47,10 @@
 #include <stdlib.h>
 
 #include <libxfce4util/libxfce4util.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
 
 #include <gtk/gtk.h>
-#include <libxfce4panel/xfce-panel-plugin.h>
+#include <libxfce4panel/libxfce4panel.h>
 
 #include "libacpi.h"
 
@@ -591,7 +591,7 @@ do_critical_warn:
                 int interm=(battmon->options.action_on_critical == BM_COMMAND_TERM)?1:0;
                 if (!battmon->options.command_on_critical ||
                     !strlen(battmon->options.command_on_critical)) goto do_critical_warn;
-                xfce_exec (battmon->options.command_on_critical, interm, 0, NULL);
+                xfce_spawn_command_line_on_screen(NULL, battmon->options.command_on_critical, interm, FALSE, NULL);
             }
         } else if (!battmon->low){
                 battmon->low = TRUE;
@@ -609,7 +609,7 @@ do_low_warn:
                 int interm=(battmon->options.action_on_low == BM_COMMAND_TERM)?1:0;
                 if (!battmon->options.command_on_low ||
                     !strlen(battmon->options.command_on_low)) goto do_low_warn;
-                xfce_exec(battmon->options.command_on_low, interm, 0, NULL);
+                xfce_spawn_command_line_on_screen(NULL, battmon->options.command_on_low, interm, FALSE, NULL);
             }
         }
     }
@@ -867,7 +867,7 @@ battmon_create(XfcePanelPlugin *plugin)
     battmon->low = FALSE;
     battmon->critical = FALSE;
     battmon->ebox = gtk_event_box_new();
-    gtk_event_box_set_visible_window(battmon->ebox, FALSE);
+    gtk_event_box_set_visible_window(GTK_EVENT_BOX(battmon->ebox), FALSE);
 
 #if defined (LIBXFCE4PANEL_CHECK_VERSION) && LIBXFCE4PANEL_CHECK_VERSION (4,9,0)
     mode = xfce_panel_plugin_get_mode (plugin);