soc.2010.detachablepurple: 5631a484: Moved the dbus transfered data defines, ...

[gillux at soc.pidgin.im]

----------------------------------------------------------------------
Revision: 5631a4845c119dde06fe7cc27275587621906cd5
Parent:   feba32b43a23e1471962ce0033873a65fa180a12
Author:   gillux at soc.pidgin.im
Date:     08/11/10 20:28:30
Branch:   im.pidgin.soc.2010.detachablepurple
URL: http://d.pidgin.im/viewmtn/revision/info/5631a4845c119dde06fe7cc27275587621906cd5

Changelog: 

Moved the dbus transfered data defines, this has nothing to do in a .h.

Changes against parent feba32b43a23e1471962ce0033873a65fa180a12

  patched  libpurple/dbus/constructor.c
  patched  libpurple/dbus/constructor.h

-------------- next part --------------
============================================================
--- libpurple/dbus/constructor.c	6babbab3c176b88f0f992f8f9a1f0af5150f48b9
+++ libpurple/dbus/constructor.c	8def14e5a6bd609bad29b83bb0b262b3d46c5b6f
@@ -60,6 +60,23 @@ G_DEFINE_TYPE(PurpleConstructor, purple_
 
 G_DEFINE_TYPE(PurpleConstructor, purple_constructor, PURPLE_TYPE_OBJECT)
 
+/* DBus transfered data formats */
+#define DBUS_STRUCT_PROPERTY \
+( \
+	dbus_g_type_get_struct("GValueArray", \
+		G_TYPE_STRING, G_TYPE_VALUE, G_TYPE_INVALID) \
+)
+#define DBUS_COLLECTION_PROPS \
+( \
+	dbus_g_type_get_collection("GPtrArray", \
+		DBUS_STRUCT_PROPERTY) \
+)
+#define DBUS_STRUCT_ACCOUNT \
+( \
+	dbus_g_type_get_struct("GValueArray", \
+		G_TYPE_STRING, DBUS_COLLECTION_PROPS, G_TYPE_INVALID) \
+)
+
 /**
  * Callback called when we receive a dbus "PurpleConnectionCreated" signal.
  */
============================================================
--- libpurple/dbus/constructor.h	6aa24788db64d1c82059b477adfd1bacd894e682
+++ libpurple/dbus/constructor.h	d58cfee1624947caa643b1f4436ca0c58996101b
@@ -40,24 +40,6 @@ typedef struct {
 	PurpleConstructor* instance;
 } PurpleConstructorClass;
 
-/* DBus transfered data formats */
-
-#define DBUS_STRUCT_PROPERTY \
-( \
-	dbus_g_type_get_struct("GValueArray", \
-		G_TYPE_STRING, G_TYPE_VALUE, G_TYPE_INVALID) \
-)
-#define DBUS_COLLECTION_PROPS \
-( \
-	dbus_g_type_get_collection("GPtrArray", \
-		DBUS_STRUCT_PROPERTY) \
-)
-#define DBUS_STRUCT_ACCOUNT \
-( \
-	dbus_g_type_get_struct("GValueArray", \
-		G_TYPE_STRING, DBUS_COLLECTION_PROPS, G_TYPE_INVALID) \
-)
-
 G_BEGIN_DECLS
 
 /**