GNOME.org
 

[gnome-session/wip/modernize: 4/5] Drop gsm-marshal.list, use g_cclosure_marshal_generic

commit 06c70656beb3fff1b3067f53e3ec5f23871d94b8
Author: Colin Walters <walters verbum org>
Date:   Thu Oct 25 18:42:40 2012 -0400

    Drop gsm-marshal.list, use g_cclosure_marshal_generic
    
    We can just pass NULL everywhere nowadays.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=687067

 gnome-session/Makefile.am         |   12 ------------
 gnome-session/gsm-app.c           |    9 +++------
 gnome-session/gsm-autostart-app.c |    3 +--
 gnome-session/gsm-client.c        |    7 ++-----
 gnome-session/gsm-dbus-client.c   |    1 -
 gnome-session/gsm-manager.c       |   27 +++++++--------------------
 gnome-session/gsm-marshal.list    |    3 ---
 gnome-session/gsm-shell.c         |   28 +++++++---------------------
 gnome-session/gsm-store.c         |    8 ++------
 gnome-session/gsm-system.c        |    4 +---
 gnome-session/gsm-systemd.c       |    1 -
 gnome-session/gsm-xsmp-client.c   |    5 ++---
 12 files changed, 25 insertions(+), 83 deletions(-)
---
diff --git a/gnome-session/Makefile.am b/gnome-session/Makefile.am
index 0514dcc..48a1516 100644
--- a/gnome-session/Makefile.am
+++ b/gnome-session/Makefile.am
@@ -24,8 +24,6 @@ gnome_session_SOURCES =				\
 	gsm-dbus-client.c			\
 	gsm-fail-whale-dialog.h			\
 	gsm-fail-whale-dialog.c			\
-	gsm-marshal.h				\
-	gsm-marshal.c				\
 	gsm-system.h				\
 	gsm-system.c				\
 	gsm-consolekit.c			\
@@ -109,13 +107,6 @@ test_client_dbus_LDADD = $(DBUS_GLIB_LIBS)
 test_process_helper_SOURCES = test-process-helper.c gsm-process-helper.c gsm-process-helper.h
 test_process_helper_LDADD = $(DBUS_GLIB_LIBS)
 
-gsm-marshal.c: gsm-marshal.list
-	$(AM_V_GEN)echo "#include \"gsm-marshal.h\"" > $@ && \
-	$(GLIB_GENMARSHAL) $< --prefix=gsm_marshal --body >> $@
-
-gsm-marshal.h: gsm-marshal.list
-	$(AM_V_GEN)$(GLIB_GENMARSHAL) $< --prefix=gsm_marshal --header > $@
-
 gsm-manager-glue.h: org.gnome.SessionManager.xml Makefile.am
 	$(AM_V_GEN)dbus-binding-tool --prefix=gsm_manager --mode=glib-server --output=gsm-manager-glue.h $(srcdir)/org.gnome.SessionManager.xml
 
@@ -132,8 +123,6 @@ gsm-presence-glue.h: org.gnome.SessionManager.Presence.xml Makefile.am
 	$(AM_V_GEN)dbus-binding-tool --prefix=gsm_presence --mode=glib-server --output=gsm-presence-glue.h $(srcdir)/org.gnome.SessionManager.Presence.xml
 
 BUILT_SOURCES =			\
-	gsm-marshal.c		\
-	gsm-marshal.h		\
 	gsm-manager-glue.h	\
 	gsm-presence-glue.h	\
 	gsm-inhibitor-glue.h	\
@@ -142,7 +131,6 @@ BUILT_SOURCES =			\
 
 EXTRA_DIST =						\
 	README						\
-	gsm-marshal.list				\
 	org.gnome.SessionManager.xml			\
 	org.gnome.SessionManager.App.xml		\
 	org.gnome.SessionManager.Client.xml		\
diff --git a/gnome-session/gsm-app.c b/gnome-session/gsm-app.c
index 9470bad..7d863e7 100644
--- a/gnome-session/gsm-app.c
+++ b/gnome-session/gsm-app.c
@@ -282,8 +282,7 @@ gsm_app_class_init (GsmAppClass *klass)
                               G_OBJECT_CLASS_TYPE (object_class),
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (GsmAppClass, exited),
-                              NULL, NULL,
-                              g_cclosure_marshal_VOID__UCHAR,
+                              NULL, NULL, NULL,
                               G_TYPE_NONE,
                               1, G_TYPE_UCHAR);
         signals[DIED] =
@@ -291,8 +290,7 @@ gsm_app_class_init (GsmAppClass *klass)
                               G_OBJECT_CLASS_TYPE (object_class),
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (GsmAppClass, died),
-                              NULL, NULL,
-                              g_cclosure_marshal_VOID__INT,
+                              NULL, NULL, NULL,
                               G_TYPE_NONE,
                               1, G_TYPE_INT);
 
@@ -301,8 +299,7 @@ gsm_app_class_init (GsmAppClass *klass)
                               G_OBJECT_CLASS_TYPE (object_class),
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (GsmAppClass, registered),
-                              NULL, NULL,
-                              g_cclosure_marshal_VOID__VOID,
+                              NULL, NULL, NULL,
                               G_TYPE_NONE,
                               0);
 
diff --git a/gnome-session/gsm-autostart-app.c b/gnome-session/gsm-autostart-app.c
index 2cf1776..f8c1681 100644
--- a/gnome-session/gsm-autostart-app.c
+++ b/gnome-session/gsm-autostart-app.c
@@ -1416,8 +1416,7 @@ gsm_autostart_app_class_init (GsmAutostartAppClass *klass)
                               G_OBJECT_CLASS_TYPE (object_class),
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (GsmAutostartAppClass, condition_changed),
-                              NULL, NULL,
-                              g_cclosure_marshal_VOID__BOOLEAN,
+                              NULL, NULL, NULL,
                               G_TYPE_NONE,
                               1,
                               G_TYPE_BOOLEAN);
diff --git a/gnome-session/gsm-client.c b/gnome-session/gsm-client.c
index 37a2483..c21aa10 100644
--- a/gnome-session/gsm-client.c
+++ b/gnome-session/gsm-client.c
@@ -25,7 +25,6 @@
 
 #include "eggdesktopfile.h"
 
-#include "gsm-marshal.h"
 #include "gsm-client.h"
 #include "gsm-client-glue.h"
 
@@ -314,8 +313,7 @@ gsm_client_class_init (GsmClientClass *klass)
                               G_OBJECT_CLASS_TYPE (object_class),
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (GsmClientClass, disconnected),
-                              NULL, NULL,
-                              g_cclosure_marshal_VOID__VOID,
+                              NULL, NULL, NULL,
                               G_TYPE_NONE,
                               0);
         signals[END_SESSION_RESPONSE] =
@@ -323,8 +321,7 @@ gsm_client_class_init (GsmClientClass *klass)
                               G_OBJECT_CLASS_TYPE (object_class),
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (GsmClientClass, end_session_response),
-                              NULL, NULL,
-                              gsm_marshal_VOID__BOOLEAN_BOOLEAN_BOOLEAN_STRING,
+                              NULL, NULL, NULL,
                               G_TYPE_NONE,
                               4, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_STRING);
 
diff --git a/gnome-session/gsm-dbus-client.c b/gnome-session/gsm-dbus-client.c
index 8d44f50..855ce8f 100644
--- a/gnome-session/gsm-dbus-client.c
+++ b/gnome-session/gsm-dbus-client.c
@@ -33,7 +33,6 @@
 #include <dbus/dbus-glib-lowlevel.h>
 
 #include "gsm-dbus-client.h"
-#include "gsm-marshal.h"
 
 #include "gsm-manager.h"
 #include "gsm-util.h"
diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c
index 9c50c16..192c81d 100644
--- a/gnome-session/gsm-manager.c
+++ b/gnome-session/gsm-manager.c
@@ -2558,9 +2558,7 @@ gsm_manager_class_init (GsmManagerClass *klass)
                               G_TYPE_FROM_CLASS (object_class),
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (GsmManagerClass, phase_changed),
-                              NULL,
-                              NULL,
-                              g_cclosure_marshal_VOID__STRING,
+                              NULL, NULL, NULL,
                               G_TYPE_NONE,
                               1, G_TYPE_STRING);
 
@@ -2569,9 +2567,7 @@ gsm_manager_class_init (GsmManagerClass *klass)
                               G_OBJECT_CLASS_TYPE (object_class),
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (GsmManagerClass, session_running),
-                              NULL,
-                              NULL,
-                              g_cclosure_marshal_VOID__VOID,
+                              NULL, NULL, NULL,
                               G_TYPE_NONE,
                               0);
 
@@ -2580,8 +2576,7 @@ gsm_manager_class_init (GsmManagerClass *klass)
                               G_OBJECT_CLASS_TYPE (object_class),
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (GsmManagerClass, session_over),
-                              NULL, NULL,
-                              g_cclosure_marshal_VOID__VOID,
+                              NULL, NULL, NULL,
                               G_TYPE_NONE,
                               0);
         signals [CLIENT_ADDED] =
@@ -2589,9 +2584,7 @@ gsm_manager_class_init (GsmManagerClass *klass)
                               G_TYPE_FROM_CLASS (object_class),
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (GsmManagerClass, client_added),
-                              NULL,
-                              NULL,
-                              g_cclosure_marshal_VOID__BOXED,
+                              NULL, NULL, NULL,
                               G_TYPE_NONE,
                               1, DBUS_TYPE_G_OBJECT_PATH);
         signals [CLIENT_REMOVED] =
@@ -2599,9 +2592,7 @@ gsm_manager_class_init (GsmManagerClass *klass)
                               G_TYPE_FROM_CLASS (object_class),
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (GsmManagerClass, client_removed),
-                              NULL,
-                              NULL,
-                              g_cclosure_marshal_VOID__BOXED,
+                              NULL, NULL, NULL,
                               G_TYPE_NONE,
                               1, DBUS_TYPE_G_OBJECT_PATH);
         signals [INHIBITOR_ADDED] =
@@ -2609,9 +2600,7 @@ gsm_manager_class_init (GsmManagerClass *klass)
                               G_TYPE_FROM_CLASS (object_class),
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (GsmManagerClass, inhibitor_added),
-                              NULL,
-                              NULL,
-                              g_cclosure_marshal_VOID__BOXED,
+                              NULL, NULL, NULL,
                               G_TYPE_NONE,
                               1, DBUS_TYPE_G_OBJECT_PATH);
         signals [INHIBITOR_REMOVED] =
@@ -2619,9 +2608,7 @@ gsm_manager_class_init (GsmManagerClass *klass)
                               G_TYPE_FROM_CLASS (object_class),
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (GsmManagerClass, inhibitor_removed),
-                              NULL,
-                              NULL,
-                              g_cclosure_marshal_VOID__BOXED,
+                              NULL, NULL, NULL,
                               G_TYPE_NONE,
                               1, DBUS_TYPE_G_OBJECT_PATH);
 
diff --git a/gnome-session/gsm-shell.c b/gnome-session/gsm-shell.c
index 4a5d49a..87ff10b 100644
--- a/gnome-session/gsm-shell.c
+++ b/gnome-session/gsm-shell.c
@@ -147,9 +147,7 @@ gsm_shell_class_init (GsmShellClass *shell_class)
                               G_OBJECT_CLASS_TYPE (object_class),
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (GsmShellClass, end_session_dialog_opened),
-                              NULL,
-                              NULL,
-                              g_cclosure_marshal_VOID__VOID,
+                              NULL, NULL, NULL,
                               G_TYPE_NONE, 0);
 
         signals [END_SESSION_DIALOG_OPEN_FAILED] =
@@ -157,9 +155,7 @@ gsm_shell_class_init (GsmShellClass *shell_class)
                               G_OBJECT_CLASS_TYPE (object_class),
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (GsmShellClass, end_session_dialog_open_failed),
-                              NULL,
-                              NULL,
-                              g_cclosure_marshal_VOID__VOID,
+                              NULL, NULL, NULL,
                               G_TYPE_NONE, 0);
 
         signals [END_SESSION_DIALOG_CLOSED] =
@@ -167,9 +163,7 @@ gsm_shell_class_init (GsmShellClass *shell_class)
                               G_OBJECT_CLASS_TYPE (object_class),
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (GsmShellClass, end_session_dialog_closed),
-                              NULL,
-                              NULL,
-                              g_cclosure_marshal_VOID__VOID,
+                              NULL, NULL, NULL,
                               G_TYPE_NONE, 0);
 
         signals [END_SESSION_DIALOG_CANCELED] =
@@ -177,9 +171,7 @@ gsm_shell_class_init (GsmShellClass *shell_class)
                               G_OBJECT_CLASS_TYPE (object_class),
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (GsmShellClass, end_session_dialog_canceled),
-                              NULL,
-                              NULL,
-                              g_cclosure_marshal_VOID__VOID,
+                              NULL, NULL, NULL,
                               G_TYPE_NONE, 0);
 
         signals [END_SESSION_DIALOG_CONFIRMED_LOGOUT] =
@@ -187,9 +179,7 @@ gsm_shell_class_init (GsmShellClass *shell_class)
                               G_OBJECT_CLASS_TYPE (object_class),
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (GsmShellClass, end_session_dialog_confirmed_logout),
-                              NULL,
-                              NULL,
-                              g_cclosure_marshal_VOID__VOID,
+                              NULL, NULL, NULL,
                               G_TYPE_NONE, 0);
 
         signals [END_SESSION_DIALOG_CONFIRMED_SHUTDOWN] =
@@ -197,9 +187,7 @@ gsm_shell_class_init (GsmShellClass *shell_class)
                               G_OBJECT_CLASS_TYPE (object_class),
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (GsmShellClass, end_session_dialog_confirmed_shutdown),
-                              NULL,
-                              NULL,
-                              g_cclosure_marshal_VOID__VOID,
+                              NULL, NULL, NULL,
                               G_TYPE_NONE, 0);
 
         signals [END_SESSION_DIALOG_CONFIRMED_REBOOT] =
@@ -207,9 +195,7 @@ gsm_shell_class_init (GsmShellClass *shell_class)
                               G_OBJECT_CLASS_TYPE (object_class),
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (GsmShellClass, end_session_dialog_confirmed_reboot),
-                              NULL,
-                              NULL,
-                              g_cclosure_marshal_VOID__VOID,
+                              NULL, NULL, NULL,
                               G_TYPE_NONE, 0);
 
         g_type_class_add_private (shell_class, sizeof (GsmShellPrivate));
diff --git a/gnome-session/gsm-store.c b/gnome-session/gsm-store.c
index e250d8d..2d1708f 100644
--- a/gnome-session/gsm-store.c
+++ b/gnome-session/gsm-store.c
@@ -339,9 +339,7 @@ gsm_store_class_init (GsmStoreClass *klass)
                               G_TYPE_FROM_CLASS (object_class),
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (GsmStoreClass, added),
-                              NULL,
-                              NULL,
-                              g_cclosure_marshal_VOID__STRING,
+                              NULL, NULL, NULL,
                               G_TYPE_NONE,
                               1, G_TYPE_STRING);
         signals [REMOVED] =
@@ -349,9 +347,7 @@ gsm_store_class_init (GsmStoreClass *klass)
                               G_TYPE_FROM_CLASS (object_class),
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (GsmStoreClass, removed),
-                              NULL,
-                              NULL,
-                              g_cclosure_marshal_VOID__STRING,
+                              NULL, NULL, NULL,
                               G_TYPE_NONE,
                               1, G_TYPE_STRING);
         g_object_class_install_property (object_class,
diff --git a/gnome-session/gsm-system.c b/gnome-session/gsm-system.c
index 259cc19..7ace678 100644
--- a/gnome-session/gsm-system.c
+++ b/gnome-session/gsm-system.c
@@ -44,9 +44,7 @@ gsm_system_default_init (GsmSystemInterface *iface)
                               GSM_TYPE_SYSTEM,
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (GsmSystemInterface, request_completed),
-                              NULL,
-                              NULL,
-                              g_cclosure_marshal_VOID__POINTER,
+                              NULL, NULL, NULL,
                               G_TYPE_NONE,
                               1, G_TYPE_POINTER);
 }
diff --git a/gnome-session/gsm-systemd.c b/gnome-session/gsm-systemd.c
index 345c345..417bb60 100644
--- a/gnome-session/gsm-systemd.c
+++ b/gnome-session/gsm-systemd.c
@@ -41,7 +41,6 @@
 #include <gio/gio.h>
 #include <gio/gunixfdlist.h>
 
-#include "gsm-marshal.h"
 #include "gsm-system.h"
 
 #define SD_NAME              "org.freedesktop.login1"
diff --git a/gnome-session/gsm-xsmp-client.c b/gnome-session/gsm-xsmp-client.c
index 4d745aa..b1c40b6 100644
--- a/gnome-session/gsm-xsmp-client.c
+++ b/gnome-session/gsm-xsmp-client.c
@@ -32,7 +32,6 @@
 #include <glib/gi18n.h>
 
 #include "gsm-xsmp-client.h"
-#include "gsm-marshal.h"
 
 #include "gsm-util.h"
 #include "gsm-autostart-app.h"
@@ -1000,7 +999,7 @@ gsm_xsmp_client_class_init (GsmXSMPClientClass *klass)
                               G_STRUCT_OFFSET (GsmXSMPClientClass, register_request),
                               _boolean_handled_accumulator,
                               NULL,
-                              gsm_marshal_BOOLEAN__POINTER,
+                              NULL,
                               G_TYPE_BOOLEAN,
                               1, G_TYPE_POINTER);
         signals[LOGOUT_REQUEST] =
@@ -1010,7 +1009,7 @@ gsm_xsmp_client_class_init (GsmXSMPClientClass *klass)
                               G_STRUCT_OFFSET (GsmXSMPClientClass, logout_request),
                               NULL,
                               NULL,
-                              g_cclosure_marshal_VOID__BOOLEAN,
+                              NULL,
                               G_TYPE_NONE,
                               1, G_TYPE_BOOLEAN);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]