/pidgin/main: 2acee98e6c25: Clean merge.

[Mark Doliner]

Changeset: 2acee98e6c25b6e468531c8861c29a255174e265
Author:	 Mark Doliner <mark at kingant.net>
Date:	 2014-01-23 23:28 -0800
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/2acee98e6c25

Description:

Clean merge.

diffstat:

 ChangeLog.API                          |  1 +
 libpurple/account.c                    |  2 +-
 libpurple/account.h                    |  8 --------
 libpurple/accounts.c                   |  2 +-
 libpurple/internal.h                   |  8 ++++++++
 libpurple/plugins/perl/common/Prefs.xs |  3 ---
 libpurple/prefs.c                      |  6 +++---
 libpurple/prefs.h                      |  5 -----
 libpurple/tests/check_libpurple.c      |  1 +
 libpurple/tests/test_oscar_util.c      |  2 +-
 10 files changed, 16 insertions(+), 22 deletions(-)

diffs (142 lines):

diff --git a/ChangeLog.API b/ChangeLog.API
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -344,6 +344,7 @@ version 3.0.0 (??/??/????):
 		* 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
diff --git a/libpurple/account.c b/libpurple/account.c
--- a/libpurple/account.c
+++ b/libpurple/account.c
@@ -2735,7 +2735,7 @@ ui_setting_to_xmlnode(gpointer key, gpoi
 }
 
 PurpleXmlNode *
-purple_account_to_xmlnode(PurpleAccount *account)
+_purple_account_to_xmlnode(PurpleAccount *account)
 {
 	PurpleXmlNode *node, *child;
 	const char *tmp;
diff --git a/libpurple/account.h b/libpurple/account.h
--- a/libpurple/account.h
+++ b/libpurple/account.h
@@ -1150,14 +1150,6 @@ const PurpleConnectionErrorInfo *purple_
  */
 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
diff --git a/libpurple/accounts.c b/libpurple/accounts.c
--- a/libpurple/accounts.c
+++ b/libpurple/accounts.c
@@ -52,7 +52,7 @@ accounts_to_xmlnode(void)
 
 	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);
 	}
 
diff --git a/libpurple/internal.h b/libpurple/internal.h
--- a/libpurple/internal.h
+++ b/libpurple/internal.h
@@ -171,6 +171,14 @@ void _purple_account_set_current_error(P
                                        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.
diff --git a/libpurple/plugins/perl/common/Prefs.xs b/libpurple/plugins/perl/common/Prefs.xs
--- a/libpurple/plugins/perl/common/Prefs.xs
+++ b/libpurple/plugins/perl/common/Prefs.xs
@@ -242,6 +242,3 @@ PPCODE:
 		XPUSHs(sv_2mortal(newSVpv(l->data, 0)));
 		g_free(l->data);
 	}
-
-void
-purple_prefs_update_old()
diff --git a/libpurple/prefs.c b/libpurple/prefs.c
--- a/libpurple/prefs.c
+++ b/libpurple/prefs.c
@@ -1327,8 +1327,8 @@ purple_prefs_get_children_names(const ch
 	return list;
 }
 
-void
-purple_prefs_update_old()
+static void
+prefs_update_old(void)
 {
 	purple_prefs_rename("/core", "/purple");
 
@@ -1433,7 +1433,7 @@ purple_prefs_init(void)
 	purple_prefs_remove("/purple/contact/idle_score");
 
 	purple_prefs_load();
-	purple_prefs_update_old();
+	prefs_update_old();
 }
 
 void
diff --git a/libpurple/prefs.h b/libpurple/prefs.h
--- a/libpurple/prefs.h
+++ b/libpurple/prefs.h
@@ -336,11 +336,6 @@ void purple_prefs_trigger_callback(const
  */
 gboolean purple_prefs_load(void);
 
-/**
- * Rename legacy prefs and delete some that no longer exist.
- */
-void purple_prefs_update_old(void);
-
 /*@}*/
 
 G_END_DECLS
diff --git a/libpurple/tests/check_libpurple.c b/libpurple/tests/check_libpurple.c
--- a/libpurple/tests/check_libpurple.c
+++ b/libpurple/tests/check_libpurple.c
@@ -28,6 +28,7 @@ static PurpleEventLoopUiOps eventloop_ui
 	g_timeout_add_seconds,
 	NULL,
 	NULL,
+	NULL,
 	NULL
 };
 
diff --git a/libpurple/tests/test_oscar_util.c b/libpurple/tests/test_oscar_util.c
--- a/libpurple/tests/test_oscar_util.c
+++ b/libpurple/tests/test_oscar_util.c
@@ -5,7 +5,7 @@
 
 START_TEST(test_oscar_util_name_compare)
 {
-	int i;
+	size_t i;
 	const char *good[] = {
 		"test",
 		"TEST",