gnome-power-manager r3057 - in trunk: . src src/dbus

[rhughes svn gnome org]

Author: rhughes
Date: Mon Nov  3 17:35:10 2008
New Revision: 3057
URL: http://svn.gnome.org/viewvc/gnome-power-manager?rev=3057&view=rev

Log:
2008-11-03  Richard Hughes  <richard hughsie com>

* configure.ac:
* src/Makefile.am:
* src/dbus/Makefile.am:
* src/dbus/xdg-power-management-backlight.xml:
* src/dbus/xdg-power-management-core.xml:
* src/dbus/xdg-power-management-inhibit.xml:
* src/dbus/xdg-power-management-stats.xml:
* src/dbus/xdg-power-management-widget.xml:
* src/gpm-main.c:
* src/gpm-manager.c:
Rename the DBUS interfaces to the more familiar format:
org.freedesktop.PowerManagement.Foo.xml


Added:
   trunk/src/org.freedesktop.PowerManagement.Backlight.xml   (props changed)
      - copied unchanged from r3049, /trunk/src/dbus/xdg-power-management-backlight.xml
   trunk/src/org.freedesktop.PowerManagement.Inhibit.xml   (props changed)
      - copied unchanged from r3049, /trunk/src/dbus/xdg-power-management-inhibit.xml
   trunk/src/org.freedesktop.PowerManagement.Statistics.xml   (props changed)
      - copied unchanged from r3049, /trunk/src/dbus/xdg-power-management-stats.xml
   trunk/src/org.freedesktop.PowerManagement.Ui.xml   (props changed)
      - copied unchanged from r3049, /trunk/src/dbus/xdg-power-management-widget.xml
   trunk/src/org.freedesktop.PowerManagement.xml   (props changed)
      - copied unchanged from r3049, /trunk/src/dbus/xdg-power-management-core.xml
Removed:
   trunk/src/dbus/
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/Makefile.am
   trunk/src/gpm-main.c
   trunk/src/gpm-manager.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Nov  3 17:35:10 2008
@@ -602,7 +602,6 @@
 AC_CONFIG_FILES([
 Makefile
 src/Makefile
-src/dbus/Makefile
 applets/Makefile
 applets/brightness/Makefile
 applets/inhibit/Makefile

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Mon Nov  3 17:35:10 2008
@@ -1,11 +1,14 @@
-SUBDIRS = dbus
-
 ## We require new-style dependency handling.
 AUTOMAKE_OPTIONS = 1.7
 
 NULL =
 
 EXTRA_DIST =						\
+	org.freedesktop.PowerManagement.xml		\
+	org.freedesktop.PowerManagement.Ui.xml		\
+	org.freedesktop.PowerManagement.Inhibit.xml	\
+	org.freedesktop.PowerManagement.Backlight.xml	\
+	org.freedesktop.PowerManagement.Statistics.xml	\
 	gpm-marshal.list				\
 	$(NULL)
 
@@ -319,6 +322,11 @@
 gnome_power_self_test_CFLAGS = -DEGG_TEST $(AM_CFLAGS)
 
 BUILT_SOURCES = 					\
+	org.freedesktop.PowerManagement.h		\
+	org.freedesktop.PowerManagement.Ui.h		\
+	org.freedesktop.PowerManagement.Inhibit.h	\
+	org.freedesktop.PowerManagement.Backlight.h	\
+	org.freedesktop.PowerManagement.Statistics.h	\
 	gpm-marshal.c					\
 	gpm-marshal.h					\
 	$(NULL)
@@ -330,6 +338,41 @@
 gpm-marshal.h: gpm-marshal.list
 	@GLIB_GENMARSHAL@ $< --prefix=gpm_marshal --header > $@
 
+org.freedesktop.PowerManagement.h: org.freedesktop.PowerManagement.xml
+	libtool --mode=execute dbus-binding-tool	\
+		--prefix=gpm_manager			\
+		--mode=glib-server			\
+		--output=org.freedesktop.PowerManagement.h		\
+		$(srcdir)/org.freedesktop.PowerManagement.xml
+
+org.freedesktop.PowerManagement.Inhibit.h: org.freedesktop.PowerManagement.Inhibit.xml
+	libtool --mode=execute dbus-binding-tool	\
+		--prefix=gpm_inhibit			\
+		--mode=glib-server			\
+		--output=org.freedesktop.PowerManagement.Inhibit.h	\
+		$(srcdir)/org.freedesktop.PowerManagement.Inhibit.xml
+
+org.freedesktop.PowerManagement.Ui.h: org.freedesktop.PowerManagement.Ui.xml
+	libtool --mode=execute dbus-binding-tool	\
+		--prefix=gpm_widget				\
+		--mode=glib-server			\
+		--output=org.freedesktop.PowerManagement.Ui.h	\
+		$(srcdir)/org.freedesktop.PowerManagement.Ui.xml
+
+org.freedesktop.PowerManagement.Statistics.h: org.freedesktop.PowerManagement.Statistics.xml
+	libtool --mode=execute dbus-binding-tool	\
+		--prefix=gpm_statistics			\
+		--mode=glib-server			\
+		--output=org.freedesktop.PowerManagement.Statistics.h	\
+		$(srcdir)/org.freedesktop.PowerManagement.Statistics.xml
+
+org.freedesktop.PowerManagement.Backlight.h: org.freedesktop.PowerManagement.Backlight.xml
+	libtool --mode=execute dbus-binding-tool	\
+		--prefix=gpm_backlight			\
+		--mode=glib-server			\
+		--output=org.freedesktop.PowerManagement.Backlight.h	\
+		$(srcdir)/org.freedesktop.PowerManagement.Backlight.xml
+
 clean-local:
 	rm -f *~
 	rm -f gpm-marshal.c gpm-marshal.h

Modified: trunk/src/gpm-main.c
==============================================================================
--- trunk/src/gpm-main.c	(original)
+++ trunk/src/gpm-main.c	Mon Nov  3 17:35:10 2008
@@ -39,7 +39,7 @@
 #include "egg-debug.h"
 
 #include "gpm-manager.h"
-#include "dbus/xdg-power-management-core.h"
+#include "org.freedesktop.PowerManagement.h"
 
 static void gpm_exit (GpmManager *manager);
 

Modified: trunk/src/gpm-manager.c
==============================================================================
--- trunk/src/gpm-manager.c	(original)
+++ trunk/src/gpm-manager.c	Mon Nov  3 17:35:10 2008
@@ -69,9 +69,9 @@
 #include "gpm-engine.h"
 #include "gpm-feedback-widget.h"
 
-#include "dbus/xdg-power-management-stats.h"
-#include "dbus/xdg-power-management-inhibit.h"
-#include "dbus/xdg-power-management-backlight.h"
+#include "org.freedesktop.PowerManagement.Statistics.h"
+#include "org.freedesktop.PowerManagement.Inhibit.h"
+#include "org.freedesktop.PowerManagement.Backlight.h"
 
 static void     gpm_manager_class_init	(GpmManagerClass *klass);
 static void     gpm_manager_init	(GpmManager      *manager);