nautilus r15145 - in trunk: . src/file-manager

[cosimoc svn gnome org]

Author: cosimoc
Date: Fri Mar 20 14:35:04 2009
New Revision: 15145
URL: http://svn.gnome.org/viewvc/nautilus?rev=15145&view=rev

Log:
2009-03-20  Cosimo Cecchi  <cosimoc gnome org>

	* src/file-manager/fm-properties-window.c:
	(custom_icon_file_chooser_response_cb),
	(select_image_button_callback): don't use gtk_dialog_run to
	spawn the filechooser for a custom icon (#575344).


Modified:
   trunk/ChangeLog
   trunk/src/file-manager/fm-properties-window.c

Modified: trunk/src/file-manager/fm-properties-window.c
==============================================================================
--- trunk/src/file-manager/fm-properties-window.c	(original)
+++ trunk/src/file-manager/fm-properties-window.c	Fri Mar 20 14:35:04 2009
@@ -5677,6 +5677,31 @@
 }
 
 static void
+custom_icon_file_chooser_response_cb (GtkDialog *dialog,
+				      gint response,
+				      FMPropertiesWindow *window)
+{
+	char *uri;
+
+	switch (response) {
+	case GTK_RESPONSE_NO:
+		reset_icon (window);
+		break;
+
+	case GTK_RESPONSE_OK:
+		uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog));
+		set_icon (uri, window);
+		g_free (uri);
+		break;
+
+	default:
+		break;
+	}
+
+	gtk_widget_hide (GTK_WIDGET (dialog));
+}
+
+static void
 select_image_button_callback (GtkWidget *widget,
 			      FMPropertiesWindow *window)
 {
@@ -5684,8 +5709,8 @@
 	GtkFileFilter *filter;
 	GList *l;
 	NautilusFile *file;
-	char *image_path;
 	char *uri;
+	char *image_path;
 	gboolean revert_is_sensitive;
 
 	g_assert (FM_IS_PROPERTIES_WINDOW (window));
@@ -5751,22 +5776,9 @@
 	}
 	gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_NO, revert_is_sensitive);
 
-	switch (gtk_dialog_run (GTK_DIALOG (dialog))) {
-	case GTK_RESPONSE_NO:
-		reset_icon (window);
-		break;
-
-	case GTK_RESPONSE_OK:
-		uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog));
-		set_icon (uri, window);
-		g_free (uri);
-		break;
-
-	default:
-		break;
-	}
-
-	gtk_widget_hide (dialog);
+	g_signal_connect (dialog, "response",
+			  G_CALLBACK (custom_icon_file_chooser_response_cb), window);
+	gtk_widget_show (dialog);
 }
 
 static void