Mercurial > pidgin3 / changeset

--- a/libpurple/protocols/facebook/data.c	Mon Jun 26 01:11:28 2017 -0300
+++ b/libpurple/protocols/facebook/data.c	Mon Jun 26 02:04:55 2017 -0300
@@ -243,6 +243,10 @@
 		g_object_get_property(G_OBJECT(priv->api), fb_props_strs[i],
 		                      &val);
 		str = g_value_get_string(&val);
+
+		if (purple_strequal(fb_props_strs[i], "token") && !purple_account_get_remember_password(acct)) {
+			str = "";
+		}
 		purple_account_set_string(acct, fb_props_strs[i], str);
 		g_value_unset(&val);
 	}

--- a/libpurple/protocols/facebook/facebook.c	Mon Jun 26 01:11:28 2017 -0300
+++ b/libpurple/protocols/facebook/facebook.c	Mon Jun 26 02:04:55 2017 -0300
@@ -1053,7 +1053,7 @@
 	                      G_CALLBACK(fb_cb_conv_deleting),
 	                      fata);
 
-	if (!fb_data_load(fata)) {
+	if (!fb_data_load(fata) || !purple_account_get_remember_password(acct)) {
 		user = purple_account_get_username(acct);
 		pass = purple_connection_get_password(gc);
 		purple_connection_update_progress(gc, _("Authenticating"),