/soc/2013/ankitkv/gobjectification: 8fbb2fcdae93: Merged soc.201...
Ankit Vani
a at nevitus.org
Wed Oct 2 07:45:13 EDT 2013
Changeset: 8fbb2fcdae93bef8251a061880c86b80cc612399
Author: Ankit Vani <a at nevitus.org>
Date: 2013-10-02 16:16 +0530
Branch: soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/8fbb2fcdae93
Description:
Merged soc.2013.gobjectification branch
diffstat:
libpurple/media.h | 3 +--
libpurple/mediamanager.c | 15 ---------------
libpurple/mediamanager.h | 24 ++++++++++++++++++++++--
libpurple/sound-theme.h | 13 ++++++-------
libpurple/theme-loader.h | 14 +++++++-------
libpurple/theme.h | 12 ++++++------
6 files changed, 42 insertions(+), 39 deletions(-)
diffs (187 lines):
diff --git a/libpurple/media.h b/libpurple/media.h
--- a/libpurple/media.h
+++ b/libpurple/media.h
@@ -41,7 +41,7 @@
#define PURPLE_IS_MEDIA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), PURPLE_TYPE_MEDIA))
#define PURPLE_MEDIA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), PURPLE_TYPE_MEDIA, PurpleMediaClass))
-/** A structure representing a media call. */
+/** @copydoc _PurpleMedia */
typedef struct _PurpleMedia PurpleMedia;
#include "signals.h"
@@ -51,7 +51,6 @@ typedef struct _PurpleMedia PurpleMedia;
/** @copydoc _PurpleMediaClass */
typedef struct _PurpleMediaClass PurpleMediaClass;
-/** @copydoc _PurpleMediaPrivate */
typedef struct _PurpleMediaPrivate PurpleMediaPrivate;
/** The media instance */
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
/**************************************************************************/
diff --git a/libpurple/sound-theme.h b/libpurple/sound-theme.h
--- a/libpurple/sound-theme.h
+++ b/libpurple/sound-theme.h
@@ -31,14 +31,9 @@
#include "theme.h"
#include "sound.h"
-/**
- * extends PurpleTheme (theme.h)
- * A purple sound theme.
- * This is an object for Purple to represent a sound theme.
- *
- * PurpleSoundTheme is a PurpleTheme Object.
- */
+/** @copydoc _PurpleSoundTheme */
typedef struct _PurpleSoundTheme PurpleSoundTheme;
+/** @copydoc _PurpleSoundThemeClass */
typedef struct _PurpleSoundThemeClass PurpleSoundThemeClass;
#define PURPLE_TYPE_SOUND_THEME (purple_sound_theme_get_type())
@@ -48,6 +43,10 @@ typedef struct _PurpleSoundThemeClass
#define PURPLE_IS_SOUND_THEME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), PURPLE_TYPE_SOUND_THEME))
#define PURPLE_SOUND_THEME_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), PURPLE_TYPE_SOUND_THEME, PurpleSoundThemeClass))
+/**
+ * A purple sound theme.
+ * This is an object for Purple to represent a sound theme.
+ */
struct _PurpleSoundTheme
{
/*< private >*/
diff --git a/libpurple/theme-loader.h b/libpurple/theme-loader.h
--- a/libpurple/theme-loader.h
+++ b/libpurple/theme-loader.h
@@ -30,14 +30,9 @@
#include <glib-object.h>
#include "theme.h"
-/**
- * A purple theme loader.
- * This is an abstract class for Purple to use with the Purple theme manager.
- * The loader is responsible for building each type of theme
- *
- * PurpleThemeLoader is a GObject.
- */
+/** @copydoc _PurpleThemeLoader */
typedef struct _PurpleThemeLoader PurpleThemeLoader;
+/** @copydoc _PurpleThemeLoaderClass */
typedef struct _PurpleThemeLoaderClass PurpleThemeLoaderClass;
#define PURPLE_TYPE_THEME_LOADER (purple_theme_loader_get_type())
@@ -47,6 +42,11 @@ typedef struct _PurpleThemeLoaderClass
#define PURPLE_IS_THEME_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), PURPLE_TYPE_THEME_LOADER))
#define PURPLE_THEME_LOADER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), PURPLE_TYPE_THEME_LOADER, PurpleThemeLoaderClass))
+/**
+ * A purple theme loader.
+ * This is an abstract class for Purple to use with the Purple theme manager.
+ * The loader is responsible for building each type of theme
+ */
struct _PurpleThemeLoader
{
/*< private >*/
diff --git a/libpurple/theme.h b/libpurple/theme.h
--- a/libpurple/theme.h
+++ b/libpurple/theme.h
@@ -30,13 +30,9 @@
#include <glib-object.h>
#include "imgstore.h"
-/**
- * A purple theme.
- * This is an abstract class for Purple to use with the Purple theme manager.
- *
- * PurpleTheme is a GObject.
- */
+/** @copydoc _PurpleTheme */
typedef struct _PurpleTheme PurpleTheme;
+/** @copydoc _PurpleThemeClass */
typedef struct _PurpleThemeClass PurpleThemeClass;
#define PURPLE_TYPE_THEME (purple_theme_get_type ())
@@ -46,6 +42,10 @@ typedef struct _PurpleThemeClass Purpl
#define PURPLE_IS_THEME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PURPLE_TYPE_THEME))
#define PURPLE_THEME_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PURPLE_TYPE_THEME, PurpleThemeClass))
+/**
+ * A purple theme.
+ * This is an abstract class for Purple to use with the Purple theme manager.
+ */
struct _PurpleTheme
{
/*< private >*/
More information about the Commits
mailing list