From 5f65fffc206674e4c2e32f9a1c031b1c5988fac5 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 4 Aug 2009 12:39:47 -0400 Subject: update SessionToHandler to drop is-dynamic boolean --- common/gdm-marshal.list | 2 +- daemon/gdm-local-display-factory.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/common/gdm-marshal.list b/common/gdm-marshal.list index a15b076b..0a9b4e64 100644 --- a/common/gdm-marshal.list +++ b/common/gdm-marshal.list @@ -5,4 +5,4 @@ VOID:STRING,STRING VOID:UINT,UINT VOID:STRING,INT VOID:DOUBLE -VOID:STRING,BOOLEAN,STRING,POINTER,STRING,POINTER +VOID:STRING,STRING,POINTER,STRING,POINTER diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c index 6b2d5aef..ee601791 100644 --- a/daemon/gdm-local-display-factory.c +++ b/daemon/gdm-local-display-factory.c @@ -508,7 +508,6 @@ strrep (char* in, char** out, char* old, char* new) static void seat_session_to_add (DBusGProxy *seat_proxy, const char *ssid, - gboolean is_dynamic, const char *type, GHashTable *display_variables, const char *display_type, @@ -766,9 +765,9 @@ manage_static_sessions_per_seat (GdmLocalDisplayFactory *factory, return; } - dbus_g_object_register_marshaller (gdm_marshal_VOID__STRING_BOOLEAN_STRING_POINTER_STRING_POINTER, + dbus_g_object_register_marshaller (gdm_marshal_VOID__STRING_STRING_POINTER_STRING_POINTER, G_TYPE_NONE, - DBUS_TYPE_G_OBJECT_PATH, G_TYPE_BOOLEAN, G_TYPE_STRING, + DBUS_TYPE_G_OBJECT_PATH, G_TYPE_STRING, GDM_DBUS_TYPE_G_STRING_STRING_HASHTABLE, G_TYPE_STRING, GDM_DBUS_TYPE_G_STRING_STRING_HASHTABLE, @@ -776,7 +775,6 @@ manage_static_sessions_per_seat (GdmLocalDisplayFactory *factory, dbus_g_proxy_add_signal (proxy, "SessionToAdd", DBUS_TYPE_G_OBJECT_PATH, - G_TYPE_BOOLEAN, G_TYPE_STRING, GDM_DBUS_TYPE_G_STRING_STRING_HASHTABLE, G_TYPE_STRING, -- cgit v1.2.1