Mercurial > pidgin3 / changeset

--- a/libpurple/protocols/jabber/jabber.c	Thu Mar 29 23:20:36 2018 -0500
+++ b/libpurple/protocols/jabber/jabber.c	Thu Apr 05 23:05:09 2018 -0500
@@ -237,7 +237,7 @@
 	/* Otherwise, it's a standard XMPP connection, or a HTTP (insecure) BOSH connection.
 	 * We request STARTTLS for standard XMPP connections, but we do nothing for insecure
 	 * BOSH connections, per XEP-0206. */
-	if(purple_ssl_is_supported() && !js->bosh) {
+	if(!js->bosh) {
 		jabber_send_raw(js,
 				"<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>", -1);
 		return TRUE;
@@ -249,7 +249,7 @@
 	 * and emit errors if encryption is required by the user. */
 	starttls = purple_xmlnode_get_child(packet, "starttls");
 	if(!js->bosh && purple_xmlnode_get_child(starttls, "required")) {
-		purple_connection_error_reason(js->gc,
+		purple_connection_error(js->gc,
 				PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
 				_("Server requires TLS/SSL, but no TLS/SSL support was found."));
 		return TRUE;
@@ -257,7 +257,7 @@
 
 	account = purple_connection_get_account(js->gc);
 	if (purple_strequal("require_tls", purple_account_get_string(account, "connection_security", JABBER_DEFAULT_REQUIRE_TLS))) {
-		purple_connection_error_reason(js->gc,
+		purple_connection_error(js->gc,
 				PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
 				_("You require encryption, but no TLS/SSL support was found."));
 		return TRUE;

--- a/pidgin/gtkblist.c	Thu Mar 29 23:20:36 2018 -0500
+++ b/pidgin/gtkblist.c	Thu Apr 05 23:05:09 2018 -0500
@@ -939,11 +939,9 @@
 add_buddy_account_filter_func(PurpleAccount *account)
 {
 	PurpleConnection *gc = purple_account_get_connection(account);
-	PurplePluginProtocolInfo *prpl_info = NULL;
-
-	prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl);
-
-	return (prpl_info->add_buddy != NULL);
+	PurpleProtocol *protocol = purple_connection_get_protocol(gc);
+
+	return PURPLE_PROTOCOL_IMPLEMENTS(protocol, SERVER_IFACE, add_buddy);
 }
 
 static gboolean
@@ -4786,7 +4784,6 @@
 static void
 conversation_created_cb(PurpleConversation *conv, PidginBuddyList *gtkblist)
 {
-<<<<<<< working copy
 	PurpleAccount *account = purple_conversation_get_account(conv);
 
 	if (PURPLE_IS_IM_CONVERSATION(conv)) {
@@ -6127,7 +6124,7 @@
 	                      PURPLE_CALLBACK(conversation_created_cb),
 	                      gtkblist);
 	purple_signal_connect(handle, "chat-joined", gtkblist,
-	                      PURPLE_CALLBACK(chat_joined_cb),
+	                      PURPLE_CALLBACK(conversation_created_cb),
 	                      gtkblist);
 
 	gtk_widget_hide(gtkblist->headline);