From e0f4651de8ca712751f341ff1949b4be81fdabf9 Mon Sep 17 00:00:00 2001 From: Mike Massonnet Date: Tue, 1 Nov 2011 16:32:34 +0100 Subject: [PATCH] Port from libxfcegui4 to libxfce4ui Bump dependencies: - GTK 2.20 - Xfce 4.8 --- 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 9e51ad1..f4bd52b 100644 --- a/panel-plugin/battery.c +++ b/panel-plugin/battery.c @@ -47,10 +47,10 @@ #include #include -#include +#include #include -#include +#include #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); } } } @@ -778,7 +778,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); setup_battmon(battmon, xfce_panel_plugin_get_orientation (plugin)); battmon->timeoutid = 0; battmon->flag = FALSE; -- 1.7.2.5