* Patch to avoid installing the ui file.

(Old svn revision: 7658)

8 files changed, 28 insertions, 27 deletions

diff --git a/ChangeLog b/ChangeLog
index 5979a5e7..ab006f0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2009-07-03 10:00 Mike Massonnet
+	* Patch to avoid installing the ui file.
+
 2009-06-30: 15:00 Ali aliov@xfce.org
 	* settings/xfpm-setting.c Don't allow brightness timeout to be less than
 	DPMS sleep timeout.
diff --git a/Makefile.am b/Makefile.am
index 4cc35dc4..fa225bb6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,11 +5,11 @@ plugins_dir = panel-plugins
 endif
 
 SUBDIRS =        	\
+	data		\
 	libxfpm		\
 	src		\
 	settings	\
 	$(plugins_dir)	\
-	data         	\
 	po           	\
 	doc
 
diff --git a/configure.ac.in b/configure.ac.in
index c2744cfe..f5ed3d74 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -3,7 +3,7 @@ m4_define([xfpm_version_major],  [0])
 m4_define([xfpm_version_minor],  [8])
 m4_define([xfpm_version_micro],  [1])
 m4_define([xfpm_version_build],  [])
-m4_define([xfpm_version_tag],[])
+m4_define([xfpm_version_tag],[@REVISION@])
 m4_define([xfpm_version], [xfpm_version_major().xfpm_version_minor().xfpm_version_micro()ifelse(xfpm_version_tag(), [svn], [xfpm_version_tag().xfpm_version_build()], [xfpm_version_tag()])])
 
 AC_INIT([xfce4-power-manager], [xfpm_version], [http://bugzilla.xfce.org/])
@@ -107,20 +107,6 @@ if test "x${ac_cv_have_decl_XF86XK_Hibernate}" != "xno"; then
   AC_DEFINE(HAVE_XF86XK_HIBERNATE, 1, [Define if XF86XK_Hibernate is available])
 fi
 
-# Taken from Gnome system tools
-#=======================================================#
-#              Pixmaps and interface files              #
-#=======================================================#
-if test "x${prefix}" = "xNONE"; then
-  AC_DEFINE_UNQUOTED(INTERFACES_DIR, "${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/ui", [path where UI files will be installed])
-  interfacesdir="${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/ui"
-else
-  AC_DEFINE_UNQUOTED(INTERFACES_DIR, "${prefix}/${DATADIRNAME}/${PACKAGE}/ui", [path where UI files will be installed])
-  interfacesdir="${prefix}/${DATADIRNAME}/${PACKAGE}/ui"
-fi
-
-AC_SUBST(interfacesdir)
-
 #=======================================================#
 #                 Panel plugins ?                       #
 #=======================================================#
@@ -200,7 +186,6 @@ echo "
  
 	prefix:			$prefix
 	xdg autostart:		$sysconfdir/xdg/autostart
-	interfaces dir:		$interfacesdir
    	DPMS         support:   $have_dpms
   	Build panel  plugins:   $build_panel_plugins
    	Debug        support:   $enable_debug
diff --git a/data/interfaces/Makefile.am b/data/interfaces/Makefile.am
index f027971b..76a65f72 100644
--- a/data/interfaces/Makefile.am
+++ b/data/interfaces/Makefile.am
@@ -1,9 +1,18 @@
+interfaces_h =					\
+	xfpm-settings_ui.h
+
 interfaces =					\
 	xfpm-settings.ui
 
+if MAINTAINER_MODE
+BUILT_SOURCES = $(interfaces_h)
+xfpm-settings_ui.h: xfpm-settings.ui
+	exo-csource --static --strip-comments --strip-content --name=xfpm_settings_ui $< > $@
+endif
 
-interfaces_DATA = 				\
-	$(interfaces)
+DISTCLEANFILES =				\
+	$(interfaces_h)
 
 EXTRA_DIST =					\
-	$(interfaces)
\ No newline at end of file
+	$(interfaces)				\
+	$(interfaces_h)
diff --git a/libxfpm/xfpm-common.c b/libxfpm/xfpm-common.c
index c7bf3fef..e2190b49 100644
--- a/libxfpm/xfpm-common.c
+++ b/libxfpm/xfpm-common.c
@@ -25,16 +25,17 @@
 #include "xfpm-common.h"
 #include "xfpm-string.h"
 
-GtkBuilder *xfpm_builder_new_from_file (const gchar *file, GError **error)
+GtkBuilder *xfpm_builder_new_from_string (const gchar *ui, GError **error)
 {
     GtkBuilder *builder;
 
     builder = gtk_builder_new ();
     
-    gtk_builder_add_from_file (GTK_BUILDER (builder),
-			       file,
-			       error);
-			       
+    gtk_builder_add_from_string (GTK_BUILDER (builder),
+                                 ui,
+                                 -1,
+                                 error);
+    
     return builder;
 }
 
diff --git a/libxfpm/xfpm-common.h b/libxfpm/xfpm-common.h
index 04d0894a..717dcc0a 100644
--- a/libxfpm/xfpm-common.h
+++ b/libxfpm/xfpm-common.h
@@ -30,7 +30,7 @@
 
 G_BEGIN_DECLS
 
-GtkBuilder     *xfpm_builder_new_from_file   	(const gchar *file,
+GtkBuilder     *xfpm_builder_new_from_string   	(const gchar *file,
 						 GError **error);
 
 GdkPixbuf* 	xfpm_load_icon    		(const gchar *icon_name,
diff --git a/settings/Makefile.am b/settings/Makefile.am
index 379e0a4c..dafbd3c3 100644
--- a/settings/Makefile.am
+++ b/settings/Makefile.am
@@ -12,6 +12,7 @@ xfce4_power_manager_settings_SOURCES = 				\
 xfce4_power_manager_settings_CFLAGS =				\
 	-I$(top_srcdir)						\
 	-I$(top_srcdir)/src					\
+	-I$(top_srcdir)/data					\
 	-DLOCALEDIR=\"$(localedir)\"				\
 	-DG_LOG_DOMAIN=\"xfce4-power-manager-settings\" 	\
 	-export-dynamic						\
diff --git a/settings/xfpm-settings.c b/settings/xfpm-settings.c
index d16d0456..b3911c3f 100644
--- a/settings/xfpm-settings.c
+++ b/settings/xfpm-settings.c
@@ -37,6 +37,8 @@
 #include "libxfpm/xfpm-common.h"
 #include "libxfpm/xfpm-string.h"
 
+#include "interfaces/xfpm-settings_ui.h"
+
 #include "xfpm-settings.h"
 #include "xfpm-config.h"
 #include "xfpm-enum-glib.h"
@@ -1561,7 +1563,7 @@ xfpm_settings_dialog_new (XfconfChannel *channel, gboolean system_laptop,
 	  xfpm_bool_to_string (has_sleep_button), xfpm_bool_to_string (has_hibernate_button),
 	  xfpm_bool_to_string (has_power_button) );
 
-    xml = xfpm_builder_new_from_file (INTERFACE_FILE, &error);
+    xml = xfpm_builder_new_from_string (xfpm_settings_ui, &error);
     
     if ( G_UNLIKELY (error) )
     {