[Goodies-commits] r2854 - in xfce4-volstatus-icon/trunk: . xfce4-volstatus-icon

Brian Tarricone kelnos at xfce.org
Sat Jun 23 11:31:22 CEST 2007


Author: kelnos
Date: 2007-06-23 09:31:21 +0000 (Sat, 23 Jun 2007)
New Revision: 2854

Removed:
   xfce4-volstatus-icon/trunk/ghal/
Modified:
   xfce4-volstatus-icon/trunk/Makefile.am
   xfce4-volstatus-icon/trunk/README
   xfce4-volstatus-icon/trunk/configure.ac.in
   xfce4-volstatus-icon/trunk/xfce4-volstatus-icon/Makefile.am
   xfce4-volstatus-icon/trunk/xfce4-volstatus-icon/main.c
   xfce4-volstatus-icon/trunk/xfce4-volstatus-icon/xfce-volstatus-common.c
Log:
remove ghal directory, as it's now a separate library, which we now depend on


Modified: xfce4-volstatus-icon/trunk/Makefile.am
===================================================================
--- xfce4-volstatus-icon/trunk/Makefile.am	2007-06-23 07:14:40 UTC (rev 2853)
+++ xfce4-volstatus-icon/trunk/Makefile.am	2007-06-23 09:31:21 UTC (rev 2854)
@@ -1,5 +1,4 @@
 SUBDIRS = \
-	ghal \
 	po \
 	xfce4-volstatus-icon
 

Modified: xfce4-volstatus-icon/trunk/README
===================================================================
--- xfce4-volstatus-icon/trunk/README	2007-06-23 07:14:40 UTC (rev 2853)
+++ xfce4-volstatus-icon/trunk/README	2007-06-23 09:31:21 UTC (rev 2854)
@@ -1,8 +1,14 @@
 xfce4-volstatus-icon
 ====================
 
-This is a program that sits around and does nothing until a removable volume
+This is a program that sits around and does nothing until a removable device
 is inserted.  Then it becomes an icon in the systray, which allows you to
-easily (and safely) unmount/eject the volume.
+easily (and safely) unmount/eject the device.
 
+-> Requirements:
+
+* gtk+ 2.10.0
+* libxfcegui4 4.4.0
+* ghal 0.1.0  (SVN only; see http://svn.xfce.org/svn/kelnos/ghal/trunk)
+
 More documentation coming eventually...

Modified: xfce4-volstatus-icon/trunk/configure.ac.in
===================================================================
--- xfce4-volstatus-icon/trunk/configure.ac.in	2007-06-23 07:14:40 UTC (rev 2853)
+++ xfce4-volstatus-icon/trunk/configure.ac.in	2007-06-23 09:31:21 UTC (rev 2854)
@@ -53,16 +53,13 @@
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.10.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
 XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
-XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.70])
-XDT_CHECK_PACKAGE([HAL], [hal-storage], [0.5.7.1])
-XDT_CHECK_PACKAGE([EXO_HAL], [exo-hal-0.3], [0.3.2])
+XDT_CHECK_PACKAGE([GHAL], [ghal-0.1], [0.1.0])
 
 dnl check for debugging support
 XDT_FEATURE_DEBUG
 
 AC_OUTPUT([
 Makefile
-ghal/Makefile
 po/Makefile.in
 xfce4-volstatus-icon/Makefile
 ])

Modified: xfce4-volstatus-icon/trunk/xfce4-volstatus-icon/Makefile.am
===================================================================
--- xfce4-volstatus-icon/trunk/xfce4-volstatus-icon/Makefile.am	2007-06-23 07:14:40 UTC (rev 2853)
+++ xfce4-volstatus-icon/trunk/xfce4-volstatus-icon/Makefile.am	2007-06-23 09:31:21 UTC (rev 2854)
@@ -13,23 +13,17 @@
 
 xfce4_volstatus_icon_CFLAGS = \
 	-I$(top_srcdir) \
-	-DEXO_API_SUBJECT_TO_CHANGE \
 	-DLOCALEDIR=\"$(localedir)\" \
 	@GTK_CFLAGS@ \
 	@LIBXFCE4UTIL_CFLAGS@ \
 	@LIBXFCEGUI4_CFLAGS@ \
-	@DBUS_GLIB_CFLAGS@ \
-	@HAL_CFLAGS@ \
-	@EXO_HAL_CFLAGS@
+	@GHAL_CFLAGS@
 
 xfce4_volstatus_icon_LDADD = \
-	$(top_builddir)/ghal/libghal.la \
 	@GTK_LIBS@ \
 	@LIBXFCE4UTIL_LIBS@ \
 	@LIBXFCEGUI4_LIBS@ \
-	@DBUS_GLIB_LIBS@ \
-	@HAL_LIBS@ \
-	@EXO_HAL_LIBS@
+	@GHAL_LIBS@
 
 
 if MAINTAINER_MODE
@@ -58,5 +52,3 @@
 	glib-genmarshal --prefix=xfce_volstatus_marshal xfce-volstatus-marshal.list --body >> xfce-volstatus-marshal.c
 
 endif
-
-

Modified: xfce4-volstatus-icon/trunk/xfce4-volstatus-icon/main.c
===================================================================
--- xfce4-volstatus-icon/trunk/xfce4-volstatus-icon/main.c	2007-06-23 07:14:40 UTC (rev 2853)
+++ xfce4-volstatus-icon/trunk/xfce4-volstatus-icon/main.c	2007-06-23 09:31:21 UTC (rev 2854)
@@ -35,7 +35,6 @@
 #include <gtk/gtk.h>
 
 #include <ghal/ghal.h>
-#include <exo-hal/exo-hal.h>
 
 #include "xfce-volstatus-common.h"
 #include "xfce-volstatus-icon.h"

Modified: xfce4-volstatus-icon/trunk/xfce4-volstatus-icon/xfce-volstatus-common.c
===================================================================
--- xfce4-volstatus-icon/trunk/xfce4-volstatus-icon/xfce-volstatus-common.c	2007-06-23 07:14:40 UTC (rev 2853)
+++ xfce4-volstatus-icon/trunk/xfce4-volstatus-icon/xfce-volstatus-common.c	2007-06-23 09:31:21 UTC (rev 2854)
@@ -26,8 +26,6 @@
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
-#include <exo-hal/exo-hal.h>
-
 #include "xfce-volstatus-common.h"
 
 gboolean




More information about the Goodies-commits mailing list