/soc/2013/ankitkv/gobjectification: 1795d1263daf: Expose the med...

[Ankit Vani]

Changeset: 1795d1263daf02732987a2eac21be0d98dc15753
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-10-02 16:15 +0530
Branch:	 soc.2013.gobjectification
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/1795d1263daf

Description:

Expose the media manager GObject structs

diffstat:

 libpurple/mediamanager.c |  15 ---------------
 libpurple/mediamanager.h |  24 ++++++++++++++++++++++--
 2 files changed, 22 insertions(+), 17 deletions(-)

diffs (74 lines):

diff --git a/libpurple/mediamanager.c b/libpurple/mediamanager.c
--- a/libpurple/mediamanager.c
+++ b/libpurple/mediamanager.c
@@ -50,26 +50,11 @@
 #include <gst/interfaces/xoverlay.h>
 #endif
 
-/** @copydoc _PurpleMediaManagerPrivate */
-typedef struct _PurpleMediaManagerPrivate PurpleMediaManagerPrivate;
 /** @copydoc _PurpleMediaOutputWindow */
 typedef struct _PurpleMediaOutputWindow PurpleMediaOutputWindow;
 /** @copydoc _PurpleMediaManagerPrivate */
 typedef struct _PurpleMediaElementInfoPrivate PurpleMediaElementInfoPrivate;
 
-/** The media manager class. */
-struct _PurpleMediaManagerClass
-{
-	GObjectClass parent_class;       /**< The parent class. */
-};
-
-/** The media manager's data. */
-struct _PurpleMediaManager
-{
-	GObject parent;                  /**< The parent of this manager. */
-	PurpleMediaManagerPrivate *priv; /**< Private data for the manager. */
-};
-
 struct _PurpleMediaOutputWindow
 {
 	gulong id;
diff --git a/libpurple/mediamanager.h b/libpurple/mediamanager.h
--- a/libpurple/mediamanager.h
+++ b/libpurple/mediamanager.h
@@ -30,11 +30,13 @@
 #include <glib.h>
 #include <glib-object.h>
 
-/** An opaque structure representing a group of (usually all) media calls. */
+/** @copydoc _PurpleMediaManager */
 typedef struct _PurpleMediaManager PurpleMediaManager;
-/** The GObject class structure of the PurpleMediaManager object. */
+/** @copydoc _PurpleMediaManagerClass */
 typedef struct _PurpleMediaManagerClass PurpleMediaManagerClass;
 
+typedef struct _PurpleMediaManagerPrivate PurpleMediaManagerPrivate;
+
 #include "account.h"
 #include "media.h"
 
@@ -45,6 +47,24 @@ typedef struct _PurpleMediaManagerClass 
 #define PURPLE_IS_MEDIA_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), PURPLE_TYPE_MEDIA_MANAGER))
 #define PURPLE_MEDIA_MANAGER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), PURPLE_TYPE_MEDIA_MANAGER, PurpleMediaManagerClass))
 
+/** The media manager's data. */
+struct _PurpleMediaManager
+{
+	GObject parent;                  /**< The parent of this manager. */
+	PurpleMediaManagerPrivate *priv; /**< Private data for the manager. */
+};
+
+/** The media manager class. */
+struct _PurpleMediaManagerClass
+{
+	GObjectClass parent_class;       /**< The parent class. */
+
+	void (*purple_reserved1)(void);
+	void (*purple_reserved2)(void);
+	void (*purple_reserved3)(void);
+	void (*purple_reserved4)(void);
+};
+
 G_BEGIN_DECLS
 
 /**************************************************************************/