[network-manager-applet] libnm-gtk: Restrict the list of exported symbols

[Michael Biebl <mbiebl src gnome org>]

commit d71a5113860c497708abec5a421cd7bbf8e72056
Author: Michael Biebl <biebl debian org>
Date:   Thu Nov 3 22:41:04 2011 +0100

    libnm-gtk: Restrict the list of exported symbols
    
    Use -export-symbols-regex '^nma_.*' to trim down the list of exported
    symbols. Rename the marshallers accordingly.

 src/applet-agent.c                           |    2 +-
 src/applet-device-cdma.c                     |    4 ++--
 src/applet-device-gsm.c                      |    4 ++--
 src/connection-editor/nm-connection-editor.c |    2 +-
 src/gnome-bluetooth/bt-widget.c              |    2 +-
 src/libnm-gtk/Makefile.am                    |    6 ++++--
 src/marshallers/Makefile.am                  |    4 ++--
 7 files changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/src/applet-agent.c b/src/applet-agent.c
index 3ed3944..6b4119f 100644
--- a/src/applet-agent.c
+++ b/src/applet-agent.c
@@ -863,7 +863,7 @@ applet_agent_class_init (AppletAgentClass *agent_class)
 		              G_SIGNAL_RUN_FIRST,
 		              G_STRUCT_OFFSET (AppletAgentClass, get_secrets),
 		              NULL, NULL,
-		              nma_marshal_VOID__POINTER_POINTER_STRING_POINTER_UINT_POINTER_POINTER,
+		              _nma_marshal_VOID__POINTER_POINTER_STRING_POINTER_UINT_POINTER_POINTER,
 		              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);
 
diff --git a/src/applet-device-cdma.c b/src/applet-device-cdma.c
index 7894df2..bd13d13 100644
--- a/src/applet-device-cdma.c
+++ b/src/applet-device-cdma.c
@@ -974,7 +974,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 (_nma_marshal_VOID__UINT_UINT,
 	                                   G_TYPE_NONE,
 	                                   G_TYPE_UINT, G_TYPE_UINT, G_TYPE_INVALID);
 	dbus_g_proxy_add_signal (info->cdma_proxy, "RegistrationStateChanged",
@@ -990,7 +990,7 @@ cdma_device_added (NMDevice *device, NMApplet *applet)
 	                             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 (_nma_marshal_VOID__STRING_BOXED,
 	                                   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 e411aee..a68f2a5 100644
--- a/src/applet-device-gsm.c
+++ b/src/applet-device-gsm.c
@@ -1675,7 +1675,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 (_nma_marshal_VOID__UINT_STRING_STRING,
 	                                   G_TYPE_NONE,
 	                                   G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
 	dbus_g_proxy_add_signal (info->net_proxy, "RegistrationInfo",
@@ -1691,7 +1691,7 @@ gsm_device_added (NMDevice *device, NMApplet *applet)
 	                             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 (_nma_marshal_VOID__STRING_BOXED,
 	                                   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/connection-editor/nm-connection-editor.c b/src/connection-editor/nm-connection-editor.c
index 2a58561..743b4d2 100644
--- a/src/connection-editor/nm-connection-editor.c
+++ b/src/connection-editor/nm-connection-editor.c
@@ -372,7 +372,7 @@ nm_connection_editor_class_init (NMConnectionEditorClass *klass)
 		              G_SIGNAL_RUN_FIRST,
 		              G_STRUCT_OFFSET (NMConnectionEditorClass, done),
 		              NULL, NULL,
-		              nma_marshal_VOID__INT_POINTER,
+		              _nma_marshal_VOID__INT_POINTER,
 		              G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_POINTER);
 }
 
diff --git a/src/gnome-bluetooth/bt-widget.c b/src/gnome-bluetooth/bt-widget.c
index 18c2059..32b3af5 100644
--- a/src/gnome-bluetooth/bt-widget.c
+++ b/src/gnome-bluetooth/bt-widget.c
@@ -819,7 +819,7 @@ dun_start (PluginInfo *info)
 		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 (_nma_marshal_VOID__STRING_BOXED,
 		                                   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 7ac24fe..89b643b 100644
--- a/src/libnm-gtk/Makefile.am
+++ b/src/libnm-gtk/Makefile.am
@@ -38,9 +38,11 @@ libnm_gtk_la_LIBADD = \
 	$(top_builddir)/src/marshallers/libmarshallers.la \
 	$(top_builddir)/src/wireless-security/libwireless-security.la
 
-libnm_gtk_la_LDFLAGS = -Wl,-no-undefined
+libnm_gtk_la_LDFLAGS = -Wl,-no-undefined \
+	-export-symbols-regex '^nma_.*'
+
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libnm-gtk.pc
 
-EXTRA_DIST = libnm-gtk.pc.in $(ui_DATA)
\ No newline at end of file
+EXTRA_DIST = libnm-gtk.pc.in $(ui_DATA)
diff --git a/src/marshallers/Makefile.am b/src/marshallers/Makefile.am
index bde3405..be4fe3c 100644
--- a/src/marshallers/Makefile.am
+++ b/src/marshallers/Makefile.am
@@ -18,10 +18,10 @@ EXTRA_DIST = nma-marshal.list
 CLEANFILES = $(BUILT_SOURCES)
 
 nma-marshal.h: nma-marshal.list
-	$(GLIB_GENMARSHAL) $< --prefix=nma_marshal --header > $@
+	$(GLIB_GENMARSHAL) $< --prefix=_nma_marshal --header > $@
 
 nma-marshal.c: nma-marshal.list
-	$(GLIB_GENMARSHAL) $< --prefix=nma_marshal --body > $@
+	$(GLIB_GENMARSHAL) $< --prefix=_nma_marshal --body > $@
 
 nma-marshal-main.c: nma-marshal.c nma-marshal.h