gnome-session r4802 - in branches/dbus_based: . gnome-session

[mccann svn gnome org]

Author: mccann
Date: Tue Jul 15 19:09:43 2008
New Revision: 4802
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4802&view=rev

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

	* gnome-session/Makefile.am:
	* gnome-session/gsm-dbus-client.c (gsm_dbus_client_new):
	* gnome-session/gsm-dbus-client.h:
	* gnome-session/gsm-manager.c (register_client_for_name),
	(gsm_manager_register_client):
	* gnome-session/gsm-method-client.c:
	* gnome-session/gsm-method-client.h:
	* gnome-session/gsm-service-client.c:
	* gnome-session/gsm-service-client.h:
	* gnome-session/test-client-method.c:
	Drop ServiceClient for now.  Move MethodClient stuff
	into DBusClient.



Added:
   branches/dbus_based/gnome-session/test-client-dbus.c   (props changed)
      - copied unchanged from r4798, /branches/dbus_based/gnome-session/test-client-method.c
Removed:
   branches/dbus_based/gnome-session/gsm-method-client.c
   branches/dbus_based/gnome-session/gsm-method-client.h
   branches/dbus_based/gnome-session/gsm-service-client.c
   branches/dbus_based/gnome-session/gsm-service-client.h
   branches/dbus_based/gnome-session/test-client-method.c
Modified:
   branches/dbus_based/ChangeLog
   branches/dbus_based/gnome-session/Makefile.am
   branches/dbus_based/gnome-session/gsm-dbus-client.c
   branches/dbus_based/gnome-session/gsm-dbus-client.h
   branches/dbus_based/gnome-session/gsm-manager.c

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 15 19:09:43 2008
@@ -5,7 +5,7 @@
 noinst_LTLIBRARIES = libgsmutil.la
 
 noinst_PROGRAMS = 		\
-	test-client-method	\
+	test-client-dbus	\
 	test-inhibit		\
 	$(NULL)
 
@@ -37,11 +37,11 @@
 	$(DBUS_GLIB_LIBS)			\
 	$(NULL)
 
-test_client_method_SOURCES = 	\
-	test-client-method.c	\
+test_client_dbus_SOURCES = 	\
+	test-client-dbus.c	\
 	$(NULL)
 
-test_client_method_LDADD =			\
+test_client_dbus_LDADD =			\
 	$(DBUS_GLIB_LIBS)			\
 	$(NULL)
 
@@ -67,10 +67,6 @@
 	gsm-xsmp-client.c			\
 	gsm-dbus-client.h			\
 	gsm-dbus-client.c			\
-	gsm-method-client.h			\
-	gsm-method-client.c			\
-	gsm-service-client.h			\
-	gsm-service-client.c			\
 	gsm-marshal.h				\
 	gsm-marshal.c				\
 	gsm-consolekit.c			\

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 15 19:09:43 2008
@@ -50,7 +50,7 @@
         PROP_BUS_NAME,
 };
 
-G_DEFINE_ABSTRACT_TYPE (GsmDBusClient, gsm_dbus_client, GSM_TYPE_CLIENT)
+G_DEFINE_TYPE (GsmDBusClient, gsm_dbus_client, GSM_TYPE_CLIENT)
 
 static GObject *
 gsm_dbus_client_constructor (GType                  type,
@@ -212,3 +212,17 @@
 
         g_type_class_add_private (klass, sizeof (GsmDBusClientPrivate));
 }
+
+GsmClient *
+gsm_dbus_client_new (const char *client_id,
+                     const char *bus_name)
+{
+        GsmDBusClient *client;
+
+        client = g_object_new (GSM_TYPE_DBUS_CLIENT,
+                               "client-id", client_id,
+                               "bus-name", bus_name,
+                               NULL);
+
+        return GSM_CLIENT (client);
+}

Modified: branches/dbus_based/gnome-session/gsm-dbus-client.h
==============================================================================
--- branches/dbus_based/gnome-session/gsm-dbus-client.h	(original)
+++ branches/dbus_based/gnome-session/gsm-dbus-client.h	Tue Jul 15 19:09:43 2008
@@ -51,6 +51,8 @@
 
 GType          gsm_dbus_client_get_type           (void) G_GNUC_CONST;
 
+GsmClient *    gsm_dbus_client_new                (const char     *client_id,
+                                                   const char     *bus_name);
 const char *   gsm_dbus_client_get_bus_name       (GsmDBusClient  *client);
 
 G_END_DECLS

Modified: branches/dbus_based/gnome-session/gsm-manager.c
==============================================================================
--- branches/dbus_based/gnome-session/gsm-manager.c	(original)
+++ branches/dbus_based/gnome-session/gsm-manager.c	Tue Jul 15 19:09:43 2008
@@ -49,8 +49,7 @@
 #include "gsm-inhibitor.h"
 
 #include "gsm-xsmp-client.h"
-#include "gsm-method-client.h"
-#include "gsm-service-client.h"
+#include "gsm-dbus-client.h"
 
 #include "gsm-autostart-app.h"
 #include "gsm-resumed-app.h"
@@ -586,6 +585,7 @@
 register_client_for_name (GsmManager *manager,
                           const char *dbus_name)
 {
+#if 0
         GsmApp    *app;
         GsmClient *client;
 
@@ -606,6 +606,7 @@
         gsm_app_registered (app);
 
         gsm_client_set_status (client, GSM_CLIENT_REGISTERED);
+#endif
 }
 
 static void
@@ -2050,7 +2051,7 @@
         }
 
         sender = dbus_g_method_get_sender (context);
-        client = gsm_method_client_new (client_id, sender);
+        client = gsm_dbus_client_new (client_id, sender);
         g_free (sender);
         if (client == NULL) {
                 GError *new_error;