changeset 17035:0be41b604566

Patch #702, Info not reset on URL redirect
author Sean Egan <seanegan@gmail.com>
date Mon, 14 May 2007 19:55:01 +0000
parents d2353e780fd5
children 74f1f5bbd858
files libpurple/util.c pidgin/gtkblist.c
diffstat 2 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/util.c	Mon May 14 19:23:09 2007 +0000
+++ b/libpurple/util.c	Mon May 14 19:55:01 2007 +0000
@@ -3285,6 +3285,9 @@
 		gfud->inpa = 0;
 		close(gfud->fd);
 		gfud->fd = -1;
+		gfud->request_written = 0;
+		gfud->len = 0;
+		gfud->data_len = 0;
 
 		g_free(gfud->website.user);
 		g_free(gfud->website.passwd);
@@ -3497,7 +3500,7 @@
 	}
 	gfud->request_written += len;
 
-	if (gfud->request_written != total_len)
+	if (gfud->request_written < total_len)
 		return;
 
 	/* We're done writing our request, now start reading the response */
--- a/pidgin/gtkblist.c	Mon May 14 19:23:09 2007 +0000
+++ b/pidgin/gtkblist.c	Mon May 14 19:55:01 2007 +0000
@@ -327,7 +327,6 @@
 	GValue val;
 	PurpleBlistNode *node;
 	const char *text = NULL;
-	char *esc;
 
 	path = gtk_tree_path_new_from_string (path_str);
 	gtk_tree_model_get_iter (GTK_TREE_MODEL(gtkblist->treemodel), &iter, path);
@@ -350,12 +349,10 @@
 		g_return_if_reached();
 	}
 
-	esc = g_markup_escape_text(text, -1);
 	if (GTK_IS_ENTRY (editable)) {
 		GtkEntry *entry = GTK_ENTRY (editable);
-		gtk_entry_set_text(entry, esc);
-	}
-	g_free(esc);
+		gtk_entry_set_text(entry, text);
+	}
 }
 
 static void gtk_blist_renderer_edited_cb(GtkCellRendererText *text_rend, char *arg1,