gir-repository r286 - in trunk: . gir

[johan svn gnome org]

Author: johan
Date: Wed Feb  4 13:47:53 2009
New Revision: 286
URL: http://svn.gnome.org/viewvc/gir-repository?rev=286&view=rev

Log:
2009-02-04  Johan Dahlin  <jdahlin async com br>

    * gir/DBus-1.0.gir:
    * gir/Makefile.am:
    * gir/dbus.c (dbus_connection_get_type), (dbus_message_get_type):
    * gir/dbus.h:
    Generate DBus-1.0.gir from headers instead of hand coded.
    Add a hack to map get the _get_type functions to work properly.



Added:
   trunk/gir/dbus.c
   trunk/gir/dbus.h
Removed:
   trunk/gir/DBus-1.0.gir
Modified:
   trunk/ChangeLog
   trunk/gir/   (props changed)
   trunk/gir/Makefile.am

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Wed Feb  4 13:47:53 2009
@@ -6,12 +6,6 @@
 XPATH_TESTS =
 COMMON_CUSTOM_LDFLAGS= -module -avoid-version -rdynamic
 
-DBUS_GIROURCES = DBus-1.0.gir
-if BUILD_DBUS
-CUSTOM_GIRSOURCES += $(DBUS_GIROURCES)
-endif
-EXTRA_DIST += $(DBUS_GIROURCES)
-
 AVAHI_GIRSOURCES = AvahiCore-0.6.gir
 if BUILD_AVAHI
 CUSTOM_GIRSOURCES += $(AVAHI_GIRSOURCES)
@@ -26,6 +20,30 @@
 endif
 EXTRA_DIST += $(MISSIONCONTROL_GIRSOURCES)
 
+libgirepo_DBus_custom_la_CPPFLAGS = $(DBUS_CFLAGS)
+libgirepo_DBus_custom_la_LIBADD = $(DBUS_LIBS)
+libgirepo_DBus_custom_la_LDFLAGS = $(COMMON_CUSTOM_LDFLAGS)
+libgirepo_DBus_custom_la_SOURCES = 	\
+	$(srcdir)/dbus.c		\
+	$(srcdir)/dbus.h
+EXTRA_DIST += $(srcdir)/dbus.c $(srcdir)/dbus.h
+
+if BUILD_DBUS
+DBus-1.0.gir: libgirepo-DBus-custom.la
+	$(G_IR_SCANNER) -v --namespace DBus --nsversion=2.0 \
+	    --add-include-path=$(srcdir) --add-include-path=. \
+            --include=GObject-2.0 \
+	    --library=girepo-DBus-custom \
+            --library=dbus-glib-1 \
+	    --libtool="$(LIBTOOL)" \
+            --output $@ \
+            --pkg dbus-glib-1 \
+            $(srcdir)/dbus.c \
+            $(srcdir)/dbus.h
+BUILT_GIRSOURCES += DBus-1.0.gir
+lib_LTLIBRARIES += libgirepo-DBus-custom.la
+endif
+
 if BUILD_GCONF
 GCONF_INCLUDEDIR=`pkg-config --variable=includedir gconf-2.0`/gconf/2
 GConf-2.0.gir: $(G_IR_SCANNER)

Added: trunk/gir/dbus.c
==============================================================================
--- (empty file)
+++ trunk/gir/dbus.c	Wed Feb  4 13:47:53 2009
@@ -0,0 +1,14 @@
+#include <glib-object.h>
+
+extern GType dbus_connection_get_g_type(void);
+extern GType dbus_message_get_g_type(void);
+
+GType dbus_connection_get_type(void)
+{
+  return dbus_connection_get_g_type();
+}
+
+GType dbus_message_get_type(void)
+{
+  return dbus_message_get_g_type();
+}

Added: trunk/gir/dbus.h
==============================================================================
--- (empty file)
+++ trunk/gir/dbus.h	Wed Feb  4 13:47:53 2009
@@ -0,0 +1,23 @@
+#include <glib.h>
+#include <dbus/dbus-glib.h>
+
+typedef gint32 dbus_int32_t;
+typedef gboolean dbus_bool_t;
+
+typedef struct DBusConnection DBusConnection;
+typedef struct DBusError DBusError;
+typedef struct DBusMessage DBusMessage;
+typedef struct DBusMessageIter DBusMessageIter;
+typedef struct DBusPendingCall DBusPendingCall;
+
+dbus_bool_t  dbus_threads_init_default (void);
+
+typedef enum
+{
+  DBUS_BUS_SESSION,    /**< The login session bus */
+  DBUS_BUS_SYSTEM,     /**< The systemwide bus */
+  DBUS_BUS_STARTER     /**< The bus that started us, if any */
+} DbusBusType;
+
+GType dbus_connection_get_type (void);
+GType dbus_message_get_type (void);