Mercurial > pidgin3 / changeset

--- a/libpurple/http.c	Fri May 06 09:39:32 2016 -0500
+++ b/libpurple/http.c	Tue May 10 22:02:28 2016 -0500
@@ -2011,13 +2011,13 @@
 {
 	gchar *escaped_name = g_strdup(purple_url_encode(name));
 	gchar *escaped_value = NULL;
-	
-	if (escaped_value) {
+
+	if (value) {
 		escaped_value = g_strdup(purple_url_encode(value));
 	}
-	
+
 	purple_http_cookie_jar_set_ext(cookie_jar, escaped_name, escaped_value, -1);
-	
+
 	g_free(escaped_name);
 	g_free(escaped_value);
 }

--- a/libpurple/protocols/jabber/presence.c	Fri May 06 09:39:32 2016 -0500
+++ b/libpurple/protocols/jabber/presence.c	Tue May 10 22:02:28 2016 -0500
@@ -305,6 +305,8 @@
 	gboolean audio_enabled, video_enabled;
 #endif
 
+	g_return_val_if_fail(js !=NULL, NULL);
+
 	presence = purple_xmlnode_new("presence");
 
 	if(state == JABBER_BUDDY_STATE_UNAVAILABLE)
@@ -332,7 +334,7 @@
 	}
 
 	/* if we are idle and not offline, include idle */
-	if (js && js->idle && state != JABBER_BUDDY_STATE_UNAVAILABLE) {
+	if (js->idle && state != JABBER_BUDDY_STATE_UNAVAILABLE) {
 		PurpleXmlNode *query = purple_xmlnode_new_child(presence, "query");
 		gchar seconds[10];
 		g_snprintf(seconds, 10, "%d", (int) (time(NULL) - js->idle));

--- a/pidgin/gtkcertmgr.c	Fri May 06 09:39:32 2016 -0500
+++ b/pidgin/gtkcertmgr.c	Tue May 10 22:02:28 2016 -0500
@@ -317,7 +317,7 @@
 	GtkTreeModel *model;
 	gchar *id;
 	GTlsCertificate *crt;
-	char *title;
+	gchar *title;
 	GError *error = NULL;
 
 	/* See if things are selected */
@@ -331,7 +331,7 @@
 	gtk_tree_model_get(model, &iter, TPM_HOSTNAME_COLUMN, &id, -1);
 
 	/* Now retrieve the certificate */
-	crt = purple_tls_certificate_new_from_id(id, NULL);
+	crt = purple_tls_certificate_new_from_id(id, &error);
 
 	if (crt == NULL) {
 		purple_debug_warning("gtkcertmgr/tls_peers_mgmt",