Mercurial > pidgin.yaz

changeset 9513:ac94e3f5ac8a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 10340] I really am trying to break a commit record committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sun, 11 Jul 2004 21:47:10 +0000
parents 3c79229259ba
children 1fac0336890c
files src/gtkrequest.c
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/gtkrequest.c	Sun Jul 11 20:46:28 2004 +0000
+++ b/src/gtkrequest.c	Sun Jul 11 21:47:10 2004 +0000
@@ -1355,7 +1355,6 @@
 {
 	if (data->cbs[id] != NULL)
 		((GaimRequestFileCb)data->cbs[id])(data->user_data, data->u.file.name);
-	g_free(data->u.file.name);
 
 	if (id == 1)
 		gaim_request_close(GAIM_REQUEST_FILE, data);
@@ -1379,10 +1378,11 @@
 	const gchar *name;
 
 	name = gtk_file_selection_get_filename(GTK_FILE_SELECTION(data->dialog));
+
+	/* If name is a directory then change directories */
 	if (gaim_gtk_check_if_dir(name, GTK_FILE_SELECTION(data->dialog)))
-		/* Descend into directory? */
-		/* Close dialog? */
 		return;
+
 	data->u.file.name = g_strdup(name);
 #endif /* FILECHOOSER */
 
@@ -1477,6 +1477,8 @@
 
 	if (type == GAIM_REQUEST_FIELDS)
 		gaim_request_fields_destroy(data->u.multifield.fields);
+	else if (type == GAIM_REQUEST_FILE)
+		g_free(data->u.file.name);
 
 	g_free(data);
 }