pidgin/pidgin

Move (_)purple_conversations_update_cache to internal.h

2014-01-30, Ankit Vani
2af82f31e6a8
Parents abc36dad1363
Children 134f3e8c5c6caa0892ac617412d925ea1e2f
Move (_)purple_conversations_update_cache to internal.h
5 files changed, 18 insertions(+), 21 deletions(-)
  • +2 -2
    libpurple/conversation.c
  • +1 -1
    libpurple/conversations.c
  • +0 -12
    libpurple/conversations.h
  • +15 -0
    libpurple/internal.h
  • +0 -6
    libpurple/plugins/perl/common/Conversation.xs
    • --- a/libpurple/conversation.c Wed Jan 29 13:41:33 2014 +0100
    +++ b/libpurple/conversation.c Thu Jan 30 02:52:18 2014 +0530
    @@ -335,7 +335,7 @@
    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 @@
    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);
    --- a/libpurple/conversations.c Wed Jan 29 13:41:33 2014 +0100
    +++ b/libpurple/conversations.c Thu Jan 30 02:52:18 2014 +0530
    @@ -115,7 +115,7 @@
    }
    void
    -purple_conversations_update_cache(PurpleConversation *conv, const char *name,
    +_purple_conversations_update_cache(PurpleConversation *conv, const char *name,
    PurpleAccount *account)
    {
    PurpleAccount *old_account;
    --- a/libpurple/conversations.h Wed Jan 29 13:41:33 2014 +0100
    +++ b/libpurple/conversations.h Thu Jan 30 02:52:18 2014 +0530
    @@ -52,18 +52,6 @@
    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.
    --- a/libpurple/internal.h Wed Jan 29 13:41:33 2014 +0100
    +++ b/libpurple/internal.h Thu Jan 30 02:52:18 2014 +0530
    @@ -264,6 +264,21 @@
    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
    --- a/libpurple/plugins/perl/common/Conversation.xs Wed Jan 29 13:41:33 2014 +0100
    +++ b/libpurple/plugins/perl/common/Conversation.xs Thu Jan 30 02:52:18 2014 +0530
    @@ -90,12 +90,6 @@
    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()