Replace PURPLE_CALLBACK by G_CALLBACK
Another straight search-and-replace for 'easy' review.
Testing Done:
Compile only.
Reviewed at https://reviews.imfreedom.org/r/1371/
--- a/ChangeLog.API Fri Mar 25 02:38:11 2022 -0500
+++ b/ChangeLog.API Fri Mar 25 02:51:58 2022 -0500
@@ -368,6 +368,7 @@
* purple_buddy_icons_set_custom_icon
* purple_build_dir. Use g_mkdir_with_parents instead
* PurpleCallback. Use GCallback instead
+ * PURPLE_CALLBACK. Use G_CALLBACK instead * PurpleCertificateScheme
* PURPLE_CERTIFICATE_SCHEME_HAS_FUNC
* purple_certificate_check_signature_chain
--- a/finch/gntaccount.c Fri Mar 25 02:38:11 2022 -0500
+++ b/finch/gntaccount.c Fri Mar 25 02:51:58 2022 -0500
@@ -902,17 +902,17 @@
purple_signal_connect(purple_accounts_get_handle(), "account-added",
- finch_accounts_get_handle(), PURPLE_CALLBACK(account_added_callback),+ finch_accounts_get_handle(), G_CALLBACK(account_added_callback), purple_signal_connect(purple_accounts_get_handle(), "account-removed",
- finch_accounts_get_handle(), PURPLE_CALLBACK(account_removed_callback),+ finch_accounts_get_handle(), G_CALLBACK(account_removed_callback), purple_signal_connect(purple_accounts_get_handle(), "account-disabled",
finch_accounts_get_handle(),
- PURPLE_CALLBACK(account_abled_cb), GINT_TO_POINTER(FALSE));+ G_CALLBACK(account_abled_cb), GINT_TO_POINTER(FALSE)); purple_signal_connect(purple_accounts_get_handle(), "account-enabled",
finch_accounts_get_handle(),
- PURPLE_CALLBACK(account_abled_cb), GINT_TO_POINTER(TRUE));+ G_CALLBACK(account_abled_cb), GINT_TO_POINTER(TRUE)); manager = purple_account_manager_get_default();
iter = purple_account_manager_get_all(manager);
--- a/finch/gntblist.c Fri Mar 25 02:38:11 2022 -0500
+++ b/finch/gntblist.c Fri Mar 25 02:51:58 2022 -0500
@@ -1096,11 +1096,11 @@
create_group_menu(GntMenu *menu, PurpleGroup *group)
add_custom_action(menu, _("Add Buddy"),
- PURPLE_CALLBACK(finch_add_buddy), group);+ G_CALLBACK(finch_add_buddy), group); add_custom_action(menu, _("Add Chat"),
- PURPLE_CALLBACK(finch_add_chat), group);+ G_CALLBACK(finch_add_chat), group); add_custom_action(menu, _("Add Group"),
- PURPLE_CALLBACK(finch_add_group), group);+ G_CALLBACK(finch_add_group), group); gpointer finch_retrieve_user_info(PurpleConnection *conn, const char *name)
@@ -1162,7 +1162,7 @@
if (protocol && PURPLE_PROTOCOL_IMPLEMENTS(protocol, SERVER, get_info))
add_custom_action(menu, _("Get Info"),
- PURPLE_CALLBACK(finch_blist_get_buddy_info_cb), buddy);+ G_CALLBACK(finch_blist_get_buddy_info_cb), buddy); if (PURPLE_IS_PROTOCOL_XFER(protocol))
@@ -1173,7 +1173,7 @@
purple_buddy_get_name(buddy))
add_custom_action(menu, _("Send File"),
- PURPLE_CALLBACK(finch_blist_menu_send_file_cb), buddy);+ G_CALLBACK(finch_blist_menu_send_file_cb), buddy); @@ -1522,19 +1522,19 @@
add_custom_action(GNT_MENU(context),
PURPLE_IS_GROUP(node) ? _("Rename") : _("Alias"),
- PURPLE_CALLBACK(finch_blist_rename_node_cb), node);+ G_CALLBACK(finch_blist_rename_node_cb), node); add_custom_action(GNT_MENU(context), _("Remove"),
- PURPLE_CALLBACK(finch_blist_remove_node_cb), node);+ G_CALLBACK(finch_blist_remove_node_cb), node); if (ggblist->tagged && (PURPLE_IS_CONTACT(node)
|| PURPLE_IS_GROUP(node))) {
add_custom_action(GNT_MENU(context), _("Place tagged"),
- PURPLE_CALLBACK(finch_blist_place_tagged), node);+ G_CALLBACK(finch_blist_place_tagged), node); if (PURPLE_IS_BUDDY(node) || PURPLE_IS_CONTACT(node)) {
add_custom_action(GNT_MENU(context), _("Toggle Tag"),
- PURPLE_CALLBACK(finch_blist_toggle_tag_buddy), node);+ G_CALLBACK(finch_blist_toggle_tag_buddy), node); @@ -2826,15 +2826,15 @@
gnt_widget_show(ggblist->window);
purple_signal_connect(purple_connections_get_handle(), "signed-on", finch_blist_get_handle(),
- PURPLE_CALLBACK(reconstruct_accounts_menu), NULL);+ G_CALLBACK(reconstruct_accounts_menu), NULL); purple_signal_connect(purple_connections_get_handle(), "signed-off", finch_blist_get_handle(),
- PURPLE_CALLBACK(reconstruct_accounts_menu), NULL);+ G_CALLBACK(reconstruct_accounts_menu), NULL); purple_signal_connect(purple_accounts_get_handle(), "account-actions-changed", finch_blist_get_handle(),
- PURPLE_CALLBACK(reconstruct_accounts_menu), NULL);+ G_CALLBACK(reconstruct_accounts_menu), NULL); purple_signal_connect(purple_blist_get_handle(), "buddy-status-changed", finch_blist_get_handle(),
- PURPLE_CALLBACK(buddy_status_changed), ggblist);+ G_CALLBACK(buddy_status_changed), ggblist); purple_signal_connect(purple_blist_get_handle(), "buddy-idle-changed", finch_blist_get_handle(),
- PURPLE_CALLBACK(buddy_idle_changed), ggblist);+ G_CALLBACK(buddy_idle_changed), ggblist); plugin_manager = gplugin_manager_get_default();
g_signal_connect_object(plugin_manager, "loaded-plugin",
@@ -2843,9 +2843,9 @@
G_CALLBACK(reconstruct_plugins_menu_cb), ggblist, 0);
purple_signal_connect(purple_blist_get_handle(), "buddy-signed-on", finch_blist_get_handle(),
- PURPLE_CALLBACK(buddy_signed_on_off), ggblist);+ G_CALLBACK(buddy_signed_on_off), ggblist); purple_signal_connect(purple_blist_get_handle(), "buddy-signed-off", finch_blist_get_handle(),
- PURPLE_CALLBACK(buddy_signed_on_off), ggblist);+ G_CALLBACK(buddy_signed_on_off), ggblist); g_signal_connect(G_OBJECT(ggblist->tree), "selection_changed", G_CALLBACK(selection_changed), ggblist);
g_signal_connect(G_OBJECT(ggblist->tree), "key_pressed", G_CALLBACK(key_pressed), ggblist);
@@ -2864,7 +2864,7 @@
purple_signal_connect(purple_savedstatuses_get_handle(), "savedstatus-changed", finch_blist_get_handle(),
- PURPLE_CALLBACK(savedstatus_changed), NULL);+ G_CALLBACK(savedstatus_changed), NULL); g_signal_connect(G_OBJECT(ggblist->status), "selection_changed",
G_CALLBACK(status_selection_changed), NULL);
g_signal_connect(G_OBJECT(ggblist->statustext), "key_pressed",
--- a/finch/gntconn.c Fri Mar 25 02:38:11 2022 -0500
+++ b/finch/gntconn.c Fri Mar 25 02:51:58 2022 -0500
@@ -127,8 +127,8 @@
purple_request_action(account, NULL, primary, secondary, 2,
purple_request_cpar_from_account(account), account, 3,
- _("Modify Account"), PURPLE_CALLBACK(ce_modify_account_cb),- _("Re-enable Account"), PURPLE_CALLBACK(ce_enable_account_cb));+ _("Modify Account"), G_CALLBACK(ce_modify_account_cb), + _("Re-enable Account"), G_CALLBACK(ce_enable_account_cb)); @@ -179,7 +179,7 @@
purple_signal_connect(purple_accounts_get_handle(), "account-removed",
finch_connection_get_handle(),
- PURPLE_CALLBACK(account_removed_cb), NULL);+ G_CALLBACK(account_removed_cb), NULL); void finch_connections_uninit()
--- a/finch/gntconv.c Fri Mar 25 02:38:11 2022 -0500
+++ b/finch/gntconv.c Fri Mar 25 02:51:58 2022 -0500
@@ -1370,25 +1370,25 @@
purple_signal_connect(purple_conversations_get_handle(), "buddy-typing", finch_conv_get_handle(),
- PURPLE_CALLBACK(update_buddy_typing), NULL);+ G_CALLBACK(update_buddy_typing), NULL); purple_signal_connect(purple_conversations_get_handle(), "buddy-typing-stopped", finch_conv_get_handle(),
- PURPLE_CALLBACK(update_buddy_typing), NULL);+ G_CALLBACK(update_buddy_typing), NULL); purple_signal_connect(purple_conversations_get_handle(), "chat-left", finch_conv_get_handle(),
- PURPLE_CALLBACK(chat_left_cb), NULL);+ G_CALLBACK(chat_left_cb), NULL); purple_signal_connect(purple_conversations_get_handle(), "cleared-message-history", finch_conv_get_handle(),
- PURPLE_CALLBACK(cleared_message_history_cb), NULL);+ G_CALLBACK(cleared_message_history_cb), NULL); purple_signal_connect(purple_conversations_get_handle(), "conversation-updated", finch_conv_get_handle(),
- PURPLE_CALLBACK(conv_updated), NULL);+ G_CALLBACK(conv_updated), NULL); purple_signal_connect(purple_blist_get_handle(), "buddy-signed-on", finch_conv_get_handle(),
- PURPLE_CALLBACK(buddy_signed_on_off), NULL);+ G_CALLBACK(buddy_signed_on_off), NULL); purple_signal_connect(purple_blist_get_handle(), "buddy-signed-off", finch_conv_get_handle(),
- PURPLE_CALLBACK(buddy_signed_on_off), NULL);+ G_CALLBACK(buddy_signed_on_off), NULL); purple_signal_connect(purple_connections_get_handle(), "signed-on", finch_conv_get_handle(),
- PURPLE_CALLBACK(account_signed_on_off), NULL);+ G_CALLBACK(account_signed_on_off), NULL); purple_signal_connect(purple_connections_get_handle(), "signed-off", finch_conv_get_handle(),
- PURPLE_CALLBACK(account_signed_on_off), NULL);+ G_CALLBACK(account_signed_on_off), NULL); purple_signal_connect(purple_connections_get_handle(), "signing-off", finch_conv_get_handle(),
- PURPLE_CALLBACK(account_signing_off), NULL);+ G_CALLBACK(account_signing_off), NULL); void finch_conversation_uninit()
--- a/finch/plugins/gntgf.c Fri Mar 25 02:38:11 2022 -0500
+++ b/finch/plugins/gntgf.c Fri Mar 25 02:51:58 2022 -0500
@@ -361,13 +361,13 @@
purple_signal_connect(purple_blist_get_handle(), "buddy-signed-on", plugin,
- PURPLE_CALLBACK(buddy_signed_on), NULL);+ G_CALLBACK(buddy_signed_on), NULL); purple_signal_connect(purple_blist_get_handle(), "buddy-signed-off", plugin,
- PURPLE_CALLBACK(buddy_signed_off), NULL);+ G_CALLBACK(buddy_signed_off), NULL); purple_signal_connect(purple_conversations_get_handle(), "received-im-msg", plugin,
- PURPLE_CALLBACK(received_im_msg), NULL);+ G_CALLBACK(received_im_msg), NULL); purple_signal_connect(purple_conversations_get_handle(), "received-chat-msg", plugin,
- PURPLE_CALLBACK(received_chat_msg), NULL);+ G_CALLBACK(received_chat_msg), NULL); memset(&gpsy, 0, sizeof(gpsy));
memset(&gpsw, 0, sizeof(gpsw));
--- a/finch/plugins/gnttinyurl.c Fri Mar 25 02:38:11 2022 -0500
+++ b/finch/plugins/gnttinyurl.c Fri Mar 25 02:51:58 2022 -0500
@@ -497,19 +497,19 @@
purple_signal_connect(purple_conversations_get_handle(),
- plugin, PURPLE_CALLBACK(wrote_msg), NULL);+ plugin, G_CALLBACK(wrote_msg), NULL); purple_signal_connect(purple_conversations_get_handle(),
- plugin, PURPLE_CALLBACK(wrote_msg), NULL);+ plugin, G_CALLBACK(wrote_msg), NULL); purple_signal_connect(purple_conversations_get_handle(),
- plugin, PURPLE_CALLBACK(writing_msg), NULL);+ plugin, G_CALLBACK(writing_msg), NULL); purple_signal_connect(purple_conversations_get_handle(),
- plugin, PURPLE_CALLBACK(writing_msg), NULL);+ plugin, G_CALLBACK(writing_msg), NULL); purple_signal_connect(purple_conversations_get_handle(),
- plugin, PURPLE_CALLBACK(free_conv_urls), NULL);+ plugin, G_CALLBACK(free_conv_urls), NULL); --- a/libpurple/account.c Fri Mar 25 02:38:11 2022 -0500
+++ b/libpurple/account.c Fri Mar 25 02:51:58 2022 -0500
@@ -1174,7 +1174,7 @@
cbb = g_new0(PurpleCallbackBundle, 1);
- cbb->cb = PURPLE_CALLBACK(cb);+ cbb->cb = G_CALLBACK(cb); manager = purple_credential_manager_get_default();
--- a/libpurple/accounts.c Fri Mar 25 02:38:11 2022 -0500
+++ b/libpurple/accounts.c Fri Mar 25 02:51:58 2022 -0500
@@ -776,11 +776,11 @@
PURPLE_TYPE_CONNECTION_ERROR, G_TYPE_STRING);
purple_signal_connect(conn_handle, "signed-on", handle,
- PURPLE_CALLBACK(signed_on_cb), NULL);+ G_CALLBACK(signed_on_cb), NULL); purple_signal_connect(conn_handle, "signed-off", handle,
- PURPLE_CALLBACK(signed_off_cb), NULL);+ G_CALLBACK(signed_off_cb), NULL); purple_signal_connect(conn_handle, "connection-error", handle,
- PURPLE_CALLBACK(connection_error_cb), NULL);+ G_CALLBACK(connection_error_cb), NULL); --- a/libpurple/buddylist.c Fri Mar 25 02:38:11 2022 -0500
+++ b/libpurple/buddylist.c Fri Mar 25 02:51:58 2022 -0500
@@ -2198,12 +2198,12 @@
purple_signal_connect(purple_accounts_get_handle(), "account-created",
- PURPLE_CALLBACK(purple_blist_buddies_cache_add_account),+ G_CALLBACK(purple_blist_buddies_cache_add_account), purple_signal_connect(purple_accounts_get_handle(), "account-destroying",
- PURPLE_CALLBACK(purple_blist_buddies_cache_remove_account),+ G_CALLBACK(purple_blist_buddies_cache_remove_account), --- a/libpurple/example/nullclient.c Fri Mar 25 02:38:11 2022 -0500
+++ b/libpurple/example/nullclient.c Fri Mar 25 02:51:58 2022 -0500
@@ -135,7 +135,7 @@
purple_signal_connect(purple_connections_get_handle(), "signed-on", &handle,
- PURPLE_CALLBACK(signed_on), NULL);+ G_CALLBACK(signed_on), NULL); #if defined(_WIN32) || defined(__BIONIC__)
--- a/libpurple/idle.c Fri Mar 25 02:38:11 2022 -0500
+++ b/libpurple/idle.c Fri Mar 25 02:51:58 2022 -0500
@@ -323,13 +323,13 @@
purple_signal_connect(purple_conversations_get_handle(), "sent-im-msg",
purple_idle_get_handle(),
- PURPLE_CALLBACK(im_msg_sent_cb), NULL);+ G_CALLBACK(im_msg_sent_cb), NULL); purple_signal_connect(purple_connections_get_handle(), "signing-on",
purple_idle_get_handle(),
- PURPLE_CALLBACK(signing_on_cb), NULL);+ G_CALLBACK(signing_on_cb), NULL); purple_signal_connect(purple_connections_get_handle(), "signing-off",
purple_idle_get_handle(),
- PURPLE_CALLBACK(signing_off_cb), NULL);+ G_CALLBACK(signing_off_cb), NULL); purple_prefs_connect_callback(purple_idle_get_handle(), "/purple/away/idle_reporting",
idle_reporting_cb, NULL);
--- a/libpurple/plugins/autoaccept.c Fri Mar 25 02:38:11 2022 -0500
+++ b/libpurple/plugins/autoaccept.c Fri Mar 25 02:51:58 2022 -0500
@@ -234,7 +234,7 @@
action = purple_action_menu_new(_("Autoaccept File Transfers..."),
- PURPLE_CALLBACK(set_auto_accept_settings), plugin, NULL);+ G_CALLBACK(set_auto_accept_settings), plugin, NULL); (*menu) = g_list_prepend(*menu, action);
@@ -325,9 +325,9 @@
purple_signal_connect(purple_xfers_get_handle(), "file-recv-request", plugin,
- PURPLE_CALLBACK(file_recv_request_cb), plugin);+ G_CALLBACK(file_recv_request_cb), plugin); purple_signal_connect(purple_blist_get_handle(), "blist-node-extended-menu", plugin,
- PURPLE_CALLBACK(context_menu), plugin);+ G_CALLBACK(context_menu), plugin); --- a/libpurple/plugins/buddynote.c Fri Mar 25 02:38:11 2022 -0500
+++ b/libpurple/plugins/buddynote.c Fri Mar 25 02:51:58 2022 -0500
@@ -59,7 +59,7 @@
*m = g_list_append(*m, bna);
- bna = purple_action_menu_new(_("Edit Notes..."), PURPLE_CALLBACK(buddynote_edit_cb), NULL, NULL);+ bna = purple_action_menu_new(_("Edit Notes..."), G_CALLBACK(buddynote_edit_cb), NULL, NULL); *m = g_list_append(*m, bna);
@@ -91,7 +91,7 @@
purple_signal_connect(purple_blist_get_handle(), "blist-node-extended-menu",
- plugin, PURPLE_CALLBACK(buddynote_extended_menu_cb), NULL);+ plugin, G_CALLBACK(buddynote_extended_menu_cb), NULL); --- a/libpurple/plugins/idle.c Fri Mar 25 02:38:11 2022 -0500
+++ b/libpurple/plugins/idle.c Fri Mar 25 02:51:58 2022 -0500
@@ -297,7 +297,7 @@
purple_signal_connect(purple_connections_get_handle(), "signing-off",
- PURPLE_CALLBACK(signing_off_cb), NULL);+ G_CALLBACK(signing_off_cb), NULL); --- a/libpurple/plugins/joinpart.c Fri Mar 25 02:38:11 2022 -0500
+++ b/libpurple/plugins/joinpart.c Fri Mar 25 02:51:58 2022 -0500
@@ -250,11 +250,11 @@
conv_handle = purple_conversations_get_handle();
purple_signal_connect(conv_handle, "chat-user-joining", plugin,
- PURPLE_CALLBACK(chat_user_joining_cb), users);+ G_CALLBACK(chat_user_joining_cb), users); purple_signal_connect(conv_handle, "chat-user-leaving", plugin,
- PURPLE_CALLBACK(chat_user_leaving_cb), users);+ G_CALLBACK(chat_user_leaving_cb), users); purple_signal_connect(conv_handle, "received-chat-msg", plugin,
- PURPLE_CALLBACK(received_chat_msg_cb), users);+ G_CALLBACK(received_chat_msg_cb), users); /* Cleanup every 5 minutes */
id = g_timeout_add_seconds(60 * 5, (GSourceFunc)clean_users_hash, users);
--- a/libpurple/plugins/notification-sound/notification-sound.c Fri Mar 25 02:38:11 2022 -0500
+++ b/libpurple/plugins/notification-sound/notification-sound.c Fri Mar 25 02:51:58 2022 -0500
@@ -272,14 +272,14 @@
purple_signal_connect(conv_handle,
- PURPLE_CALLBACK(purple_notification_sound_im_message_received),+ G_CALLBACK(purple_notification_sound_im_message_received), purple_signal_connect(conv_handle,
- PURPLE_CALLBACK(purple_notification_sound_chat_message_received),+ G_CALLBACK(purple_notification_sound_chat_message_received), --- a/libpurple/plugins/psychic.c Fri Mar 25 02:38:11 2022 -0500
+++ b/libpurple/plugins/psychic.c Fri Mar 25 02:51:58 2022 -0500
@@ -152,7 +152,7 @@
convs_handle = purple_conversations_get_handle();
purple_signal_connect(convs_handle, "buddy-typing", plugin,
- PURPLE_CALLBACK(buddy_typing_cb), NULL);+ G_CALLBACK(buddy_typing_cb), NULL); --- a/libpurple/plugins/purple-toast.c Fri Mar 25 02:38:11 2022 -0500
+++ b/libpurple/plugins/purple-toast.c Fri Mar 25 02:51:58 2022 -0500
@@ -214,14 +214,14 @@
purple_signal_connect(conv_handle,
- PURPLE_CALLBACK(purple_toast_im_message_received),+ G_CALLBACK(purple_toast_im_message_received), purple_signal_connect(conv_handle,
- PURPLE_CALLBACK(purple_toast_chat_message_received),+ G_CALLBACK(purple_toast_chat_message_received), --- a/libpurple/plugins/statenotify.c Fri Mar 25 02:38:11 2022 -0500
+++ b/libpurple/plugins/statenotify.c Fri Mar 25 02:51:58 2022 -0500
@@ -165,13 +165,13 @@
purple_prefs_add_bool("/plugins/core/statenotify/notify_signon", TRUE);
purple_signal_connect(blist_handle, "buddy-status-changed", plugin,
- PURPLE_CALLBACK(buddy_status_changed_cb), NULL);+ G_CALLBACK(buddy_status_changed_cb), NULL); purple_signal_connect(blist_handle, "buddy-idle-changed", plugin,
- PURPLE_CALLBACK(buddy_idle_changed_cb), NULL);+ G_CALLBACK(buddy_idle_changed_cb), NULL); purple_signal_connect(blist_handle, "buddy-signed-on", plugin,
- PURPLE_CALLBACK(buddy_signon_cb), NULL);+ G_CALLBACK(buddy_signon_cb), NULL); purple_signal_connect(blist_handle, "buddy-signed-off", plugin,
- PURPLE_CALLBACK(buddy_signoff_cb), NULL);+ G_CALLBACK(buddy_signoff_cb), NULL); --- a/libpurple/protocols/facebook/facebook.c Fri Mar 25 02:38:11 2022 -0500
+++ b/libpurple/protocols/facebook/facebook.c Fri Mar 25 02:51:58 2022 -0500
@@ -1208,7 +1208,7 @@
fata = purple_connection_get_protocol_data(gc);
act = purple_action_menu_new(_("Initiate _Chat"),
- PURPLE_CALLBACK(fb_blist_chat_init),+ G_CALLBACK(fb_blist_chat_init), acts = g_list_prepend(acts, act);
--- a/libpurple/protocols/gg/gg.c Fri Mar 25 02:38:11 2022 -0500
+++ b/libpurple/protocols/gg/gg.c Fri Mar 25 02:51:58 2022 -0500
@@ -1276,7 +1276,7 @@
ggp_message_setup_global();
purple_signal_connect(purple_get_core(), "uri-handler", plugin,
- PURPLE_CALLBACK(gg_uri_handler), NULL);+ G_CALLBACK(gg_uri_handler), NULL); @@ -1291,7 +1291,7 @@
purple_signal_disconnect(purple_get_core(), "uri-handler", plugin,
- PURPLE_CALLBACK(gg_uri_handler));+ G_CALLBACK(gg_uri_handler)); --- a/libpurple/protocols/irc/irc.c Fri Mar 25 02:38:11 2022 -0500
+++ b/libpurple/protocols/irc/irc.c Fri Mar 25 02:51:58 2022 -0500
@@ -1222,7 +1222,7 @@
G_TYPE_POINTER); /* pointer to a string */
purple_signal_connect(purple_get_core(), "uri-handler", plugin,
- PURPLE_CALLBACK(irc_uri_handler), NULL);+ G_CALLBACK(irc_uri_handler), NULL); @@ -1239,7 +1239,7 @@
irc_unregister_commands();
purple_signal_disconnect(purple_get_core(), "uri-handler", plugin,
- PURPLE_CALLBACK(irc_uri_handler));+ G_CALLBACK(irc_uri_handler)); g_clear_object(&_irc_protocol);
--- a/libpurple/protocols/jabber/buddy.c Fri Mar 25 02:38:11 2022 -0500
+++ b/libpurple/protocols/jabber/buddy.c Fri Mar 25 02:51:58 2022 -0500
@@ -1800,11 +1800,11 @@
if(jb->invisible & JABBER_INVIS_BUDDY) {
act = purple_action_menu_new(_("Un-hide From"),
- PURPLE_CALLBACK(jabber_buddy_make_visible),+ G_CALLBACK(jabber_buddy_make_visible), act = purple_action_menu_new(_("Temporarily Hide From"),
- PURPLE_CALLBACK(jabber_buddy_make_invisible),+ G_CALLBACK(jabber_buddy_make_invisible), m = g_list_append(m, act);
@@ -1812,14 +1812,14 @@
if(jb->subscription & JABBER_SUB_FROM && jb != js->user_jb) {
act = purple_action_menu_new(_("Cancel Presence Notification"),
- PURPLE_CALLBACK(jabber_buddy_cancel_presence_notification),+ G_CALLBACK(jabber_buddy_cancel_presence_notification), m = g_list_append(m, act);
if(!(jb->subscription & JABBER_SUB_TO)) {
act = purple_action_menu_new(_("(Re-)Request authorization"),
- PURPLE_CALLBACK(jabber_buddy_rerequest_auth),+ G_CALLBACK(jabber_buddy_rerequest_auth), m = g_list_append(m, act);
@@ -1828,7 +1828,7 @@
/* shouldn't this just happen automatically when the buddy is
act = purple_action_menu_new(_("Unsubscribe"),
- PURPLE_CALLBACK(jabber_buddy_unsubscribe),+ G_CALLBACK(jabber_buddy_unsubscribe), m = g_list_append(m, act);
@@ -1845,11 +1845,11 @@
if (strchr(name, '@') == NULL) {
act = purple_action_menu_new(_("Log In"),
- PURPLE_CALLBACK(jabber_buddy_login),+ G_CALLBACK(jabber_buddy_login), m = g_list_append(m, act);
act = purple_action_menu_new(_("Log Out"),
- PURPLE_CALLBACK(jabber_buddy_logout),+ G_CALLBACK(jabber_buddy_logout), m = g_list_append(m, act);
@@ -1862,7 +1862,7 @@
for(commands = jbr->commands; commands; commands = g_list_next(commands)) {
JabberAdHocCommands *cmd = commands->data;
- act = purple_action_menu_new(cmd->name, PURPLE_CALLBACK(jabber_adhoc_execute_action), cmd, NULL);+ act = purple_action_menu_new(cmd->name, G_CALLBACK(jabber_adhoc_execute_action), cmd, NULL); m = g_list_append(m, act);
@@ -2208,7 +2208,7 @@
_("Select a user directory to search"),
- _("Search Directory"), PURPLE_CALLBACK(jabber_user_search),+ _("Search Directory"), G_CALLBACK(jabber_user_search), --- a/libpurple/protocols/jabber/chat.c Fri Mar 25 02:38:11 2022 -0500
+++ b/libpurple/protocols/jabber/chat.c Fri Mar 25 02:51:58 2022 -0500
@@ -878,8 +878,8 @@
_("Select a conference server to query"),
js->chat_servers ? js->chat_servers->data : NULL,
- _("Find Rooms"), PURPLE_CALLBACK(roomlist_ok_cb),- _("Cancel"), PURPLE_CALLBACK(roomlist_cancel_cb),+ _("Find Rooms"), G_CALLBACK(roomlist_ok_cb), + _("Cancel"), G_CALLBACK(roomlist_cancel_cb), purple_request_cpar_from_connection(gc),
--- a/libpurple/protocols/jabber/jabber.c Fri Mar 25 02:38:11 2022 -0500
+++ b/libpurple/protocols/jabber/jabber.c Fri Mar 25 02:51:58 2022 -0500
@@ -3868,9 +3868,9 @@
G_TYPE_STRING); /* namespace */
purple_signal_connect(protocol, "jabber-register-namespace-watcher",
- protocol, PURPLE_CALLBACK(jabber_iq_signal_register), NULL);+ protocol, G_CALLBACK(jabber_iq_signal_register), NULL); purple_signal_connect(protocol, "jabber-unregister-namespace-watcher",
- protocol, PURPLE_CALLBACK(jabber_iq_signal_unregister), NULL);+ protocol, G_CALLBACK(jabber_iq_signal_unregister), NULL); purple_signal_register(protocol, "jabber-receiving-xmlnode",
@@ -3888,7 +3888,7 @@
purple_signal_connect_priority(protocol, "jabber-sending-xmlnode",
- protocol, PURPLE_CALLBACK(jabber_send_signal_cb),+ protocol, G_CALLBACK(jabber_send_signal_cb), NULL, PURPLE_SIGNAL_PRIORITY_HIGHEST);
purple_signal_register(protocol, "jabber-sending-text",
@@ -4160,7 +4160,7 @@
purple_signal_connect(purple_get_core(), "uri-handler", xmpp_protocol,
- PURPLE_CALLBACK(xmpp_uri_handler), xmpp_protocol);+ G_CALLBACK(xmpp_uri_handler), xmpp_protocol); jabber_init_protocol(xmpp_protocol);
@@ -4177,7 +4177,7 @@
purple_signal_disconnect(purple_get_core(), "uri-handler",
- xmpp_protocol, PURPLE_CALLBACK(xmpp_uri_handler));+ xmpp_protocol, G_CALLBACK(xmpp_uri_handler)); jabber_uninit_protocol(xmpp_protocol);
--- a/libpurple/protocols/jabber/usernick.c Fri Mar 25 02:38:11 2022 -0500
+++ b/libpurple/protocols/jabber/usernick.c Fri Mar 25 02:51:58 2022 -0500
@@ -79,7 +79,7 @@
purple_request_input(js->gc, _("Set User Nickname"), _("Please specify a new nickname for you."),
_("This information is visible to all contacts on your contact list, so choose something appropriate."),
- oldnickname, FALSE, FALSE, NULL, _("Set"), PURPLE_CALLBACK(do_nick_set), _("Cancel"), NULL,+ oldnickname, FALSE, FALSE, NULL, _("Set"), G_CALLBACK(do_nick_set), _("Cancel"), NULL, purple_request_cpar_from_connection(js->gc), js);
--- a/libpurple/protocols/novell/novell.c Fri Mar 25 02:38:11 2022 -0500
+++ b/libpurple/protocols/novell/novell.c Fri Mar 25 02:51:58 2022 -0500
@@ -3505,7 +3505,7 @@
if(PURPLE_IS_BUDDY(node)) {
act = purple_action_menu_new(_("Initiate _Chat"),
- PURPLE_CALLBACK(_initiate_conference_cb),+ G_CALLBACK(_initiate_conference_cb), list = g_list_append(list, act);
--- a/libpurple/protocols/null/nullprpl.c Fri Mar 25 02:38:11 2022 -0500
+++ b/libpurple/protocols/null/nullprpl.c Fri Mar 25 02:51:58 2022 -0500
@@ -378,7 +378,7 @@
if (PURPLE_IS_BUDDY(node)) {
PurpleActionMenu *action = purple_action_menu_new(
_("NullProtocol example menu item"),
- PURPLE_CALLBACK(blist_example_menu_item),+ G_CALLBACK(blist_example_menu_item), NULL, /* userdata passed to the callback */
NULL); /* child menu items */
return g_list_append(NULL, action);
--- a/libpurple/protocols/sametime/sametime.c Fri Mar 25 02:38:11 2022 -0500
+++ b/libpurple/protocols/sametime/sametime.c Fri Mar 25 02:51:58 2022 -0500
@@ -1297,7 +1297,7 @@
owner = purple_blist_node_get_string(node, GROUP_KEY_OWNER);
if(owner && purple_strequal(owner, purple_account_get_username(acct))) {
act = purple_action_menu_new(_("Get Notes Address Book Info"),
- PURPLE_CALLBACK(blist_menu_nab), pd, NULL);+ G_CALLBACK(blist_menu_nab), pd, NULL); *menu = g_list_append(*menu, act);
@@ -1449,12 +1449,12 @@
/* start watching for new conversations */
purple_signal_connect(purple_conversations_get_handle(),
"conversation-created", pd,
- PURPLE_CALLBACK(conversation_created_cb), pd);+ G_CALLBACK(conversation_created_cb), pd); /* watch for group extended menu items */
purple_signal_connect(purple_blist_get_handle(),
"blist-node-extended-menu", pd,
- PURPLE_CALLBACK(blist_node_menu_cb), pd);+ G_CALLBACK(blist_node_menu_cb), pd); /* use our services to do neat things */
@@ -3531,7 +3531,7 @@
l = g_list_append(l, NULL);
act = purple_action_menu_new(_("Invite to Conference..."),
- PURPLE_CALLBACK(blist_menu_conf), NULL, NULL);+ G_CALLBACK(blist_menu_conf), NULL, NULL); l = g_list_append(l, act);
/** note: this never gets called for a PurpleGroup, have to use the
--- a/libpurple/protocols/silc/buddy.c Fri Mar 25 02:38:11 2022 -0500
+++ b/libpurple/protocols/silc/buddy.c Fri Mar 25 02:51:58 2022 -0500
@@ -1665,37 +1665,37 @@
silc_client_private_message_key_is_set(sg->client,
sg->conn, client_entry)) {
act = purple_action_menu_new(_("Reset IM Key"),
- PURPLE_CALLBACK(silcpurple_buddy_resetkey),+ G_CALLBACK(silcpurple_buddy_resetkey), m = g_list_append(m, act);
act = purple_action_menu_new(_("IM with Key Exchange"),
- PURPLE_CALLBACK(silcpurple_buddy_keyagr),+ G_CALLBACK(silcpurple_buddy_keyagr), m = g_list_append(m, act);
act = purple_action_menu_new(_("IM with Password"),
- PURPLE_CALLBACK(silcpurple_buddy_privkey_menu),+ G_CALLBACK(silcpurple_buddy_privkey_menu), m = g_list_append(m, act);
act = purple_action_menu_new(_("Show Public Key"),
- PURPLE_CALLBACK(silcpurple_buddy_showkey),+ G_CALLBACK(silcpurple_buddy_showkey), m = g_list_append(m, act);
act = purple_action_menu_new(_("Get Public Key..."),
- PURPLE_CALLBACK(silcpurple_buddy_getkey_menu),+ G_CALLBACK(silcpurple_buddy_getkey_menu), m = g_list_append(m, act);
if (conn && conn->local_entry->mode & SILC_UMODE_ROUTER_OPERATOR) {
act = purple_action_menu_new(_("Kill User"),
- PURPLE_CALLBACK(silcpurple_buddy_kill),+ G_CALLBACK(silcpurple_buddy_kill), m = g_list_append(m, act);
@@ -1705,7 +1705,7 @@
wb->client_entry = client_entry;
act = purple_action_menu_new(_("Draw On Whiteboard"),
- PURPLE_CALLBACK(silcpurple_buddy_wb),+ G_CALLBACK(silcpurple_buddy_wb), m = g_list_append(m, act);
--- a/libpurple/protocols/silc/chat.c Fri Mar 25 02:38:11 2022 -0500
+++ b/libpurple/protocols/silc/chat.c Fri Mar 25 02:51:58 2022 -0500
@@ -866,31 +866,31 @@
act = purple_action_menu_new(_("Get Info"),
- PURPLE_CALLBACK(silcpurple_chat_getinfo_menu),+ G_CALLBACK(silcpurple_chat_getinfo_menu), m = g_list_append(m, act);
act = purple_action_menu_new(_("Add Private Group"),
- PURPLE_CALLBACK(silcpurple_chat_prv),+ G_CALLBACK(silcpurple_chat_prv), m = g_list_append(m, act);
if (chu && mode & SILC_CHANNEL_UMODE_CHANFO) {
act = purple_action_menu_new(_("Channel Authentication"),
- PURPLE_CALLBACK(silcpurple_chat_chauth),+ G_CALLBACK(silcpurple_chat_chauth), m = g_list_append(m, act);
if (channel->mode & SILC_CHANNEL_MODE_FOUNDER_AUTH) {
act = purple_action_menu_new(_("Reset Permanent"),
- PURPLE_CALLBACK(silcpurple_chat_permanent_reset),+ G_CALLBACK(silcpurple_chat_permanent_reset), m = g_list_append(m, act);
act = purple_action_menu_new(_("Set Permanent"),
- PURPLE_CALLBACK(silcpurple_chat_permanent),+ G_CALLBACK(silcpurple_chat_permanent), m = g_list_append(m, act);
@@ -898,42 +898,42 @@
if (chu && mode & SILC_CHANNEL_UMODE_CHANOP) {
act = purple_action_menu_new(_("Set User Limit"),
- PURPLE_CALLBACK(silcpurple_chat_ulimit),+ G_CALLBACK(silcpurple_chat_ulimit), m = g_list_append(m, act);
if (channel->mode & SILC_CHANNEL_MODE_TOPIC) {
act = purple_action_menu_new(_("Reset Topic Restriction"),
- PURPLE_CALLBACK(silcpurple_chat_resettopic),+ G_CALLBACK(silcpurple_chat_resettopic), m = g_list_append(m, act);
act = purple_action_menu_new(_("Set Topic Restriction"),
- PURPLE_CALLBACK(silcpurple_chat_settopic),+ G_CALLBACK(silcpurple_chat_settopic), m = g_list_append(m, act);
if (channel->mode & SILC_CHANNEL_MODE_PRIVATE) {
act = purple_action_menu_new(_("Reset Private Channel"),
- PURPLE_CALLBACK(silcpurple_chat_resetprivate),+ G_CALLBACK(silcpurple_chat_resetprivate), m = g_list_append(m, act);
act = purple_action_menu_new(_("Set Private Channel"),
- PURPLE_CALLBACK(silcpurple_chat_setprivate),+ G_CALLBACK(silcpurple_chat_setprivate), m = g_list_append(m, act);
if (channel->mode & SILC_CHANNEL_MODE_SECRET) {
act = purple_action_menu_new(_("Reset Secret Channel"),
- PURPLE_CALLBACK(silcpurple_chat_resetsecret),+ G_CALLBACK(silcpurple_chat_resetsecret), m = g_list_append(m, act);
act = purple_action_menu_new(_("Set Secret Channel"),
- PURPLE_CALLBACK(silcpurple_chat_setsecret),+ G_CALLBACK(silcpurple_chat_setsecret), m = g_list_append(m, act);
@@ -945,7 +945,7 @@
act = purple_action_menu_new(_("Draw On Whiteboard"),
- PURPLE_CALLBACK(silcpurple_chat_wb),+ G_CALLBACK(silcpurple_chat_wb), m = g_list_append(m, act);
--- a/libpurple/purplecredentialmanager.c Fri Mar 25 02:38:11 2022 -0500
+++ b/libpurple/purplecredentialmanager.c Fri Mar 25 02:51:58 2022 -0500
@@ -173,7 +173,7 @@
* were unable to find their credential provider.
purple_signal_connect(purple_get_core(), "core-initialized", manager,
- PURPLE_CALLBACK(purple_credential_manager_core_init_cb),+ G_CALLBACK(purple_credential_manager_core_init_cb), --- a/libpurple/savedstatuses.c Fri Mar 25 02:38:11 2022 -0500
+++ b/libpurple/savedstatuses.c Fri Mar 25 02:51:58 2022 -0500
@@ -1244,7 +1244,7 @@
purple_signal_connect(purple_accounts_get_handle(), "account-removed",
- PURPLE_CALLBACK(purple_savedstatus_unset_all_substatuses),+ G_CALLBACK(purple_savedstatus_unset_all_substatuses), --- a/libpurple/signals.h Fri Mar 25 02:38:11 2022 -0500
+++ b/libpurple/signals.h Fri Mar 25 02:51:58 2022 -0500
@@ -31,14 +31,6 @@
- * @func: a function pointer.- * Cast a function pointer to #GCallback.-#define PURPLE_CALLBACK(func) ((GCallback)(func)) * PurpleSignalMarshalFunc:
* @cb: The #GCallback to call.
* @args: The arguments to the function.
--- a/pidgin/gtkaccount.c Fri Mar 25 02:38:11 2022 -0500
+++ b/pidgin/gtkaccount.c Fri Mar 25 02:51:58 2022 -0500
@@ -2197,7 +2197,7 @@
purple_signal_connect(pidgin_accounts_get_handle(), "account-modified",
- PURPLE_CALLBACK(account_modified_cb), accounts_window);+ G_CALLBACK(account_modified_cb), accounts_window); purple_prefs_connect_callback(accounts_window,
PIDGIN_PREFS_ROOT "/accounts/buddyicon",
global_buddyicon_changed, accounts_window);
@@ -2567,22 +2567,22 @@
/* Setup some purple signal handlers. */
purple_signal_connect(purple_connections_get_handle(), "signed-on",
pidgin_accounts_get_handle(),
- PURPLE_CALLBACK(signed_on_off_cb), NULL);+ G_CALLBACK(signed_on_off_cb), NULL); purple_signal_connect(purple_connections_get_handle(), "signed-off",
pidgin_accounts_get_handle(),
- PURPLE_CALLBACK(signed_on_off_cb), NULL);+ G_CALLBACK(signed_on_off_cb), NULL); purple_signal_connect(purple_accounts_get_handle(), "account-added",
pidgin_accounts_get_handle(),
- PURPLE_CALLBACK(add_account_to_liststore), NULL);+ G_CALLBACK(add_account_to_liststore), NULL); purple_signal_connect(purple_accounts_get_handle(), "account-removed",
pidgin_accounts_get_handle(),
- PURPLE_CALLBACK(account_removed_cb), NULL);+ G_CALLBACK(account_removed_cb), NULL); purple_signal_connect(purple_accounts_get_handle(), "account-disabled",
pidgin_accounts_get_handle(),
- PURPLE_CALLBACK(account_abled_cb), GINT_TO_POINTER(FALSE));+ G_CALLBACK(account_abled_cb), GINT_TO_POINTER(FALSE)); purple_signal_connect(purple_accounts_get_handle(), "account-enabled",
pidgin_accounts_get_handle(),
- PURPLE_CALLBACK(account_abled_cb), GINT_TO_POINTER(TRUE));+ G_CALLBACK(account_abled_cb), GINT_TO_POINTER(TRUE)); g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, NULL);
--- a/pidgin/gtkblist.c Fri Mar 25 02:38:11 2022 -0500
+++ b/pidgin/gtkblist.c Fri Mar 25 02:51:58 2022 -0500
@@ -500,7 +500,7 @@
char *msg = g_strdup_printf(ngettext("You have %d contact named %s. Would you like to merge them?", "You currently have %d contacts named %s. Would you like to merge them?", i), i, alias);
purple_request_action(NULL, NULL, msg, _("Merging these contacts will cause them to share a single entry on the buddy list and use a single conversation window. "
"You can separate them again by choosing 'Expand' from the contact's context menu"), 0, NULL,
- merges, 2, _("_Yes"), PURPLE_CALLBACK(gtk_blist_do_personize), _("_No"), PURPLE_CALLBACK(g_list_free));+ merges, 2, _("_Yes"), G_CALLBACK(gtk_blist_do_personize), _("_No"), G_CALLBACK(g_list_free)); @@ -3106,7 +3106,7 @@
purple_signal_connect(purple_conversations_get_handle(), "deleting-conversation",
- ui, PURPLE_CALLBACK(conversation_deleted_update_ui_cb), ui);+ ui, G_CALLBACK(conversation_deleted_update_ui_cb), ui); } else if (PURPLE_IS_CHAT_CONVERSATION(conv)) {
PurpleChat *chat = purple_blist_find_chat(account, purple_conversation_get_name(conv));
@@ -3119,7 +3119,7 @@
purple_signal_connect(purple_conversations_get_handle(), "deleting-conversation",
- ui, PURPLE_CALLBACK(conversation_deleted_update_ui_cb), ui);+ ui, G_CALLBACK(conversation_deleted_update_ui_cb), ui); @@ -4014,21 +4014,21 @@
handle = purple_accounts_get_handle();
purple_signal_connect(handle, "account-error-changed", gtkblist,
- PURPLE_CALLBACK(update_account_error_state),+ G_CALLBACK(update_account_error_state), handle = purple_conversations_get_handle();
purple_signal_connect(handle, "conversation-updated", gtkblist,
- PURPLE_CALLBACK(conversation_updated_cb),+ G_CALLBACK(conversation_updated_cb), purple_signal_connect(handle, "deleting-conversation", gtkblist,
- PURPLE_CALLBACK(conversation_deleting_cb),+ G_CALLBACK(conversation_deleting_cb), purple_signal_connect(handle, "conversation-created", gtkblist,
- PURPLE_CALLBACK(conversation_created_cb),+ G_CALLBACK(conversation_created_cb), purple_signal_connect(handle, "chat-joined", gtkblist,
- PURPLE_CALLBACK(conversation_created_cb),+ G_CALLBACK(conversation_created_cb), show_initial_account_errors(gtkblist);
@@ -5147,14 +5147,14 @@
G_TYPE_STRING, 1, PURPLE_TYPE_BUDDY);
purple_signal_connect(purple_blist_get_handle(), "buddy-signed-on",
- gtk_blist_handle, PURPLE_CALLBACK(buddy_signonoff_cb), NULL);+ gtk_blist_handle, G_CALLBACK(buddy_signonoff_cb), NULL); purple_signal_connect(purple_blist_get_handle(), "buddy-signed-off",
- gtk_blist_handle, PURPLE_CALLBACK(buddy_signonoff_cb), NULL);+ gtk_blist_handle, G_CALLBACK(buddy_signonoff_cb), NULL); purple_signal_connect(purple_blist_get_handle(), "buddy-privacy-changed",
- gtk_blist_handle, PURPLE_CALLBACK(pidgin_blist_update_privacy_cb), NULL);+ gtk_blist_handle, G_CALLBACK(pidgin_blist_update_privacy_cb), NULL); purple_signal_connect_priority(purple_connections_get_handle(), "autojoin",
- gtk_blist_handle, PURPLE_CALLBACK(autojoin_cb),+ gtk_blist_handle, G_CALLBACK(autojoin_cb), NULL, PURPLE_SIGNAL_PRIORITY_HIGHEST);
--- a/pidgin/gtkconn.c Fri Mar 25 02:38:11 2022 -0500
+++ b/pidgin/gtkconn.c Fri Mar 25 02:51:58 2022 -0500
@@ -219,7 +219,7 @@
purple_signal_connect(purple_accounts_get_handle(), "account-removed",
pidgin_connection_get_handle(),
- PURPLE_CALLBACK(account_removed_cb), NULL);+ G_CALLBACK(account_removed_cb), NULL); --- a/pidgin/gtkconv.c Fri Mar 25 02:38:11 2022 -0500
+++ b/pidgin/gtkconv.c Fri Mar 25 02:51:58 2022 -0500
@@ -1860,11 +1860,11 @@
purple_signal_connect(blist_handle, "blist-node-added",
- gtkchat, PURPLE_CALLBACK(buddy_added_cb), conv);+ gtkchat, G_CALLBACK(buddy_added_cb), conv); purple_signal_connect(blist_handle, "blist-node-removed",
- gtkchat, PURPLE_CALLBACK(buddy_removed_cb), conv);+ gtkchat, G_CALLBACK(buddy_removed_cb), conv); purple_signal_connect(blist_handle, "blist-node-aliased",
- gtkchat, PURPLE_CALLBACK(blist_node_aliased_cb), conv);+ gtkchat, G_CALLBACK(blist_node_aliased_cb), conv); gtk_tree_view_column_set_expand(col, TRUE);
g_object_set(rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
@@ -3362,36 +3362,36 @@
/* Callbacks to update a conversation */
purple_signal_connect(blist_handle, "buddy-signed-on",
- handle, PURPLE_CALLBACK(update_buddy_sign), "on");+ handle, G_CALLBACK(update_buddy_sign), "on"); purple_signal_connect(blist_handle, "buddy-signed-off",
- handle, PURPLE_CALLBACK(update_buddy_sign), "off");+ handle, G_CALLBACK(update_buddy_sign), "off"); purple_signal_connect(blist_handle, "buddy-status-changed",
- handle, PURPLE_CALLBACK(update_buddy_status_changed), NULL);+ handle, G_CALLBACK(update_buddy_status_changed), NULL); purple_signal_connect(blist_handle, "buddy-privacy-changed",
- handle, PURPLE_CALLBACK(update_buddy_privacy_changed), NULL);+ handle, G_CALLBACK(update_buddy_privacy_changed), NULL); purple_signal_connect(blist_handle, "buddy-idle-changed",
- handle, PURPLE_CALLBACK(update_buddy_idle_changed), NULL);+ handle, G_CALLBACK(update_buddy_idle_changed), NULL); purple_signal_connect(blist_handle, "buddy-icon-changed",
- handle, PURPLE_CALLBACK(update_buddy_icon), NULL);+ handle, G_CALLBACK(update_buddy_icon), NULL); purple_signal_connect(purple_conversations_get_handle(), "buddy-typing",
- handle, PURPLE_CALLBACK(update_buddy_typing), NULL);+ handle, G_CALLBACK(update_buddy_typing), NULL); purple_signal_connect(purple_conversations_get_handle(), "buddy-typing-stopped",
- handle, PURPLE_CALLBACK(update_buddy_typing), NULL);+ handle, G_CALLBACK(update_buddy_typing), NULL); purple_signal_connect(pidgin_conversations_get_handle(), "conversation-switched",
- handle, PURPLE_CALLBACK(update_conversation_switched), NULL);+ handle, G_CALLBACK(update_conversation_switched), NULL); purple_signal_connect(purple_conversations_get_handle(), "chat-left", handle,
- PURPLE_CALLBACK(update_chat), NULL);+ G_CALLBACK(update_chat), NULL); purple_signal_connect(purple_conversations_get_handle(), "chat-joined", handle,
- PURPLE_CALLBACK(update_chat), NULL);+ G_CALLBACK(update_chat), NULL); purple_signal_connect(purple_conversations_get_handle(), "chat-topic-changed", handle,
- PURPLE_CALLBACK(update_chat_topic), NULL);+ G_CALLBACK(update_chat_topic), NULL); purple_signal_connect_priority(purple_conversations_get_handle(), "conversation-updated", handle,
- PURPLE_CALLBACK(pidgin_conv_updated), NULL,+ G_CALLBACK(pidgin_conv_updated), NULL, PURPLE_SIGNAL_PRIORITY_LOWEST);
purple_signal_connect(purple_conversations_get_handle(), "wrote-im-msg", handle,
- PURPLE_CALLBACK(wrote_msg_update_unseen_cb), NULL);+ G_CALLBACK(wrote_msg_update_unseen_cb), NULL); purple_signal_connect(purple_conversations_get_handle(), "wrote-chat-msg", handle,
- PURPLE_CALLBACK(wrote_msg_update_unseen_cb), NULL);+ G_CALLBACK(wrote_msg_update_unseen_cb), NULL); --- a/pidgin/gtkrequest.c Fri Mar 25 02:38:11 2022 -0500
+++ b/pidgin/gtkrequest.c Fri Mar 25 02:51:58 2022 -0500
@@ -1866,7 +1866,7 @@
datasheet_fill(sheet, model);
purple_signal_connect(sheet, "record-changed",
pidgin_request_get_handle(),
- PURPLE_CALLBACK(datasheet_update), model);+ G_CALLBACK(datasheet_update), model); sel = gtk_tree_view_get_selection(view);
g_signal_connect(G_OBJECT(sel), "changed",
--- a/pidgin/gtksavedstatuses.c Fri Mar 25 02:38:11 2022 -0500
+++ b/pidgin/gtksavedstatuses.c Fri Mar 25 02:51:58 2022 -0500
@@ -583,16 +583,16 @@
purple_signal_connect(purple_savedstatuses_get_handle(),
"savedstatus-changed", status_window,
- PURPLE_CALLBACK(current_status_changed), dialog);+ G_CALLBACK(current_status_changed), dialog); purple_signal_connect(purple_savedstatuses_get_handle(),
"savedstatus-added", status_window,
- PURPLE_CALLBACK(saved_status_updated_cb), dialog);+ G_CALLBACK(saved_status_updated_cb), dialog); purple_signal_connect(purple_savedstatuses_get_handle(),
"savedstatus-deleted", status_window,
- PURPLE_CALLBACK(saved_status_updated_cb), dialog);+ G_CALLBACK(saved_status_updated_cb), dialog); purple_signal_connect(purple_savedstatuses_get_handle(),
"savedstatus-modified", status_window,
- PURPLE_CALLBACK(saved_status_updated_cb), dialog);+ G_CALLBACK(saved_status_updated_cb), dialog); gtk_widget_show_all(win);
--- a/pidgin/gtkstatusbox.c Fri Mar 25 02:38:11 2022 -0500
+++ b/pidgin/gtkstatusbox.c Fri Mar 25 02:51:58 2022 -0500
@@ -1424,36 +1424,36 @@
handle = purple_savedstatuses_get_handle();
purple_signal_connect(handle, "savedstatus-changed", status_box,
- PURPLE_CALLBACK(current_savedstatus_changed_cb),+ G_CALLBACK(current_savedstatus_changed_cb), purple_signal_connect(handle, "savedstatus-added", status_box,
- PURPLE_CALLBACK(saved_status_updated_cb), status_box);+ G_CALLBACK(saved_status_updated_cb), status_box); purple_signal_connect(handle, "savedstatus-deleted", status_box,
- PURPLE_CALLBACK(saved_status_updated_cb), status_box);+ G_CALLBACK(saved_status_updated_cb), status_box); purple_signal_connect(handle, "savedstatus-modified", status_box,
- PURPLE_CALLBACK(saved_status_updated_cb), status_box);+ G_CALLBACK(saved_status_updated_cb), status_box); handle = purple_accounts_get_handle();
purple_signal_connect(handle, "account-enabled", status_box,
- PURPLE_CALLBACK(account_enabled_cb), status_box);+ G_CALLBACK(account_enabled_cb), status_box); purple_signal_connect(handle, "account-disabled", status_box,
- PURPLE_CALLBACK(account_enabled_cb), status_box);+ G_CALLBACK(account_enabled_cb), status_box); purple_signal_connect(handle, "account-status-changed", status_box,
- PURPLE_CALLBACK(account_status_changed_cb),+ G_CALLBACK(account_status_changed_cb), handle = purple_connections_get_handle();
purple_signal_connect(handle, "signing-on", status_box,
- PURPLE_CALLBACK(connection_start_cb),+ G_CALLBACK(connection_start_cb), purple_signal_connect(handle, "signed-on", status_box,
- PURPLE_CALLBACK(connection_finish_cb),+ G_CALLBACK(connection_finish_cb), purple_signal_connect(handle, "signing-off", status_box,
- PURPLE_CALLBACK(connection_finish_cb),+ G_CALLBACK(connection_finish_cb), purple_signal_connect(handle, "connection-error", status_box,
- PURPLE_CALLBACK(connection_error_cb), status_box);+ G_CALLBACK(connection_error_cb), status_box); monitor = g_network_monitor_get_default();
g_signal_connect(G_OBJECT(monitor), "network-changed",
--- a/pidgin/gtkutils.c Fri Mar 25 02:38:11 2022 -0500
+++ b/pidgin/gtkutils.c Fri Mar 25 02:51:58 2022 -0500
@@ -879,14 +879,14 @@
gtk_entry_completion_set_text_column(completion, COMPLETION_DISPLAYED_COLUMN);
purple_signal_connect(purple_connections_get_handle(), "signed-on", entry,
- PURPLE_CALLBACK(repopulate_autocomplete), data);+ G_CALLBACK(repopulate_autocomplete), data); purple_signal_connect(purple_connections_get_handle(), "signed-off", entry,
- PURPLE_CALLBACK(repopulate_autocomplete), data);+ G_CALLBACK(repopulate_autocomplete), data); purple_signal_connect(purple_accounts_get_handle(), "account-added", entry,
- PURPLE_CALLBACK(repopulate_autocomplete), data);+ G_CALLBACK(repopulate_autocomplete), data); purple_signal_connect(purple_accounts_get_handle(), "account-removed", entry,
- PURPLE_CALLBACK(repopulate_autocomplete), data);+ G_CALLBACK(repopulate_autocomplete), data); g_signal_connect(G_OBJECT(entry), "destroy", G_CALLBACK(buddyname_autocomplete_destroyed_cb), data);
--- a/pidgin/pidginapplication.c Fri Mar 25 02:38:11 2022 -0500
+++ b/pidgin/pidginapplication.c Fri Mar 25 02:51:58 2022 -0500
@@ -753,10 +753,10 @@
handle = purple_connections_get_handle();
purple_signal_connect(handle, "online", application,
- PURPLE_CALLBACK(pidgin_application_online_cb),+ G_CALLBACK(pidgin_application_online_cb), purple_signal_connect(handle, "offline", application,
- PURPLE_CALLBACK(pidgin_application_offline_cb),+ G_CALLBACK(pidgin_application_offline_cb), /* connect to account-signed-on and account-signed-off to toggle actions
@@ -764,10 +764,10 @@
handle = purple_accounts_get_handle();
purple_signal_connect(handle, "account-signed-on", application,
- PURPLE_CALLBACK(pidgin_application_signed_on_cb),+ G_CALLBACK(pidgin_application_signed_on_cb), purple_signal_connect(handle, "account-signed-off", application,
- PURPLE_CALLBACK(pidgin_application_signed_off_cb),+ G_CALLBACK(pidgin_application_signed_off_cb), --- a/pidgin/pidginstatusmanager.c Fri Mar 25 02:38:11 2022 -0500
+++ b/pidgin/pidginstatusmanager.c Fri Mar 25 02:51:58 2022 -0500
@@ -254,16 +254,16 @@
handle = purple_savedstatuses_get_handle();
purple_signal_connect(handle, "savedstatus-changed", manager,
- PURPLE_CALLBACK(pidgin_status_manager_savedstatus_changed_cb),+ G_CALLBACK(pidgin_status_manager_savedstatus_changed_cb), purple_signal_connect(handle, "savedstatus-added", manager,
- PURPLE_CALLBACK(pidgin_status_manager_savedstatus_updated_cb),+ G_CALLBACK(pidgin_status_manager_savedstatus_updated_cb), purple_signal_connect(handle, "savedstatus-deleted", manager,
- PURPLE_CALLBACK(pidgin_status_manager_savedstatus_updated_cb),+ G_CALLBACK(pidgin_status_manager_savedstatus_updated_cb), purple_signal_connect(handle, "savedstatus-modified", manager,
- PURPLE_CALLBACK(pidgin_status_manager_savedstatus_updated_cb),+ G_CALLBACK(pidgin_status_manager_savedstatus_updated_cb), --- a/pidgin/plugins/disco/gtkdisco.c Fri Mar 25 02:38:11 2022 -0500
+++ b/pidgin/plugins/disco/gtkdisco.c Fri Mar 25 02:51:58 2022 -0500
@@ -235,8 +235,8 @@
dialog->prompt_handle = purple_request_input(my_plugin, _("Server name request"), _("Enter an XMPP Server"),
_("Select an XMPP server to query"),
server, FALSE, FALSE, NULL,
- _("Find Services"), PURPLE_CALLBACK(discolist_ok_cb),- _("Cancel"), PURPLE_CALLBACK(discolist_cancel_cb),+ _("Find Services"), G_CALLBACK(discolist_ok_cb), + _("Cancel"), G_CALLBACK(discolist_cancel_cb), purple_request_cpar_from_connection(pc), pdl);
--- a/pidgin/plugins/disco/xmppdisco.c Fri Mar 25 02:38:11 2022 -0500
+++ b/pidgin/plugins/disco/xmppdisco.c Fri Mar 25 02:51:58 2022 -0500
@@ -126,7 +126,7 @@
PurpleProtocol *protocol = purple_connection_get_protocol(pc);
purple_signal_disconnect(protocol, "jabber-receiving-iq", my_plugin,
- PURPLE_CALLBACK(xmpp_iq_received));+ G_CALLBACK(xmpp_iq_received)); @@ -152,7 +152,7 @@
purple_signal_connect(protocol, "jabber-receiving-iq", my_plugin,
- PURPLE_CALLBACK(xmpp_iq_received), NULL);+ G_CALLBACK(xmpp_iq_received), NULL); @@ -654,7 +654,7 @@
pidgin_disco_dialog_register(plugin);
purple_signal_connect(purple_connections_get_handle(), "signing-off",
- plugin, PURPLE_CALLBACK(signed_off_cb), NULL);+ plugin, G_CALLBACK(signed_off_cb), NULL); iq_callbacks = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
--- a/pidgin/plugins/gestures/gestures.c Fri Mar 25 02:38:11 2022 -0500
+++ b/pidgin/plugins/gestures/gestures.c Fri Mar 25 02:51:58 2022 -0500
@@ -257,7 +257,7 @@
purple_signal_connect(purple_conversations_get_handle(),
- plugin, PURPLE_CALLBACK(new_conv_cb), NULL);+ plugin, G_CALLBACK(new_conv_cb), NULL); --- a/pidgin/plugins/gtkbuddynote.c Fri Mar 25 02:38:11 2022 -0500
+++ b/pidgin/plugins/gtkbuddynote.c Fri Mar 25 02:51:58 2022 -0500
@@ -73,7 +73,7 @@
gtk_buddy_note_load(GPluginPlugin *plugin, GError **error)
purple_signal_connect(pidgin_blist_get_handle(), "drawing-tooltip",
- plugin, PURPLE_CALLBACK(append_to_tooltip), NULL);+ plugin, G_CALLBACK(append_to_tooltip), NULL); --- a/pidgin/plugins/iconaway.c Fri Mar 25 02:38:11 2022 -0500
+++ b/pidgin/plugins/iconaway.c Fri Mar 25 02:51:58 2022 -0500
@@ -78,7 +78,7 @@
icon_away_load(GPluginPlugin *plugin, GError **error)
purple_signal_connect(purple_accounts_get_handle(), "account-status-changed",
- plugin, PURPLE_CALLBACK(iconify_windows), NULL);+ plugin, G_CALLBACK(iconify_windows), NULL); --- a/pidgin/plugins/notify.c Fri Mar 25 02:38:11 2022 -0500
+++ b/pidgin/plugins/notify.c Fri Mar 25 02:51:58 2022 -0500
@@ -871,19 +871,19 @@
purple_prefs_add_bool("/plugins/gtk/X11/notify/notify_switch", TRUE);
purple_signal_connect(gtk_conv_handle, "displayed-im-msg", plugin,
- PURPLE_CALLBACK(message_displayed_cb), NULL);+ G_CALLBACK(message_displayed_cb), NULL); purple_signal_connect(gtk_conv_handle, "displayed-chat-msg", plugin,
- PURPLE_CALLBACK(message_displayed_cb), NULL);+ G_CALLBACK(message_displayed_cb), NULL); purple_signal_connect(gtk_conv_handle, "conversation-switched", plugin,
- PURPLE_CALLBACK(conv_switched), NULL);+ G_CALLBACK(conv_switched), NULL); purple_signal_connect(conv_handle, "sent-im-msg", plugin,
- PURPLE_CALLBACK(im_sent_im), NULL);+ G_CALLBACK(im_sent_im), NULL); purple_signal_connect(conv_handle, "sent-chat-msg", plugin,
- PURPLE_CALLBACK(chat_sent_im), NULL);+ G_CALLBACK(chat_sent_im), NULL); purple_signal_connect(conv_handle, "conversation-created", plugin,
- PURPLE_CALLBACK(conv_created), NULL);+ G_CALLBACK(conv_created), NULL); purple_signal_connect(conv_handle, "deleting-conversation", plugin,
- PURPLE_CALLBACK(deleting_conv), NULL);+ G_CALLBACK(deleting_conv), NULL); PurpleConversation *conv = (PurpleConversation *)convs->data;
--- a/pidgin/plugins/spellchk.c Fri Mar 25 02:38:11 2022 -0500
+++ b/pidgin/plugins/spellchk.c Fri Mar 25 02:51:58 2022 -0500
@@ -2311,7 +2311,7 @@
purple_signal_connect(conv_handle, "conversation-created",
- plugin, PURPLE_CALLBACK(spellchk_new_attach), NULL);+ plugin, G_CALLBACK(spellchk_new_attach), NULL); --- a/pidgin/plugins/transparency.c Fri Mar 25 02:38:11 2022 -0500
+++ b/pidgin/plugins/transparency.c Fri Mar 25 02:51:58 2022 -0500
@@ -606,14 +606,14 @@
conv_handle = purple_conversations_get_handle();
purple_signal_connect(conv_handle, "conversation-created", plugin,
- PURPLE_CALLBACK(new_conversation_cb), NULL);+ G_CALLBACK(new_conversation_cb), NULL); /* Set callback to remove window from the list, if the window is destroyed */
purple_signal_connect(conv_handle, "deleting-conversation", plugin,
- PURPLE_CALLBACK(conversation_delete_cb), NULL);+ G_CALLBACK(conversation_delete_cb), NULL); purple_signal_connect(conv_handle, "conversation-updated", plugin,
- PURPLE_CALLBACK(conv_updated_cb), NULL);+ G_CALLBACK(conv_updated_cb), NULL); @@ -623,7 +623,7 @@
purple_signal_connect(pidgin_blist_get_handle(),
"gtkblist-created", plugin,
- PURPLE_CALLBACK(blist_created_cb), NULL);+ G_CALLBACK(blist_created_cb), NULL); --- a/pidgin/plugins/unity.c Fri Mar 25 02:38:11 2022 -0500
+++ b/pidgin/plugins/unity.c Fri Mar 25 02:51:58 2022 -0500
@@ -607,24 +607,24 @@
status_changed_cb(saved_status);
purple_signal_connect(savedstat_handle, "savedstatus-changed", plugin,
- PURPLE_CALLBACK(status_changed_cb), NULL);+ G_CALLBACK(status_changed_cb), NULL); launcher = unity_launcher_entry_get_for_desktop_id("pidgin.desktop");
launcher_count = purple_prefs_get_int("/plugins/gtk/unity/launcher_count");
purple_signal_connect(gtk_conv_handle, "displayed-im-msg", plugin,
- PURPLE_CALLBACK(message_displayed_cb), NULL);+ G_CALLBACK(message_displayed_cb), NULL); purple_signal_connect(gtk_conv_handle, "displayed-chat-msg", plugin,
- PURPLE_CALLBACK(message_displayed_cb), NULL);+ G_CALLBACK(message_displayed_cb), NULL); purple_signal_connect(conv_handle, "sent-im-msg", plugin,
- PURPLE_CALLBACK(im_sent_im), NULL);+ G_CALLBACK(im_sent_im), NULL); purple_signal_connect(conv_handle, "sent-chat-msg", plugin,
- PURPLE_CALLBACK(chat_sent_im), NULL);+ G_CALLBACK(chat_sent_im), NULL); purple_signal_connect(conv_handle, "conversation-created", plugin,
- PURPLE_CALLBACK(conv_created), NULL);+ G_CALLBACK(conv_created), NULL); purple_signal_connect(conv_handle, "deleting-conversation", plugin,
- PURPLE_CALLBACK(deleting_conv), NULL);+ G_CALLBACK(deleting_conv), NULL); manager = purple_conversation_manager_get_default();
convs = purple_conversation_manager_get_all(manager);
--- a/pidgin/plugins/xmppconsole/xmppconsole.c Fri Mar 25 02:38:11 2022 -0500
+++ b/pidgin/plugins/xmppconsole/xmppconsole.c Fri Mar 25 02:51:58 2022 -0500
@@ -748,10 +748,10 @@
purple_signal_connect(xmpp, "jabber-receiving-xmlnode",
- PURPLE_CALLBACK(purple_xmlnode_received_cb), NULL);+ G_CALLBACK(purple_xmlnode_received_cb), NULL); purple_signal_connect(xmpp, "jabber-sending-text",
- PURPLE_CALLBACK(purple_xmlnode_sent_cb), NULL);+ G_CALLBACK(purple_xmlnode_sent_cb), NULL); @@ -761,9 +761,9 @@
purple_signal_connect(purple_connections_get_handle(), "signing-on",
- plugin, PURPLE_CALLBACK(signing_on_cb), NULL);+ plugin, G_CALLBACK(signing_on_cb), NULL); purple_signal_connect(purple_connections_get_handle(), "signed-off",
- plugin, PURPLE_CALLBACK(signed_off_cb), NULL);+ plugin, G_CALLBACK(signed_off_cb), NULL);
