/soc/2013/ankitkv/gobjectification: 3865997e388b: Merged soc.201...
Ankit Vani
a at nevitus.org
Sat Oct 12 14:42:42 EDT 2013
Changeset: 3865997e388be0182bc1d472ca3b0d71a4830371
Author: Ankit Vani <a at nevitus.org>
Date: 2013-10-12 23:32 +0530
Branch: soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/3865997e388b
Description:
Merged soc.2013.gobjectification branch
diffstat:
finch/gntblist.c | 2 +-
finch/gntblist.h | 2 ++
finch/gntplugin.h | 3 +--
finch/libfinch.c | 2 ++
finch/libgnt/gntprogressbar.c | 2 +-
finch/libgnt/gntprogressbar.h | 4 ++--
libpurple/account.h | 3 +--
libpurple/accounts.h | 1 +
libpurple/blistnode.h | 15 +++++++--------
libpurple/blistnodetypes.h | 8 ++++----
libpurple/buddylist.h | 13 ++++++++-----
libpurple/certificate.h | 3 +++
libpurple/cipher.h | 3 +--
libpurple/ciphers/aescipher.h | 3 +--
libpurple/ciphers/des3cipher.h | 3 +--
libpurple/ciphers/descipher.h | 3 +--
libpurple/ciphers/hmaccipher.h | 3 +--
libpurple/ciphers/md4hash.h | 3 +--
libpurple/ciphers/md5hash.h | 3 +--
libpurple/ciphers/pbkdf2cipher.h | 3 +--
libpurple/ciphers/rc4cipher.h | 3 +--
libpurple/ciphers/sha1hash.h | 3 +--
libpurple/ciphers/sha256hash.h | 3 +--
libpurple/connection.h | 4 ++--
libpurple/conversation.h | 4 ++--
libpurple/conversationtypes.h | 9 +++------
libpurple/core.h | 2 ++
libpurple/debug.h | 1 +
libpurple/dnsquery.h | 1 +
libpurple/dnssrv.h | 1 +
libpurple/eventloop.h | 2 ++
libpurple/hash.h | 3 +--
libpurple/idle.h | 1 +
libpurple/log.h | 1 +
libpurple/media.h | 3 +++
libpurple/mediamanager.h | 3 +++
libpurple/notify.h | 1 +
libpurple/plugins.h | 5 +----
libpurple/plugins/ssl/ssl-gnutls.c | 1 +
libpurple/plugins/ssl/ssl-nss.c | 1 +
libpurple/presence.h | 9 +++------
libpurple/protocol.h | 4 ++--
libpurple/request.h | 1 +
libpurple/roomlist.h | 4 ++--
libpurple/sound-theme-loader.h | 3 +--
libpurple/sound.h | 1 +
libpurple/sslconn.h | 2 ++
libpurple/status.h | 3 +--
libpurple/theme-loader.h | 3 +--
libpurple/theme-manager.h | 3 +--
libpurple/theme.h | 3 +--
libpurple/whiteboard.h | 5 +++--
libpurple/xfer.h | 3 +--
pidgin/gtkblist.c | 2 +-
pidgin/gtkeventloop.c | 1 +
pidgin/gtkplugin.h | 3 +--
pidgin/gtkscrollbook.h | 4 ++--
pidgin/gtkstatusbox.h | 2 +-
pidgin/libpidgin.c | 1 +
pidgin/minidialog.h | 2 ++
60 files changed, 100 insertions(+), 93 deletions(-)
diffs (truncated from 1269 to 300 lines):
diff --git a/finch/gntblist.c b/finch/gntblist.c
--- a/finch/gntblist.c
+++ b/finch/gntblist.c
@@ -858,7 +858,7 @@ static PurpleBlistUiOps blist_ui_ops =
NULL,
NULL,
NULL,
- NULL
+ NULL, NULL, NULL, NULL
};
static gpointer
diff --git a/finch/gntblist.h b/finch/gntblist.h
--- a/finch/gntblist.h
+++ b/finch/gntblist.h
@@ -47,6 +47,8 @@ typedef struct
gboolean (*can_add_node)(PurpleBlistNode *node); /**< Whether a node should be added to the view. */
gpointer (*find_parent)(PurpleBlistNode *node); /**< Find the parent row for a node. */
gboolean (*create_tooltip)(gpointer selected_row, GString **body, char **title); /**< Create tooltip for a selected row. */
+
+ /*< private >*/
gpointer reserved[4];
} FinchBlistManager;
diff --git a/finch/gntplugin.h b/finch/gntplugin.h
--- a/finch/gntplugin.h
+++ b/finch/gntplugin.h
@@ -53,7 +53,6 @@ typedef GntWidget* (*FinchPluginFrame) (
* Extends #PurplePluginInfo to hold UI information for finch.
*/
struct _FinchPluginInfo {
- /*< private >*/
PurplePluginInfo parent;
};
@@ -63,9 +62,9 @@ struct _FinchPluginInfo {
* The base class for all #FinchPluginInfo's.
*/
struct _FinchPluginInfoClass {
- /*< private >*/
PurplePluginInfoClass parent_class;
+ /*< private >*/
void (*_gnt_reserved1)(void);
void (*_gnt_reserved2)(void);
void (*_gnt_reserved3)(void);
diff --git a/finch/libfinch.c b/finch/libfinch.c
--- a/finch/libfinch.c
+++ b/finch/libfinch.c
@@ -128,6 +128,7 @@ static PurpleCoreUiOps core_ops =
/* padding */
NULL,
NULL,
+ NULL,
NULL
};
@@ -224,6 +225,7 @@ static PurpleEventLoopUiOps eventloop_op
/* padding */
NULL,
NULL,
+ NULL,
NULL
};
diff --git a/finch/libgnt/gntprogressbar.c b/finch/libgnt/gntprogressbar.c
--- a/finch/libgnt/gntprogressbar.c
+++ b/finch/libgnt/gntprogressbar.c
@@ -143,7 +143,7 @@ gnt_progress_bar_init (GTypeInstance *in
}
GType
-gnt_progress_bar_get_type (void)
+gnt_progress_bar_get_gtype (void)
{
static GType type = 0;
diff --git a/finch/libgnt/gntprogressbar.h b/finch/libgnt/gntprogressbar.h
--- a/finch/libgnt/gntprogressbar.h
+++ b/finch/libgnt/gntprogressbar.h
@@ -30,7 +30,7 @@
#include "gnt.h"
#include "gntwidget.h"
-#define GNT_TYPE_PROGRESS_BAR (gnt_progress_bar_get_type ())
+#define GNT_TYPE_PROGRESS_BAR (gnt_progress_bar_get_gtype ())
#define GNT_PROGRESS_BAR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GNT_TYPE_PROGRESS_BAR, GntProgressBar))
#define GNT_PROGRESS_BAR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GNT_TYPE_PROGRESS_BAR, GntProgressBarClass))
#define GNT_IS_PROGRESS_BAR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNT_TYPE_PROGRESS_BAR))
@@ -64,7 +64,7 @@ G_BEGIN_DECLS
* @return The GType for GntProrgressBar
**/
GType
-gnt_progress_bar_get_type (void);
+gnt_progress_bar_get_gtype (void);
/**
* Create a new GntProgressBar
diff --git a/libpurple/account.h b/libpurple/account.h
--- a/libpurple/account.h
+++ b/libpurple/account.h
@@ -94,7 +94,6 @@ typedef enum
*/
struct _PurpleAccount
{
- /*< private >*/
GObject gparent;
/** The UI data associated with this account. This is a convenience
@@ -109,9 +108,9 @@ struct _PurpleAccount
* The base class for all #PurpleAccount's.
*/
struct _PurpleAccountClass {
- /*< private >*/
GObjectClass parent_class;
+ /*< private >*/
void (*_purple_reserved1)(void);
void (*_purple_reserved2)(void);
void (*_purple_reserved3)(void);
diff --git a/libpurple/accounts.h b/libpurple/accounts.h
--- a/libpurple/accounts.h
+++ b/libpurple/accounts.h
@@ -84,6 +84,7 @@ struct _PurpleAccountUiOps
void (*deny_added)(PurpleAccount *account, const char *name);
void (*deny_removed)(PurpleAccount *account, const char *name);
+ /*< private >*/
void (*_purple_reserved1)(void);
void (*_purple_reserved2)(void);
void (*_purple_reserved3)(void);
diff --git a/libpurple/blistnode.h b/libpurple/blistnode.h
--- a/libpurple/blistnode.h
+++ b/libpurple/blistnode.h
@@ -61,25 +61,24 @@ typedef struct _PurpleCountingNodeClass
* This is a base class for PurpleBuddy, PurpleContact, PurpleGroup, and for
* anything else that wants to put itself in the buddy list. */
struct _PurpleBlistNode {
- /*< private >*/
GObject gparent;
+ PurpleBlistNode *prev; /**< The sibling before this buddy. */
+ PurpleBlistNode *next; /**< The sibling after this buddy. */
+ PurpleBlistNode *parent; /**< The parent of this node */
+ PurpleBlistNode *child; /**< The child of this node */
+
/** The UI data associated with this node. This is a convenience
* field provided to the UIs -- it is not used by the libpurple core.
*/
gpointer ui_data;
-
- PurpleBlistNode *prev; /**< The sibling before this buddy. */
- PurpleBlistNode *next; /**< The sibling after this buddy. */
- PurpleBlistNode *parent; /**< The parent of this node */
- PurpleBlistNode *child; /**< The child of this node */
};
/** The base class for all #PurpleBlistNode's. */
struct _PurpleBlistNodeClass {
- /*< private >*/
GObjectClass gparent_class;
+ /*< private >*/
void (*_purple_reserved1)(void);
void (*_purple_reserved2)(void);
void (*_purple_reserved3)(void);
@@ -105,9 +104,9 @@ struct _PurpleCountingNode {
/** The base class for all #PurpleCountingNode's. */
struct _PurpleCountingNodeClass {
- /*< private >*/
PurpleBlistNodeClass node_class;
+ /*< private >*/
void (*_purple_reserved1)(void);
void (*_purple_reserved2)(void);
void (*_purple_reserved3)(void);
diff --git a/libpurple/blistnodetypes.h b/libpurple/blistnodetypes.h
--- a/libpurple/blistnodetypes.h
+++ b/libpurple/blistnodetypes.h
@@ -103,9 +103,9 @@ struct _PurpleBuddy {
/** The base class for all #PurpleBuddy's. */
struct _PurpleBuddyClass {
- /*< private >*/
PurpleBlistNodeClass node_class;
+ /*< private >*/
void (*_purple_reserved1)(void);
void (*_purple_reserved2)(void);
void (*_purple_reserved3)(void);
@@ -125,9 +125,9 @@ struct _PurpleContact {
/** The base class for all #PurpleContact's. */
struct _PurpleContactClass {
- /*< private >*/
PurpleCountingNodeClass counting_class;
+ /*< private >*/
void (*_purple_reserved1)(void);
void (*_purple_reserved2)(void);
void (*_purple_reserved3)(void);
@@ -147,9 +147,9 @@ struct _PurpleGroup {
/** The base class for all #PurpleGroup's. */
struct _PurpleGroupClass {
- /*< private >*/
PurpleCountingNodeClass counting_class;
+ /*< private >*/
void (*_purple_reserved1)(void);
void (*_purple_reserved2)(void);
void (*_purple_reserved3)(void);
@@ -166,9 +166,9 @@ struct _PurpleChat {
/** The base class for all #PurpleChat's. */
struct _PurpleChatClass {
- /*< private >*/
PurpleBlistNodeClass node_class;
+ /*< private >*/
void (*_purple_reserved1)(void);
void (*_purple_reserved2)(void);
void (*_purple_reserved3)(void);
diff --git a/libpurple/buddylist.h b/libpurple/buddylist.h
--- a/libpurple/buddylist.h
+++ b/libpurple/buddylist.h
@@ -53,23 +53,22 @@ typedef struct _PurpleBlistUiOps PurpleB
* The Buddy List
*/
struct _PurpleBuddyList {
- /*< private >*/
GObject gparent;
+ /** The first node in the buddy list */
+ PurpleBlistNode *root;
+
/** The UI data associated with this buddy list. This is a convenience
* field provided to the UIs -- it is not used by the libpurple core.
*/
gpointer ui_data;
-
- /** The first node in the buddy list */
- PurpleBlistNode *root;
};
/** The base class for all #PurpleBuddyList's. */
struct _PurpleBuddyListClass {
- /*< private >*/
GObjectClass gparent_class;
+ /*< private >*/
void (*_purple_reserved1)(void);
void (*_purple_reserved2)(void);
void (*_purple_reserved3)(void);
@@ -138,7 +137,11 @@ struct _PurpleBlistUiOps
*/
void (*save_account)(PurpleAccount *account);
+ /*< private >*/
void (*_purple_reserved1)(void);
+ void (*_purple_reserved2)(void);
+ void (*_purple_reserved3)(void);
+ void (*_purple_reserved4)(void);
};
G_BEGIN_DECLS
diff --git a/libpurple/certificate.h b/libpurple/certificate.h
--- a/libpurple/certificate.h
+++ b/libpurple/certificate.h
@@ -167,6 +167,7 @@ struct _PurpleCertificatePool
/** Returns a list of IDs stored in the pool */
GList * (* get_idlist)(void);
+ /*< private >*/
void (*_purple_reserved1)(void);
void (*_purple_reserved2)(void);
void (*_purple_reserved3)(void);
@@ -315,6 +316,7 @@ struct _PurpleCertificateScheme
*/
gchar * (* get_display_string)(PurpleCertificate *crt);
+ /*< private >*/
void (*_purple_reserved1)(void);
};
@@ -361,6 +363,7 @@ struct _PurpleCertificateVerifier
*/
void (* destroy_request)(PurpleCertificateVerificationRequest *vrq);
+ /*< private >*/
void (*_purple_reserved1)(void);
void (*_purple_reserved2)(void);
void (*_purple_reserved3)(void);
diff --git a/libpurple/cipher.h b/libpurple/cipher.h
--- a/libpurple/cipher.h
+++ b/libpurple/cipher.h
@@ -61,7 +61,6 @@ typedef enum {
* Purple Cipher is an opaque data structure and should not be used directly.
*/
More information about the Commits
mailing list