=== modified file 'bin/shutter'
--- bin/shutter	2009-12-01 17:14:17 +0000
+++ bin/shutter	2010-09-16 16:39:05 +0000
@@ -969,9 +969,9 @@
 my $saveDir_label = Gtk2::Label->new( $d->get("Directory") . ":" );
 my $saveDir_button = Gtk2::FileChooserButton->new( "Shutter - " . $d->get("Choose folder"), 'select-folder' );
 if ( defined $settings_xml->{'general'}->{'folder'} ) {
-	$saveDir_button->set_filename( $settings_xml->{'general'}->{'folder'} );
+	$saveDir_button->set_current_folder( $settings_xml->{'general'}->{'folder'} );
 } else {
-	$saveDir_button->set_filename( File::HomeDir->my_pictures );
+	$saveDir_button->set_current_folder( File::HomeDir->my_pictures );
 }
 
 $tooltips->set_tip( $saveDir_button, $d->get("Your screenshots will be saved to this directory") );
@@ -3415,7 +3415,7 @@
 	$settings{'general'}->{'filetype'} 		 = $combobox_type->get_active;
 	$settings{'general'}->{'quality'}  		 = $scale->get_value();
 	$settings{'general'}->{'filename'} 		 = $filename->get_text();
-	$settings{'general'}->{'folder'} 		 = $saveDir_button->get_filename();
+	$settings{'general'}->{'folder'} 		 = $saveDir_button->get_current_folder();
 	$settings{'general'}->{'image_autocopy'} = $image_autocopy_active->get_active();
 	$settings{'general'}->{'fname_autocopy'} = $fname_autocopy_active->get_active();
 	$settings{'general'}->{'cursor'}		 = $cursor_active->get_active();
@@ -3741,7 +3741,7 @@
 				$filename->set_text( $settings_xml->{'general'}->{'filename'} );
 
 				utf8::decode $settings_xml->{'general'}->{'folder'};
-				$saveDir_button->set_filename( $settings_xml->{'general'}->{'folder'} );
+				$saveDir_button->set_current_folder( $settings_xml->{'general'}->{'folder'} );
 				
 				$image_autocopy_active->set_active( $settings_xml->{'general'}->{'image_autocopy'} );
 				$fname_autocopy_active->set_active( $settings_xml->{'general'}->{'fname_autocopy'} );
@@ -4887,7 +4887,7 @@
 	my $filetype_value 	   = undef;
 	
 	#folder to save
-	my $folder             = $saveDir_button->get_filename || $folder_from_config;
+	my $folder             = $saveDir_button->get_current_folder || $folder_from_config;
 	utf8::decode $folder;
 	
 	#screenshot(pixbuf) and screenshot name
@@ -9109,18 +9109,15 @@
 				$replace_btn, undef, undef
 			);
 
-			#rename == replace_btn was hit
-			if ( $response == 40 ) {
-				$profile_dialog->destroy();
-				return $new_profile_name->get_text;
-			} else {
+			#40 == replace_btn was hit
+			if ( $response != 40 ) {
 				$profile_dialog->destroy();
 				return FALSE;
 			}
 		}
 
 		$profile_dialog->destroy();
-		return $new_profile_name->get_text;
+		return $entered_name;
 	} else {
 		$profile_dialog->destroy();
 		return FALSE;