--- a/ChangeLog.API Sun Oct 09 01:48:50 2022 -0500
+++ b/ChangeLog.API Sun Oct 09 02:20:18 2022 -0500
@@ -105,8 +105,6 @@
protocol interfaces) and protocols.h (protocols subsystem)
* status.h has been split into status.h (Status API) and presence.h
- * account-authorization-requested signal merged with
- account-authorization-requested-with-message signal
* purple_account_add_buddy now takes an invite message as the last
* purple_account_add_buddies now takes an invite message as the last
@@ -326,7 +324,17 @@
- * account-authorization-requested-with-message signal
+ * account-added signal. Use PurpleAccountManager::added + * account-alias-changed signal + * account-authorization-denied, account-authorization-granted, + account-authorization-requested, + account-authorization-requested-with-message signals + * account-connecting signal + * account-connection-error signal + * account-removed signal. Use PurpleAccountManager::removed + * account-setting-info, account-set-info signals * file-recv-accept, file-recv-cancel, file-recv-complete,
file-recv-start, file-send-accept, file-send-cancel,
file-send-complete, file-send-start signals. Use
--- a/doc/reference/libpurple/signals_account.md Sun Oct 09 01:48:50 2022 -0500
+++ b/doc/reference/libpurple/signals_account.md Sun Oct 09 02:20:18 2022 -0500
@@ -7,23 +7,13 @@
* [account-created](#account-created)
* [account-destroying](#account-destroying)
-* [account-added](#account-added)
-* [account-connecting](#account-connecting)
-* [account-removed](#account-removed)
* [account-disabled](#account-disabled)
* [account-enabled](#account-enabled)
-* [account-setting-info](#account-setting-info)
-* [account-set-info](#account-set-info)
* [account-status-changed](#account-status-changed)
* [account-actions-changed](#account-actions-changed)
-* [account-alias-changed](#account-alias-changed)
-* [account-authorization-requested](#account-authorization-requested)
-* [account-authorization-denied](#account-authorization-denied)
-* [account-authorization-granted](#account-authorization-granted)
* [account-error-changed](#account-error-changed)
* [account-signed-on](#account-signed-on)
* [account-signed-off](#account-signed-off)
-* [account-connection-error](#account-connection-error)
@@ -63,61 +53,6 @@
-void user_function(PurpleAccount *account, gpointer user_data);
-Emitted when an account is added.
-: The account that was added. See `purple_accounts_add()`.
-: User data set when the signal handler was connected.
-----
-void user_function(PurpleAccount *account, gpointer user_data);
-This is emitted when an account is in the process of connecting.
-: The account in the process of connecting.
-: User data set when the signal handler was connected.
-----
-void user_function(PurpleAccount *account, gpointer user_data);
-Emitted when an account is removed.
-: The account that was removed. See `purple_accounts_remove()`.
-: User data set when the signal handler was connected.
-----
@@ -154,48 +89,6 @@
-#### account-setting-info
-void user_function(PurpleAccount *account, const gchar *new_info, gpointer user_data);
-Emitted when a user is about to send his new user info, or profile, to the server.
-: The account that the info will be set on.
-: The new information to set.
-: User data set when the signal handler was connected.
-----
-void user_function(PurpleAccount *account, const gchar *new_info, gpointer user_data);
-Emitted when a user sent his new user info, or profile, to the server.
-: The account that the info was set on.
-: The new information set.
-: User data set when the signal handler was connected.
-----
#### account-status-changed
@@ -241,126 +134,6 @@
-#### account-alias-changed
-void user_function(PurpleAccount *account, const gchar *old, gpointer user_data);
-Emitted when the alias of an account changes (after the change).
-: The account for which the alias was changed.
-: The alias before change.
-: User data set when the signal handler was connected.
-----
-#### account-authorization-requested
-int user_function(PurpleAccount *account,
-Emitted when a user requests authorization.
-: The name of the user requesting authorization.
-: The authorization request message.
-: The message to send in the response.
-: User data set when the signal handler was connected.
-`PURPLE_ACCOUNT_RESPONSE_IGNORE`
-: To silently ignore the request
-`PURPLE_ACCOUNT_RESPONSE_DENY`
-: To block the request (the sender might get informed)
-`PURPLE_ACCOUNT_RESPONSE_ACCEPT`
-: If the request should be granted.
-`PURPLE_ACCOUNT_RESPONSE_PASS`
-: The user will be prompted with the request.
-----
-#### account-authorization-denied
-void user_function(PurpleAccount *account,
-Emitted when the authorization request for a buddy is denied.
-: The name of the user requesting authorization.
-: The message to tell the buddy who was denied.
-: User data set when the signal handler was connected.
-----
-#### account-authorization-granted
-void user_function(PurpleAccount *account,
-Emitted when the authorization request for a buddy is granted.
-: The name of the user requesting authorization.
-: The message to tell the buddy who was granted authorization.
-: User data set when the signal handler was connected.
-----
#### account-error-changed
@@ -421,30 +194,3 @@
: User data set when the signal handler was connected.
-----
-#### account-connection-error
-void user_function(PurpleAccount *account,
- PurpleConnectionError err,
-Emitted when a connection error occurs, before `"signed"`-off.
-: The account on which the error has occurred.
-: The error that occurred.
-: A description of the error, giving more information.
-: User data set when the signal handler was connected.
--- a/libpurple/account.c Sun Oct 09 01:48:50 2022 -0500
+++ b/libpurple/account.c Sun Oct 09 02:20:18 2022 -0500
@@ -1372,14 +1372,11 @@
if ((!alias && account->alias) || (alias && !account->alias) ||
g_utf8_collate(account->alias, alias))
- char *old = account->alias;
+ g_free(account->alias); account->alias = g_strdup(alias);
g_object_notify_by_pspec(G_OBJECT(account),
properties[PROP_PRIVATE_ALIAS]);
- purple_signal_emit(purple_accounts_get_handle(), "account-alias-changed",
purple_accounts_schedule_save();
--- a/libpurple/accounts.c Sun Oct 09 01:48:50 2022 -0500
+++ b/libpurple/accounts.c Sun Oct 09 02:20:18 2022 -0500
@@ -671,9 +671,6 @@
err = purple_connection_error_info_new(type, description);
_purple_account_set_current_error(account, err);
- purple_signal_emit(purple_accounts_get_handle(), "account-connection-error",
- account, type, description);
@@ -682,10 +679,6 @@
void *handle = purple_accounts_get_handle();
void *conn_handle = purple_connections_get_handle();
- purple_signal_register(handle, "account-connecting",
- purple_marshal_VOID__POINTER, G_TYPE_NONE, 1,
purple_signal_register(handle, "account-disabled",
purple_marshal_VOID__POINTER, G_TYPE_NONE, 1,
@@ -694,14 +687,6 @@
purple_marshal_VOID__POINTER, G_TYPE_NONE, 1,
- purple_signal_register(handle, "account-setting-info",
- purple_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2,
- PURPLE_TYPE_ACCOUNT, G_TYPE_STRING);
- purple_signal_register(handle, "account-set-info",
- purple_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2,
- PURPLE_TYPE_ACCOUNT, G_TYPE_STRING);
purple_signal_register(handle, "account-created",
purple_marshal_VOID__POINTER, G_TYPE_NONE, 1,
@@ -710,14 +695,6 @@
purple_marshal_VOID__POINTER, G_TYPE_NONE, 1,
- purple_signal_register(handle, "account-added",
- purple_marshal_VOID__POINTER, G_TYPE_NONE, 1,
- purple_signal_register(handle, "account-removed",
- purple_marshal_VOID__POINTER, G_TYPE_NONE, 1,
purple_signal_register(handle, "account-status-changing",
purple_marshal_VOID__POINTER_POINTER_POINTER,
G_TYPE_NONE, 3, PURPLE_TYPE_ACCOUNT,
@@ -732,23 +709,6 @@
purple_marshal_VOID__POINTER, G_TYPE_NONE, 1,
- purple_signal_register(handle, "account-alias-changed",
- purple_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2,
- PURPLE_TYPE_ACCOUNT, G_TYPE_STRING);
- purple_signal_register(handle, "account-authorization-requested",
- purple_marshal_INT__POINTER_POINTER_POINTER,
- G_TYPE_INT, 4, PURPLE_TYPE_ACCOUNT, G_TYPE_STRING,
- G_TYPE_STRING, G_TYPE_STRING);
- purple_signal_register(handle, "account-authorization-denied",
- purple_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 3,
- PURPLE_TYPE_ACCOUNT, G_TYPE_STRING, G_TYPE_STRING);
- purple_signal_register(handle, "account-authorization-granted",
- purple_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 3,
- PURPLE_TYPE_ACCOUNT, G_TYPE_STRING, G_TYPE_STRING);
purple_signal_register(handle, "account-error-changed",
purple_marshal_VOID__POINTER_POINTER_POINTER,
G_TYPE_NONE, 3, PURPLE_TYPE_ACCOUNT,
@@ -763,11 +723,6 @@
purple_marshal_VOID__POINTER, G_TYPE_NONE, 1,
- purple_signal_register(handle, "account-connection-error",
- purple_marshal_VOID__POINTER_INT_POINTER,
- G_TYPE_NONE, 3, PURPLE_TYPE_ACCOUNT,
- PURPLE_TYPE_CONNECTION_ERROR, G_TYPE_STRING);
purple_signal_connect(conn_handle, "signed-on", handle,
G_CALLBACK(signed_on_cb), NULL);
purple_signal_connect(conn_handle, "signed-off", handle,
--- a/libpurple/connection.c Sun Oct 09 01:48:50 2022 -0500
+++ b/libpurple/connection.c Sun Oct 09 02:20:18 2022 -0500
@@ -958,8 +958,6 @@
purple_debug_info("connection", "Connecting. connection = %p",
- purple_signal_emit(purple_accounts_get_handle(), "account-connecting",
purple_protocol_login(protocol, account);
--- a/libpurple/purpleaccountmanager.c Sun Oct 09 01:48:50 2022 -0500
+++ b/libpurple/purpleaccountmanager.c Sun Oct 09 02:20:18 2022 -0500
@@ -153,9 +153,6 @@
purple_accounts_schedule_save();
g_signal_emit(manager, signals[SIG_ADDED], 0, account);
- /* Finally emit the old purple signal that will eventually be removed. */
- purple_signal_emit(purple_accounts_get_handle(), "account-added", account);
@@ -175,10 +172,6 @@
purple_account_clear_current_error(account);
g_signal_emit(manager, signals[SIG_REMOVED], 0, account);
- /* Finally emit the old purple signal that will eventually be removed. */
- purple_signal_emit(purple_accounts_get_handle(), "account-removed",
--- a/libpurple/server.c Sun Oct 09 01:48:50 2022 -0500
+++ b/libpurple/server.c Sun Oct 09 02:20:18 2022 -0500
@@ -110,22 +110,13 @@
void purple_serv_set_info(PurpleConnection *gc, const char *info)
PurpleProtocol *protocol;
- PurpleAccount *account;
protocol = purple_connection_get_protocol(gc);
if (PURPLE_PROTOCOL_IMPLEMENTS(protocol, SERVER, set_info)) {
- account = purple_connection_get_account(gc);
- purple_signal_emit(purple_accounts_get_handle(),
- "account-setting-info", account, info);
purple_protocol_server_set_info(PURPLE_PROTOCOL_SERVER(protocol),
- purple_signal_emit(purple_accounts_get_handle(),
- "account-set-info", account, info);