[file-roller: 26/26] Merge branch 'file-selector'
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [file-roller: 26/26] Merge branch 'file-selector'
- Date: Thu, 9 Aug 2012 20:20:11 +0000 (UTC)
commit 0fd0ac3c6d43d52cb94c5612a04600345d7d7710
Merge: c623764 f14b36e
Author: Paolo Bacchilega <paobac src gnome org>
Date: Thu Aug 9 21:45:47 2012 +0200
Merge branch 'file-selector'
data/org.gnome.FileRoller.gschema.xml.in | 21 +-
po/POTFILES.in | 9 +-
src/Makefile.am | 10 +-
src/actions.c | 27 +-
src/actions.h | 4 +-
src/dlg-add-files.c | 198 ----
src/dlg-add-files.h | 29 -
src/{dlg-add-folder.c => dlg-add.c} | 281 +++---
src/{dlg-add-folder.h => dlg-add.h} | 3 +-
src/file-roller.gresource.xml | 1 +
src/fr-archive.c | 5 +-
src/fr-archive.h | 1 +
src/fr-file-selector-dialog.c | 1566 ++++++++++++++++++++++++++++++
src/fr-file-selector-dialog.h | 60 ++
src/fr-window.c | 805 ++++++----------
src/fr-window.h | 3 +-
src/gio-utils.c | 106 +--
src/gio-utils.h | 21 +-
src/glib-utils.c | 27 +
src/glib-utils.h | 7 +
src/gth-icon-cache.c | 118 +++
src/gth-icon-cache.h | 44 +
src/gtk-utils.c | 74 +-
src/preferences.h | 3 +-
src/ui.h | 43 +-
src/ui/Makefile.am | 1 +
src/ui/add-dialog-options.ui | 8 +-
src/ui/file-selector.ui | 320 ++++++
src/ui/menus-toolbars.ui | 13 +-
29 files changed, 2698 insertions(+), 1110 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]