gthumb r2228 - in trunk: . src

[mjc svn gnome org]

Author: mjc
Date: Mon Jan 28 20:30:51 2008
New Revision: 2228
URL: http://svn.gnome.org/viewvc/gthumb?rev=2228&view=rev

Log:
Merged 2225:2227 from gthumb-2-10.


Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/src/dlg-web-exporter.c
   trunk/src/gth-browser-actions-callbacks.c
   trunk/src/gth-browser.c
   trunk/src/gth-location.c
   trunk/src/gth-viewer.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Mon Jan 28 20:30:51 2008
@@ -65,6 +65,9 @@
 
 	* Fixed bug #508873 - gthumb cannot scale up images
 	* Fixed bug #510326 - x-content/* support
+	* Fixed bug #510521 - Canceling Save stops movement between pictures
+	* Fixed bug #477285 - Hitting enter in Open Location Dialog while 
+	  text entry is focused does nothing
 
 version 2.10.8
 --------------

Modified: trunk/src/dlg-web-exporter.c
==============================================================================
--- trunk/src/dlg-web-exporter.c	(original)
+++ trunk/src/dlg-web-exporter.c	Mon Jan 28 20:30:51 2008
@@ -840,7 +840,8 @@
 {
 	GtkWidget *file_sel;
 
-	file_sel = gtk_file_chooser_dialog_new (_("Select Album Theme"), NULL,
+	file_sel = gtk_file_chooser_dialog_new (_("Select Album Theme"),
+						GTK_WINDOW (tdata->dialog),
 						GTK_FILE_CHOOSER_ACTION_OPEN,
 						GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 						GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
@@ -848,19 +849,16 @@
 
 	/* Permit VFS URIs */
 	gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (file_sel), FALSE);
+	gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (file_sel), g_get_home_dir ());
+	gtk_dialog_set_default_response(GTK_DIALOG (file_sel), GTK_RESPONSE_ACCEPT);
 
-	gtk_window_set_modal (GTK_WINDOW (file_sel), TRUE);
 	g_object_set_data (G_OBJECT (file_sel), "theme_dialog_data", tdata);
 
-	gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (file_sel), g_get_home_dir ());
-
-	g_signal_connect (GTK_DIALOG (file_sel),
+	g_signal_connect (G_OBJECT (file_sel),
 			  "response",
 			  G_CALLBACK (install_theme_response_cb),
 			  NULL);
 
-	gtk_window_set_transient_for (GTK_WINDOW (file_sel),
-				      GTK_WINDOW (tdata->dialog));
 	gtk_window_set_modal (GTK_WINDOW (file_sel), TRUE);
 	gtk_widget_show (file_sel);
 }

Modified: trunk/src/gth-browser-actions-callbacks.c
==============================================================================
--- trunk/src/gth-browser-actions-callbacks.c	(original)
+++ trunk/src/gth-browser-actions-callbacks.c	Mon Jan 28 20:30:51 2008
@@ -1737,11 +1737,10 @@
 					       NULL);
 	/* Permit VFS URIs */
 	gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (chooser), FALSE);
-
-	gtk_window_set_modal (GTK_WINDOW (chooser), TRUE);
 	gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (chooser), gth_browser_get_current_directory (browser));
+	gtk_dialog_set_default_response(GTK_DIALOG (chooser), GTK_RESPONSE_OK);
 
-	g_signal_connect (G_OBJECT (GTK_DIALOG (chooser)),
+	g_signal_connect (G_OBJECT (chooser),
 			  "response",
 			  G_CALLBACK (open_location_response_cb),
 			  browser);

Modified: trunk/src/gth-browser.c
==============================================================================
--- trunk/src/gth-browser.c	(original)
+++ trunk/src/gth-browser.c	Mon Jan 28 20:30:51 2008
@@ -1837,6 +1837,8 @@
 				file, 
 				save_pixbuf__jpeg_data_saved_cb,
 				browser);
+	else
+		browser->priv->saving_modified_image = FALSE;
 }
 
 

Modified: trunk/src/gth-location.c
==============================================================================
--- trunk/src/gth-location.c	(original)
+++ trunk/src/gth-location.c	Mon Jan 28 20:30:51 2008
@@ -222,11 +222,12 @@
 					       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 					       GTK_STOCK_OPEN, GTK_RESPONSE_OK,
 					       NULL);
+
 	gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (chooser), FALSE);
-	gtk_window_set_modal (GTK_WINDOW (chooser), TRUE);
 	gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (chooser), gth_location_get_folder_uri (location));
+	gtk_dialog_set_default_response(GTK_DIALOG (chooser), GTK_RESPONSE_OK);
 
-	g_signal_connect (G_OBJECT (GTK_DIALOG (chooser)),
+	g_signal_connect (G_OBJECT (chooser),
 			  "response",
 			  G_CALLBACK (open_other_location_response_cb),
 			  location);

Modified: trunk/src/gth-viewer.c
==============================================================================
--- trunk/src/gth-viewer.c	(original)
+++ trunk/src/gth-viewer.c	Mon Jan 28 20:30:51 2008
@@ -957,6 +957,8 @@
 				file, 
 				save_pixbuf__jpeg_data_saved_cb,
 				viewer);
+	else
+		viewer->priv->saving_modified_image = FALSE;
 }