Mercurial > pidgin3 / changeset

--- a/libpurple/connection.c	Thu Oct 10 23:24:57 2013 +0530
+++ b/libpurple/connection.c	Thu Oct 10 23:53:58 2013 +0530
@@ -908,7 +908,9 @@
 	{
 		purple_debug_info("connection", "Connecting. gc = %p\n", gc);
 
-		purple_signal_emit(purple_accounts_get_handle(), "account-connecting", account);
+		g_signal_emit_by_name(purple_account_manager_get_instance(),
+				"account-connecting", account);
+
 		purple_protocol_class_login(protocol, account);
 	}
 }

--- a/libpurple/protocols.c	Thu Oct 10 23:24:57 2013 +0530
+++ b/libpurple/protocols.c	Thu Oct 10 23:53:58 2013 +0530
@@ -264,8 +264,8 @@
 	g_return_if_fail(account != NULL);
 	g_return_if_fail(purple_account_is_connected(account));
 
-	purple_signal_emit(purple_accounts_get_handle(), "account-actions-changed",
-	                   account);
+	g_signal_emit_by_name(purple_account_manager_get_instance(),
+	                      "account-actions-changed", account);
 }
 
 void
@@ -456,8 +456,8 @@
 
 	do_protocol_change_account_status(account, old_status, new_status);
 
-	purple_signal_emit(purple_accounts_get_handle(), "account-status-changed",
-					account, old_status, new_status);
+	g_signal_emit_by_name(purple_account_manager_get_instance(),
+					"account-status-changed", account, old_status, new_status);
 }
 
 GList *

--- a/libpurple/server.c	Thu Oct 10 23:24:57 2013 +0530
+++ b/libpurple/server.c	Thu Oct 10 23:53:58 2013 +0530
@@ -178,13 +178,12 @@
 		if (PURPLE_PROTOCOL_IMPLEMENTS(protocol, SERVER_IFACE, set_info)) {
 			account = purple_connection_get_account(gc);
 
-			if (purple_signal_emit_return_1(purple_accounts_get_handle(),
-					"account-setting-info", account, info))
-				return;
+			g_signal_emit_by_name(purple_account_manager_get_instance(),
+					"account-setting-info", account, info);
 
 			purple_protocol_server_iface_set_info(protocol, gc, info);
 
-			purple_signal_emit(purple_accounts_get_handle(),
+			g_signal_emit_by_name(purple_account_manager_get_instance(),
 					"account-set-info", account, info);
 		}
 	}