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 /gui | |
| 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 'gui')
| -rw-r--r-- | gui/simple-greeter/gdm-greeter-client.c | 11 | ||||
| -rw-r--r-- | gui/simple-greeter/gdm-greeter-login-window.c | 6 | ||||
| -rw-r--r-- | gui/simple-greeter/gdm-timer.c | 4 | ||||
| -rw-r--r-- | gui/simple-greeter/libgdmsimplegreeter/gdm-login-extension.c | 3 |
4 files changed, 9 insertions, 15 deletions
diff --git a/gui/simple-greeter/gdm-greeter-client.c b/gui/simple-greeter/gdm-greeter-client.c index 312b52c1..ec56f90f 100644 --- a/gui/simple-greeter/gdm-greeter-client.c +++ b/gui/simple-greeter/gdm-greeter-client.c @@ -34,7 +34,6 @@ #include <dbus/dbus-glib-lowlevel.h> #include "gdm-greeter-client.h" -#include "gdm-marshal.h" #include "gdm-profile.h" #define GDM_GREETER_CLIENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_GREETER_CLIENT, GdmGreeterClientPrivate)) @@ -940,7 +939,7 @@ gdm_greeter_client_class_init (GdmGreeterClientClass *klass) G_STRUCT_OFFSET (GdmGreeterClientClass, info_query), NULL, NULL, - gdm_marshal_VOID__STRING_STRING, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); @@ -952,7 +951,7 @@ gdm_greeter_client_class_init (GdmGreeterClientClass *klass) G_STRUCT_OFFSET (GdmGreeterClientClass, secret_info_query), NULL, NULL, - gdm_marshal_VOID__STRING_STRING, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); @@ -964,7 +963,7 @@ gdm_greeter_client_class_init (GdmGreeterClientClass *klass) G_STRUCT_OFFSET (GdmGreeterClientClass, info), NULL, NULL, - gdm_marshal_VOID__STRING_STRING, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); @@ -976,7 +975,7 @@ gdm_greeter_client_class_init (GdmGreeterClientClass *klass) G_STRUCT_OFFSET (GdmGreeterClientClass, problem), NULL, NULL, - gdm_marshal_VOID__STRING_STRING, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); @@ -1071,7 +1070,7 @@ gdm_greeter_client_class_init (GdmGreeterClientClass *klass) G_STRUCT_OFFSET (GdmGreeterClientClass, timed_login_requested), NULL, NULL, - gdm_marshal_VOID__STRING_INT, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_INT); diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c index ef220834..e4f4afff 100644 --- a/gui/simple-greeter/gdm-greeter-login-window.c +++ b/gui/simple-greeter/gdm-greeter-login-window.c @@ -53,8 +53,6 @@ #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> -#include "gdm-marshal.h" - #include "gdm-settings-client.h" #include "gdm-settings-keys.h" #include "gdm-profile.h" @@ -2170,7 +2168,7 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass) G_STRUCT_OFFSET (GdmGreeterLoginWindowClass, 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); signals [QUERY_ANSWER] = @@ -2180,7 +2178,7 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass) G_STRUCT_OFFSET (GdmGreeterLoginWindowClass, query_answer), NULL, NULL, - gdm_marshal_VOID__STRING_STRING, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); signals [USER_SELECTED] = diff --git a/gui/simple-greeter/gdm-timer.c b/gui/simple-greeter/gdm-timer.c index 833da940..aca740a3 100644 --- a/gui/simple-greeter/gdm-timer.c +++ b/gui/simple-greeter/gdm-timer.c @@ -34,8 +34,6 @@ #include <glib/gstdio.h> #include <gtk/gtk.h> -#include "gdm-marshal.h" - #define GDM_TIMER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_TIMER, GdmTimerPrivate)) #ifndef GDM_TIMER_TICKS_PER_SECOND @@ -131,7 +129,7 @@ gdm_timer_class_init (GdmTimerClass *klass) G_STRUCT_OFFSET (GdmTimerClass, tick), NULL, NULL, - gdm_marshal_VOID__DOUBLE, + g_cclosure_marshal_generic, G_TYPE_NONE, 1, G_TYPE_DOUBLE); signals[STOP] = g_signal_new ("stop", diff --git a/gui/simple-greeter/libgdmsimplegreeter/gdm-login-extension.c b/gui/simple-greeter/libgdmsimplegreeter/gdm-login-extension.c index ae620e38..4e7739ff 100644 --- a/gui/simple-greeter/libgdmsimplegreeter/gdm-login-extension.c +++ b/gui/simple-greeter/libgdmsimplegreeter/gdm-login-extension.c @@ -23,7 +23,6 @@ #include <glib-object.h> #include "gdm-login-extension.h" -#include "gdm-marshal.h" enum { ENABLED, @@ -99,7 +98,7 @@ gdm_login_extension_class_init (gpointer g_iface) G_STRUCT_OFFSET (GdmLoginExtensionIface, user_chosen), NULL, NULL, - gdm_marshal_BOOLEAN__STRING, + g_cclosure_marshal_generic, G_TYPE_BOOLEAN, 1, G_TYPE_STRING); signals [CANCEL] = |