[file-roller: 123/123] Merge branch 'libarchive'

[Paolo Bacchilega <paobac src gnome org>]

commit 8bd373f46d16cd41def5b860a8484ada7ee91951
Merge: 4944208 c459aab
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Mon Aug 6 15:23:48 2012 +0200

    Merge branch 'libarchive'

 Makefile.am                                      |    2 +-
 configure.ac                                     |   92 +-
 nautilus/Makefile.am                             |    3 +-
 nautilus/nautilus-fileroller.c                   |    4 +-
 po/POTFILES.in                                   |   14 +-
 src/Makefile.am                                  |   30 +-
 src/actions.c                                    |  363 +--
 src/actions.h                                    |    3 -
 src/dlg-add-files.c                              |   43 +-
 src/dlg-add-folder.c                             |  247 +-
 src/dlg-ask-password.c                           |   27 +-
 src/dlg-ask-password.h                           |    4 +-
 src/dlg-batch-add.c                              |  113 +-
 src/dlg-extract.c                                |   33 +-
 src/dlg-new.c                                    |  509 ---
 src/dlg-new.h                                    |   58 -
 src/dlg-open-with.c                              |    4 +-
 src/dlg-package-installer.c                      |   52 +-
 src/dlg-prop.c                                   |   19 +-
 src/dlg-update.c                                 |   23 +-
 src/eggfileformatchooser.c                       | 1223 ------
 src/eggfileformatchooser.h                       |   85 -
 src/file-data.c                                  |    1 -
 src/file-roller.gresource.xml                    |    2 +-
 src/file-utils.c                                 |  983 ++---
 src/file-utils.h                                 |   59 +-
 src/fr-archive-libarchive.c                      | 1836 +++++++++
 src/fr-archive-libarchive.h                      |   50 +
 src/fr-archive.c                                 | 4371 ++++++++--------------
 src/fr-archive.h                                 |  594 +++-
 src/fr-command-7z.c                              |  366 +-
 src/fr-command-ace.c                             |   44 +-
 src/fr-command-ace.h                             |    2 -
 src/fr-command-alz.c                             |   57 +-
 src/fr-command-ar.c                              |   40 +-
 src/fr-command-arj.c                             |   60 +-
 src/fr-command-cfile.c                           |  148 +-
 src/fr-command-cfile.h                           |    2 +-
 src/fr-command-cpio.c                            |   42 +-
 src/fr-command-dpkg.c                            |   37 +-
 src/fr-command-iso.c                             |   48 +-
 src/fr-command-jar.c                             |   39 +-
 src/fr-command-lha.c                             |   34 +-
 src/fr-command-lrzip.c                           |   34 +-
 src/fr-command-rar.c                             |  109 +-
 src/fr-command-rpm.c                             |   34 +-
 src/fr-command-tar.c                             |  212 +-
 src/fr-command-unarchiver.c                      |   56 +-
 src/fr-command-unstuff.c                         |   40 +-
 src/fr-command-zip.c                             |   87 +-
 src/fr-command-zoo.c                             |   34 +-
 src/fr-command.c                                 | 3370 ++++++++++++++---
 src/fr-command.h                                 |  300 +--
 src/fr-error.c                                   |   93 +-
 src/fr-error.h                                   |   39 +-
 src/fr-init.c                                    |  269 +-
 src/fr-init.h                                    |   14 +-
 src/fr-new-archive-dialog.c                      |  642 ++++
 src/fr-new-archive-dialog.h                      |   62 +
 src/fr-proc-error.c                              |   55 -
 src/fr-proc-error.h                              |   31 -
 src/fr-process.c                                 |  710 ++--
 src/fr-process.h                                 |  118 +-
 src/fr-window.c                                  | 4409 ++++++++++++----------
 src/fr-window.h                                  |  377 +-
 src/gio-utils.c                                  |  940 ++---
 src/gio-utils.h                                  |  110 +-
 src/glib-utils.c                                 |  254 +-
 src/glib-utils.h                                 |   27 +-
 src/gth-menu-button.c                            |  559 +++
 src/gth-menu-button.h                            |   77 +
 src/gtk-utils.c                                  |   22 +
 src/gtk-utils.h                                  |    1 +
 src/main.c                                       |  197 +-
 src/open-file.c                                  |   28 +-
 src/open-file.h                                  |   11 +-
 src/rar-utils.c                                  |    4 +-
 src/typedefs.h                                   |   54 +-
 src/ui/Makefile.am                               |   28 +-
 src/ui/message-dialog.ui                         |    7 +-
 src/ui/{new.ui => new-archive-dialog-options.ui} |   94 +-
 src/ui/progress-dialog.ui                        |   12 +-
 src/ui/update.ui                                 |  102 +-
 83 files changed, 14027 insertions(+), 11361 deletions(-)
---