changeset 9493:99423678a6e3

[gaim-migrate @ 10318] Take this, nosnilmot! committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Fri, 09 Jul 2004 01:03:33 +0000
parents 3df81e9e3184
children 42d6650bcdac
files src/gtkconv.c
diffstat 1 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/gtkconv.c	Fri Jul 09 00:54:36 2004 +0000
+++ b/src/gtkconv.c	Fri Jul 09 01:03:33 2004 +0000
@@ -870,8 +870,9 @@
 
 #if !GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
 static void
-savelog_destroy_cb(GtkWidget *widget, GaimGtkConversation *gtkconv)
+savelog_destroy_cb(GtkWidget *widget, GaimConversation *conv)
 {
+	GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION(conv);
 	if (gtkconv->dialogs.savelog != NULL) {
 		gaim_notify_close_with_handle(gtkconv->dialogs.savelog);
 		gaim_request_close_with_handle(gtkconv->dialogs.savelog);
@@ -889,6 +890,11 @@
 	GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION(conv);
 	gchar *buf;
 
+	if (gtkconv->dialogs.savelog != NULL) {
+		gtk_window_present(GTK_WINDOW(gtkconv->dialogs.savelog));
+		return;
+	}
+
 #if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
 	buf = g_strdup_printf("%s.html", gaim_normalize(conv->account, conv->name));
 	gtkconv->dialogs.savelog = gtk_file_chooser_dialog_new(_("Save Conversation"),
@@ -913,7 +919,7 @@
 	g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(gtkconv->dialogs.savelog)->cancel_button),
 					 "clicked", G_CALLBACK(savelog_destroy_cb), conv);
 	g_signal_connect(G_OBJECT(gtkconv->dialogs.savelog),
-					 "clicked", G_CALLBACK(savelog_destroy_cb), conv);
+					 "destroy", G_CALLBACK(savelog_destroy_cb), conv);
 #endif /* FILECHOOSER */
 
 	g_free(buf);