From 905097f2f3a647daddd06a447365474c3650eddc Mon Sep 17 00:00:00 2001 From: Christoph J. Thompson Date: Tue, 11 Jan 2011 12:29:17 +0100 Subject: [PATCH 1/2] Port to libxfce4ui. modified: configure.ac.in modified: panel-plugin/Makefile.am modified: panel-plugin/cpu.c modified: panel-plugin/systemload.c modified: panel-plugin/uptime.c --- configure.ac.in | 2 +- panel-plugin/Makefile.am | 4 ++-- panel-plugin/cpu.c | 2 +- panel-plugin/systemload.c | 2 +- panel-plugin/uptime.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index ae50a76..b278f26 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -58,7 +58,7 @@ dnl *** Check for required packages *** dnl *********************************** XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0]) XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.99.1]) -XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.99.1]) +XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0]) XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.99.1]) dnl *********************************** diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am index 4e888e7..a271a82 100644 --- a/panel-plugin/Makefile.am +++ b/panel-plugin/Makefile.am @@ -22,13 +22,13 @@ xfce4_systemload_plugin_SOURCES = \ xfce4_systemload_plugin_CFLAGS = \ $(GTK_CFLAGS) \ $(LIBXFCE4UTIL_CFLAGS) \ - $(LIBXFCEGUI4_CFLAGS) \ + $(LIBXFCE4UI_CFLAGS) \ $(LIBXFCE4PANEL_CFLAGS) \ $(PLATFORM_CFLAGS) xfce4_systemload_plugin_LDADD = \ $(LIBXFCE4UTIL_LIBS) \ - $(LIBXFCEGUI4_LIBS) \ + $(LIBXFCE4UI_LIBS) \ $(LIBXFCE4PANEL_LIBS) # diff --git a/panel-plugin/cpu.c b/panel-plugin/cpu.c index bb4a829..bc950f7 100644 --- a/panel-plugin/cpu.c +++ b/panel-plugin/cpu.c @@ -35,7 +35,7 @@ #include #include -#include +#include #include "cpu.h" #if defined(__linux__) || defined(__FreeBSD_kernel__) diff --git a/panel-plugin/systemload.c b/panel-plugin/systemload.c index afac26e..22668d5 100644 --- a/panel-plugin/systemload.c +++ b/panel-plugin/systemload.c @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include "cpu.h" diff --git a/panel-plugin/uptime.c b/panel-plugin/uptime.c index 60c2a78..33fd4c6 100644 --- a/panel-plugin/uptime.c +++ b/panel-plugin/uptime.c @@ -31,7 +31,7 @@ #include #include -#include +#include #include "uptime.h" -- 1.7.1