← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/fr-application.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-application.c
656
656
        }
657
657
 
658
658
        if (arg_extract_to != NULL)
659
 
                extraction_destination = g_file_new_for_commandline_arg (arg_extract_to);
 
659
                extraction_destination = g_application_command_line_create_file_for_arg (command_line, arg_extract_to);
660
660
 
661
661
        if (arg_add_to != NULL)
662
 
                add_to_archive = g_file_new_for_commandline_arg (arg_add_to);
 
662
                add_to_archive = g_application_command_line_create_file_for_arg (command_line, arg_add_to);
663
663
 
664
664
        if (arg_default_dir != NULL)
665
 
                default_directory = g_file_new_for_commandline_arg (arg_default_dir);
 
665
                default_directory = g_application_command_line_create_file_for_arg (command_line, arg_default_dir);
666
666
 
667
667
        if ((arg_add_to != NULL) || (arg_add == 1)) { /* Add files to an archive */
668
668
                GtkWidget   *window;
677
677
 
678
678
                file_list = NULL;
679
679
                while ((filename = remaining_args[i++]) != NULL)
680
 
                        file_list = g_list_prepend (file_list, g_file_new_for_commandline_arg (filename));
 
680
                        file_list = g_list_prepend (file_list, g_application_command_line_create_file_for_arg (command_line, filename));
681
681
                file_list = g_list_reverse (file_list);
682
682
 
683
683
                fr_window_new_batch (FR_WINDOW (window), _("Compress"));
708
708
                while ((archive = remaining_args[i++]) != NULL) {
709
709
                        GFile *file;
710
710
 
711
 
                        file = g_file_new_for_commandline_arg (archive);
 
711
                        file = g_application_command_line_create_file_for_arg (command_line, archive);
712
712
                        if (arg_extract_here == 1)
713
713
                                fr_window_set_batch__extract_here (FR_WINDOW (window), file);
714
714
                        else
734
734
                        window = fr_window_new ();
735
735
                        gtk_widget_show (window);
736
736
 
737
 
                        file = g_file_new_for_commandline_arg (filename);
 
737
                        file = g_application_command_line_create_file_for_arg (command_line, filename);
738
738
                        fr_window_archive_open (FR_WINDOW (window), file, GTK_WINDOW (window));
739
739
 
740
740
                        g_object_unref (file);