/soc/2013/ankitkv/gobjectification: 12d925ea1e2f: Merged default...

[Ankit Vani]

Changeset: 12d925ea1e2f8b83f90970c9221de18f45f2d25c
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2014-01-30 02:53 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/12d925ea1e2f

Description:

Merged default branch

diffstat:

 libpurple/conversation.c                      |   4 ++--
 libpurple/conversations.c                     |   2 +-
 libpurple/conversations.h                     |  12 ------------
 libpurple/internal.h                          |  15 +++++++++++++++
 libpurple/plugins/perl/common/Conversation.xs |   6 ------
 5 files changed, 18 insertions(+), 21 deletions(-)

diffs (96 lines):

diff --git a/libpurple/conversation.c b/libpurple/conversation.c
--- a/libpurple/conversation.c
+++ b/libpurple/conversation.c
@@ -335,7 +335,7 @@ purple_conversation_set_account(PurpleCo
 	if (account == purple_conversation_get_account(conv))
 		return;
 
-	purple_conversations_update_cache(conv, NULL, account);
+	_purple_conversations_update_cache(conv, NULL, account);
 	priv->account = account;
 
 	g_object_notify_by_pspec(G_OBJECT(conv), properties[PROP_ACCOUNT]);
@@ -428,7 +428,7 @@ purple_conversation_set_name(PurpleConve
 
 	g_return_if_fail(priv != NULL);
 
-	purple_conversations_update_cache(conv, name, NULL);
+	_purple_conversations_update_cache(conv, name, NULL);
 
 	g_free(priv->name);
 	priv->name = g_strdup(name);
diff --git a/libpurple/conversations.c b/libpurple/conversations.c
--- a/libpurple/conversations.c
+++ b/libpurple/conversations.c
@@ -115,7 +115,7 @@ purple_conversations_remove(PurpleConver
 }
 
 void
-purple_conversations_update_cache(PurpleConversation *conv, const char *name,
+_purple_conversations_update_cache(PurpleConversation *conv, const char *name,
 		PurpleAccount *account)
 {
 	PurpleAccount *old_account;
diff --git a/libpurple/conversations.h b/libpurple/conversations.h
--- a/libpurple/conversations.h
+++ b/libpurple/conversations.h
@@ -52,18 +52,6 @@ void purple_conversations_add(PurpleConv
 void purple_conversations_remove(PurpleConversation *conv);
 
 /**
- * Updates the conversation cache to use a new conversation name and/or
- * account. This function only updates the conversation cache. It is the
- * caller's responsibility to actually update the conversation.
- *
- * @param conv    The conversation.
- * @param name    The new name. If no change, use @c NULL.
- * @param account The new account. If no change, use @c NULL.
- */
-void purple_conversations_update_cache(PurpleConversation *conv,
-		const char *name, PurpleAccount *account);
-
-/**
  * Returns a list of all conversations.
  *
  * This list includes both IMs and chats.
diff --git a/libpurple/internal.h b/libpurple/internal.h
--- a/libpurple/internal.h
+++ b/libpurple/internal.h
@@ -262,6 +262,21 @@ void _purple_connection_remove_active_ch
                                            PurpleChatConversation *chat);
 
 /**
+ * Updates the conversation cache to use a new conversation name and/or
+ * account. This function only updates the conversation cache. It is the
+ * caller's responsibility to actually update the conversation.
+ *
+ * @note This function should only be called by purple_conversation_set_name()
+ *       and purple_conversation_set_account() in conversation.c.
+ *
+ * @param conv    The conversation.
+ * @param name    The new name. If no change, use @c NULL.
+ * @param account The new account. If no change, use @c NULL.
+ */
+void _purple_conversations_update_cache(PurpleConversation *conv,
+		const char *name, PurpleAccount *account);
+
+/**
  * Returns the primitive scores array from status.c.
  *
  * @note This function should only be called by
diff --git a/libpurple/plugins/perl/common/Conversation.xs b/libpurple/plugins/perl/common/Conversation.xs
--- a/libpurple/plugins/perl/common/Conversation.xs
+++ b/libpurple/plugins/perl/common/Conversation.xs
@@ -90,12 +90,6 @@ void
 purple_conversations_remove(conv)
     Purple::Conversation conv
 
-void
-purple_conversations_update_cache(conv, name, account)
-	Purple::Conversation conv
-	const char * name
-	Purple::Account account
-
 Purple::Handle
 purple_conversations_get_handle()