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/

10 files changed, 31 insertions, 31 deletions

diff --git a/pidgin/plugins/disco/gtkdisco.c b/pidgin/plugins/disco/gtkdisco.c
index 03f12a7c7c..f5c0791103 100644
--- a/pidgin/plugins/disco/gtkdisco.c
+++ b/pidgin/plugins/disco/gtkdisco.c
@@ -235,8 +235,8 @@ static void browse_button_cb(GtkWidget *button, PidginDiscoDialog *dialog)
 	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);
 
 	g_free(server);
diff --git a/pidgin/plugins/disco/xmppdisco.c b/pidgin/plugins/disco/xmppdisco.c
index 18b0c7cc4a..adc6297849 100644
--- a/pidgin/plugins/disco/xmppdisco.c
+++ b/pidgin/plugins/disco/xmppdisco.c
@@ -126,7 +126,7 @@ xmpp_iq_received(PurpleConnection *pc, const char *type, const char *id,
 		PurpleProtocol *protocol = purple_connection_get_protocol(pc);
 		iq_listening = FALSE;
 		purple_signal_disconnect(protocol, "jabber-receiving-iq", my_plugin,
-		                         PURPLE_CALLBACK(xmpp_iq_received));
+		                         G_CALLBACK(xmpp_iq_received));
 	}
 
 	/* Om nom nom nom */
@@ -152,7 +152,7 @@ xmpp_iq_register_callback(PurpleConnection *pc, gchar *id, gpointer data,
 
 		iq_listening = TRUE;
 		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 @@ xmpp_disco_load(GPluginPlugin *plugin, GError **error)
 	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);
 
diff --git a/pidgin/plugins/gestures/gestures.c b/pidgin/plugins/gestures/gestures.c
index 9758c37156..617eb50624 100644
--- a/pidgin/plugins/gestures/gestures.c
+++ b/pidgin/plugins/gestures/gestures.c
@@ -257,7 +257,7 @@ gestures_load(GPluginPlugin *plugin, GError **error)
 
 	purple_signal_connect(purple_conversations_get_handle(),
 						"conversation-created",
-						plugin, PURPLE_CALLBACK(new_conv_cb), NULL);
+						plugin, G_CALLBACK(new_conv_cb), NULL);
 
 	return TRUE;
 }
diff --git a/pidgin/plugins/gtkbuddynote.c b/pidgin/plugins/gtkbuddynote.c
index ed4a69a414..b9d50008da 100644
--- a/pidgin/plugins/gtkbuddynote.c
+++ b/pidgin/plugins/gtkbuddynote.c
@@ -73,7 +73,7 @@ static gboolean
 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);
 	return TRUE;
 }
 
diff --git a/pidgin/plugins/iconaway.c b/pidgin/plugins/iconaway.c
index 632fb445c4..6c536c7765 100644
--- a/pidgin/plugins/iconaway.c
+++ b/pidgin/plugins/iconaway.c
@@ -78,7 +78,7 @@ static gboolean
 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);
 
 	return TRUE;
 }
diff --git a/pidgin/plugins/notify.c b/pidgin/plugins/notify.c
index b84dc05916..05e81b4405 100644
--- a/pidgin/plugins/notify.c
+++ b/pidgin/plugins/notify.c
@@ -871,19 +871,19 @@ notify_load(GPluginPlugin *plugin, GError **error)
 	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);
 
 	while (convs) {
 		PurpleConversation *conv = (PurpleConversation *)convs->data;
diff --git a/pidgin/plugins/spellchk.c b/pidgin/plugins/spellchk.c
index 4bffeb9401..ea1567832c 100644
--- a/pidgin/plugins/spellchk.c
+++ b/pidgin/plugins/spellchk.c
@@ -2311,7 +2311,7 @@ spell_check_load(GPluginPlugin *plugin, GError **error)
 	}
 
 	purple_signal_connect(conv_handle, "conversation-created",
-			    plugin, PURPLE_CALLBACK(spellchk_new_attach), NULL);
+			    plugin, G_CALLBACK(spellchk_new_attach), NULL);
 
 	return TRUE;
 }
diff --git a/pidgin/plugins/transparency.c b/pidgin/plugins/transparency.c
index 6dcee73ab4..19f91deebd 100644
--- a/pidgin/plugins/transparency.c
+++ b/pidgin/plugins/transparency.c
@@ -606,14 +606,14 @@ transparency_load(GPluginPlugin *plugin, GError **error) {
 
 	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);
 
 	update_existing_convs();
 
@@ -623,7 +623,7 @@ transparency_load(GPluginPlugin *plugin, GError **error) {
 	} else {
 		purple_signal_connect(pidgin_blist_get_handle(),
 			"gtkblist-created", plugin,
-			PURPLE_CALLBACK(blist_created_cb), NULL);
+			G_CALLBACK(blist_created_cb), NULL);
 	}
 
 	return TRUE;
diff --git a/pidgin/plugins/unity.c b/pidgin/plugins/unity.c
index bd990cce47..4e963fd25b 100644
--- a/pidgin/plugins/unity.c
+++ b/pidgin/plugins/unity.c
@@ -607,24 +607,24 @@ unity_load(GPluginPlugin *plugin, GError **error) {
 	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");
 	g_object_ref(launcher);
 	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);
diff --git a/pidgin/plugins/xmppconsole/xmppconsole.c b/pidgin/plugins/xmppconsole/xmppconsole.c
index 93bbd958fa..5febd5fcd2 100644
--- a/pidgin/plugins/xmppconsole/xmppconsole.c
+++ b/pidgin/plugins/xmppconsole/xmppconsole.c
@@ -748,10 +748,10 @@ xmpp_console_load(GPluginPlugin *plugin, GError **error)
 
 		purple_signal_connect(xmpp, "jabber-receiving-xmlnode",
 			xmpp_console_handle,
-			PURPLE_CALLBACK(purple_xmlnode_received_cb), NULL);
+			G_CALLBACK(purple_xmlnode_received_cb), NULL);
 		purple_signal_connect(xmpp, "jabber-sending-text",
 			xmpp_console_handle,
-			PURPLE_CALLBACK(purple_xmlnode_sent_cb), NULL);
+			G_CALLBACK(purple_xmlnode_sent_cb), NULL);
 	}
 
 	if (!any_registered) {
@@ -761,9 +761,9 @@ xmpp_console_load(GPluginPlugin *plugin, GError **error)
 	}
 
 	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);
 
 	return TRUE;
 }