soc.2010.detachablepurple: e83dd268: Massive cleanup. Moved all the detachabl...
gillux at soc.pidgin.im
gillux at soc.pidgin.im
Thu Aug 5 22:20:29 EDT 2010
----------------------------------------------------------------------
Revision: e83dd268f180ec4c05aa313ce8db03da528814ad
Parent: 62ec68c42ce9e3256e5ae62609a64f2873918623
Author: gillux at soc.pidgin.im
Date: 08/05/10 22:13:04
Branch: im.pidgin.soc.2010.detachablepurple
URL: http://d.pidgin.im/viewmtn/revision/info/e83dd268f180ec4c05aa313ce8db03da528814ad
Changelog:
Massive cleanup. Moved all the detachable session dbus code to a dbus/
subdirectory. The old dbus system currently remains in libpurple/.
The new option in configure.ac changes the object target names:
* old beheaviour: libpurple/foo/bar.c generates libpurple/bar.lo
* new beheaviour: libpurple/foo/bar.c generates libpurple/foo/bar.lo
This is needed for account.c and others files.
Changes against parent 62ec68c42ce9e3256e5ae62609a64f2873918623
renamed libpurple/account-dbus.c
to libpurple/dbus/account.c
renamed libpurple/account-dbus.h
to libpurple/dbus/account.h
renamed libpurple/connection-dbus.c
to libpurple/dbus/connection.c
renamed libpurple/connection-dbus.h
to libpurple/dbus/connection.h
renamed libpurple/dbus-callback.c
to libpurple/dbus/callback.c
renamed libpurple/dbus-callback.h
to libpurple/dbus/callback.h
renamed libpurple/dbus-constructor.c
to libpurple/dbus/constructor.c
renamed libpurple/dbus-constructor.h
to libpurple/dbus/constructor.h
renamed libpurple/dbus-prototypes/account.xml
to libpurple/dbus/account.xml
renamed libpurple/dbus-prototypes/callback.xml
to libpurple/dbus/callback.xml
renamed libpurple/dbus-prototypes/connection.xml
to libpurple/dbus/connection.xml
renamed libpurple/dbus-prototypes/constructor.xml
to libpurple/dbus/constructor.xml
added libpurple/dbus
patched configure.ac
patched libpurple/Makefile.am
patched libpurple/account.c
patched libpurple/accountlist.c
patched libpurple/connection.c
patched libpurple/dbus/account.c
patched libpurple/dbus/callback.c
patched libpurple/dbus/connection.c
patched libpurple/dbus/constructor.c
patched libpurple/dbus-server.c
-------------- next part --------------
============================================================
--- configure.ac 0e9ab71f0f49834359df169b10863292cd7bbee8
+++ configure.ac 5c6fb29aa455dabfad49ada001c8a16627d9fbc2
@@ -74,7 +74,7 @@ AC_CONFIG_HEADERS([config.h])
AC_CANONICAL_HOST
AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE([1.9 -Wno-portability dist-bzip2])
+AM_INIT_AUTOMAKE([1.9 -Wno-portability dist-bzip2 subdir-objects])
dnl TODO: Always use AM_SILENT_RULES when we depend on automake >= 1.11
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
============================================================
--- libpurple/account.c 942ba7c43bdf89f59b7fe6ba8a6e2da2c1c8da54
+++ libpurple/account.c f2d17ca0c70ea5975e90d26ed7d73cc9157eccad
@@ -25,11 +25,11 @@
*/
#include "internal.h"
#include "account.h"
-#include "account-dbus.h"
+#include "dbus/account.h"
#include "accountlist.h"
#include "core.h"
#include "dbus-maybe.h"
-#include "dbus-callback.h"
+#include "dbus/callback.h"
#include "debug.h"
#include "marshallers.h"
#include "network.h"
============================================================
--- libpurple/connection.c dce434b27fa0933ca26d4a603565f5c21ffa5db5
+++ libpurple/connection.c a04add0a450a963744907755b5d6dca1eff0ce52
@@ -29,7 +29,7 @@
#include "account.h"
#include "blist.h"
#include "connection.h"
-#include "connection-dbus.h"
+#include "dbus/connection.h"
#include "dbus-maybe.h"
#include "debug.h"
#include "log.h"
============================================================
--- libpurple/dbus-server.c 8e420a9796afd2a677344942f50c6b4a764312b6
+++ libpurple/dbus-server.c 10f2def749c56e3d6aaaec6fe29fdf8264556d69
@@ -40,8 +40,8 @@
#include "accountlist.h"
#include "blist.h"
#include "conversation.h"
-#include "dbus-callback.h"
-#include "dbus-constructor.h"
+#include "dbus/callback.h"
+#include "dbus/constructor.h"
#include "dbus-purple.h"
#include "dbus-server.h"
#include "dbus-useful.h"
============================================================
--- libpurple/Makefile.am d2add1d1dd5d96a1a5e75d2ecdefe5b1305ae13f
+++ libpurple/Makefile.am 34c66c44ec65b6b9f0119e20916fcd536d411305
@@ -207,10 +207,10 @@ purple_builtheaders = \
purple_builtheaders = \
purple.h version.h marshallers.h \
- dbus-account-server.h dbus-account-client.h \
- dbus-connection-server.h dbus-connection-client.h \
- dbus-constructor-server.h dbus-constructor-client.h \
- dbus-callback-server.h dbus-callback-client.h
+ dbus/account-server.h dbus/account-client.h \
+ dbus/connection-server.h dbus/connection-client.h \
+ dbus/constructor-server.h dbus/constructor-client.h \
+ dbus/callback-server.h dbus/callback-client.h
marshallers.h: marshallers.list
$(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=purple_smarshal $(srcdir)/marshallers.list --header > marshallers.h
@@ -221,28 +221,28 @@ if ENABLE_DBUS
if ENABLE_DBUS
-dbus-constructor-server.h: dbus-prototypes/constructor.xml
+dbus/constructor-server.h: dbus/constructor.xml
$(AM_V_GEN)dbus-binding-tool --prefix=DBUS_purple_constructor --mode=glib-server --output=$@ $<
-dbus-constructor-client.h: dbus-prototypes/constructor.xml
+dbus/constructor-client.h: dbus/constructor.xml
$(AM_V_GEN)dbus-binding-tool --prefix=DBUS_purple_constructor --mode=glib-client --output=$@ $<
-dbus-callback-server.h: dbus-prototypes/callback.xml
+dbus/callback-server.h: dbus/callback.xml
$(AM_V_GEN)dbus-binding-tool --prefix=DBUS_purple_callback --mode=glib-server --output=$@ $<
-dbus-callback-client.h: dbus-prototypes/callback.xml
+dbus/callback-client.h: dbus/callback.xml
$(AM_V_GEN)dbus-binding-tool --prefix=DBUS_purple_callback --mode=glib-client --output=$@ $<
-dbus-account-server.h: dbus-prototypes/account.xml
+dbus/account-server.h: dbus/account.xml
$(AM_V_GEN)dbus-binding-tool --prefix=DBUS_purple_account --mode=glib-server --output=$@ $<
-dbus-account-client.h: dbus-prototypes/account.xml
+dbus/account-client.h: dbus/account.xml
$(AM_V_GEN)dbus-binding-tool --prefix=DBUS_purple_account --mode=glib-client --output=$@ $<
-dbus-connection-server.h: dbus-prototypes/connection.xml
+dbus/connection-server.h: dbus/connection.xml
$(AM_V_GEN)dbus-binding-tool --prefix=DBUS_purple_connection --mode=glib-server --output=$@ $<
-dbus-connection-client.h: dbus-prototypes/connection.xml
+dbus/connection-client.h: dbus/connection.xml
$(AM_V_GEN)dbus-binding-tool --prefix=DBUS_purple_connection --mode=glib-client --output=$@ $<
CLEANFILES = \
@@ -261,9 +261,9 @@ dbus_sources = dbus-server.c dbus-usefu
# purple dbus server
dbus_sources = dbus-server.c dbus-useful.c \
- dbus-constructor.c dbus-callback.c account-dbus.c connection-dbus.c
+ dbus/constructor.c dbus/callback.c dbus/account.c dbus/connection.c
dbus_headers = dbus-bindings.h dbus-purple.h dbus-server.h dbus-useful.h dbus-define-api.h dbus-types.h \
- dbus-constructor.h dbus-callback.h account-dbus.h connection-dbus.h
+ dbus/constructor.h dbus/callback.h dbus/account.h dbus/connection.h
dbus_exported = dbus-useful.h dbus-define-api.h account.h accountlist.h blist.h buddyicon.h \
connection.h conversation.h core.h ft.h log.h notify.h prefs.h roomlist.h \
============================================================
--- libpurple/accountlist.c e76447796cc3ab318cb53df9b79efba0d8cbd798
+++ libpurple/accountlist.c f4c3ce09b56c4c2d2e1378ea4da4a9786ad9c5ff
@@ -24,7 +24,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
#include "internal.h"
-#include "dbus-constructor.h"
+#include "dbus/constructor.h"
#include "purple.h"
#include "gsignal.h"
#include "marshallers.h"
============================================================
--- libpurple/account-dbus.c c592e33adbac1487a85d8f051158e3741ce8fd11
+++ libpurple/dbus/account.c a3847feb1678c8f359236997e757ef5b4b58bee2
@@ -1,11 +1,11 @@
#include "internal.h"
#include "account.h"
-#include "account-dbus.h"
-#include "dbus-account-client.h"
-#include "dbus-account-server.h"
-#include "dbus-callback.h"
-#include "dbus-constructor-client.h"
+#include "dbus/account.h"
+#include "dbus/account-client.h"
+#include "dbus/account-server.h"
+#include "dbus/callback.h"
+#include "dbus/constructor-client.h"
#include "dbus-maybe.h"
#include "marshallers.h"
#include "nullmarshaller.h"
============================================================
--- libpurple/dbus-constructor.c 847e1cc1755342e8102f910166b3b0dfb2b6f6de
+++ libpurple/dbus/constructor.c 34190cc7e90de964a43559ba12b5af26eb3b07c1
@@ -28,9 +28,9 @@
#include "account.h"
#include "accountlist.h"
#include "connection.h"
-#include "dbus-constructor.h"
-#include "dbus-constructor-client.h"
-#include "dbus-constructor-server.h"
+#include "dbus/constructor.h"
+#include "dbus/constructor-client.h"
+#include "dbus/constructor-server.h"
#include "dbus-maybe.h"
#include "debug.h"
#include "marshallers.h"
============================================================
--- libpurple/dbus-callback.c 6f66005a71c2a9cc8f5225eeab40cedee8233846
+++ libpurple/dbus/callback.c 90e4b24b5e62b23d97180306b2020447a6180b3c
@@ -23,9 +23,9 @@
#include "internal.h"
#include "core.h"
-#include "dbus-callback.h"
-#include "dbus-callback-server.h"
-#include "dbus-callback-client.h"
+#include "dbus/callback.h"
+#include "dbus/callback-server.h"
+#include "dbus/callback-client.h"
#include "dbus-maybe.h"
#include "dbus-purple.h"
#include "dbus-server.h"
============================================================
--- libpurple/connection-dbus.c 2122ae75074adf1cda35c9b404cbf869d85cfdaa
+++ libpurple/dbus/connection.c 8c5d4d3f8923307a5be2b4c243c7833085f0a628
@@ -20,11 +20,11 @@
*/
#include "internal.h"
-#include "connection-dbus.h"
#include "core.h"
-#include "dbus-connection-client.h"
-#include "dbus-connection-server.h"
-#include "dbus-constructor.h"
+#include "dbus/connection.h"
+#include "dbus/connection-client.h"
+#include "dbus/connection-server.h"
+#include "dbus/constructor.h"
#include "dbus-server.h"
#include "dbus-purple.h"
#include "pobject.h"
More information about the Commits
mailing list