[gthumb: 19/23] Merge branch 'selections'



commit ac19a8e5a96a4b0abf09be7d52c93c2dcd7b9f56
Merge: ffaf13f 8297916
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sun Mar 4 16:22:15 2012 +0100

    Merge branch 'selections'

 configure.ac                                       |    2 +-
 data/icons/Makefile.am                             |    2 +
 data/icons/hicolor/16x16/actions/Makefile.am       |    4 +
 data/icons/hicolor/16x16/actions/selection.png     |  Bin 0 -> 710 bytes
 data/icons/hicolor/16x16/actions/selection1.png    |  Bin 0 -> 731 bytes
 data/icons/hicolor/16x16/actions/selection2.png    |  Bin 0 -> 715 bytes
 data/icons/hicolor/16x16/actions/selection3.png    |  Bin 0 -> 726 bytes
 data/icons/hicolor/22x22/actions/selection.png     |  Bin 0 -> 922 bytes
 data/icons/hicolor/48x48/actions/Makefile.am       |    6 +-
 data/icons/hicolor/48x48/actions/selection.png     |  Bin 0 -> 2454 bytes
 data/icons/hicolor/48x48/actions/selection1.png    |  Bin 0 -> 2436 bytes
 data/icons/hicolor/48x48/actions/selection2.png    |  Bin 0 -> 2408 bytes
 data/icons/hicolor/48x48/actions/selection3.png    |  Bin 0 -> 2499 bytes
 data/icons/selection.svg                           |  290 +++++++++++++
 extensions/Makefile.am                             |    1 +
 extensions/catalogs/gth-file-source-catalogs.c     |    2 +-
 extensions/selections/Makefile.am                  |   31 ++
 extensions/selections/actions.c                    |   64 +++
 extensions/selections/actions.h                    |   33 ++
 extensions/selections/callbacks.c                  |  173 ++++++++
 extensions/selections/callbacks.h                  |   32 ++
 extensions/selections/gth-file-source-selections.c |  308 ++++++++++++++
 extensions/selections/gth-file-source-selections.h |   51 +++
 extensions/selections/gth-selections-manager.c     |  429 ++++++++++++++++++++
 extensions/selections/gth-selections-manager.h     |   74 ++++
 extensions/selections/main.c                       |   56 +++
 extensions/selections/selections.extension.in.in   |   13 +
 gthumb/gth-browser.c                               |   50 +--
 gthumb/gth-embedded-dialog.c                       |   26 +-
 gthumb/gth-extensions.c                            |   10 +-
 gthumb/gth-main.c                                  |    5 +-
 31 files changed, 1616 insertions(+), 46 deletions(-)
---



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]