[Goodies-commits] r6375 - in xfce4-screenshooter-plugin/trunk: . lib

[Jerome Guelfucci]

Author: jeromeg
Date: 2008-12-29 07:37:42 +0000 (Mon, 29 Dec 2008)
New Revision: 6375

Modified:
   xfce4-screenshooter-plugin/trunk/ChangeLog
   xfce4-screenshooter-plugin/trunk/NEWS
   xfce4-screenshooter-plugin/trunk/lib/screenshooter-dialogs.c
Log:
Fix bug #4748.

Modified: xfce4-screenshooter-plugin/trunk/ChangeLog
===================================================================
--- xfce4-screenshooter-plugin/trunk/ChangeLog	2008-12-28 18:45:00 UTC (rev 6374)
+++ xfce4-screenshooter-plugin/trunk/ChangeLog	2008-12-29 07:37:42 UTC (rev 6375)
@@ -1,3 +1,10 @@
+2008-12-29 jeromeg
+
+  * Fix bug 4748:
+    - remove (cb_current_folder_changed).
+    - don't connect the signal in (screenshooter_save_screenshot).
+  * NEWS: updated.
+
 2008-12-28 jeromeg
 
   * Fix a bunch of compilation warnings.

Modified: xfce4-screenshooter-plugin/trunk/NEWS
===================================================================
--- xfce4-screenshooter-plugin/trunk/NEWS	2008-12-28 18:45:00 UTC (rev 6374)
+++ xfce4-screenshooter-plugin/trunk/NEWS	2008-12-29 07:37:42 UTC (rev 6375)
@@ -10,6 +10,8 @@
     - fix some remaining crashes when taking a screenshot of the active
       window.
     - only read the preferences file once when opening the application.
+    - don't automatically set filenames in the file chooser, as user set
+      are overriden (bug #4748).
   
   * Enhancements:
     - Use -V for the version CLI option.

Modified: xfce4-screenshooter-plugin/trunk/lib/screenshooter-dialogs.c
===================================================================
--- xfce4-screenshooter-plugin/trunk/lib/screenshooter-dialogs.c	2008-12-28 18:45:00 UTC (rev 6374)
+++ xfce4-screenshooter-plugin/trunk/lib/screenshooter-dialogs.c	2008-12-29 07:37:42 UTC (rev 6375)
@@ -245,30 +245,6 @@
 
 
 
-/* Generate a correct file name when setting a folder in chooser
-GtkFileChooser *chooser: the file chooser we are using.
-gpointer user_data: not used here.
-*/
-static void
-cb_current_folder_changed (GtkFileChooser *chooser, gpointer user_data)
-{
-  gchar *current_folder = 
-    gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (chooser));
-  
-  if (current_folder)
-    {
-      gchar *new_filename = generate_filename_for_uri (current_folder);
-      
-      gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (chooser), 
-                                         new_filename);
-      g_free (new_filename);
-    }
-  
-  g_free (current_folder);
-}
-
-
-
 #ifdef HAVE_GIO
 /* Set sd->app as per the active item in the combobox */
 static void cb_combo_active_item_changed (GtkWidget *box, 
@@ -1038,12 +1014,7 @@
       gtk_image_set_from_pixbuf (GTK_IMAGE (preview), thumbnail);
       
       g_object_unref (thumbnail);
-      
-      /* We the user opens a folder in the fine_chooser, we set a valid
-      filename */
-      g_signal_connect (G_OBJECT (chooser), "current-folder-changed", 
-                        G_CALLBACK(cb_current_folder_changed), NULL);
-    
+          
       dialog_response = gtk_dialog_run (GTK_DIALOG (chooser));
 	    
       /* The user pressed the save button */