gnome-screensaver r1577 - in trunk: . src

[mccann svn gnome org]

Author: mccann
Date: Fri Jan 16 20:23:13 2009
New Revision: 1577
URL: http://svn.gnome.org/viewvc/gnome-screensaver?rev=1577&view=rev

Log:
2009-01-16  William Jon McCann  <jmccann redhat com>

	* src/gs-listener-dbus.c (listener_set_session_idle_internal):
	Don't set idle hint in CK.  This is now done by gnome-session.



Modified:
   trunk/ChangeLog
   trunk/src/gs-listener-dbus.c

Modified: trunk/src/gs-listener-dbus.c
==============================================================================
--- trunk/src/gs-listener-dbus.c	(original)
+++ trunk/src/gs-listener-dbus.c	Fri Jan 16 20:23:13 2009
@@ -261,60 +261,6 @@
         send_dbus_boolean_signal (listener, "SessionIdleChanged", listener->priv->session_idle);
 }
 
-static void
-gs_listener_update_console_kit_idle (GSListener *listener)
-{
-        DBusMessage    *message;
-        DBusMessage    *reply;
-        DBusError       error;
-        DBusMessageIter iter;
-        gboolean        idle;
-
-        g_return_if_fail (listener != NULL);
-
-        if (listener->priv->session_id == NULL) {
-                /* we don't have ConsoleKit running booo! */
-                return;
-        }
-
-        if (listener->priv->system_connection == NULL) {
-                gs_debug ("No connection to the system bus");
-                return;
-        }
-
-        idle = listener->priv->session_idle;
-
-        gs_debug ("Updating ConsoleKit idle status: %d", idle);
-        message = dbus_message_new_method_call (CK_NAME,
-                                                listener->priv->session_id,
-                                                CK_SESSION_INTERFACE,
-                                                "SetIdleHint");
-        if (message == NULL) {
-                gs_debug ("Couldn't allocate the D-Bus message");
-                return;
-        }
-
-        dbus_message_iter_init_append (message, &iter);
-        dbus_message_iter_append_basic (&iter, DBUS_TYPE_BOOLEAN, &idle);
-
-        /* FIXME: use async? */
-        dbus_error_init (&error);
-        reply = dbus_connection_send_with_reply_and_block (listener->priv->system_connection,
-                                                           message,
-                                                           -1, &error);
-        dbus_message_unref (message);
-
-        if (reply != NULL) {
-                dbus_message_unref (reply);
-        }
-
-        if (dbus_error_is_set (&error)) {
-                gs_debug ("%s raised:\n %s\n\n", error.name, error.message);
-                dbus_error_free (&error);
-                return;
-        }
-}
-
 static const char *
 get_name_for_entry_type (int entry_type)
 {
@@ -467,8 +413,6 @@
 
         gs_listener_send_signal_session_idle_changed (listener);
 
-        gs_listener_update_console_kit_idle (listener);
-
         return TRUE;
 }