GNOME.org
 

[network-manager-applet/danw/libnm-bgo736911: 1/9] marshallers: delete

commit 2af1a73084bc8a091355a15cde759f547122bf23
Author: Dan Winship <danw redhat com>
Date:   Mon Nov 24 16:59:46 2014 -0500

    marshallers: delete
    
    Delete the custom-marshaller code and use g_cclosure_marshal_generic()
    everywhere.

 configure.ac                                 |    1 -
 src/Makefile.am                              |    4 +---
 src/applet-agent.c                           |    7 ++-----
 src/applet-device-cdma.c                     |    7 +++----
 src/applet-device-gsm.c                      |    7 +++----
 src/applet-device-wimax.c                    |    1 -
 src/applet-vpn-request.c                     |    1 -
 src/connection-editor/Makefile.am            |    4 +---
 src/connection-editor/ce-page.c              |    7 ++-----
 src/connection-editor/ce-polkit-button.c     |    6 ++----
 src/connection-editor/nm-connection-editor.c |    4 +---
 src/connection-editor/nm-connection-list.c   |    6 ++----
 src/connection-editor/page-master.c          |    9 +++------
 src/gnome-bluetooth/Makefile.am              |    2 --
 src/gnome-bluetooth/nma-bt-device.c          |    5 ++---
 src/libnm-gtk/Makefile.am                    |    2 --
 src/marshallers/Makefile.am                  |   26 --------------------------
 17 files changed, 22 insertions(+), 77 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f6ce1d5..5e85177 100644
--- a/configure.ac
+++ b/configure.ac
@@ -198,7 +198,6 @@ src/libnm-gtk/Makefile
 src/libnm-gtk/tests/Makefile
 src/libnm-gtk/examples/Makefile
 src/libnm-gtk/libnm-gtk.pc
-src/marshallers/Makefile
 src/utils/Makefile
 src/utils/tests/Makefile
 src/gconf-helpers/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index acf6c13..10d0077 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = marshallers utils wireless-security libnm-gtk connection-editor gnome-bluetooth
+SUBDIRS = utils wireless-security libnm-gtk connection-editor gnome-bluetooth
 
 bin_PROGRAMS = nm-applet
 
@@ -20,7 +20,6 @@ nm_applet_CPPFLAGS = \
        -DG_LOG_DOMAIN=\""nm-applet"\" \
        $(DBUS_CFLAGS)                                                                          \
        $(DISABLE_DEPRECATED)   \
-       -I${top_builddir}/src/marshallers \
        -I${top_srcdir}/src/utils \
        -I${top_srcdir}/src/wireless-security \
        -I${top_srcdir}/src/libnm-gtk
@@ -78,7 +77,6 @@ nm_applet_LDADD = \
        $(NMA_LIBS) \
        $(LIBSECRET_LIBS) \
        $(NOTIFY_LIBS) \
-       ${top_builddir}/src/marshallers/libmarshallers.la \
        ${top_builddir}/src/utils/libutils.la \
        ${top_builddir}/src/wireless-security/libwireless-security.la \
        ${top_builddir}/src/libnm-gtk/libnm-gtk.la
diff --git a/src/applet-agent.c b/src/applet-agent.c
index 5ea0d3a..3358519 100644
--- a/src/applet-agent.c
+++ b/src/applet-agent.c
@@ -39,7 +39,6 @@
 
 #include "applet-agent.h"
 #include "utils.h"
-#include "nma-marshal.h"
 
 #define KEYRING_UUID_TAG "connection-uuid"
 #define KEYRING_SN_TAG "setting-name"
@@ -875,8 +874,7 @@ applet_agent_class_init (AppletAgentClass *agent_class)
                              G_OBJECT_CLASS_TYPE (object_class),
                              G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (AppletAgentClass, get_secrets),
-                             NULL, NULL,
-                             _nma_marshal_VOID__POINTER_POINTER_STRING_POINTER_UINT_POINTER_POINTER,
+                             NULL, NULL, NULL,
                              G_TYPE_NONE, 7,
                              G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_UINT, 
G_TYPE_POINTER, G_TYPE_POINTER);
 
@@ -885,8 +883,7 @@ applet_agent_class_init (AppletAgentClass *agent_class)
                              G_OBJECT_CLASS_TYPE (object_class),
                              G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (AppletAgentClass, cancel_secrets),
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__POINTER,
+                             NULL, NULL, NULL,
                              G_TYPE_NONE, 1, G_TYPE_POINTER);
 }
 
diff --git a/src/applet-device-cdma.c b/src/applet-device-cdma.c
index 5abd75d..f56f977 100644
--- a/src/applet-device-cdma.c
+++ b/src/applet-device-cdma.c
@@ -40,7 +40,6 @@
 #include "applet-device-cdma.h"
 #include "utils.h"
 #include "applet-dialogs.h"
-#include "nma-marshal.h"
 #include "nm-mobile-providers.h"
 #include "mb-menu-item.h"
 #include "nm-ui-utils.h"
@@ -691,7 +690,7 @@ cdma_device_added (NMDevice *device, NMApplet *applet)
        g_object_set_data_full (G_OBJECT (modem), "devinfo", info, cdma_device_info_free);
 
        /* Registration state change signal */
-       dbus_g_object_register_marshaller (_nma_marshal_VOID__UINT_UINT,
+       dbus_g_object_register_marshaller (g_cclosure_marshal_generic,
                                           G_TYPE_NONE,
                                           G_TYPE_UINT, G_TYPE_UINT, G_TYPE_INVALID);
        dbus_g_proxy_add_signal (info->cdma_proxy, "RegistrationStateChanged",
@@ -700,14 +699,14 @@ cdma_device_added (NMDevice *device, NMApplet *applet)
                                     G_CALLBACK (reg_state_changed_cb), info, NULL);
 
        /* Signal quality change signal */
-       dbus_g_object_register_marshaller (g_cclosure_marshal_VOID__UINT,
+       dbus_g_object_register_marshaller (g_cclosure_marshal_generic,
                                           G_TYPE_NONE, G_TYPE_UINT, G_TYPE_INVALID);
        dbus_g_proxy_add_signal (info->cdma_proxy, "SignalQuality", G_TYPE_UINT, G_TYPE_INVALID);
        dbus_g_proxy_connect_signal (info->cdma_proxy, "SignalQuality",
                                     G_CALLBACK (signal_quality_changed_cb), info, NULL);
 
        /* Modem property change signal */
-       dbus_g_object_register_marshaller (_nma_marshal_VOID__STRING_BOXED,
+       dbus_g_object_register_marshaller (g_cclosure_marshal_generic,
                                           G_TYPE_NONE, G_TYPE_STRING, DBUS_TYPE_G_MAP_OF_VARIANT,
                                           G_TYPE_INVALID);
        dbus_g_proxy_add_signal (info->props_proxy, "MmPropertiesChanged",
diff --git a/src/applet-device-gsm.c b/src/applet-device-gsm.c
index b398224..c67fd84 100644
--- a/src/applet-device-gsm.c
+++ b/src/applet-device-gsm.c
@@ -46,7 +46,6 @@
 #include "utils.h"
 #include "applet-dialogs.h"
 #include "mb-menu-item.h"
-#include "nma-marshal.h"
 #include "nm-mobile-providers.h"
 #include "nm-ui-utils.h"
 #include "nm-glib-compat.h"
@@ -1154,7 +1153,7 @@ gsm_device_added (NMDevice *device, NMApplet *applet)
        g_object_set_data_full (G_OBJECT (modem), "devinfo", info, gsm_device_info_free);
 
        /* Registration info signal */
-       dbus_g_object_register_marshaller (_nma_marshal_VOID__UINT_STRING_STRING,
+       dbus_g_object_register_marshaller (g_cclosure_marshal_generic,
                                           G_TYPE_NONE,
                                           G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
        dbus_g_proxy_add_signal (info->net_proxy, "RegistrationInfo",
@@ -1163,14 +1162,14 @@ gsm_device_added (NMDevice *device, NMApplet *applet)
                                     G_CALLBACK (reg_info_changed_cb), info, NULL);
 
        /* Signal quality change signal */
-       dbus_g_object_register_marshaller (g_cclosure_marshal_VOID__UINT,
+       dbus_g_object_register_marshaller (g_cclosure_marshal_generic,
                                           G_TYPE_NONE, G_TYPE_UINT, G_TYPE_INVALID);
        dbus_g_proxy_add_signal (info->net_proxy, "SignalQuality", G_TYPE_UINT, G_TYPE_INVALID);
        dbus_g_proxy_connect_signal (info->net_proxy, "SignalQuality",
                                     G_CALLBACK (signal_quality_changed_cb), info, NULL);
 
        /* Modem property change signal */
-       dbus_g_object_register_marshaller (_nma_marshal_VOID__STRING_BOXED,
+       dbus_g_object_register_marshaller (g_cclosure_marshal_generic,
                                           G_TYPE_NONE, G_TYPE_STRING, DBUS_TYPE_G_MAP_OF_VARIANT,
                                           G_TYPE_INVALID);
        dbus_g_proxy_add_signal (info->props_proxy, "MmPropertiesChanged",
diff --git a/src/applet-device-wimax.c b/src/applet-device-wimax.c
index 1741b2f..4055542 100644
--- a/src/applet-device-wimax.c
+++ b/src/applet-device-wimax.c
@@ -36,7 +36,6 @@
 #include "applet.h"
 #include "applet-device-wimax.h"
 #include "applet-dialogs.h"
-#include "nma-marshal.h"
 #include "mb-menu-item.h"
 #include "nm-ui-utils.h"
 
diff --git a/src/applet-vpn-request.c b/src/applet-vpn-request.c
index 09b94c0..62f7a98 100644
--- a/src/applet-vpn-request.c
+++ b/src/applet-vpn-request.c
@@ -33,7 +33,6 @@
 #include <glib-object.h>
 
 #include "applet-vpn-request.h"
-#include "nma-marshal.h"
 #include <nm-connection.h>
 #include <nm-setting-connection.h>
 #include <nm-setting-vpn.h>
diff --git a/src/connection-editor/Makefile.am b/src/connection-editor/Makefile.am
index 2422a86..b1b5588 100644
--- a/src/connection-editor/Makefile.am
+++ b/src/connection-editor/Makefile.am
@@ -16,8 +16,7 @@ nm_connection_editor_CPPFLAGS = \
        $(DISABLE_DEPRECATED) \
        -I${top_srcdir}/src/utils \
        -I${top_srcdir}/src/wireless-security \
-       -I${top_srcdir}/src/libnm-gtk \
-       -I${top_builddir}/src/marshallers
+       -I${top_srcdir}/src/libnm-gtk
 
 nm_connection_editor_SOURCES = \
        nm-connection-editor.c \
@@ -90,7 +89,6 @@ nm-connection-editor-service-glue.h: $(top_srcdir)/src/connection-editor/nm-conn
 nm_connection_editor_LDADD = \
        ${top_builddir}/src/wireless-security/libwireless-security.la \
        ${top_builddir}/src/utils/libutils.la \
-       ${top_builddir}/src/marshallers/libmarshallers.la \
        ${top_builddir}/src/libnm-gtk/libnm-gtk.la \
        $(GTK_LIBS) \
        $(NMA_LIBS) \
diff --git a/src/connection-editor/ce-page.c b/src/connection-editor/ce-page.c
index bde329f..278e946 100644
--- a/src/connection-editor/ce-page.c
+++ b/src/connection-editor/ce-page.c
@@ -33,7 +33,6 @@
 #include <nm-utils.h>
 
 #include "ce-page.h"
-#include "nma-marshal.h"
 
 G_DEFINE_ABSTRACT_TYPE (CEPage, ce_page, G_TYPE_OBJECT)
 
@@ -506,8 +505,7 @@ ce_page_class_init (CEPageClass *page_class)
                              G_OBJECT_CLASS_TYPE (object_class),
                              G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (CEPageClass, changed),
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__VOID,
+                             NULL, NULL, NULL,
                              G_TYPE_NONE, 0);
 
        signals[INITIALIZED] = 
@@ -515,8 +513,7 @@ ce_page_class_init (CEPageClass *page_class)
                              G_OBJECT_CLASS_TYPE (object_class),
                              G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (CEPageClass, initialized),
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__POINTER,
+                             NULL, NULL, NULL,
                              G_TYPE_NONE, 1, G_TYPE_POINTER);
 }
 
diff --git a/src/connection-editor/ce-polkit-button.c b/src/connection-editor/ce-polkit-button.c
index 892311a..ebd4355 100644
--- a/src/connection-editor/ce-polkit-button.c
+++ b/src/connection-editor/ce-polkit-button.c
@@ -230,16 +230,14 @@ ce_polkit_button_class_init (CEPolkitButtonClass *pb_class)
                                            G_OBJECT_CLASS_TYPE (object_class),
                                            G_SIGNAL_RUN_FIRST,
                                            G_STRUCT_OFFSET (CEPolkitButtonClass, actionable),
-                                           NULL, NULL,
-                                           g_cclosure_marshal_VOID__BOOLEAN,
+                                           NULL, NULL, NULL,
                                            G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 
        signals[AUTHORIZED] = g_signal_new ("authorized",
                                            G_OBJECT_CLASS_TYPE (object_class),
                                            G_SIGNAL_RUN_FIRST,
                                            G_STRUCT_OFFSET (CEPolkitButtonClass, authorized),
-                                           NULL, NULL,
-                                           g_cclosure_marshal_VOID__BOOLEAN,
+                                           NULL, NULL, NULL,
                                            G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 }
 
diff --git a/src/connection-editor/nm-connection-editor.c b/src/connection-editor/nm-connection-editor.c
index 7821525..3d737f4 100644
--- a/src/connection-editor/nm-connection-editor.c
+++ b/src/connection-editor/nm-connection-editor.c
@@ -55,7 +55,6 @@
 #include <nm-remote-connection.h>
 
 #include "nm-connection-editor.h"
-#include "nma-marshal.h"
 
 #include "ce-page.h"
 #include "page-general.h"
@@ -384,8 +383,7 @@ nm_connection_editor_class_init (NMConnectionEditorClass *klass)
                              G_OBJECT_CLASS_TYPE (object_class),
                              G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (NMConnectionEditorClass, done),
-                             NULL, NULL,
-                             _nma_marshal_VOID__ENUM,
+                             NULL, NULL, NULL,
                              G_TYPE_NONE, 1, GTK_TYPE_RESPONSE_TYPE);
 }
 
diff --git a/src/connection-editor/nm-connection-list.c b/src/connection-editor/nm-connection-list.c
index c8c3a15..964c973 100644
--- a/src/connection-editor/nm-connection-list.c
+++ b/src/connection-editor/nm-connection-list.c
@@ -466,8 +466,7 @@ nm_connection_list_class_init (NMConnectionListClass *klass)
                                          G_OBJECT_CLASS_TYPE (object_class),
                                          G_SIGNAL_RUN_FIRST,
                                          G_STRUCT_OFFSET (NMConnectionListClass, done),
-                                         NULL, NULL,
-                                         g_cclosure_marshal_VOID__INT,
+                             NULL, NULL, NULL,
                                          G_TYPE_NONE, 1, G_TYPE_INT);
 
        list_signals[EDITING_DONE] =
@@ -475,8 +474,7 @@ nm_connection_list_class_init (NMConnectionListClass *klass)
                              G_OBJECT_CLASS_TYPE (object_class),
                              G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (NMConnectionListClass, done),
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__INT,
+                             NULL, NULL, NULL,
                              G_TYPE_NONE, 1, G_TYPE_INT);
 }
 
diff --git a/src/connection-editor/page-master.c b/src/connection-editor/page-master.c
index 1b89003..c2c63db 100644
--- a/src/connection-editor/page-master.c
+++ b/src/connection-editor/page-master.c
@@ -622,8 +622,7 @@ ce_page_master_class_init (CEPageMasterClass *master_class)
                              G_OBJECT_CLASS_TYPE (object_class),
                              G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (CEPageMasterClass, create_connection),
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__OBJECT,
+                             NULL, NULL, NULL,
                              G_TYPE_NONE, 1,
                              NM_TYPE_CONNECTION);
 
@@ -632,8 +631,7 @@ ce_page_master_class_init (CEPageMasterClass *master_class)
                              G_OBJECT_CLASS_TYPE (object_class),
                              G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (CEPageMasterClass, connection_added),
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__OBJECT,
+                             NULL, NULL, NULL,
                              G_TYPE_NONE, 1,
                              NM_TYPE_CONNECTION);
 
@@ -642,8 +640,7 @@ ce_page_master_class_init (CEPageMasterClass *master_class)
                              G_OBJECT_CLASS_TYPE (object_class),
                              G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (CEPageMasterClass, connection_removed),
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__OBJECT,
+                             NULL, NULL, NULL,
                              G_TYPE_NONE, 1,
                              NM_TYPE_CONNECTION);
 }
diff --git a/src/gnome-bluetooth/Makefile.am b/src/gnome-bluetooth/Makefile.am
index 940aeba..2448b24 100644
--- a/src/gnome-bluetooth/Makefile.am
+++ b/src/gnome-bluetooth/Makefile.am
@@ -3,7 +3,6 @@ AM_CPPFLAGS = \
        -DICONDIR=\"$(icondir)\" \
        -DLOCALEDIR="\"$(datadir)/locale\""     \
        -I$(top_builddir) \
-       -I${top_builddir}/src/marshallers \
        -I${top_srcdir}/src/utils \
        -I${top_srcdir}/src/libnm-gtk \
        $(GNOME_BLUETOOTH_CFLAGS) \
@@ -31,7 +30,6 @@ endif
 libnma_la_LDFLAGS = -module -avoid-version
 
 libnma_la_LIBADD = \
-       $(top_builddir)/src/marshallers/libmarshallers.la \
        $(top_builddir)/src/utils/libutils.la \
        $(top_builddir)/src/libnm-gtk/libnm-gtk.la \
        $(GNOME_BLUETOOTH_LIBS)
diff --git a/src/gnome-bluetooth/nma-bt-device.c b/src/gnome-bluetooth/nma-bt-device.c
index 870d2be..1a22331 100644
--- a/src/gnome-bluetooth/nma-bt-device.c
+++ b/src/gnome-bluetooth/nma-bt-device.c
@@ -38,7 +38,6 @@
 #include <nm-remote-connection.h>
 
 #include "nma-bt-device.h"
-#include "nma-marshal.h"
 #include "nm-mobile-wizard.h"
 #include "nm-utils.h"
 #include "utils.h"
@@ -821,7 +820,7 @@ dun_start (NmaBtDevice *self)
                                                    MM_INTERFACE);
        g_assert (priv->mm_proxy);
 
-       dbus_g_object_register_marshaller (g_cclosure_marshal_VOID__BOXED,
+       dbus_g_object_register_marshaller (g_cclosure_marshal_generic,
                                           G_TYPE_NONE,
                                           G_TYPE_BOXED,
                                           G_TYPE_INVALID);
@@ -849,7 +848,7 @@ dun_start (NmaBtDevice *self)
        g_message ("%s: calling Connect...", __func__);
 
        /* Watch for BT device property changes */
-       dbus_g_object_register_marshaller (_nma_marshal_VOID__STRING_BOXED,
+       dbus_g_object_register_marshaller (g_cclosure_marshal_generic,
                                           G_TYPE_NONE,
                                           G_TYPE_STRING, G_TYPE_VALUE,
                                           G_TYPE_INVALID);
diff --git a/src/libnm-gtk/Makefile.am b/src/libnm-gtk/Makefile.am
index 54cb0ac..1d21b6a 100644
--- a/src/libnm-gtk/Makefile.am
+++ b/src/libnm-gtk/Makefile.am
@@ -39,7 +39,6 @@ libnm_gtk_la_CFLAGS = \
        -DVPN_NAME_FILES_DIR=\""$(sysconfdir)/NetworkManager/VPN"\" \
        -DNMALOCALEDIR=\"$(datadir)/locale\" \
        $(DISABLE_DEPRECATED) \
-       -I${top_builddir}/src/marshallers \
        -I${top_srcdir}/src/utils \
        -I${top_srcdir}/src/wireless-security
 
@@ -47,7 +46,6 @@ libnm_gtk_la_LIBADD = \
        $(GTK_LIBS) \
        $(NMA_LIBS) \
        $(GUDEV_LIBS) \
-       $(top_builddir)/src/marshallers/libmarshallers.la \
        $(top_builddir)/src/wireless-security/libwireless-security.la
 
 libnm_gtk_la_LDFLAGS = -Wl,-no-undefined \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]