[Goodies-commits] r7659 - in xfce4-power-manager/trunk: . data/interfaces settings

[Ali Abdallah]

Author: aliov
Date: 2009-07-03 17:27:31 +0000 (Fri, 03 Jul 2009)
New Revision: 7659

Modified:
   xfce4-power-manager/trunk/ChangeLog
   xfce4-power-manager/trunk/data/interfaces/Makefile.am
   xfce4-power-manager/trunk/settings/xfpm-settings.c
Log:
	* data/interfaces/Makefile.am use a sort of filter for interfaces_h 
	* data/interfaces/xfpm-settings.ui drops a forgotten #define.
	

Modified: xfce4-power-manager/trunk/ChangeLog
===================================================================
--- xfce4-power-manager/trunk/ChangeLog	2009-07-03 08:12:02 UTC (rev 7658)
+++ xfce4-power-manager/trunk/ChangeLog	2009-07-03 17:27:31 UTC (rev 7659)
@@ -1,4 +1,8 @@
-2009-07-03 10:00 Mike Massonnet
+2009-07-03 19:30 Mike Massonnet mmassonnet at xfce.org
+	* data/interfaces/Makefile.am use a sort of filter for interfaces_h 
+	* data/interfaces/xfpm-settings.ui drops a forgotten #define.
+	
+2009-07-03 10:00 Mike Massonnet mmassonnet at xfce.org
 	* Patch to avoid installing the ui file.
 
 2009-06-30: 15:00 Ali aliov at xfce.org

Modified: xfce4-power-manager/trunk/data/interfaces/Makefile.am
===================================================================
--- xfce4-power-manager/trunk/data/interfaces/Makefile.am	2009-07-03 08:12:02 UTC (rev 7658)
+++ xfce4-power-manager/trunk/data/interfaces/Makefile.am	2009-07-03 17:27:31 UTC (rev 7659)
@@ -1,9 +1,9 @@
-interfaces_h =					\
-	xfpm-settings_ui.h
-
 interfaces =					\
 	xfpm-settings.ui
 
+interfaces_h =					\
+	$(interfaces:.ui=_ui.h)
+
 if MAINTAINER_MODE
 BUILT_SOURCES = $(interfaces_h)
 xfpm-settings_ui.h: xfpm-settings.ui

Modified: xfce4-power-manager/trunk/settings/xfpm-settings.c
===================================================================
--- xfce4-power-manager/trunk/settings/xfpm-settings.c	2009-07-03 08:12:02 UTC (rev 7658)
+++ xfce4-power-manager/trunk/settings/xfpm-settings.c	2009-07-03 17:27:31 UTC (rev 7659)
@@ -44,7 +44,6 @@
 #include "xfpm-enum-glib.h"
 #include "xfpm-enum.h"
 
-#define INTERFACE_FILE INTERFACES_DIR "/xfpm-settings.ui"
 #define BRIGHTNESS_DISABLED 	9
 
 static 	GtkBuilder *xml 			= NULL;