/soc/2013/ankitkv/gobjectification: e882bcc46c2b: Added sources ...

[Ankit Vani]

Changeset: e882bcc46c2bfb15eda66b5cce65d6bb23766238
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-09-26 00:47 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/e882bcc46c2b

Description:

Added sources and dbus files for introspection

diffstat:

 finch/Makefile.am           |   4 +++-
 libpurple/Makefile.am       |  10 +++++++---
 libpurple/dbus-define-api.h |   2 ++
 pidgin/Makefile.am          |   4 +++-
 4 files changed, 15 insertions(+), 5 deletions(-)

diffs (73 lines):

diff --git a/finch/Makefile.am b/finch/Makefile.am
--- a/finch/Makefile.am
+++ b/finch/Makefile.am
@@ -105,7 +105,9 @@ INTROSPECTION_SCANNER_ARGS = --add-inclu
 INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/libpurple
 
 if HAVE_INTROSPECTION
-introspection_sources = $(finchinclude_HEADERS)
+introspection_sources = \
+	$(finchinclude_HEADERS) \
+	$(finch_SOURCES)
 
 Finch-$(PURPLE_MAJOR_VERSION).$(PURPLE_MINOR_VERSION).gir: $(builddir)/finch
 Finch_3_0_gir_INCLUDES = GObject-2.0 Purple-$(PURPLE_MAJOR_VERSION).$(PURPLE_MINOR_VERSION)
diff --git a/libpurple/Makefile.am b/libpurple/Makefile.am
--- a/libpurple/Makefile.am
+++ b/libpurple/Makefile.am
@@ -267,7 +267,7 @@ CLEANFILES += \
 # purple dbus server
 
 dbus_sources  = dbus-server.c dbus-useful.c
-dbus_headers  = dbus-bindings.h dbus-purple.h dbus-server.h dbus-useful.h dbus-define-api.h dbus-types.h
+dbus_headers  = dbus-server.h dbus-bindings.h dbus-purple.h dbus-useful.h dbus-define-api.h dbus-types.h
 
 dbus_exported = dbus-useful.h dbus-define-api.h account.h accounts.h blistnode.h \
                 blistnodetypes.h buddylist.h buddyicon.h connection.h conversation.h \
@@ -435,13 +435,17 @@ INTROSPECTION_COMPILER_ARGS =
 
 if HAVE_INTROSPECTION
 introspection_sources = \
-	$(purple_coreheaders) \
+	$(libpurpleinclude_HEADERS) \
 	$(addprefix ciphers/, $(purple_cipherheaders)) \
 	$(addprefix media/, $(purple_mediaheaders)) \
-	$(purple_builtheaders)
+	$(libpurple_la_SOURCES)
 
 Purple-$(PURPLE_MAJOR_VERSION).$(PURPLE_MINOR_VERSION).gir: $(builddir)/libpurple.la
 Purple_3_0_gir_INCLUDES = GObject-2.0
+if ENABLE_DBUS
+Purple_3_0_gir_INCLUDES += DBus-1.0 DBusGLib-1.0
+endif
+
 Purple_3_0_gir_CFLAGS = $(INCLUDES) $(AM_CPPFLAGS)
 Purple_3_0_gir_LIBS = $(builddir)/libpurple.la
 Purple_3_0_gir_FILES = $(introspection_sources)
diff --git a/libpurple/dbus-define-api.h b/libpurple/dbus-define-api.h
--- a/libpurple/dbus-define-api.h
+++ b/libpurple/dbus-define-api.h
@@ -1,3 +1,4 @@
+#ifndef __GI_SCANNER__ /* hide this file from g-ir-scanner */
 #error "This is file is not a valid C code"
 
 /* This file contains some of the macros from other header files as
@@ -12,3 +13,4 @@ gboolean PURPLE_BUDDY_IS_ONLINE(PurpleBu
 gboolean PURPLE_CONNECTION_IS_CONNECTED(PurpleConnection *connection);
 gboolean PURPLE_CONNECTION_IS_VALID(PurpleConnection *connection);
 
+#endif /* __GI_SCANNER__ */
diff --git a/pidgin/Makefile.am b/pidgin/Makefile.am
--- a/pidgin/Makefile.am
+++ b/pidgin/Makefile.am
@@ -220,7 +220,9 @@ INTROSPECTION_SCANNER_ARGS = --add-inclu
 INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/libpurple
 
 if HAVE_INTROSPECTION
-introspection_sources = $(pidgininclude_HEADERS)
+introspection_sources = \
+	$(pidgininclude_HEADERS) \
+	$(pidgin_SOURCES)
 
 Pidgin-$(PURPLE_MAJOR_VERSION).$(PURPLE_MINOR_VERSION).gir: $(builddir)/pidgin
 Pidgin_3_0_gir_INCLUDES = GObject-2.0 Gtk-$(GTK_VERSION).0 Purple-$(PURPLE_MAJOR_VERSION).$(PURPLE_MINOR_VERSION)