# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1089334476 0
# Node ID 3df81e9e31848710154ace375eeb90d67afd7b44
# Parent  c2e4c3ab430756a41e6e6147f4cea466177bf519
[gaim-migrate @ 10317]
Non gtk 2.4 compile fixes.  Now nosnilmot can fix the crash bugs.

committer: Tailor Script <tailor@pidgin.im>

diff -r c2e4c3ab4307 -r 3df81e9e3184 src/gtkconv.c
--- a/src/gtkconv.c	Fri Jul 09 00:44:11 2004 +0000
+++ b/src/gtkconv.c	Fri Jul 09 00:54:36 2004 +0000
@@ -800,7 +800,7 @@
 #if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
 	filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(gtkconv->dialogs.savelog));
 #else /* FILECHOOSER */
-	filename = gtk_file_selection_get_filename(GTK_FILE_SELECTION(gtkconv->dialogs.save));
+	filename = gtk_file_selection_get_filename(GTK_FILE_SELECTION(gtkconv->dialogs.savelog));
 #endif /* FILECHOOSER */
 
 	gaim_notify_close_with_handle(gtkconv->dialogs.savelog);
@@ -870,9 +870,9 @@
 
 #if !GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
 static void
-savelog_destroy_cb(GtkWidget *widget, GtkConversation *gtkconv)
+savelog_destroy_cb(GtkWidget *widget, GaimGtkConversation *gtkconv)
 {
-	if (gtkconv->save != NULL) {
+	if (gtkconv->dialogs.savelog != NULL) {
 		gaim_notify_close_with_handle(gtkconv->dialogs.savelog);
 		gaim_request_close_with_handle(gtkconv->dialogs.savelog);
 		gtk_widget_destroy(gtkconv->dialogs.savelog);
@@ -905,7 +905,7 @@
 					 G_CALLBACK(savelog_checkfile_cb), conv);
 #else /* FILECHOOSER */
 	buf = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s.html", gaim_home_dir(),
-						  gaim_normalize(c->account, c->name));
+						  gaim_normalize(conv->account, conv->name));
 	gtkconv->dialogs.savelog = gtk_file_selection_new(_("Save Conversation"));
 	gtk_file_selection_set_filename(GTK_FILE_SELECTION(gtkconv->dialogs.savelog), buf);
 	g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(gtkconv->dialogs.savelog)->ok_button),