soc.2010.detachablepurple: 457bf54b: Now some dbus types are used in pobject....

gillux at soc.pidgin.im gillux at soc.pidgin.im
Wed Jul 28 13:45:59 EDT 2010


----------------------------------------------------------------------
Revision: 457bf54be301a87ba25fb03725a7ad70230d04af
Parent:   66fc48248d433b4d06ca26926b96e998fbb29922
Author:   gillux at soc.pidgin.im
Date:     07/28/10 12:20:32
Branch:   im.pidgin.soc.2010.detachablepurple
URL: http://d.pidgin.im/viewmtn/revision/info/457bf54be301a87ba25fb03725a7ad70230d04af

Changelog: 

Now some dbus types are used in pobject.h, since this file gets included by the
inclusion of internal.h, we need to add the DBUS_CFLAGS in every prpl. Do so.

Changes against parent 66fc48248d433b4d06ca26926b96e998fbb29922

  patched  libpurple/protocols/bonjour/Makefile.am
  patched  libpurple/protocols/gg/Makefile.am
  patched  libpurple/protocols/irc/Makefile.am
  patched  libpurple/protocols/jabber/Makefile.am
  patched  libpurple/protocols/msn/Makefile.am
  patched  libpurple/protocols/mxit/Makefile.am
  patched  libpurple/protocols/myspace/Makefile.am
  patched  libpurple/protocols/novell/Makefile.am
  patched  libpurple/protocols/null/Makefile.am
  patched  libpurple/protocols/oscar/Makefile.am
  patched  libpurple/protocols/qq/Makefile.am
  patched  libpurple/protocols/sametime/Makefile.am
  patched  libpurple/protocols/silc/Makefile.am
  patched  libpurple/protocols/silc10/Makefile.am
  patched  libpurple/protocols/simple/Makefile.am
  patched  libpurple/protocols/yahoo/Makefile.am
  patched  libpurple/protocols/zephyr/Makefile.am

-------------- next part --------------
============================================================
--- libpurple/protocols/irc/Makefile.am	46e38d6c53d483126f20fed27c5f092c164d2987
+++ libpurple/protocols/irc/Makefile.am	6bf8846c9fe8d6226293b9ce62e5d643c3297be3
@@ -35,4 +35,5 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
 	$(GLIB_CFLAGS) \
-	$(DEBUG_CFLAGS)
+	$(DEBUG_CFLAGS) \
+	$(DBUS_CFLAGS)
============================================================
--- libpurple/protocols/jabber/Makefile.am	e8fd2a79ca1e64d01ae20a8d79eaba17ef9ca3ad
+++ libpurple/protocols/jabber/Makefile.am	451b0b4122ec6748d3c7d6466dd5c007c1ab747c
@@ -110,5 +110,6 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/libpurple \
 	$(DEBUG_CFLAGS) \
 	$(GLIB_CFLAGS) \
+	$(DBUS_CFLAGS) \
 	$(IDN_CFLAGS) \
 	$(LIBXML_CFLAGS)
============================================================
--- libpurple/protocols/msn/Makefile.am	e7c9f92d4df55c26c8822cffe3330821ce67221d
+++ libpurple/protocols/msn/Makefile.am	c5268b658fa9b954e58130ea8eae01b61a694ff6
@@ -93,4 +93,5 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
 	$(GLIB_CFLAGS) \
+	$(DBUS_CFLAGS) \
 	$(DEBUG_CFLAGS)
============================================================
--- libpurple/protocols/oscar/Makefile.am	13d5f82e41548cece082032e12046b9b3c01968e
+++ libpurple/protocols/oscar/Makefile.am	979547a34765261c8719a962683440900847bcb0
@@ -76,4 +76,5 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
 	$(GLIB_CFLAGS) \
+	$(DBUS_CFLAGS) \
 	$(DEBUG_CFLAGS)
============================================================
--- libpurple/protocols/yahoo/Makefile.am	e9d9993f55ec5505a065b7892b98df4be11a6288
+++ libpurple/protocols/yahoo/Makefile.am	dbeb20bced581faab0119686004322e947757acd
@@ -57,4 +57,5 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
 	$(GLIB_CFLAGS) \
+	$(DBUS_CFLAGS) \
 	$(DEBUG_CFLAGS)
============================================================
--- libpurple/protocols/zephyr/Makefile.am	85a1cab4ed6adeefb04eac2858bf3feaff409f7e
+++ libpurple/protocols/zephyr/Makefile.am	be2bc9fee06e1308b393fdbefe2ba1063ec70591
@@ -105,5 +105,6 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple/protocols \
 	-DCONFDIR=\"$(sysconfdir)\" \
 	$(GLIB_CFLAGS) \
+	$(DBUS_CFLAGS) \
 	$(KRB4_CFLAGS) \
 	$(DEBUG_CFLAGS)
============================================================
--- libpurple/protocols/gg/Makefile.am	d2a5d647a208288b647f82a6af11ddc8bd8d43d4
+++ libpurple/protocols/gg/Makefile.am	083b0b4b5d2750a74e5131d2dee4ae59f72c27f5
@@ -83,5 +83,6 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/libpurple \
 	$(INTGG_CFLAGS) \
 	$(GLIB_CFLAGS) \
+	$(DBUS_CFLAGS) \
 	$(DEBUG_CFLAGS)
 
============================================================
--- libpurple/protocols/novell/Makefile.am	2b78f14e51a7a16863761efc9475a7659ab1fb61
+++ libpurple/protocols/novell/Makefile.am	8bb62789cd60e2c6a19c7ad0e7403f24352c08ab
@@ -50,4 +50,5 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
 	$(DEBUG_CFLAGS) \
+	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS)
============================================================
--- libpurple/protocols/silc/Makefile.am	9027e8798472f9337fe234981756294b425864ea
+++ libpurple/protocols/silc/Makefile.am	992885cf0fb62f481c79bd52a97dc039dd380463
@@ -43,4 +43,5 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/libpurple \
 	$(DEBUG_CFLAGS) \
 	$(GLIB_CFLAGS) \
+	$(DBUS_CFLAGS) \
 	$(SILC_CFLAGS)
============================================================
--- libpurple/protocols/sametime/Makefile.am	4a7ac04622d68956e3c7f4843beae612690a9a43
+++ libpurple/protocols/sametime/Makefile.am	f22418a3349d2b5a1b00a71da393e10a3ea30192
@@ -32,6 +32,7 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/libpurple \
 	$(DEBUG_CFLAGS) \
 	$(GLIB_CFLAGS) \
+	$(DBUS_CFLAGS) \
 	$(MEANWHILE_CFLAGS) \
 	-DG_LOG_DOMAIN=\"sametime\"
 
============================================================
--- libpurple/protocols/simple/Makefile.am	59aa6ea7de482d5fcb89533ab91d9bc94028fb39
+++ libpurple/protocols/simple/Makefile.am	699c9fdad608a8ef5d8344c05585cb177fb8dfc0
@@ -33,4 +33,5 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
 	$(GLIB_CFLAGS) \
+	$(DBUS_CFLAGS) \
 	$(DEBUG_CFLAGS)
============================================================
--- libpurple/protocols/bonjour/Makefile.am	474b55b41a9f7bb6c7644bce36f59ffbb05565f6
+++ libpurple/protocols/bonjour/Makefile.am	638b0acd9a82e3e2481dd84e5a28de0a26f57ae7
@@ -48,6 +48,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
 	$(GLIB_CFLAGS) \
+	$(DBUS_CFLAGS) \
 	$(DEBUG_CFLAGS) \
 	$(LIBXML_CFLAGS) \
-	$(AVAHI_CFLAGS)
\ No newline at end of file
+	$(AVAHI_CFLAGS)
============================================================
--- libpurple/protocols/qq/Makefile.am	42487997e120bb298af3c7e0279f323e23daf5c7
+++ libpurple/protocols/qq/Makefile.am	fc6ddecda6859f272548c4fad22dd499107a7916
@@ -87,4 +87,5 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/libpurple \
 	-DQQ_BUDDY_ICON_DIR=\"$(datadir)/pixmaps/purple/buddy_icons/qq\" \
 	$(DEBUG_CFLAGS) \
-	$(GLIB_CFLAGS)
+	$(GLIB_CFLAGS) \
+	$(DBUS_CFLAGS)
============================================================
--- libpurple/protocols/myspace/Makefile.am	42fb944cd11587c6fd12ce66b648ea6c0cd247bc
+++ libpurple/protocols/myspace/Makefile.am	865e1b2a55b43195462105d34e85715c45a8033f
@@ -41,4 +41,5 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
 	$(GLIB_CFLAGS) \
+	$(DBUS_CFLAGS) \
 	$(DEBUG_CFLAGS)
============================================================
--- libpurple/protocols/null/Makefile.am	d2765f08974fc534d8a5e243d26e9209f0011bff
+++ libpurple/protocols/null/Makefile.am	635ffa0f1f33e59fe3fa40af2ecec0890a2dd66d
@@ -20,4 +20,5 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
 	$(GLIB_CFLAGS) \
+	$(DBUS_CFLAGS) \
 	$(DEBUG_CFLAGS)
============================================================
--- libpurple/protocols/silc10/Makefile.am	62d8f3edb8604438593e88835e3771e2216e4494
+++ libpurple/protocols/silc10/Makefile.am	e475efd38c9d105e2088b9d3a7913c71a70e3b96
@@ -33,4 +33,5 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/libpurple \
 	$(DEBUG_CFLAGS) \
 	$(GLIB_CFLAGS) \
+	$(DBUS_CFLAGS) \
 	$(SILC_CFLAGS)
============================================================
--- libpurple/protocols/mxit/Makefile.am	d5d7c82e5a7155e4171ccdbbca419160dd88b536
+++ libpurple/protocols/mxit/Makefile.am	0f876061a61a49e10649355f367f7d3130b22d54
@@ -60,4 +60,5 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
 	$(GLIB_CFLAGS) \
+	$(DBUS_CFLAGS) \
 	$(DEBUG_CFLAGS)


More information about the Commits mailing list