gnome-session r4877 - in branches/dbus_based: . doc/dbus gnome-session

[mccann svn gnome org]

Author: mccann
Date: Tue Jul 29 17:06:27 2008
New Revision: 4877
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4877&view=rev

Log:
2008-07-29  William Jon McCann  <jmccann redhat com>

	* doc/dbus/Makefile.am:
	* gnome-session/Makefile.am:
	* gnome-session/gsm-client.xml:
	* gnome-session/gsm-dbus-client.c (gsm_dbus_client_class_init):
	* gnome-session/gsm-dbus-client.xml:
	* gnome-session/gsm-inhibitor.xml:
	* gnome-session/gsm-manager.xml:
	Rename the introspection docs.  Remove the
	dbus-glib stuff from the DBusClient.



Added:
   branches/dbus_based/gnome-session/org.gnome.SessionManager.Client.xml   (props changed)
      - copied unchanged from r4875, /branches/dbus_based/gnome-session/gsm-client.xml
   branches/dbus_based/gnome-session/org.gnome.SessionManager.ClientPrivate.xml   (props changed)
      - copied unchanged from r4876, /branches/dbus_based/gnome-session/gsm-dbus-client.xml
   branches/dbus_based/gnome-session/org.gnome.SessionManager.Inhibitor.xml   (props changed)
      - copied unchanged from r4875, /branches/dbus_based/gnome-session/gsm-inhibitor.xml
   branches/dbus_based/gnome-session/org.gnome.SessionManager.xml   (props changed)
      - copied unchanged from r4873, /branches/dbus_based/gnome-session/gsm-manager.xml
Removed:
   branches/dbus_based/gnome-session/gsm-client.xml
   branches/dbus_based/gnome-session/gsm-dbus-client.xml
   branches/dbus_based/gnome-session/gsm-inhibitor.xml
   branches/dbus_based/gnome-session/gsm-manager.xml
Modified:
   branches/dbus_based/ChangeLog
   branches/dbus_based/doc/dbus/Makefile.am
   branches/dbus_based/gnome-session/Makefile.am
   branches/dbus_based/gnome-session/gsm-dbus-client.c

Modified: branches/dbus_based/doc/dbus/Makefile.am
==============================================================================
--- branches/dbus_based/doc/dbus/Makefile.am	(original)
+++ branches/dbus_based/doc/dbus/Makefile.am	Tue Jul 29 17:06:27 2008
@@ -25,13 +25,13 @@
 	org.gnome.SessionManager.Inhibitor.ref.xml \
 	$(NULL)
 
-org.gnome.SessionManager.ref.xml : $(top_srcdir)/gnome-session/gsm-manager.xml spec-to-docbook.xsl
+org.gnome.SessionManager.ref.xml : $(top_srcdir)/gnome-session/org.gnome.SessionManager.xml spec-to-docbook.xsl
 	$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
-org.gnome.SessionManager.Client.ref.xml : $(top_srcdir)/gnome-session/gsm-client.xml spec-to-docbook.xsl
+org.gnome.SessionManager.Client.ref.xml : $(top_srcdir)/gnome-session/org.gnome.SessionManager.Client.xml spec-to-docbook.xsl
 	$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
-org.gnome.SessionManager.ClientPrivate.ref.xml : $(top_srcdir)/gnome-session/gsm-dbus-client.xml spec-to-docbook.xsl
+org.gnome.SessionManager.ClientPrivate.ref.xml : $(top_srcdir)/gnome-session/org.gnome.SessionManager.ClientPrivate.xml spec-to-docbook.xsl
 	$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
-org.gnome.SessionManager.Inhibitor.ref.xml : $(top_srcdir)/gnome-session/gsm-inhibitor.xml spec-to-docbook.xsl
+org.gnome.SessionManager.Inhibitor.ref.xml : $(top_srcdir)/gnome-session/org.gnome.SessionManager.Inhibitor.xml spec-to-docbook.xsl
 	$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
 
 EXTRA_DIST =				\

Modified: branches/dbus_based/gnome-session/Makefile.am
==============================================================================
--- branches/dbus_based/gnome-session/Makefile.am	(original)
+++ branches/dbus_based/gnome-session/Makefile.am	Tue Jul 29 17:06:27 2008
@@ -107,17 +107,14 @@
 gsm-marshal.h: gsm-marshal.list
 	@GLIB_GENMARSHAL@ $< --prefix=gsm_marshal --header > $@
 
-gsm-manager-glue.h: gsm-manager.xml Makefile.am
-	dbus-binding-tool --prefix=gsm_manager --mode=glib-server --output=gsm-manager-glue.h $(srcdir)/gsm-manager.xml
+gsm-manager-glue.h: org.gnome.SessionManager.xml Makefile.am
+	dbus-binding-tool --prefix=gsm_manager --mode=glib-server --output=gsm-manager-glue.h $(srcdir)/org.gnome.SessionManager.xml
 
-gsm-client-glue.h: gsm-client.xml Makefile.am
-	dbus-binding-tool --prefix=gsm_client --mode=glib-server --output=gsm-client-glue.h $(srcdir)/gsm-client.xml
+gsm-client-glue.h: org.gnome.SessionManager.Client.xml Makefile.am
+	dbus-binding-tool --prefix=gsm_client --mode=glib-server --output=gsm-client-glue.h $(srcdir)/org.gnome.SessionManager.Client.xml
 
-gsm-inhibitor-glue.h: gsm-inhibitor.xml Makefile.am
-	dbus-binding-tool --prefix=gsm_inhibitor --mode=glib-server --output=gsm-inhibitor-glue.h $(srcdir)/gsm-inhibitor.xml
-
-gsm-dbus-client-glue.h: gsm-dbus-client.xml Makefile.am
-	dbus-binding-tool --prefix=gsm_dbus_client --mode=glib-server --output=gsm-dbus-client-glue.h $(srcdir)/gsm-dbus-client.xml
+gsm-inhibitor-glue.h: org.gnome.SessionManager.Inhibitor.xml Makefile.am
+	dbus-binding-tool --prefix=gsm_inhibitor --mode=glib-server --output=gsm-inhibitor-glue.h $(srcdir)/org.gnome.SessionManager.Inhibitor.xml
 
 BUILT_SOURCES =			\
 	gsm-marshal.c           \
@@ -125,20 +122,19 @@
 	gsm-manager-glue.h	\
 	gsm-inhibitor-glue.h	\
 	gsm-client-glue.h	\
-	gsm-dbus-client-glue.h	\
 	$(NULL)
 
 CLEANFILES =					\
 	$(BUILT_SOURCES)
 
-EXTRA_DIST =					\
-	$(glade_DATA)				\
-	README					\
-	gsm-marshal.list        		\
-	gsm-manager.xml				\
-	gsm-client.xml				\
-	gsm-inhibitor.xml			\
-	gsm-dbus-client.xml			\
+EXTRA_DIST =						\
+	$(glade_DATA)					\
+	README						\
+	gsm-marshal.list        			\
+	org.gnome.SessionManager.xml			\
+	org.gnome.SessionManager.Client.xml		\
+	org.gnome.SessionManager.ClientPrivate.xml	\
+	org.gnome.SessionManager.Inhibitor.xml		\
 	$(NULL)
 
 MAINTAINERCLEANFILES =                  \

Modified: branches/dbus_based/gnome-session/gsm-dbus-client.c
==============================================================================
--- branches/dbus_based/gnome-session/gsm-dbus-client.c	(original)
+++ branches/dbus_based/gnome-session/gsm-dbus-client.c	Tue Jul 29 17:06:27 2008
@@ -34,14 +34,13 @@
 #include <dbus/dbus-glib-lowlevel.h>
 
 #include "gsm-dbus-client.h"
-#include "gsm-dbus-client-glue.h"
 #include "gsm-marshal.h"
 
 #include "gsm-manager.h"
 
 #define GSM_DBUS_CLIENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_DBUS_CLIENT, GsmDBusClientPrivate))
 
-#define CLIENT_INTERFACE "org.gnome.SessionManager.DBusClient"
+#define CLIENT_INTERFACE "org.gnome.SessionManager.ClientPrivate"
 
 struct GsmDBusClientPrivate
 {
@@ -443,8 +442,6 @@
                                                               G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
         g_type_class_add_private (klass, sizeof (GsmDBusClientPrivate));
-        dbus_g_object_type_install_info (GSM_TYPE_CLIENT, &dbus_glib_gsm_dbus_client_object_info);
-        dbus_g_error_domain_register (GSM_DBUS_CLIENT_ERROR, NULL, GSM_DBUS_CLIENT_TYPE_ERROR);
 }
 
 GsmClient *