Author: colossus
Date: 2008-11-08 20:26:34 +0000 (Sat, 08 Nov 2008)
New Revision: 28673
Modified:
xarchiver/trunk/src/extract_dialog.c
xarchiver/trunk/src/rar.c
Log:
Fixed bug when adding to rar archives with password.
Made the password field to work when extracting with the -e switch a password
protected archive.
Modified: xarchiver/trunk/src/extract_dialog.c
===================================================================
--- xarchiver/trunk/src/extract_dialog.c 2008-11-08 20:21:41 UTC (rev
28672)
+++ xarchiver/trunk/src/extract_dialog.c 2008-11-08 20:26:34 UTC (rev
28673)
@@ -326,7 +326,7 @@
archive->extraction_path =
g_strconcat(cur_dir,"/",archive->extraction_path,NULL);
g_free (cur_dir);
}
- if (archive->has_passwd)
+ if (archive->has_passwd || (xa_main_window == FALSE &&
strlen(gtk_entry_get_text(GTK_ENTRY(dialog_data->password_entry))) > 0) )
archive->passwd = g_strdup (gtk_entry_get_text
(GTK_ENTRY(dialog_data->password_entry)));
if (archive->has_passwd && strlen(archive->passwd)== 0 )
@@ -381,6 +381,7 @@
gtk_widget_set_sensitive (Stop_button,TRUE);
gtk_label_set_text(GTK_LABEL(total_label),_("Extracting files from
archive,please wait..."));
}
+ g_print ("%s\n",archive->passwd);
(*archive->extract)(archive,names);
}
}
Modified: xarchiver/trunk/src/rar.c
===================================================================
--- xarchiver/trunk/src/rar.c 2008-11-08 20:21:41 UTC (rev 28672)
+++ xarchiver/trunk/src/rar.c 2008-11-08 20:26:34 UTC (rev 28673)
@@ -265,7 +265,7 @@
archive->solid_archive ? "-s " : "",
archive->remove_files ? "-df " : "",
"-p" ,
archive->passwd,
- "-idp ",
+ " -idp
",
"-m",compression_string," ",
archive->escaped_path,
files->str,NULL);
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
