/soc/2013/ankitkv/gobjectification: 005cd580cedd: Merge default ...

[Ankit Vani]

Changeset: 005cd580cedd9d4fc09c60a4efb102a39fc9b811
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2014-01-21 03:45 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/005cd580cedd

Description:

Merge default branch

diffstat:

 ChangeLog.API                          |  1 +
 libpurple/plugins/perl/common/Prefs.xs |  3 ---
 libpurple/prefs.c                      |  6 +++---
 libpurple/prefs.h                      |  5 -----
 4 files changed, 4 insertions(+), 11 deletions(-)

diffs (59 lines):

diff --git a/ChangeLog.API b/ChangeLog.API
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -456,6 +456,7 @@ version 3.0.0 (??/??/????):
 		* purple_plugins_unload_all
 		* purple_pounces_load
 		* purple_prefs_set_generic
+		* purple_prefs_update_old
 		* purple_presence_add_status
 		* purple_presence_add_list
 		* PurplePresenceContext
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