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

[mccann svn gnome org]

Author: mccann
Date: Mon Jun 16 02:53:21 2008
New Revision: 4747
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4747&view=rev

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

	* gnome-session/gsm-manager.c (register_manager),
	(gsm_manager_shutdown), (gsm_manager_logout):
	* gnome-session/gsm-manager.h:
	Register to the session bus.



Modified:
   branches/dbus_based/ChangeLog
   branches/dbus_based/gnome-session/gsm-manager.c
   branches/dbus_based/gnome-session/gsm-manager.h

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	Mon Jun 16 02:53:21 2008
@@ -399,7 +399,7 @@
         GError *error = NULL;
 
         error = NULL;
-        manager->priv->connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
+        manager->priv->connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
         if (manager->priv->connection == NULL) {
                 if (error != NULL) {
                         g_critical ("error getting system bus: %s", error->message);
@@ -1374,10 +1374,19 @@
         initiate_shutdown (manager);
 }
 
+/*
+  dbus-send --session --type=method_call --print-reply
+      --dest=org.gnome.SessionManager
+      /org/gnome/SessionManager
+      org.freedesktop.DBus.Introspectable.Introspect
+*/
+
 gboolean
 gsm_manager_shutdown (GsmManager *manager,
                       GError    **error)
 {
+        g_debug ("GsmManager: Shutdown called");
+
         if (manager->priv->phase != GSM_MANAGER_PHASE_RUNNING) {
                 g_set_error (error,
                              GSM_MANAGER_ERROR,
@@ -1398,6 +1407,8 @@
                     gint        logout_mode,
                     GError    **error)
 {
+        g_debug ("GsmManager: Shutdown called");
+
         if (manager->priv->phase != GSM_MANAGER_PHASE_RUNNING) {
                 g_set_error (error,
                              GSM_MANAGER_ERROR,

Modified: branches/dbus_based/gnome-session/gsm-manager.h
==============================================================================
--- branches/dbus_based/gnome-session/gsm-manager.h	(original)
+++ branches/dbus_based/gnome-session/gsm-manager.h	Mon Jun 16 02:53:21 2008
@@ -98,30 +98,33 @@
         GSM_MANAGER_LOGOUT_MODE_FORCE
 } GsmManagerLogoutMode;
 
-GQuark              gsm_manager_error_quark                    (void);
-GType               gsm_manager_get_type                       (void);
+GQuark              gsm_manager_error_quark          (void);
+GType               gsm_manager_get_type             (void);
 
-GsmManager *        gsm_manager_new                            (GsmClientStore *store,
-                                                                gboolean        failsafe);
+GsmManager *        gsm_manager_new                  (GsmClientStore *store,
+                                                      gboolean        failsafe);
 
-void                gsm_manager_start                          (GsmManager     *manager);
+void                gsm_manager_start                (GsmManager     *manager);
 
-gboolean            gsm_manager_setenv                         (GsmManager     *manager,
-                                                                const char     *variable,
-                                                                const char     *value,
-                                                                GError        **error);
-gboolean            gsm_manager_initialization_error           (GsmManager     *manager,
-                                                                const char     *message,
-                                                                gboolean        fatal,
-                                                                GError        **error);
-gboolean            gsm_manager_shutdown                       (GsmManager     *manager,
-                                                                GError        **error);
-gboolean            gsm_manager_logout                         (GsmManager     *manager,
-                                                                int             logout_mode,
-                                                                GError        **error);
-gboolean            gsm_manager_set_name                       (GsmManager     *manager,
-                                                                const char     *session_name,
-                                                                GError        **error);
+
+/* exported methods */
+
+gboolean            gsm_manager_setenv               (GsmManager     *manager,
+                                                      const char     *variable,
+                                                      const char     *value,
+                                                      GError        **error);
+gboolean            gsm_manager_initialization_error (GsmManager     *manager,
+                                                      const char     *message,
+                                                      gboolean        fatal,
+                                                      GError        **error);
+gboolean            gsm_manager_shutdown             (GsmManager     *manager,
+                                                      GError        **error);
+gboolean            gsm_manager_logout               (GsmManager     *manager,
+                                                      int             logout_mode,
+                                                      GError        **error);
+gboolean            gsm_manager_set_name             (GsmManager     *manager,
+                                                      const char     *session_name,
+                                                      GError        **error);
 
 G_END_DECLS