Mercurial > pidgin.yaz

changeset 9482:b917acdc982f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 10307] Alright, the buddy icon selector is done. It should rock now. I also made a few tweaks to the debug save window. gaim_notify_close_with_handle() and gaim_request_close_with_handle() are sweet. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Thu, 08 Jul 2004 04:07:23 +0000
parents 683660b4efeb
children a226202bcae8
files src/gtkaccount.c src/gtkdebug.c
diffstat 2 files changed, 163 insertions(+), 117 deletions(-) [+]
line wrap: on
line diff
--- a/src/gtkaccount.c	Thu Jul 08 02:20:38 2004 +0000
+++ b/src/gtkaccount.c	Thu Jul 08 04:07:23 2004 +0000
@@ -117,12 +117,12 @@
 	/* User Options */
 	GtkWidget *user_frame;
 	GtkWidget *new_mail_check;
-	GtkWidget *buddy_icon_hbox;
-	GtkWidget *buddy_icon_entry;
-	char *buddy_icon_path;
-	GtkWidget *buddy_icon_filesel;
-	GtkWidget *buddy_icon_preview;
-	GtkWidget *buddy_icon_text;
+	GtkWidget *icon_hbox;
+	GtkWidget *icon_entry;
+	char *icon_path;
+	GtkWidget *icon_filesel;
+	GtkWidget *icon_preview;
+	GtkWidget *icon_text;
 
 	/* Protocol Options */
 	GtkWidget *protocol_frame;
@@ -248,40 +248,53 @@
 
 }
 
+#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
 static void
-buddy_icon_filesel_delete_cb(GtkWidget *w, AccountPrefsDialog *dialog)
+icon_filesel_choose_cb(GtkWidget *widget, gint response, AccountPrefsDialog *dialog)
 {
-	if (dialog->buddy_icon_filesel != NULL)
-		gtk_widget_destroy(dialog->buddy_icon_filesel);
-
-	dialog->buddy_icon_filesel = NULL;
-}
-
+	const char *filename;
+
+	if (response != GTK_RESPONSE_ACCEPT) {
+		if (response == GTK_RESPONSE_CANCEL)
+			gtk_widget_destroy(dialog->icon_filesel);
+		dialog->icon_filesel = NULL;
+		return;
+	}
+
+	filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog->icon_filesel));
+#else /* FILECHOOSER */
 static void
-buddy_icon_filesel_choose(GtkWidget *w, AccountPrefsDialog *dialog)
+icon_filesel_choose_cb(GtkWidget *w, AccountPrefsDialog *dialog)
 {
 	const char *filename;
 
 	filename = gtk_file_selection_get_filename(
-			GTK_FILE_SELECTION(dialog->buddy_icon_filesel));
+			GTK_FILE_SELECTION(dialog->icon_filesel));
 
 	/* If they typed in a directory, change there */
 	if (gaim_gtk_check_if_dir(filename,
-			GTK_FILE_SELECTION(dialog->buddy_icon_filesel)))
+			GTK_FILE_SELECTION(dialog->icon_filesel)))
 	{
 		return;
 	}
-
-	if (dialog->buddy_icon_path)
-		g_free(dialog->buddy_icon_path);
-	dialog->buddy_icon_path = g_strdup(filename);
-	gtk_image_set_from_file(GTK_IMAGE(dialog->buddy_icon_entry), filename);
-	gtk_widget_show(dialog->buddy_icon_entry);
-	gtk_widget_destroy(dialog->buddy_icon_filesel);
+#endif /* FILECHOOSER */
+
+	if (dialog->icon_path)
+		g_free(dialog->icon_path);
+	dialog->icon_path = g_strdup(filename);
+	gtk_image_set_from_file(GTK_IMAGE(dialog->icon_entry), filename);
+	gtk_widget_show(dialog->icon_entry);
+
+	gtk_widget_destroy(dialog->icon_filesel);
+	dialog->icon_filesel = NULL;
 }
 
 static void
-buddy_icon_preview_change_cb(GtkTreeSelection *sel, AccountPrefsDialog *dialog)
+#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
+icon_preview_change_cb(GtkFileChooser *widget, AccountPrefsDialog *dialog)
+#else /* FILECHOOSER */
+icon_preview_change_cb(GtkTreeSelection *sel, AccountPrefsDialog *dialog)
+#endif /* FILECHOOSER */
 {
 	GdkPixbuf *pixbuf, *scale;
 	int height, width;
@@ -289,16 +302,25 @@
 	struct stat st;
 	const char *filename;
 
+#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
+	filename = gtk_file_chooser_get_preview_filename(
+					GTK_FILE_CHOOSER(dialog->icon_filesel));
+#else /* FILECHOOSER */
 	filename = gtk_file_selection_get_filename(
-		GTK_FILE_SELECTION(dialog->buddy_icon_filesel));
+		GTK_FILE_SELECTION(dialog->icon_filesel));
+#endif /* FILECHOOSER */
 
 	if (!filename || stat(filename, &st))
 		return;
 
 	pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
 	if (!pixbuf) {
-		gtk_image_set_from_pixbuf(GTK_IMAGE(dialog->buddy_icon_preview), NULL);
-		gtk_label_set_markup(GTK_LABEL(dialog->buddy_icon_text), "");
+		gtk_image_set_from_pixbuf(GTK_IMAGE(dialog->icon_preview), NULL);
+		gtk_label_set_markup(GTK_LABEL(dialog->icon_text), "");
+#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
+		gtk_file_chooser_set_preview_widget_active(
+					GTK_FILE_CHOOSER(dialog->icon_filesel), FALSE);
+#endif /* FILECHOOSER */
 		return;
 	}
 
@@ -313,8 +335,12 @@
 
 	scale = gdk_pixbuf_scale_simple(pixbuf, width * 50 / height,
 									50, GDK_INTERP_BILINEAR);
-	gtk_image_set_from_pixbuf(GTK_IMAGE(dialog->buddy_icon_preview), scale);
-	gtk_label_set_markup(GTK_LABEL(dialog->buddy_icon_text), markup);
+	gtk_image_set_from_pixbuf(GTK_IMAGE(dialog->icon_preview), scale);
+#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
+	gtk_file_chooser_set_preview_widget_active(
+					GTK_FILE_CHOOSER(dialog->icon_filesel), TRUE);
+#endif /* FILECHOOSER */
+	gtk_label_set_markup(GTK_LABEL(dialog->icon_text), markup);
 
 	g_object_unref(G_OBJECT(pixbuf));
 	g_object_unref(G_OBJECT(scale));
@@ -323,74 +349,94 @@
 	g_free(markup);
 }
 
+#if !GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
 static void
-buddy_icon_select_cb(GtkWidget *button, AccountPrefsDialog *dialog)
+icon_filesel_delete_cb(GtkWidget *w, AccountPrefsDialog *dialog)
 {
+	if (dialog->icon_filesel != NULL)
+		gtk_widget_destroy(dialog->icon_filesel);
+
+	dialog->icon_filesel = NULL;
+}
+#endif /* FILECHOOSER */
+
+static void
+icon_select_cb(GtkWidget *button, AccountPrefsDialog *dialog)
+{
+#if !GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
 	GtkWidget *hbox;
 	GtkWidget *tv;
 	GtkTreeSelection *sel;
-
-	if (dialog->buddy_icon_filesel)
-	{
-		gtk_widget_show(GTK_WIDGET(dialog->buddy_icon_filesel));
-		gdk_window_raise(GDK_WINDOW(dialog->buddy_icon_filesel->window));
+#endif /* FILECHOOSER */
+
+	if (dialog->icon_filesel != NULL) {
+		gtk_window_present(GTK_WINDOW(dialog->icon_filesel));
 		return;
 	}
 
-	dialog->buddy_icon_filesel = gtk_file_selection_new(_("Buddy Icon"));
-	dialog->buddy_icon_preview = gtk_image_new();
-	dialog->buddy_icon_text = gtk_label_new(NULL);
-
-	gtk_widget_set_size_request(GTK_WIDGET(dialog->buddy_icon_preview), -1, 50);
+#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
+	dialog->icon_filesel = gtk_file_chooser_dialog_new(_("Buddy Icon"),
+									GTK_WINDOW(dialog->window),
+									GTK_FILE_CHOOSER_ACTION_OPEN,
+									GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+									GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+									NULL);
+	gtk_dialog_set_default_response(GTK_DIALOG(dialog->icon_filesel), GTK_RESPONSE_ACCEPT);
+	if (dialog->icon_path != NULL)
+		gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog->icon_filesel),
+			dialog->icon_path);
+	dialog->icon_preview = gtk_image_new();
+	dialog->icon_text = gtk_label_new(NULL);
+	gtk_widget_set_size_request(GTK_WIDGET(dialog->icon_preview), -1, 50);
+	gtk_file_chooser_set_preview_widget(GTK_FILE_CHOOSER(dialog->icon_filesel), 
+					    GTK_WIDGET(dialog->icon_preview));
+	g_signal_connect(G_OBJECT(dialog->icon_filesel), "update-preview",
+					 G_CALLBACK(icon_preview_change_cb), dialog);
+	g_signal_connect(G_OBJECT(dialog->icon_filesel), "response",
+					 G_CALLBACK(icon_filesel_choose_cb), dialog);
+	icon_preview_change_cb(NULL, dialog);
+#else /* FILECHOOSER */
+	dialog->icon_filesel = gtk_file_selection_new(_("Buddy Icon"));
+	dialog->icon_preview = gtk_image_new();
+	dialog->icon_text = gtk_label_new(NULL);
+
+	gtk_widget_set_size_request(GTK_WIDGET(dialog->icon_preview), -1, 50);
 	hbox = gtk_hbox_new(FALSE, 6);
 	gtk_box_pack_start(
-		GTK_BOX(GTK_FILE_SELECTION(dialog->buddy_icon_filesel)->main_vbox),
+		GTK_BOX(GTK_FILE_SELECTION(dialog->icon_filesel)->main_vbox),
 		hbox, FALSE, FALSE, 0);
-	gtk_box_pack_end(GTK_BOX(hbox), dialog->buddy_icon_preview,
+	gtk_box_pack_end(GTK_BOX(hbox), dialog->icon_preview,
 					 FALSE, FALSE, 0);
-	gtk_box_pack_end(GTK_BOX(hbox), dialog->buddy_icon_text, FALSE, FALSE, 0);
-
-	tv = GTK_FILE_SELECTION(dialog->buddy_icon_filesel)->file_list;
+	gtk_box_pack_end(GTK_BOX(hbox), dialog->icon_text, FALSE, FALSE, 0);
+
+	tv = GTK_FILE_SELECTION(dialog->icon_filesel)->file_list;
 	sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv));
 
 	g_signal_connect(G_OBJECT(sel), "changed",
-					 G_CALLBACK(buddy_icon_preview_change_cb), dialog);
-
-	g_signal_connect(G_OBJECT(dialog->buddy_icon_filesel), "destroy",
-					 G_CALLBACK(buddy_icon_filesel_delete_cb), dialog);
+					 G_CALLBACK(icon_preview_change_cb), dialog);
 	g_signal_connect(
-		G_OBJECT(GTK_FILE_SELECTION(dialog->buddy_icon_filesel)->cancel_button),
-		"clicked",
-		G_CALLBACK(buddy_icon_filesel_delete_cb), dialog);
-	g_signal_connect(
-		G_OBJECT(GTK_FILE_SELECTION(dialog->buddy_icon_filesel)->ok_button),
+		G_OBJECT(GTK_FILE_SELECTION(dialog->icon_filesel)->ok_button),
 		"clicked",
-		G_CALLBACK(buddy_icon_filesel_choose), dialog);
-
-	gtk_widget_show_all(GTK_WIDGET(dialog->buddy_icon_filesel));
-
-	/*
-	  The user doesn't know where his buddy icon is located anymore 
-	if (dialog->account &&
-		(gaim_account_get_buddy_icon(dialog->account) != NULL))
-	{
-		gtk_file_selection_set_filename(
-			GTK_FILE_SELECTION(dialog->buddy_icon_filesel),
-			gaim_account_get_buddy_icon(dialog->account));
-
-		buddy_icon_preview_change_cb(NULL, dialog);
-	}
-	*/
+		G_CALLBACK(icon_filesel_choose_cb), dialog);
+	g_signal_connect(
+		G_OBJECT(GTK_FILE_SELECTION(dialog->icon_filesel)->cancel_button),
+		"clicked",
+		G_CALLBACK(icon_filesel_delete_cb), dialog);
+	g_signal_connect(G_OBJECT(dialog->icon_filesel), "destroy",
+					 G_CALLBACK(icon_filesel_delete_cb), dialog);
+#endif /* FILECHOOSER */
+
+	gtk_widget_show_all(GTK_WIDGET(dialog->icon_filesel));
 }
 
 static void
-buddy_icon_reset_cb(GtkWidget *button, AccountPrefsDialog *dialog)
+icon_reset_cb(GtkWidget *button, AccountPrefsDialog *dialog)
 {
-	if (dialog->buddy_icon_path)
-		g_free(dialog->buddy_icon_path);
-	dialog->buddy_icon_path = NULL;
-	gtk_widget_hide(dialog->buddy_icon_entry);
-	/*gtk_image_set_from_file(GTK_IMAGE(dialog->buddy_icon_entry), "");*/
+	if (dialog->icon_path)
+		g_free(dialog->icon_path);
+	dialog->icon_path = NULL;
+
+	gtk_widget_hide(dialog->icon_entry);
 }
 
 
@@ -416,12 +462,11 @@
 			}
 			if ((rtmp = strchr(tmp, '\r')) || (rtmp = strchr(tmp, '\n')))
 				*rtmp = '\0';
-			if (dialog->buddy_icon_path)
-				g_free(dialog->buddy_icon_path);
-			printf("Really huh? %s\n", tmp);
-			dialog->buddy_icon_path = g_strdup(tmp);
-			gtk_image_set_from_file(GTK_IMAGE(dialog->buddy_icon_entry), tmp);
-			gtk_widget_show(dialog->buddy_icon_entry);
+			if (dialog->icon_path)
+				g_free(dialog->icon_path);
+			dialog->icon_path = g_strdup(tmp);
+			gtk_image_set_from_file(GTK_IMAGE(dialog->icon_entry), tmp);
+			gtk_widget_show(dialog->icon_entry);
 			g_free(tmp);
 		} 
 		gtk_drag_finish(dc, TRUE, FALSE, t);
@@ -735,7 +780,7 @@
 	gtk_widget_show(dialog->new_mail_check);
 
 	/* Buddy icon */
-	dialog->buddy_icon_hbox = hbox = gtk_hbox_new(FALSE, 6);
+	dialog->icon_hbox = hbox = gtk_hbox_new(FALSE, 6);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 	gtk_widget_show(hbox);
 
@@ -744,12 +789,12 @@
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 	gtk_widget_show(label);
 
-	dialog->buddy_icon_entry = gtk_image_new();
-	gtk_box_pack_start(GTK_BOX(hbox), dialog->buddy_icon_entry,
+	dialog->icon_entry = gtk_image_new();
+	gtk_box_pack_start(GTK_BOX(hbox), dialog->icon_entry,
 					   FALSE, FALSE, 0);
-	gtk_widget_show(dialog->buddy_icon_entry);
-	gaim_set_accessible_label (dialog->buddy_icon_entry, label);
-	dialog->buddy_icon_path = NULL;
+	gtk_widget_show(dialog->icon_entry);
+	gaim_set_accessible_label (dialog->icon_entry, label);
+	dialog->icon_path = NULL;
 
 	vbox2 = gtk_vbox_new(FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(hbox), vbox2, TRUE, TRUE, 0);
@@ -762,12 +807,12 @@
 	button = gtk_button_new_from_stock(GTK_STOCK_OPEN);
 	gtk_box_pack_start(GTK_BOX(hbox2), button, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(button), "clicked",
-					 G_CALLBACK(buddy_icon_select_cb), dialog);
+					 G_CALLBACK(icon_select_cb), dialog);
 	gtk_widget_show(button);
 
 	button = gtk_button_new_from_stock(GTK_STOCK_REMOVE);
 	g_signal_connect(G_OBJECT(button), "clicked",
-			 G_CALLBACK(buddy_icon_reset_cb), dialog);
+			 G_CALLBACK(icon_reset_cb), dialog);
 	gtk_box_pack_start(GTK_BOX(hbox2), button, FALSE, FALSE, 0);
 	gtk_widget_show(button);
 
@@ -776,7 +821,7 @@
 			gtk_widget_hide(dialog->new_mail_check);
 
 		if (!(dialog->prpl_info->icon_spec.format != NULL))
-			gtk_widget_hide(dialog->buddy_icon_hbox);
+			gtk_widget_hide(dialog->icon_hbox);
 	}
 
 	if (dialog->account != NULL) {
@@ -784,8 +829,8 @@
 				gaim_account_get_check_mail(dialog->account));
 
 		if (gaim_account_get_buddy_icon(dialog->account) != NULL) {
-			dialog->buddy_icon_path = g_strdup(gaim_account_get_buddy_icon(dialog->account));
-			gtk_image_set_from_file(GTK_IMAGE(dialog->buddy_icon_entry),dialog->buddy_icon_path);
+			dialog->icon_path = g_strdup(gaim_account_get_buddy_icon(dialog->account));
+			gtk_image_set_from_file(GTK_IMAGE(dialog->icon_entry),dialog->icon_path);
 		}
 	}
 
@@ -1228,8 +1273,8 @@
 	if (dialog->protocol_id != NULL)
 		g_free(dialog->protocol_id);
 
-	if (dialog->buddy_icon_filesel)
-		gtk_widget_destroy(dialog->buddy_icon_filesel);
+	if (dialog->icon_filesel)
+		gtk_widget_destroy(dialog->icon_filesel);
 
 	g_free(dialog);
 }
@@ -1275,7 +1320,7 @@
 		gaim_account_set_alias(dialog->account, NULL);
 
 	/* Buddy Icon */
-	value = dialog->buddy_icon_path;
+	value = dialog->icon_path;
 	
 	if (dialog->prpl_info &&
 	    (dialog->prpl_info->icon_spec.format) &&
@@ -2256,7 +2301,7 @@
 	int width, height;
 
 	if (accounts_window != NULL) {
-		gdk_window_raise(accounts_window->window->window);
+		gtk_window_present(GTK_WINDOW(accounts_window->window));
 		return;
 	}
 
--- a/src/gtkdebug.c	Thu Jul 08 02:20:38 2004 +0000
+++ b/src/gtkdebug.c	Thu Jul 08 04:07:23 2004 +0000
@@ -96,9 +96,9 @@
 }
 
 static void
-do_find_cb(GtkWidget *widget, gint resp, struct _find *f)
+do_find_cb(GtkWidget *widget, gint response, struct _find *f)
 {
-	switch (resp) {
+	switch (response) {
 	case GTK_RESPONSE_OK:
 	    gtk_imhtml_search_find(GTK_IMHTML(f->window->text),
 							   gtk_entry_get_text(GTK_ENTRY(f->entry)));
@@ -172,7 +172,7 @@
 }
 
 static void
-do_save_cb(GtkWidget *widget)
+save_writefile_cb(GtkWidget *widget)
 {
 	const char *filename;
 	char *tmp;
@@ -186,13 +186,15 @@
 	filename = gtk_file_selection_get_filename(GTK_FILE_SELECTION(debug_win->save));
 #endif /* FILECHOOSER */
 
+	gaim_notify_close_with_handle(debug_win->save);
+
 	if (filename == NULL) {
-		gaim_notify_error(NULL, NULL, _("Invalid file name."), NULL);
+		gaim_notify_error(debug_win->save, NULL, _("Invalid file name."), NULL);
 		return;
 	}
 
 	if ((fp = fopen(filename, "w+")) == NULL) {
-		gaim_notify_error(NULL, NULL, _("Unable to open file."), NULL);
+		gaim_notify_error(debug_win->save, NULL, _("Unable to open file."), NULL);
 		return;
 	}
 
@@ -209,9 +211,8 @@
 
 #if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
 static void
-do_check_save_cb(GtkWidget *widget, gint response, gpointer data)
+save_checkfile_cb(GtkWidget *widget, gint response, DebugWindow *win)
 {
-	DebugWindow *win = (DebugWindow *)data;
 	const char *filename;
 
 	if (response != GTK_RESPONSE_ACCEPT) {
@@ -224,7 +225,7 @@
 	filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(win->save));
 #else /* FILECHOOSER */
 static void
-do_check_save_cb(GtkWidget *widget, DebugWindow *win)
+save_checkfile_cb(GtkWidget *widget, DebugWindow *win)
 {
 	const char *filename;
 
@@ -237,17 +238,18 @@
 
 	if (g_file_test(filename, G_FILE_TEST_EXISTS))
 	{
-		gaim_request_yes_no(NULL, NULL, _("That file already exists"),
+		gaim_request_close_with_handle(win->save);
+		gaim_request_yes_no(win->save, NULL, _("That file already exists"),
 							_("Would you like to overwrite it?"), 1,
-							win->save, G_CALLBACK(do_save_cb), NULL);
+							win->save, G_CALLBACK(save_writefile_cb), NULL);
 	}
 	else
-		do_save_cb(win->save);
+		save_writefile_cb(win->save);
 }
 
 #if !GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
 static void
-cancel_save_cb(GtkWidget *widget, DebugWindow *win)
+save_destroy_cb(GtkWidget *widget, DebugWindow *win)
 {
 	if (win->save != NULL)
 		gtk_widget_destroy(win->save);
@@ -260,8 +262,7 @@
 save_cb(GtkWidget *w, DebugWindow *win)
 {
 	if (win->save != NULL) {
-		gtk_widget_show(win->save);
-		gdk_window_raise(win->save->window);
+		gtk_window_present(GTK_WINDOW(win->save));
 		return;
 	}
 
@@ -275,8 +276,8 @@
 	gtk_dialog_set_default_response(GTK_DIALOG(win->save), GTK_RESPONSE_ACCEPT);
 	gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(win->save),
 									  "gaim-debug.log");
-	g_signal_connect(G_OBJECT(win->save),
-					 "response", G_CALLBACK(do_check_save_cb), win->save);
+	g_signal_connect(G_OBJECT(win->save), "response",
+					 G_CALLBACK(save_checkfile_cb), win);
 #else /* FILECHOOSER */
 	gchar *buf;
 
@@ -286,14 +287,14 @@
 	gtk_file_selection_set_filename(GTK_FILE_SELECTION(win->save), buf);
 	g_free(buf);
 	g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(win->save)->ok_button),
-					 "clicked", G_CALLBACK(do_check_save_cb), win);
+					 "clicked", G_CALLBACK(save_checkfile_cb), win);
 	g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(win->save)->cancel_button),
-					 "clicked", G_CALLBACK(cancel_save_cb), win);
+					 "clicked", G_CALLBACK(save_destroy_cb), win);
 	g_signal_connect(G_OBJECT(win->save),
-					 "destroy", G_CALLBACK(cancel_save_cb), win);
+					 "destroy", G_CALLBACK(save_destroy_cb), win);
 #endif /* FILECHOOSER */
 
-	gtk_widget_show(win->save);
+	gtk_widget_show_all(GTK_WIDGET(win->save));
 }
 
 static void