[Goodies-commits] r7658 - in xfce4-power-manager/trunk: . data/interfaces libxfpm settings
Ali Abdallah
aliov at xfce.org
Fri Jul 3 10:12:02 CEST 2009
Author: aliov
Date: 2009-07-03 08:12:02 +0000 (Fri, 03 Jul 2009)
New Revision: 7658
Modified:
xfce4-power-manager/trunk/ChangeLog
xfce4-power-manager/trunk/Makefile.am
xfce4-power-manager/trunk/configure.ac.in
xfce4-power-manager/trunk/data/interfaces/Makefile.am
xfce4-power-manager/trunk/libxfpm/xfpm-common.c
xfce4-power-manager/trunk/libxfpm/xfpm-common.h
xfce4-power-manager/trunk/settings/Makefile.am
xfce4-power-manager/trunk/settings/xfpm-settings.c
Log:
* Patch to avoid installing the ui file.
Modified: xfce4-power-manager/trunk/ChangeLog
===================================================================
--- xfce4-power-manager/trunk/ChangeLog 2009-07-02 19:48:40 UTC (rev 7657)
+++ xfce4-power-manager/trunk/ChangeLog 2009-07-03 08:12:02 UTC (rev 7658)
@@ -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 at xfce.org
* settings/xfpm-setting.c Don't allow brightness timeout to be less than
DPMS sleep timeout.
Modified: xfce4-power-manager/trunk/Makefile.am
===================================================================
--- xfce4-power-manager/trunk/Makefile.am 2009-07-02 19:48:40 UTC (rev 7657)
+++ xfce4-power-manager/trunk/Makefile.am 2009-07-03 08:12:02 UTC (rev 7658)
@@ -5,11 +5,11 @@
endif
SUBDIRS = \
+ data \
libxfpm \
src \
settings \
$(plugins_dir) \
- data \
po \
doc
Modified: xfce4-power-manager/trunk/configure.ac.in
===================================================================
--- xfce4-power-manager/trunk/configure.ac.in 2009-07-02 19:48:40 UTC (rev 7657)
+++ xfce4-power-manager/trunk/configure.ac.in 2009-07-03 08:12:02 UTC (rev 7658)
@@ -3,7 +3,7 @@
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,21 +107,7 @@
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 ? #
#=======================================================#
AC_ARG_ENABLE([panel_plugins],
@@ -200,7 +186,6 @@
prefix: $prefix
xdg autostart: $sysconfdir/xdg/autostart
- interfaces dir: $interfacesdir
DPMS support: $have_dpms
Build panel plugins: $build_panel_plugins
Debug support: $enable_debug
Modified: xfce4-power-manager/trunk/data/interfaces/Makefile.am
===================================================================
--- xfce4-power-manager/trunk/data/interfaces/Makefile.am 2009-07-02 19:48:40 UTC (rev 7657)
+++ xfce4-power-manager/trunk/data/interfaces/Makefile.am 2009-07-03 08:12:02 UTC (rev 7658)
@@ -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)
Modified: xfce4-power-manager/trunk/libxfpm/xfpm-common.c
===================================================================
--- xfce4-power-manager/trunk/libxfpm/xfpm-common.c 2009-07-02 19:48:40 UTC (rev 7657)
+++ xfce4-power-manager/trunk/libxfpm/xfpm-common.c 2009-07-03 08:12:02 UTC (rev 7658)
@@ -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;
}
Modified: xfce4-power-manager/trunk/libxfpm/xfpm-common.h
===================================================================
--- xfce4-power-manager/trunk/libxfpm/xfpm-common.h 2009-07-02 19:48:40 UTC (rev 7657)
+++ xfce4-power-manager/trunk/libxfpm/xfpm-common.h 2009-07-03 08:12:02 UTC (rev 7658)
@@ -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,
Modified: xfce4-power-manager/trunk/settings/Makefile.am
===================================================================
--- xfce4-power-manager/trunk/settings/Makefile.am 2009-07-02 19:48:40 UTC (rev 7657)
+++ xfce4-power-manager/trunk/settings/Makefile.am 2009-07-03 08:12:02 UTC (rev 7658)
@@ -12,6 +12,7 @@
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 \
Modified: xfce4-power-manager/trunk/settings/xfpm-settings.c
===================================================================
--- xfce4-power-manager/trunk/settings/xfpm-settings.c 2009-07-02 19:48:40 UTC (rev 7657)
+++ xfce4-power-manager/trunk/settings/xfpm-settings.c 2009-07-03 08:12:02 UTC (rev 7658)
@@ -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_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) )
{
More information about the Goodies-commits
mailing list