/soc/2013/ankitkv/gobjectification: bccb29d7be14: Removed GObjec...

Ankit Vani a at nevitus.org
Fri Jun 21 17:46:48 EDT 2013


Changeset: bccb29d7be148ca0c1c0bb9f0ffdbfaf406e190c
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-06-22 02:08 +0530
Branch:	 soc.2013.gobjectification
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/bccb29d7be14

Description:

Removed GObject for PurpleConversationMessage, this will be a GBoxed

diffstat:

 libpurple/conversation.c |   6 +--
 libpurple/conversation.h |  79 +++++++++++++----------------------------------
 2 files changed, 25 insertions(+), 60 deletions(-)

diffs (170 lines):

diff --git a/libpurple/conversation.c b/libpurple/conversation.c
--- a/libpurple/conversation.c
+++ b/libpurple/conversation.c
@@ -43,8 +43,6 @@ typedef struct _PurpleChatConversationPr
 typedef struct _PurpleIMConversationPrivate       PurpleIMConversationPrivate;
 /** @copydoc _PurpleChatConversationBuddyPrivate */
 typedef struct _PurpleChatConversationBuddyPrivate  PurpleChatConversationBuddyPrivate;
-/** @copydoc _PurpleConversationMessagePrivate */
-typedef struct _PurpleConversationMessagePrivate  PurpleConversationMessagePrivate;
 
 /**
  * A core representation of a conversation between two or more people.
@@ -145,10 +143,10 @@ struct _PurpleChatConversationBuddyPriva
 	gpointer ui_data;
 };
 
-/**
+/** TODO GBoxed
  * Description of a conversation message
  */
-struct _PurpleConversationMessagePrivate
+struct _PurpleConversationMessage
 {
 	char *who;
 	char *what;
diff --git a/libpurple/conversation.h b/libpurple/conversation.h
--- a/libpurple/conversation.h
+++ b/libpurple/conversation.h
@@ -146,8 +146,10 @@ typedef enum /*< flags >*/
 #include "log.h"
 #include "server.h"
 
-/** Structure representing a conversation.
- */
+/**************************************************************************/
+/** PurpleConversation                                                    */
+/**************************************************************************/
+/** Structure representing a conversation instance. */
 struct _PurpleConversation
 {
 	/*< private >*/
@@ -159,11 +161,7 @@ struct _PurpleConversation
 	void (*_purple_reserved4)(void);
 };
 
-/**
- * PurpleConversationClass:
- *
- * The base class for all #PurpleConversation's.
- */
+/** Base class for all #PurpleConversation's */
 struct _PurpleConversationClass {
 	/*< private >*/
 	GObjectClass parent_class;
@@ -174,8 +172,10 @@ struct _PurpleConversationClass {
 	void (*_purple_reserved4)(void);
 };
 
-/** Structure representing a chat conversation.
- */
+/**************************************************************************/
+/** PurpleChatConversation                                                */
+/**************************************************************************/
+/** Structure representing a chat conversation instance. */
 struct _PurpleChatConversation
 {
 	/*< private >*/
@@ -187,11 +187,7 @@ struct _PurpleChatConversation
 	void (*_purple_reserved4)(void);
 };
 
-/**
- * PurpleChatConversationClass:
- *
- * The base class for all #PurpleChatConversation's.
- */
+/** Base class for all #PurpleChatConversation's */
 struct _PurpleChatConversationClass {
 	/*< private >*/
 	PurpleConversationClass parent_class;
@@ -202,8 +198,10 @@ struct _PurpleChatConversationClass {
 	void (*_purple_reserved4)(void);
 };
 
-/** Structure representing an IM conversation.
- */
+/**************************************************************************/
+/** PurpleIMConversation                                                  */
+/**************************************************************************/
+/** Structure representing an IM conversation instance. */
 struct _PurpleIMConversation
 {
 	/*< private >*/
@@ -215,11 +213,7 @@ struct _PurpleIMConversation
 	void (*_purple_reserved4)(void);
 };
 
-/**
- * PurpleIMConversationClass:
- *
- * The base class for all #PurpleIMConversation's.
- */
+/** Base class for all #PurpleIMConversation's */
 struct _PurpleIMConversationClass {
 	/*< private >*/
 	PurpleConversationClass parent_class;
@@ -230,8 +224,10 @@ struct _PurpleIMConversationClass {
 	void (*_purple_reserved4)(void);
 };
 
-/** Structure representing a chat buddy.
- */
+/**************************************************************************/
+/** PurpleChatConversationBuddy                                           */
+/**************************************************************************/
+/** Structure representing a chat buddy instance. */
 struct _PurpleChatConversationBuddy
 {
 	/*< private >*/
@@ -243,11 +239,7 @@ struct _PurpleChatConversationBuddy
 	void (*_purple_reserved4)(void);
 };
 
-/**
- * PurpleChatConversationBuddyClass:
- *
- * The base class for all #PurpleChatConversationBuddy's.
- */
+/** Base class for all #PurpleChatConversationBuddy's */
 struct _PurpleChatConversationBuddyClass {
 	/*< private >*/
 	GObjectClass parent_class;
@@ -258,34 +250,9 @@ struct _PurpleChatConversationBuddyClass
 	void (*_purple_reserved4)(void);
 };
 
-/** Structure representing a conversation message.
- */
-struct _PurpleConversationMessage
-{
-	/*< private >*/
-	GObject gparent;
-
-	void (*_purple_reserved1)(void);
-	void (*_purple_reserved2)(void);
-	void (*_purple_reserved3)(void);
-	void (*_purple_reserved4)(void);
-};
-
-/**
- * PurpleConversationMessageClass:
- *
- * The base class for all #PurpleConversationMessage's.
- */
-struct _PurpleConversationMessageClass {
-	/*< private >*/
-	GObjectClass parent_class;
-
-	void (*_purple_reserved1)(void);
-	void (*_purple_reserved2)(void);
-	void (*_purple_reserved3)(void);
-	void (*_purple_reserved4)(void);
-};
-
+/**************************************************************************/
+/** PurpleConversationUiOps                                               */
+/**************************************************************************/
 /**
  * Conversation operations and events.
  *



More information about the Commits mailing list