[network-manager-applet] libnm-gtk: add introspection

[Dan Winship <danw src gnome org>]

commit 7bc5b631df87941a52b7fe9ae19a3aacf88893dd
Author: Dan Winship <danw gnome org>
Date:   Wed Oct 3 10:48:31 2012 -0400

    libnm-gtk: add introspection

 .gitignore                       |    2 ++
 configure.ac                     |    4 +++-
 src/libnm-gtk/Makefile.am        |   27 +++++++++++++++++++++++++++
 src/libnm-gtk/nm-mobile-wizard.c |    4 ++++
 src/libnm-gtk/nm-ui-utils.c      |    2 +-
 src/libnm-gtk/nm-wifi-dialog.c   |   22 ++++++++++++++++++----
 src/libnm-gtk/nm-wifi-dialog.h   |    9 +++++----
 7 files changed, 60 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8b70645..ef5d40c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,6 +39,8 @@ org.gnome.nm-applet.gschema.valid
 src/connection-editor/nm-connection-editor
 src/connection-editor/nm-connection-editor-service-glue.h
 src/libnm-gtk/libnm-gtk.pc
+src/libnm-gtk/NMGtk-1.0.gir
+src/libnm-gtk/NMGtk-1.0.typelib
 src/marshallers/nma-marshal.*
 src/nm-applet
 src/nm-applet-migration-tool
diff --git a/configure.ac b/configure.ac
index bd9c461..6cc94f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_INIT([nm-applet],
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([1.10 subdir-objects no-dist-gzip dist-bzip2])
+AM_INIT_AUTOMAKE([1.10 subdir-objects no-dist-gzip dist-bzip2 -Wno-portability])
 AM_MAINTAINER_MODE([enable])
 
 # Support silent build rules, requires at least automake-1.11. Disable
@@ -206,6 +206,8 @@ PKG_CHECK_MODULES(GUDEV, gudev-1.0 >= 147)
 AC_SUBST(GUDEV_CFLAGS)
 AC_SUBST(GUDEV_LIBS)
 
+GOBJECT_INTROSPECTION_CHECK([0.9.6])
+
 GLIB_CONFIG_NMA
 
 dnl
diff --git a/src/libnm-gtk/Makefile.am b/src/libnm-gtk/Makefile.am
index 74491a0..7073296 100644
--- a/src/libnm-gtk/Makefile.am
+++ b/src/libnm-gtk/Makefile.am
@@ -51,4 +51,31 @@ libnm_gtk_la_LDFLAGS = -Wl,-no-undefined \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libnm-gtk.pc
 
+-include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_GIRS =
+
+if HAVE_INTROSPECTION
+introspection_sources =			\
+	$(filter-out			\
+		nm-wireless-dialog.%,	\
+		$(libnmgtk_HEADERS) $(libnm_gtk_la_SOURCES))
+
+NMGtk-1.0.gir: libnm-gtk.la
+NMGtk_1_0_gir_INCLUDES = NMClient-1.0 NetworkManager-1.0 Gtk-3.0
+NMGtk_1_0_gir_EXPORT_PACKAGES = libnm-gtk
+NMGtk_1_0_gir_CFLAGS = $(libnm_gtk_la_CFLAGS)
+NMGtk_1_0_gir_LIBS = libnm-gtk.la
+NMGtk_1_0_gir_FILES = $(introspection_sources)
+NMGtk_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NMA --symbol-prefix=nma
+INTROSPECTION_GIRS += NMGtk-1.0.gir
+
+girdir = $(datadir)/gir-1.0
+gir_DATA = $(INTROSPECTION_GIRS)
+
+typelibdir = $(libdir)/girepository-1.0
+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
+CLEANFILES = $(gir_DATA) $(typelib_DATA)
+endif
+
 EXTRA_DIST = libnm-gtk.pc.in $(ui_DATA)
diff --git a/src/libnm-gtk/nm-mobile-wizard.c b/src/libnm-gtk/nm-mobile-wizard.c
index b9ce9d5..29a49d7 100644
--- a/src/libnm-gtk/nm-mobile-wizard.c
+++ b/src/libnm-gtk/nm-mobile-wizard.c
@@ -1598,6 +1598,10 @@ get_country_from_locale (void)
 	return cc;
 }
 
+/**
+ * nma_mobile_wizard_new: (skip)
+ * @cb: (scope async):
+ */
 NMAMobileWizard *
 nma_mobile_wizard_new (GtkWindow *parent,
                    GtkWindowGroup *window_group,
diff --git a/src/libnm-gtk/nm-ui-utils.c b/src/libnm-gtk/nm-ui-utils.c
index ad51eac..ed6dfd3 100644
--- a/src/libnm-gtk/nm-ui-utils.c
+++ b/src/libnm-gtk/nm-ui-utils.c
@@ -400,7 +400,7 @@ get_bus_name (GUdevClient *uclient, NMDevice *device)
  * Generates a list of short-ish unique presentation names for the
  * devices in @devices.
  *
- * Returns: (array zero-terminated=1): the device names
+ * Returns: (transfer full) (array zero-terminated=1): the device names
  */
 char **
 nma_utils_disambiguate_device_names (NMDevice **devices,
diff --git a/src/libnm-gtk/nm-wifi-dialog.c b/src/libnm-gtk/nm-wifi-dialog.c
index 8b3cd26..c389455 100644
--- a/src/libnm-gtk/nm-wifi-dialog.c
+++ b/src/libnm-gtk/nm-wifi-dialog.c
@@ -1165,9 +1165,17 @@ internal_init (NMAWifiDialog *self,
 	return TRUE;
 }
 
+/**
+ * nma_wifi_dialog_get_connection:
+ * @self: an #NMAWifiDialog
+ * @device: (out):
+ * @ap: (out):
+ *
+ * Returns: (transfer full):
+ */
 NMConnection *
 nma_wifi_dialog_get_connection (NMAWifiDialog *self,
-                                NMDevice **out_device,
+                                NMDevice **device,
                                 NMAccessPoint **ap)
 {
 	NMAWifiDialogPrivate *priv;
@@ -1230,11 +1238,11 @@ nma_wifi_dialog_get_connection (NMAWifiDialog *self,
 	}
 
 	/* Fill device */
-	if (out_device) {
+	if (device) {
 		combo = GTK_WIDGET (gtk_builder_get_object (priv->builder, "device_combo"));
 		gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter);
-		gtk_tree_model_get (priv->device_model, &iter, D_DEV_COLUMN, out_device, -1);
-		g_object_unref (*out_device);
+		gtk_tree_model_get (priv->device_model, &iter, D_DEV_COLUMN, device, -1);
+		g_object_unref (*device);
 	}
 
 	if (ap)
@@ -1330,6 +1338,12 @@ nma_wifi_dialog_new_for_create (NMClient *client, NMRemoteSettings *settings)
 	return internal_new_other (client, settings, TRUE);
 }
 
+/**
+ * nma_wifi_dialog_nag_user:
+ * @self:
+ *
+ * Returns: (transfer full):
+ */
 GtkWidget *
 nma_wifi_dialog_nag_user (NMAWifiDialog *self)
 {
diff --git a/src/libnm-gtk/nm-wifi-dialog.h b/src/libnm-gtk/nm-wifi-dialog.h
index fc17848..35554cb 100644
--- a/src/libnm-gtk/nm-wifi-dialog.h
+++ b/src/libnm-gtk/nm-wifi-dialog.h
@@ -31,6 +31,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
+#include <nm-client.h>
 #include <nm-connection.h>
 #include <nm-device.h>
 #include <nm-access-point.h>
@@ -66,15 +67,15 @@ GtkWidget *nma_wifi_dialog_new_for_other (NMClient *client,
 GtkWidget *nma_wifi_dialog_new_for_create (NMClient *client,
                                            NMRemoteSettings *settings);
 
-NMConnection * nma_wifi_dialog_get_connection (NMAWifiDialog *dialog,
+NMConnection * nma_wifi_dialog_get_connection (NMAWifiDialog *self,
                                                NMDevice **device,
                                                NMAccessPoint **ap);
 
-GtkWidget * nma_wifi_dialog_nag_user (NMAWifiDialog *dialog);
+GtkWidget * nma_wifi_dialog_nag_user (NMAWifiDialog *self);
 
-void nma_wifi_dialog_set_nag_ignored (NMAWifiDialog *dialog, gboolean ignored);
+void nma_wifi_dialog_set_nag_ignored (NMAWifiDialog *self, gboolean ignored);
 
-gboolean nma_wifi_dialog_get_nag_ignored (NMAWifiDialog *dialog);
+gboolean nma_wifi_dialog_get_nag_ignored (NMAWifiDialog *self);
 
 #endif	/* NMA_WIFI_DIALOG_H */