diff options
| author | Ray Strode <rstrode@redhat.com> | 2011-06-13 22:10:20 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2011-06-13 22:10:20 -0400 |
| commit | 1101f68b4be360310c0e36ecafba022270baae7e (patch) | |
| tree | c2f87d569c8c23effe653386b1ad6ef1e7cdef06 /daemon | |
| parent | ba5b6b1daf9f995cd0b56cebef602fe7b21b678e (diff) | |
| download | gdm-1101f68b4be360310c0e36ecafba022270baae7e.tar.gz | |
common: drop custom marshaller goo
We live in a modern society where phones look like
something from Inspector Gadget and signal marshalling
is no longer something to waste goo credits on.
Diffstat (limited to 'daemon')
| -rw-r--r-- | daemon/gdm-greeter-server.c | 5 | ||||
| -rw-r--r-- | daemon/gdm-session-worker.c | 1 | ||||
| -rw-r--r-- | daemon/gdm-session.c | 23 |
3 files changed, 13 insertions, 16 deletions
diff --git a/daemon/gdm-greeter-server.c b/daemon/gdm-greeter-server.c index e1475a4c..7f27f930 100644 --- a/daemon/gdm-greeter-server.c +++ b/daemon/gdm-greeter-server.c @@ -44,7 +44,6 @@ #include <dbus/dbus-glib-lowlevel.h> #include "gdm-common.h" -#include "gdm-marshal.h" #include "gdm-greeter-server.h" #define GDM_GREETER_SERVER_DBUS_PATH "/org/gnome/DisplayManager/GreeterServer" @@ -1261,7 +1260,7 @@ gdm_greeter_server_class_init (GdmGreeterServerClass *klass) G_STRUCT_OFFSET (GdmGreeterServerClass, begin_verification_for_user), NULL, NULL, - gdm_marshal_VOID__STRING_STRING, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); @@ -1272,7 +1271,7 @@ gdm_greeter_server_class_init (GdmGreeterServerClass *klass) G_STRUCT_OFFSET (GdmGreeterServerClass, query_answer), NULL, NULL, - gdm_marshal_VOID__STRING_STRING, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c index 447e184e..ea12da34 100644 --- a/daemon/gdm-session-worker.c +++ b/daemon/gdm-session-worker.c @@ -51,7 +51,6 @@ #include "gdm-common.h" #include "gdm-log.h" #include "gdm-session-worker.h" -#include "gdm-marshal.h" #if defined (HAVE_ADT) #include "gdm-session-solaris-auditor.h" diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c index bf7c878e..200e3d76 100644 --- a/daemon/gdm-session.c +++ b/daemon/gdm-session.c @@ -24,7 +24,6 @@ #include <glib/gi18n.h> #include <glib-object.h> -#include "gdm-marshal.h" #include "gdm-session.h" #include "gdm-session-private.h" @@ -271,7 +270,7 @@ gdm_session_class_init (gpointer g_iface) G_STRUCT_OFFSET (GdmSessionIface, setup_failed), NULL, NULL, - gdm_marshal_VOID__STRING_STRING, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); @@ -313,7 +312,7 @@ gdm_session_class_init (gpointer g_iface) G_STRUCT_OFFSET (GdmSessionIface, authentication_failed), NULL, NULL, - gdm_marshal_VOID__STRING_STRING, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); @@ -334,7 +333,7 @@ gdm_session_class_init (gpointer g_iface) G_STRUCT_OFFSET (GdmSessionIface, authorization_failed), NULL, NULL, - gdm_marshal_VOID__STRING_STRING, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); @@ -355,7 +354,7 @@ gdm_session_class_init (gpointer g_iface) G_STRUCT_OFFSET (GdmSessionIface, accreditation_failed), NULL, NULL, - gdm_marshal_VOID__STRING_STRING, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); @@ -367,7 +366,7 @@ gdm_session_class_init (gpointer g_iface) G_STRUCT_OFFSET (GdmSessionIface, info_query), NULL, NULL, - gdm_marshal_VOID__STRING_STRING, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); @@ -378,7 +377,7 @@ gdm_session_class_init (gpointer g_iface) G_STRUCT_OFFSET (GdmSessionIface, secret_info_query), NULL, NULL, - gdm_marshal_VOID__STRING_STRING, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); @@ -389,7 +388,7 @@ gdm_session_class_init (gpointer g_iface) G_STRUCT_OFFSET (GdmSessionIface, info), NULL, NULL, - gdm_marshal_VOID__STRING_STRING, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); @@ -400,7 +399,7 @@ gdm_session_class_init (gpointer g_iface) G_STRUCT_OFFSET (GdmSessionIface, problem), NULL, NULL, - gdm_marshal_VOID__STRING_STRING, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); @@ -422,7 +421,7 @@ gdm_session_class_init (gpointer g_iface) G_STRUCT_OFFSET (GdmSessionIface, session_open_failed), NULL, NULL, - gdm_marshal_VOID__STRING_STRING, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); @@ -433,7 +432,7 @@ gdm_session_class_init (gpointer g_iface) G_STRUCT_OFFSET (GdmSessionIface, session_started), NULL, NULL, - gdm_marshal_VOID__STRING_INT, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_INT); @@ -444,7 +443,7 @@ gdm_session_class_init (gpointer g_iface) G_STRUCT_OFFSET (GdmSessionIface, session_start_failed), NULL, NULL, - gdm_marshal_VOID__STRING_STRING, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); |