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

[mccann svn gnome org]

Author: mccann
Date: Tue Jul 29 18:18:14 2008
New Revision: 4880
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4880&view=rev

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

	* gnome-session/gsm-dbus-client.c (dbus_client_stop),
	(dbus_client_query_end_session), (dbus_client_end_session),
	(dbus_client_cancel_end_session), (gsm_dbus_client_class_init):
	* gnome-session/gsm-dbus-client.h:
	Remove some obsolete signals.



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

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 18:18:14 2008
@@ -338,8 +338,6 @@
         GsmDBusClient  *dbus_client = (GsmDBusClient *) client;
         DBusMessage    *message;
         gboolean        ret;
-        DBusConnection *connection;
-        DBusError       local_error;
 
         ret = FALSE;
 
@@ -354,15 +352,7 @@
                 goto out;
         }
 
-        dbus_error_init (&local_error);
-        connection = dbus_bus_get (DBUS_BUS_SESSION, &local_error);
-        if (dbus_error_is_set (&local_error)) {
-                g_warning ("%s", local_error.message);
-                dbus_error_free (&local_error);
-                goto out;
-        }
-
-        if (!dbus_connection_send (connection, message, NULL)) {
+        if (!dbus_connection_send (dbus_client->priv->connection, message, NULL)) {
                 goto out;
         }
 
@@ -395,11 +385,8 @@
 {
         GsmDBusClient  *dbus_client = (GsmDBusClient *) client;
         DBusMessage    *message;
-        gboolean        ret;
         DBusMessageIter iter;
 
-        ret = FALSE;
-
         g_debug ("GsmDBusClient: sending QueryEndSession signal to %s", dbus_client->priv->bus_name);
 
         /* unicast the signal to only the registered bus name */
@@ -420,8 +407,6 @@
                 goto out;
         }
 
-        ret = TRUE;
-
  out:
         if (message != NULL) {
                 dbus_message_unref (message);
@@ -434,11 +419,8 @@
 {
         GsmDBusClient  *dbus_client = (GsmDBusClient *) client;
         DBusMessage    *message;
-        gboolean        ret;
         DBusMessageIter iter;
 
-        ret = FALSE;
-
         /* unicast the signal to only the registered bus name */
         message = dbus_message_new_signal (gsm_client_peek_id (client),
                                            SM_DBUS_CLIENT_PRIVATE_INTERFACE,
@@ -456,9 +438,6 @@
         if (!dbus_connection_send (dbus_client->priv->connection, message, NULL)) {
                 goto out;
         }
-
-        ret = TRUE;
-
  out:
         if (message != NULL) {
                 dbus_message_unref (message);
@@ -470,9 +449,6 @@
 {
         GsmDBusClient  *dbus_client = (GsmDBusClient *) client;
         DBusMessage    *message;
-        gboolean        ret;
-
-        ret = FALSE;
 
         /* unicast the signal to only the registered bus name */
         message = dbus_message_new_signal (gsm_client_peek_id (client),
@@ -489,8 +465,6 @@
                 goto out;
         }
 
-        ret = TRUE;
-
  out:
         if (message != NULL) {
                 dbus_message_unref (message);
@@ -515,47 +489,6 @@
         client_class->impl_get_app_name           = dbus_client_get_app_name;
         client_class->impl_get_restart_style_hint = dbus_client_get_restart_style_hint;
 
-        signals [STOP] =
-                g_signal_new ("stop",
-                              G_TYPE_FROM_CLASS (object_class),
-                              G_SIGNAL_RUN_LAST,
-                              G_STRUCT_OFFSET (GsmDBusClientClass, stop),
-                              NULL,
-                              NULL,
-                              g_cclosure_marshal_VOID__VOID,
-                              G_TYPE_NONE,
-                              0);
-        signals [CANCEL_END_SESSION] =
-                g_signal_new ("cancel-end-session",
-                              G_TYPE_FROM_CLASS (object_class),
-                              G_SIGNAL_RUN_LAST,
-                              G_STRUCT_OFFSET (GsmDBusClientClass, cancel_end_session),
-                              NULL,
-                              NULL,
-                              g_cclosure_marshal_VOID__VOID,
-                              G_TYPE_NONE,
-                              0);
-        signals [QUERY_END_SESSION] =
-                g_signal_new ("query-end-session",
-                              G_TYPE_FROM_CLASS (object_class),
-                              G_SIGNAL_RUN_LAST,
-                              G_STRUCT_OFFSET (GsmDBusClientClass, query_end_session),
-                              NULL,
-                              NULL,
-                              g_cclosure_marshal_VOID__UINT,
-                              G_TYPE_NONE,
-                              1, G_TYPE_UINT);
-        signals [END_SESSION] =
-                g_signal_new ("end-session",
-                              G_TYPE_FROM_CLASS (object_class),
-                              G_SIGNAL_RUN_LAST,
-                              G_STRUCT_OFFSET (GsmDBusClientClass, end_session),
-                              NULL,
-                              NULL,
-                              g_cclosure_marshal_VOID__UINT,
-                              G_TYPE_NONE,
-                              1, G_TYPE_UINT);
-
         g_object_class_install_property (object_class,
                                          PROP_BUS_NAME,
                                          g_param_spec_string ("bus-name",

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 29 18:18:14 2008
@@ -46,14 +46,6 @@
 struct _GsmDBusClientClass
 {
         GsmClientClass parent_class;
-
-        /* signals */
-        void         (*stop)               (GsmClient  *client);
-        void         (*query_end_session)  (GsmClient  *client,
-                                            guint       flags);
-        void         (*end_session)        (GsmClient  *client,
-                                            guint       flags);
-        void         (*cancel_end_session) (GsmClient  *client);
 };
 
 typedef enum
@@ -76,12 +68,6 @@
                                                    const char     *bus_name);
 const char *   gsm_dbus_client_get_bus_name       (GsmDBusClient  *client);
 
-/* published methods */
-void           gsm_dbus_client_end_session_response (GsmDBusClient         *client,
-                                                     gboolean               ok_to_proceed,
-                                                     const char            *reason,
-                                                     DBusGMethodInvocation *context);
-
 G_END_DECLS
 
 #endif /* __GSM_DBUS_CLIENT_H__ */