Mercurial > pidgin.yaz
changeset 32705:588f9b808a31
Hide struct _PurpleConversation.
| author | andrew.victor@mxit.com |
|---|---|
| date | Sat, 01 Oct 2011 16:48:40 +0000 |
| parents | 308519b40f50 |
| children | 6e27091869eb |
| files | ChangeLog.API libpurple/conversation.c libpurple/conversation.h pidgin/gtkconv.c |
| diffstat | 4 files changed, 37 insertions(+), 38 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog.API Sat Oct 01 16:21:16 2011 +0000 +++ b/ChangeLog.API Sat Oct 01 16:48:40 2011 +0000 @@ -192,6 +192,7 @@ * struct _PidginChatPane * struct _PidginImPane * struct _PurpleAttentionType + * struct _PurpleConversation * struct _PurpleConvChat * struct _PurpleConvChatBuddy * struct _PurpleConvIm
--- a/libpurple/conversation.c Sat Oct 01 16:21:16 2011 +0000 +++ b/libpurple/conversation.c Sat Oct 01 16:48:40 2011 +0000 @@ -110,6 +110,40 @@ gpointer ui_data; }; +/** + * A core representation of a conversation between two or more people. + * + * The conversation can be an IM or a chat. + */ +struct _PurpleConversation +{ + PurpleConversationType type; /**< The type of conversation. */ + + PurpleAccount *account; /**< The user using this conversation. */ + + + char *name; /**< The name of the conversation. */ + char *title; /**< The window title. */ + + gboolean logging; /**< The status of logging. */ + + GList *logs; /**< This conversation's logs */ + + union + { + PurpleConvIm *im; /**< IM-specific data. */ + PurpleConvChat *chat; /**< Chat-specific data. */ + } u; + + PurpleConversationUiOps *ui_ops; /**< UI-specific operations. */ + void *ui_data; /**< UI-specific data. */ + + GHashTable *data; /**< Plugin-specific data. */ + + PurpleConnectionFlags features; /**< The supported features */ + GList *message_history; /**< Message history, as a GList of PurpleConvMessage's */ +}; + static GList *conversations = NULL; static GList *ims = NULL;
--- a/libpurple/conversation.h Sat Oct 01 16:21:16 2011 +0000 +++ b/libpurple/conversation.h Sat Oct 01 16:48:40 2011 +0000 @@ -261,40 +261,6 @@ char *alias; }; -/** - * A core representation of a conversation between two or more people. - * - * The conversation can be an IM or a chat. - */ -struct _PurpleConversation -{ - PurpleConversationType type; /**< The type of conversation. */ - - PurpleAccount *account; /**< The user using this conversation. */ - - - char *name; /**< The name of the conversation. */ - char *title; /**< The window title. */ - - gboolean logging; /**< The status of logging. */ - - GList *logs; /**< This conversation's logs */ - - union - { - PurpleConvIm *im; /**< IM-specific data. */ - PurpleConvChat *chat; /**< Chat-specific data. */ - } u; - - PurpleConversationUiOps *ui_ops; /**< UI-specific operations. */ - void *ui_data; /**< UI-specific data. */ - - GHashTable *data; /**< Plugin-specific data. */ - - PurpleConnectionFlags features; /**< The supported features */ - GList *message_history; /**< Message history, as a GList of PurpleConvMessage's */ -}; - #ifdef __cplusplus extern "C" { #endif
--- a/pidgin/gtkconv.c Sat Oct 01 16:21:16 2011 +0000 +++ b/pidgin/gtkconv.c Sat Oct 01 16:48:40 2011 +0000 @@ -1425,16 +1425,14 @@ purple_conversation_write(conv, NULL, _("Logging started. Future messages in this conversation will be logged."), - conv->logs ? (PURPLE_MESSAGE_SYSTEM) : - (PURPLE_MESSAGE_SYSTEM | PURPLE_MESSAGE_NO_LOG), + PURPLE_MESSAGE_SYSTEM, time(NULL)); } else { purple_conversation_write(conv, NULL, _("Logging stopped. Future messages in this conversation will not be logged."), - conv->logs ? (PURPLE_MESSAGE_SYSTEM) : - (PURPLE_MESSAGE_SYSTEM | PURPLE_MESSAGE_NO_LOG), + PURPLE_MESSAGE_SYSTEM, time(NULL)); /* Disable the logging second, so that the above message can be logged. */