From 1101f68b4be360310c0e36ecafba022270baae7e Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Mon, 13 Jun 2011 22:10:20 -0400 Subject: 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. --- .gitignore | 2 -- common/Makefile.am | 13 ------------ common/gdm-marshal.list | 8 -------- common/gdm-settings-backend.c | 4 +--- common/gdm-settings-desktop-backend.c | 2 -- common/gdm-settings.c | 4 +--- configure.ac | 2 +- daemon/gdm-greeter-server.c | 5 ++--- daemon/gdm-session-worker.c | 1 - daemon/gdm-session.c | 23 +++++++++++----------- gui/simple-greeter/gdm-greeter-client.c | 11 +++++------ gui/simple-greeter/gdm-greeter-login-window.c | 6 ++---- gui/simple-greeter/gdm-timer.c | 4 +--- .../libgdmsimplegreeter/gdm-login-extension.c | 3 +-- 14 files changed, 25 insertions(+), 63 deletions(-) delete mode 100644 common/gdm-marshal.list diff --git a/.gitignore b/.gitignore index aa34fd35..558d99f1 100644 --- a/.gitignore +++ b/.gitignore @@ -32,8 +32,6 @@ gdm-display-glue.h gdm-factory-slave-glue.h gdm-local-display-factory-glue.h gdm-manager-glue.h -gdm-marshal.c -gdm-marshal.h gdm.pot gdm-product-display-glue.h gdm-product-slave-glue.h diff --git a/common/Makefile.am b/common/Makefile.am index 03cb46bc..3c2bc71e 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -30,8 +30,6 @@ noinst_LTLIBRARIES = \ BUILT_SOURCES = \ gdm-settings-glue.h \ - gdm-marshal.c \ - gdm-marshal.h \ $(NULL) gdmdir = $(datadir)/gdm @@ -54,13 +52,6 @@ gdm_crash_logger_LDADD = $(GTHREAD_LIBS) gdm-settings-glue.h: gdm-settings.xml Makefile.am dbus-binding-tool --prefix=gdm_settings --mode=glib-server --output=gdm-settings-glue.h $(srcdir)/gdm-settings.xml -gdm-marshal.c: gdm-marshal.list - echo "#include \"gdm-marshal.h\"" > $@ && \ - @GLIB_GENMARSHAL@ $< --prefix=gdm_marshal --body >> $@ - -gdm-marshal.h: gdm-marshal.list - @GLIB_GENMARSHAL@ $< --prefix=gdm_marshal --header > $@ - if MKDTEMP_MISSING MKDTEMP_FILES = mkdtemp.c mkdtemp.h else @@ -98,10 +89,6 @@ libgdmcommon_la_SOURCES = \ $(MKDTEMP_FILES) \ $(NULL) -nodist_libgdmcommon_la_SOURCES = \ - gdm-marshal.c \ - gdm-marshal.h - libgdmcommon_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ $(DISABLE_DEPRECATED_CFLAGS) \ diff --git a/common/gdm-marshal.list b/common/gdm-marshal.list deleted file mode 100644 index d8a9e728..00000000 --- a/common/gdm-marshal.list +++ /dev/null @@ -1,8 +0,0 @@ -VOID:STRING,STRING,STRING,STRING,STRING -VOID:STRING,STRING,STRING,STRING -VOID:STRING,STRING,STRING -VOID:STRING,STRING -VOID:UINT,UINT -VOID:STRING,INT -VOID:DOUBLE -BOOLEAN:STRING diff --git a/common/gdm-settings-backend.c b/common/gdm-settings-backend.c index d90ca536..f76d561f 100644 --- a/common/gdm-settings-backend.c +++ b/common/gdm-settings-backend.c @@ -35,8 +35,6 @@ #include "gdm-settings-backend.h" -#include "gdm-marshal.h" - #define GDM_SETTINGS_BACKEND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_SETTINGS_BACKEND, GdmSettingsBackendPrivate)) struct GdmSettingsBackendPrivate @@ -152,7 +150,7 @@ gdm_settings_backend_class_init (GdmSettingsBackendClass *klass) G_STRUCT_OFFSET (GdmSettingsBackendClass, value_changed), NULL, NULL, - gdm_marshal_VOID__STRING_STRING_STRING, + g_cclosure_marshal_generic, G_TYPE_NONE, 3, G_TYPE_STRING, diff --git a/common/gdm-settings-desktop-backend.c b/common/gdm-settings-desktop-backend.c index 9215f449..583735f9 100644 --- a/common/gdm-settings-desktop-backend.c +++ b/common/gdm-settings-desktop-backend.c @@ -36,8 +36,6 @@ #include "gdm-settings-desktop-backend.h" -#include "gdm-marshal.h" - #define GDM_SETTINGS_DESKTOP_BACKEND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_SETTINGS_DESKTOP_BACKEND, GdmSettingsDesktopBackendPrivate)) struct GdmSettingsDesktopBackendPrivate diff --git a/common/gdm-settings.c b/common/gdm-settings.c index 00fe73e6..0395681b 100644 --- a/common/gdm-settings.c +++ b/common/gdm-settings.c @@ -42,8 +42,6 @@ #include "gdm-settings-desktop-backend.h" -#include "gdm-marshal.h" - #define GDM_DBUS_PATH "/org/gnome/DisplayManager" #define GDM_SETTINGS_DBUS_PATH GDM_DBUS_PATH "/Settings" #define GDM_SETTINGS_DBUS_NAME "org.gnome.DisplayManager.Settings" @@ -178,7 +176,7 @@ gdm_settings_class_init (GdmSettingsClass *klass) G_STRUCT_OFFSET (GdmSettingsClass, value_changed), NULL, NULL, - gdm_marshal_VOID__STRING_STRING_STRING, + g_cclosure_marshal_generic, G_TYPE_NONE, 3, G_TYPE_STRING, diff --git a/configure.ac b/configure.ac index efe1e962..78887807 100644 --- a/configure.ac +++ b/configure.ac @@ -56,7 +56,7 @@ dnl - Dependencies dnl --------------------------------------------------------------------------- DBUS_GLIB_REQUIRED_VERSION=0.74 -GLIB_REQUIRED_VERSION=2.27.4 +GLIB_REQUIRED_VERSION=2.29.3 GTK_REQUIRED_VERSION=2.91.1 PANGO_REQUIRED_VERSION=1.3.0 SCROLLKEEPER_REQUIRED_VERSION=0.1.4 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 #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 #include -#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); 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 #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 #include -#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 #include -#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 #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] = -- cgit v1.2.1