[niepce: 10/14] Merge branch 'master' into magellan

[Hubert Figuière <hub src gnome org>]

commit da5dd73cf10f7f6ef3a387de9fd5844471c2b687
Merge: 58f7384 ae92ec5
Author: Hubert Figuière <hub figuiere net>
Date:   Sat Jun 8 13:03:41 2013 -0400

    Merge branch 'master' into magellan
    
    Conflicts:
        Makefile.am
        configure.ac

 .gitignore                                        |    1 +
 Makefile.am                                       |   11 +-
 README                                            |    4 +-
 camerawire/Makefile.am                            |   14 +-
 camerawire/README                                 |    2 +-
 camerawire/autogen.sh                             |   52 ---
 camerawire/configure.ac                           |  139 ------
 camerawire/m4/ax_cxx_compile_stdcxx_11.m4         |  133 ++++++
 camerawire/src/Makefile.am                        |    8 +-
 configure.ac                                      |  144 +++++--
 m4/ax_cxx_compile_stdcxx_11.m4                    |  133 ++++++
 po/LINGUAS                                        |    1 +
 po/ca.po                                          |  485 +++++++++++++++++++++
 src/engine/db/filebundle.cpp                      |   38 +-
 src/engine/db/filebundle.hpp                      |    8 +-
 src/engine/db/fsfile.hpp                          |    6 +-
 src/engine/db/keyword.hpp                         |   12 +-
 src/engine/db/label.hpp                           |    9 +-
 src/engine/db/libfile.hpp                         |   12 +-
 src/engine/db/libfolder.hpp                       |    8 +-
 src/engine/db/libmetadata.hpp                     |   13 +-
 src/engine/db/library.cpp                         |   24 +-
 src/engine/db/library.hpp                         |   10 +-
 src/engine/db/storage.hpp                         |    6 +-
 src/engine/db/test_filebundle.cpp                 |    6 +-
 src/engine/library/commands.cpp                   |   13 +-
 src/engine/library/op.cpp                         |    2 +-
 src/engine/library/op.hpp                         |    8 +-
 src/engine/library/test_opqueue.cpp               |    6 +-
 src/engine/library/thumbnailcache.cpp             |    6 +-
 src/engine/library/thumbnailcache.hpp             |    8 +-
 src/fwk/base/Makefile.am                          |    7 +-
 src/fwk/base/colour.hpp                           |    6 +-
 src/fwk/base/geometry.cpp                         |   13 +-
 src/fwk/base/geometry.hpp                         |   14 +-
 src/fwk/base/map.hpp                              |   44 ++-
 src/fwk/base/propertybag.hpp                      |   10 +-
 src/fwk/base/t/testgeometry.cpp                   |   25 +-
 src/fwk/base/t/testmap.cpp                        |   46 ++
 src/fwk/toolkit/application.cpp                   |   11 +-
 src/fwk/toolkit/application.hpp                   |    4 +-
 src/fwk/toolkit/command.hpp                       |   14 +-
 src/fwk/toolkit/controller.cpp                    |    7 +-
 src/fwk/toolkit/controller.hpp                    |   10 +-
 src/fwk/toolkit/dialog.cpp                        |    2 +-
 src/fwk/toolkit/dialog.hpp                        |    4 +-
 src/fwk/toolkit/frame.cpp                         |   41 +-
 src/fwk/toolkit/frame.hpp                         |    9 +-
 src/fwk/toolkit/metadatawidget.cpp                |    7 +-
 src/fwk/toolkit/notification.hpp                  |    6 +-
 src/fwk/toolkit/notificationcenter.cpp            |    4 +-
 src/fwk/toolkit/notificationcenter.hpp            |    6 +-
 src/fwk/toolkit/uicontroller.hpp                  |    4 +-
 src/fwk/toolkit/undo.cpp                          |   33 +-
 src/fwk/toolkit/widgets/imagegridview.cpp         |    7 +-
 src/fwk/toolkit/widgets/imagegridview.hpp         |    3 +-
 src/fwk/utils/boost.hpp                           |   44 +--
 src/fwk/utils/databinder.hpp                      |    1 -
 src/fwk/utils/db/iconnectiondriver.hpp            |    8 +-
 src/fwk/utils/db/iconnectionmanagerdriver.hpp     |    2 +-
 src/fwk/utils/db/sqlite/sqlitecnxdrv.cpp          |   11 +-
 src/fwk/utils/files.cpp                           |    4 +-
 src/fwk/utils/files.hpp                           |   10 +-
 src/fwk/utils/gphoto.hpp                          |    6 +-
 src/fwk/utils/modulemanager.cpp                   |    8 +-
 src/fwk/utils/testfiles.cpp                       |   10 +-
 src/libraryclient/clientimpl.cpp                  |   42 +-
 src/libraryclient/clientimpl.hpp                  |    3 +-
 src/libraryclient/libraryclient.cpp               |    5 +
 src/libraryclient/libraryclient.hpp               |   10 +-
 src/libraryclient/locallibraryserver.cpp          |    1 -
 src/libraryclient/locallibraryserver.hpp          |    6 +-
 src/libraryclient/test_worker.cpp                 |   12 +-
 src/ncr/image.hpp                                 |    8 +-
 src/niepce/modules/darkroom/darkroommodule.hpp    |    4 +-
 src/niepce/modules/darkroom/toolboxcontroller.hpp |    4 +-
 src/niepce/notificationcenter.hpp                 |    6 +-
 src/niepce/ui/dialogs/editlabels.cpp              |   12 +-
 src/niepce/ui/dialogs/editlabels.hpp              |   12 +-
 src/niepce/ui/dialogs/importdialog.cpp            |   23 +-
 src/niepce/ui/dialogs/importdialog.hpp            |    5 +-
 src/niepce/ui/dialogs/preferencesdialog.cpp       |    9 +-
 src/niepce/ui/filmstripcontroller.hpp             |    6 +-
 src/niepce/ui/gridviewmodule.cpp                  |   19 +-
 src/niepce/ui/gridviewmodule.hpp                  |    4 +-
 src/niepce/ui/ilibrarymodule.hpp                  |    6 +-
 src/niepce/ui/imageliststore.cpp                  |    4 +-
 src/niepce/ui/metadatapanecontroller.cpp          |    7 +-
 src/niepce/ui/metadatapanecontroller.hpp          |    4 +-
 src/niepce/ui/moduleshell.cpp                     |    2 +-
 src/niepce/ui/moduleshell.hpp                     |    6 +-
 src/niepce/ui/niepceapplication.cpp               |    2 +-
 src/niepce/ui/niepcewindow.cpp                    |   69 ++--
 src/niepce/ui/niepcewindow.hpp                    |    8 +-
 src/niepce/ui/selectioncontroller.cpp             |   30 +-
 src/niepce/ui/selectioncontroller.hpp             |    4 +-
 src/niepce/ui/thumbstripview.cpp                  |    7 +-
 src/niepce/ui/workspacecontroller.cpp             |   23 +-
 src/niepce/ui/workspacecontroller.hpp             |    8 +-
 99 files changed, 1419 insertions(+), 715 deletions(-)
---
diff --cc Makefile.am
index 94ada6e,6f8c96b..e9caa2d
--- a/Makefile.am
+++ b/Makefile.am
@@@ -11,5 -11,9 +11,12 @@@ DISTCLEANFILES = intltool-extract 
                   intltool-update \
                   po/.intltool-merge-cache
  
- SUBDIRS = po data src camerawire magellan
- DIST_SUBDIRS = po art data doc src
+ if CW_BUILD
+ CW_DIR = camerawire
+ endif
++if MG_BUILD
++MG_DIR = magellan
++endif
+ 
 -SUBDIRS = po data src $(CW_DIR)
 -DIST_SUBDIRS = po art data doc src camerawire
++SUBDIRS = po data src $(CW_DIR) $(MG_DIR)
++DIST_SUBDIRS = po art data doc src camerawire magellan