file-roller r2153 - in trunk: . src

[paobac svn gnome org]

Author: paobac
Date: Sun Mar  2 10:37:43 2008
New Revision: 2153
URL: http://svn.gnome.org/viewvc/file-roller?rev=2153&view=rev

Log:
2008-03-02  Paolo Bacchilega  <paobac svn gnome org>

	* src/dlg-ask-password.c (dlg_ask_password__common): 
	
	Fixed bug #518680 â Right click "Extract Here" action: Password dialogue
	doesn't have its title set.
	
	* src/dlg-batch-add.c (add_clicked_cb): 
	
	Fixed bug #504155 â Crash when click on create before it selects the
	current directory

Modified:
   trunk/ChangeLog
   trunk/src/dlg-ask-password.c
   trunk/src/dlg-batch-add.c

Modified: trunk/src/dlg-ask-password.c
==============================================================================
--- trunk/src/dlg-ask-password.c	(original)
+++ trunk/src/dlg-ask-password.c	Sun Mar  2 10:37:43 2008
@@ -124,7 +124,6 @@
 	text = g_strdup_printf (_("Enter the password for the archive '%s'."), name);
 	gtk_label_set_label (GTK_LABEL (label), text);
 	g_free (text);
-	g_free (name);
 	
 	if (fr_window_get_password (window) != NULL)
 		_gtk_entry_set_locale_text (GTK_ENTRY (data->pw_password_entry),
@@ -145,11 +144,15 @@
 	/* Run dialog. */
 
 	gtk_widget_grab_focus (data->pw_password_entry);
-	if (GTK_WIDGET_REALIZED (window))
+	if (GTK_WIDGET_REALIZED (window)) {
 		gtk_window_set_transient_for (GTK_WINDOW (data->dialog),
 					      GTK_WINDOW (window));
-	gtk_window_set_modal (GTK_WINDOW (data->dialog), TRUE);
-
+		gtk_window_set_modal (GTK_WINDOW (data->dialog), TRUE);
+	}
+	else 
+		gtk_window_set_title (GTK_WINDOW (data->dialog), name);
+	g_free (name);
+	
 	gtk_widget_show (data->dialog);
 }
 

Modified: trunk/src/dlg-batch-add.c
==============================================================================
--- trunk/src/dlg-batch-add.c	(original)
+++ trunk/src/dlg-batch-add.c	Sun Mar  2 10:37:43 2008
@@ -157,7 +157,12 @@
 	/* Check directory existence. */
 
 	archive_dir = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (data->a_location_filechooserbutton));
-
+	if (archive_dir == NULL) {
+		g_free (archive_dir);
+		g_free (archive_name);
+		return;
+	}
+		
 	if (! check_permissions (archive_dir, R_OK|W_OK|X_OK)) {
 		GtkWidget  *d;