Mercurial > pidgin3 / changeset

--- a/pidgin/gtkblist.c	Mon Nov 05 17:12:49 2018 -0600
+++ b/pidgin/gtkblist.c	Mon Nov 05 17:00:16 2018 -0600
@@ -3666,7 +3666,7 @@
 	{ "OnlineHelp", GTK_STOCK_HELP, N_("Online _Help"), "F1", NULL, gtk_blist_show_onlinehelp_cb },
 	{ "DebugWindow", NULL, N_("_Debug Window"), NULL, NULL, toggle_debug },
 	{ "PluginInformation", NULL, N_("_Plugin Information"), NULL, NULL, pidgin_dialogs_plugins_info },
-	{ "About", GTK_STOCK_ABOUT, N_("_About"), NULL, NULL, _pidgin_about_cb },
+	{ "About", GTK_STOCK_ABOUT, N_("_About"), NULL, NULL, G_CALLBACK(_pidgin_about_cb) },
 };
 
 /* Toggle items */

--- a/pidgin/gtkconv.c	Mon Nov 05 17:12:49 2018 -0600
+++ b/pidgin/gtkconv.c	Mon Nov 05 17:00:16 2018 -0600
@@ -1694,7 +1694,9 @@
 				real_who = purple_protocol_chat_iface_get_user_real_name(protocol, gc,
 					purple_chat_conversation_get_id(chat), who);
 
-				if (!purple_protocol_xfer_can_receive(protocol, gc, real_who ? real_who : who)) {
+				if (!purple_protocol_xfer_can_receive(
+						PURPLE_PROTOCOL_XFER(protocol),
+						gc, real_who ? real_who : who)) {
 					can_receive_file = FALSE;
 				}
 

--- a/pidgin/gtkutils.c	Mon Nov 05 17:12:49 2018 -0600
+++ b/pidgin/gtkutils.c	Mon Nov 05 17:00:16 2018 -0600
@@ -1438,10 +1438,13 @@
 		im = TRUE;
 
 	if (protocol && PURPLE_IS_PROTOCOL_XFER(protocol)) {
-		PurpleProtocolXferInterface *iface = PURPLE_PROTOCOL_XFER(protocol);
+		PurpleProtocolXferInterface *iface =
+				PURPLE_PROTOCOL_XFER_GET_IFACE(protocol);
 
 		if(iface->can_receive) {
-			ft = purple_protocol_xfer_can_receive(protocol, gc, who);
+			ft = purple_protocol_xfer_can_receive(
+					PURPLE_PROTOCOL_XFER(protocol),
+					gc, who);
 		} else {
 			ft = (iface->send_file) ? TRUE : FALSE;
 		}
@@ -2356,7 +2359,7 @@
 		g_strfreev(protocol_formats);
 		return NULL;
 	}
-	original = g_object_ref(G_OBJECT(pixbuf));
+	original = g_object_ref(pixbuf);
 
 	new_width = orig_width;
 	new_height = orig_height;

--- a/pidgin/gtkwebviewtoolbar.c	Mon Nov 05 17:12:49 2018 -0600
+++ b/pidgin/gtkwebviewtoolbar.c	Mon Nov 05 17:00:16 2018 -0600
@@ -1063,7 +1063,7 @@
 	GObject *object;
 	g_return_if_fail(toolbar);
 
-	object = g_object_ref(action);
+	object = g_object_ref(G_OBJECT(action));
 	g_signal_handlers_block_matched(object, G_SIGNAL_MATCH_DATA,
 	                                0, 0, NULL, NULL, toolbar);