Author: colossus Date: 2008-06-27 11:57:29 +0000 (Fri, 27 Jun 2008) New Revision: 27161
Modified: xarchiver/trunk/README xarchiver/trunk/TODO xarchiver/trunk/src/pref_dialog.c xarchiver/trunk/src/rpm.c xarchiver/trunk/src/tar.c xarchiver/trunk/src/window.c Log: Fixed inability to add files to a newly created tar compressed archive. Fixed the missed reload when deleting from tar compressed archives. Updated README. Updated TODO. Modified: xarchiver/trunk/README =================================================================== --- xarchiver/trunk/README 2008-06-27 09:39:23 UTC (rev 27160) +++ xarchiver/trunk/README 2008-06-27 11:57:29 UTC (rev 27161) @@ -1,22 +1,23 @@ What is it? =========== - Xarchiver is a Desktop Environment independent archiver frontend. All common archive types are supported. RPM and DEB packages are handled without their package managers. To run it you only need GTK+2 libraries and obviously the various rar, arj and 7z for these archive types. All the others archivers are installed by default in most distro. +How to use it: +============= +Please read the documentation accessible from the Help menu. + How to compile: =============== - ./configure --prefix=/usr make become root with command su make install - Please report bugs to: http://bugzilla.xfce.org , registration is needed. Suggestions and criticism please email me at <[EMAIL PROTECTED]> -Giuseppe Torelli - colossus +Giuseppe Torelli Modified: xarchiver/trunk/TODO =================================================================== --- xarchiver/trunk/TODO 2008-06-27 09:39:23 UTC (rev 27160) +++ xarchiver/trunk/TODO 2008-06-27 11:57:29 UTC (rev 27161) @@ -1,3 +1,7 @@ +- to fix missed password detection when working with cmd-line switches. +- add ability to add files in specific archive directories. +- enrich the status bar +- to fix the arrow buttons - add a small progress window when using Xarchiver cmd-line switches. - loading and saving of add/extraction options. - support tar on *BSD. Modified: xarchiver/trunk/src/pref_dialog.c =================================================================== --- xarchiver/trunk/src/pref_dialog.c 2008-06-27 09:39:23 UTC (rev 27160) +++ xarchiver/trunk/src/pref_dialog.c 2008-06-27 11:57:29 UTC (rev 27161) @@ -48,7 +48,7 @@ scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL); gtk_box_pack_start (GTK_BOX (hbox1), scrolledwindow1, TRUE, TRUE, 6); g_object_set (G_OBJECT (scrolledwindow1),"hscrollbar-policy", GTK_POLICY_NEVER,"shadow-type", GTK_SHADOW_IN,"vscrollbar-policy", GTK_POLICY_NEVER, NULL); - + prefs_data->prefs_liststore = gtk_list_store_new (3,GDK_TYPE_PIXBUF,G_TYPE_STRING,G_TYPE_UINT); gtk_list_store_append (prefs_data->prefs_liststore,&iter); gchar *pixbuf_file = g_strconcat(DATADIR,"/pixmaps/xarchiver-behaviour.svg",NULL); Modified: xarchiver/trunk/src/rpm.c =================================================================== --- xarchiver/trunk/src/rpm.c 2008-06-27 09:39:23 UTC (rev 27160) +++ xarchiver/trunk/src/rpm.c 2008-06-27 11:57:29 UTC (rev 27161) @@ -340,7 +340,7 @@ GSList *list = NULL; chdir (archive->extraction_path); - command = g_strconcat ( "cpio -id " , files->str," -F ",archive->tmp,"/file.cpio",NULL); + command = g_strconcat ( "cpio -id" , files->str,"-F ",archive->tmp,"/file.cpio",NULL); g_string_free(files,TRUE); list = g_slist_append(list,command); Modified: xarchiver/trunk/src/tar.c =================================================================== --- xarchiver/trunk/src/tar.c 2008-06-27 09:39:23 UTC (rev 27160) +++ xarchiver/trunk/src/tar.c 2008-06-27 11:57:29 UTC (rev 27161) @@ -174,27 +174,63 @@ GSList *list = NULL; gchar *command = NULL; - if (is_tar_compressed(archive->type)) - xa_add_delete_bzip2_gzip_lzma_compressed_tar(files,archive,1); - else + switch (archive->type) { - if ( g_file_test (archive->escaped_path,G_FILE_TEST_EXISTS)) - { + case XARCHIVETYPE_TAR: + if ( g_file_test ( archive->escaped_path , G_FILE_TEST_EXISTS ) ) command = g_strconcat (tar, " ", - archive->add_recurse ? "" : "--no-recursion ", - archive->remove_files ? "--remove-files " : "", - archive->update ? "-uvvf " : "-rvvf ", - archive->escaped_path, - files->str,NULL); - } + archive->add_recurse ? "" : "--no-recursion ", + archive->remove_files ? "--remove-files " : "", + archive->update ? "-uvvf " : "-rvvf ", + archive->escaped_path, + files->str , NULL ); else - { command = g_strconcat (tar, " ", - archive->add_recurse ? "" : "--no-recursion ", - archive->remove_files ? "--remove-files " : "", - "-cvvf ",archive->escaped_path, - files->str,NULL); - } + archive->add_recurse ? "" : "--no-recursion ", + archive->remove_files ? "--remove-files " : "", + "-cvvf ",archive->escaped_path, + files->str , NULL ); + break; + + case XARCHIVETYPE_TAR_BZ2: + if ( g_file_test ( archive->escaped_path , G_FILE_TEST_EXISTS ) ) + xa_add_delete_bzip2_gzip_lzma_compressed_tar (files,archive,1); + else + command = g_strconcat (tar, " ", + archive->add_recurse ? "" : "--no-recursion ", + archive->remove_files ? "--remove-files " : "", + "-cvvjf ",archive->escaped_path, + files->str , NULL ); + break; + + case XARCHIVETYPE_TAR_GZ: + if ( g_file_test ( archive->escaped_path , G_FILE_TEST_EXISTS ) ) + xa_add_delete_bzip2_gzip_lzma_compressed_tar (files,archive,1); + else + command = g_strconcat (tar, " ", + archive->add_recurse ? "" : "--no-recursion ", + archive->remove_files ? "--remove-files " : "", + "-cvvzf ",archive->escaped_path, + files->str , NULL ); + break; + + case XARCHIVETYPE_TAR_LZMA: + if ( g_file_test ( archive->escaped_path , G_FILE_TEST_EXISTS ) ) + xa_add_delete_bzip2_gzip_lzma_compressed_tar (files,archive,1); + else + command = g_strconcat (tar, " ", + archive->add_recurse ? "" : "--no-recursion ", + archive->remove_files ? "--remove-files " : "", + "--use-compress-program=lzma -cvvf ",archive->escaped_path, + files->str , NULL ); + break; + + default: + command = NULL; + } + + if (command != NULL) + { g_string_free(files,TRUE); list = g_slist_append(list,command); xa_run_command (archive,list); Modified: xarchiver/trunk/src/window.c =================================================================== --- xarchiver/trunk/src/window.c 2008-06-27 09:39:23 UTC (rev 27160) +++ xarchiver/trunk/src/window.c 2008-06-27 11:57:29 UTC (rev 27161) @@ -73,6 +73,9 @@ { if(xa_main_window) { + gtk_widget_set_sensitive(Stop_button,FALSE); + gtk_widget_hide(viewport2); + if (archive->has_comment) gtk_widget_set_sensitive (comment_menu,TRUE); else @@ -89,7 +92,6 @@ gtk_widget_grab_focus (GTK_WIDGET(archive->treeview)); } - if (archive->status == XA_ARCHIVESTATUS_ADD || archive->status == XA_ARCHIVESTATUS_DELETE) xa_reload_archive_content(archive); @@ -165,14 +167,13 @@ default: break; } - archive->status = XA_ARCHIVESTATUS_IDLE; } } void xa_watch_child (GPid pid,gint status,gpointer data) { + XArchive *archive = data; gboolean result; - XArchive *archive = data; if (WIFSIGNALED (status) ) { @@ -503,7 +504,7 @@ GString *names; gint current_page,id; - names = g_string_new ( " " ); + names = g_string_new (" "); current_page = gtk_notebook_get_current_page (notebook); id = xa_find_archive_index (current_page); GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (archive[id]->treeview)); @@ -542,6 +543,7 @@ } Update_StatusBar ( _("Deleting files from the archive, please wait...")); + archive[id]->status = XA_ARCHIVESTATUS_DELETE; (*archive[id]->delete) (archive[id],names); } @@ -1254,7 +1256,7 @@ if (archive[idx]->status != XA_ARCHIVESTATUS_ADD) if (archive[idx]->has_passwd) archive[idx]->has_passwd = FALSE; - xa_close_archive(NULL,NULL); + xa_archive_operation_finished(archive[idx],0); } void xa_view_file_inside_archive (GtkMenuItem *menuitem,gpointer user_data) _______________________________________________ Xfce4-commits mailing list [email protected] http://foo-projects.org/mailman/listinfo/xfce4-commits
