/pidgin/main: 07553a1e0900: Move pounce loading into purple_poun...

[Elliott Sales de Andrade]

Changeset: 07553a1e0900a429a48ad2f150fae9adc17f141e
Author:	 Elliott Sales de Andrade <qulogic at pidgin.im>
Date:	 2013-01-18 01:31 -0500
Branch:	 default
URL: http://hg.pidgin.im/pidgin/main/rev/07553a1e0900

Description:

Move pounce loading into purple_pounces_init().

I think this may depend on accounts existing, but fortunately that
is already the case.

diffstat:

 ChangeLog.API                  |  1 +
 finch/finch.c                  |  3 ---
 libpurple/example/nullclient.c |  3 ---
 libpurple/pounce.c             |  4 +++-
 libpurple/pounce.h             |  8 --------
 pidgin/gtkmain.c               |  3 ---
 6 files changed, 4 insertions(+), 18 deletions(-)

diffs (89 lines):

diff --git a/ChangeLog.API b/ChangeLog.API
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -195,6 +195,7 @@ version 3.0.0 (??/??/????):
 		* purple_plugins_unregister_load_notify_cb
 		* purple_plugins_unregister_probe_notify_cb
 		* purple_plugins_unregister_unload_notify_cb
+		* purple_pounces_load
 		* purple_presence_add_status
 		* purple_presence_add_list
 		* purple_proxy_connect_socks5
diff --git a/finch/finch.c b/finch/finch.c
--- a/finch/finch.c
+++ b/finch/finch.c
@@ -387,9 +387,6 @@ init_libpurple(int argc, char **argv)
 	/* load plugins we had when we quit */
 	purple_plugins_load_saved("/finch/plugins/loaded");
 
-	/* TODO: Move pounces loading into purple_pounces_init() */
-	purple_pounces_load();
-
 	if (opt_nologin)
 	{
 		/* Set all accounts to "offline" */
diff --git a/libpurple/example/nullclient.c b/libpurple/example/nullclient.c
--- a/libpurple/example/nullclient.c
+++ b/libpurple/example/nullclient.c
@@ -224,9 +224,6 @@ init_libpurple(void)
 	/* Load the desired plugins. The client should save the list of loaded plugins in
 	 * the preferences using purple_plugins_save_loaded(PLUGIN_SAVE_PREF) */
 	purple_plugins_load_saved(PLUGIN_SAVE_PREF);
-
-	/* Load the pounces. */
-	purple_pounces_load();
 }
 
 static void
diff --git a/libpurple/pounce.c b/libpurple/pounce.c
--- a/libpurple/pounce.c
+++ b/libpurple/pounce.c
@@ -572,7 +572,7 @@ static GMarkupParser pounces_parser =
 	NULL
 };
 
-gboolean
+static gboolean
 purple_pounces_load(void)
 {
 	gchar *filename = g_build_filename(purple_user_dir(), "pounces.xml", NULL);
@@ -1190,6 +1190,8 @@ purple_pounces_init(void)
 
 	purple_signal_connect(conv_handle, "received-im-msg",
 						handle, PURPLE_CALLBACK(received_message_cb), NULL);
+
+	purple_pounces_load();
 }
 
 void
diff --git a/libpurple/pounce.h b/libpurple/pounce.h
--- a/libpurple/pounce.h
+++ b/libpurple/pounce.h
@@ -289,14 +289,6 @@ void purple_pounce_execute(const PurpleA
 PurplePounce *purple_find_pounce(const PurpleAccount *pouncer,
 							 const char *pouncee, PurplePounceEvent events);
 
-
-/**
- * Loads the pounces.
- *
- * @return @c TRUE if the pounces could be loaded.
- */
-gboolean purple_pounces_load(void);
-
 /**
  * Registers a pounce handler for a UI.
  *
diff --git a/pidgin/gtkmain.c b/pidgin/gtkmain.c
--- a/pidgin/gtkmain.c
+++ b/pidgin/gtkmain.c
@@ -761,9 +761,6 @@ int main(int argc, char *argv[])
 	/* load plugins we had when we quit */
 	purple_plugins_load_saved(PIDGIN_PREFS_ROOT "/plugins/loaded");
 
-	/* TODO: Move pounces loading into purple_pounces_init() */
-	purple_pounces_load();
-
 	ui_main();
 
 #ifdef USE_SM