pidgin/pidgin

Clean merge.

2014-01-23, Mark Doliner
2acee98e6c25
Parents 2561402bb3fdc0aa93111bba
Children 2d76d38118a8
Clean merge.
10 files changed, 16 insertions(+), 22 deletions(-)
  • +1 -0
    ChangeLog.API
  • +1 -1
    libpurple/account.c
  • +0 -8
    libpurple/account.h
  • +1 -1
    libpurple/accounts.c
  • +8 -0
    libpurple/internal.h
  • +0 -3
    libpurple/plugins/perl/common/Prefs.xs
  • +3 -3
    libpurple/prefs.c
  • +0 -5
    libpurple/prefs.h
  • +1 -0
    libpurple/tests/check_libpurple.c
  • +1 -1
    libpurple/tests/test_oscar_util.c
    • --- a/ChangeLog.API Mon Jan 20 10:23:02 2014 -0800
    +++ b/ChangeLog.API Thu Jan 23 23:28:32 2014 -0800
    @@ -344,6 +344,7 @@
    * purple_plugins_unregister_unload_notify_cb
    * purple_pounces_load
    * purple_prefs_set_generic
    + * purple_prefs_update_old
    * purple_presence_add_status
    * purple_presence_add_list
    * PurplePresenceContext
    --- a/libpurple/account.c Mon Jan 20 10:23:02 2014 -0800
    +++ b/libpurple/account.c Thu Jan 23 23:28:32 2014 -0800
    @@ -2735,7 +2735,7 @@
    }
    PurpleXmlNode *
    -purple_account_to_xmlnode(PurpleAccount *account)
    +_purple_account_to_xmlnode(PurpleAccount *account)
    {
    PurpleXmlNode *node, *child;
    const char *tmp;
    --- a/libpurple/account.h Mon Jan 20 10:23:02 2014 -0800
    +++ b/libpurple/account.h Thu Jan 23 23:28:32 2014 -0800
    @@ -1150,14 +1150,6 @@
    */
    void purple_account_clear_current_error(PurpleAccount *account);
    -/**
    - * Get an XML description of an account.
    - *
    - * @param account The account
    - * @return The XML description of the account.
    - */
    -PurpleXmlNode *purple_account_to_xmlnode(PurpleAccount *account);
    -
    /*@}*/
    G_END_DECLS
    --- a/libpurple/accounts.c Mon Jan 20 10:23:02 2014 -0800
    +++ b/libpurple/accounts.c Thu Jan 23 23:28:32 2014 -0800
    @@ -52,7 +52,7 @@
    for (cur = purple_accounts_get_all(); cur != NULL; cur = cur->next)
    {
    - child = purple_account_to_xmlnode(cur->data);
    + child = _purple_account_to_xmlnode(cur->data);
    purple_xmlnode_insert_child(node, child);
    }
    --- a/libpurple/internal.h Mon Jan 20 10:23:02 2014 -0800
    +++ b/libpurple/internal.h Thu Jan 23 23:28:32 2014 -0800
    @@ -171,6 +171,14 @@
    PurpleConnectionErrorInfo *new_err);
    /**
    + * Get an XML description of an account.
    + *
    + * @param account The account
    + * @return The XML description of the account.
    + */
    +PurpleXmlNode *_purple_account_to_xmlnode(PurpleAccount *account);
    +
    +/**
    * Returns the last child of a particular node.
    *
    * @param node The node whose last child is to be retrieved.
    --- a/libpurple/plugins/perl/common/Prefs.xs Mon Jan 20 10:23:02 2014 -0800
    +++ b/libpurple/plugins/perl/common/Prefs.xs Thu Jan 23 23:28:32 2014 -0800
    @@ -242,6 +242,3 @@
    XPUSHs(sv_2mortal(newSVpv(l->data, 0)));
    g_free(l->data);
    }
    -
    -void
    -purple_prefs_update_old()
    --- a/libpurple/prefs.c Mon Jan 20 10:23:02 2014 -0800
    +++ b/libpurple/prefs.c Thu Jan 23 23:28:32 2014 -0800
    @@ -1327,8 +1327,8 @@
    return list;
    }
    -void
    -purple_prefs_update_old()
    +static void
    +prefs_update_old(void)
    {
    purple_prefs_rename("/core", "/purple");
    @@ -1433,7 +1433,7 @@
    purple_prefs_remove("/purple/contact/idle_score");
    purple_prefs_load();
    - purple_prefs_update_old();
    + prefs_update_old();
    }
    void
    --- a/libpurple/prefs.h Mon Jan 20 10:23:02 2014 -0800
    +++ b/libpurple/prefs.h Thu Jan 23 23:28:32 2014 -0800
    @@ -336,11 +336,6 @@
    */
    gboolean purple_prefs_load(void);
    -/**
    - * Rename legacy prefs and delete some that no longer exist.
    - */
    -void purple_prefs_update_old(void);
    -
    /*@}*/
    G_END_DECLS
    --- a/libpurple/tests/check_libpurple.c Mon Jan 20 10:23:02 2014 -0800
    +++ b/libpurple/tests/check_libpurple.c Thu Jan 23 23:28:32 2014 -0800
    @@ -28,6 +28,7 @@
    g_timeout_add_seconds,
    NULL,
    NULL,
    + NULL,
    NULL
    };
    --- a/libpurple/tests/test_oscar_util.c Mon Jan 20 10:23:02 2014 -0800
    +++ b/libpurple/tests/test_oscar_util.c Thu Jan 23 23:28:32 2014 -0800
    @@ -5,7 +5,7 @@
    START_TEST(test_oscar_util_name_compare)
    {
    - int i;
    + size_t i;
    const char *good[] = {
    "test",
    "TEST",