← Back to branch summary

~ubuntu-branches/ubuntu/saucy/file-roller/saucy-proposed

« back to all changes in this revision

Viewing changes to src/fr-command.c

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-08-26 10:16:27 UTC
  • mfrom: (1.7.6) (2.1.21 sid)
  • Revision ID: package-import@ubuntu.com-20130826101627-b8uh1n4pnvpfkhww
Tags: 3.9.90-0ubuntu1
https://launchpad.net/bugs/918107
https://launchpad.net/bugs/1076716
https://launchpad.net/bugs/772556
https://launchpad.net/bugs/1193921
* Sync with Debian. Remaining changes:
  - Depend on zip and unzip instead of p7zip which is in universe
  - Suggest p7zip-full (LP: #918107)
  - Recommend sessioninstaller
* Dropped change:
  - Use the Ubuntu epoch for the Nautilus depends (Ubuntu 11.10
    and newer include Nautilus 3.0 or higher)
* New upstream release
  - Restore directory modification time when extracting (LP: #1076716)
  - Allow viewing the password when creating an encrypted archive
    (LP: #772556)
  - Avoid unnecessary word break when wrapping text to new lines
    (LP: #1193921)
* debian/patches/revert_gtk_3-9.patch:
  - Revert commit that requires GTK 3.9 since GTK 3.9 won't be in Saucy
* debian/control.in, debian/rules:
  - Run dh-autoreconf for above patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/fr-command.c
721
721
 
722
722
        temp_dir = _g_file_get_temp_work_dir (NULL);
723
723
        destination_parent = _g_path_remove_level (destination);
724
 
        parent_dir =  _g_file_append_path (temp_dir, destination_parent, NULL);
 
724
        parent_dir = _g_file_append_path (temp_dir, destination_parent, NULL);
725
725
 
726
726
        debug (DEBUG_INFO, "mkdir %s\n", g_file_get_path (parent_dir));
727
727
        _g_file_make_directory_tree (parent_dir, 0700, NULL);
951
951
                new_file_list = _g_string_list_dup (file_list);
952
952
        }
953
953
 
 
954
        /* see fr-archive.h for an explanation of the following code */
 
955
 
 
956
        if (base_dir_created && ! archive->propAddCanFollowDirectoryLinksWithoutDereferencing)
 
957
                follow_links = TRUE;
 
958
 
954
959
        /* if the command cannot update,  get the list of files that are
955
960
         * newer than the ones in the archive. */
956
961