[eog: 34/34] Merge branch 'wip/gaction-migration'

[Felix Riemann <friemann src gnome org>]

commit f8051de56416e9a49184065c70c1e926a3ae8187
Merge: 631b66c 5cfdbd1
Author: Felix Riemann <friemann gnome org>
Date:   Wed Jan 7 19:43:50 2015 +0100

    Merge branch 'wip/gaction-migration'
    
    Conflicts:
        src/eog.gresource.xml
    
    This is the merge of the current state as it is required
    for further developments. The "OpenWith" and "RecentFiles" menus
    are still todo as is plugin integration.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=741050

 Makefile.am                                        |    2 +-
 configure.ac                                       |    9 -
 cut-n-paste/Makefile.am                            |    3 -
 cut-n-paste/toolbar-editor/Makefile.am             |  105 --
 cut-n-paste/toolbar-editor/egg-editable-toolbar.c  | 1936 --------------------
 cut-n-paste/toolbar-editor/egg-editable-toolbar.h  |   95 -
 cut-n-paste/toolbar-editor/egg-toolbar-editor.c    |  677 -------
 cut-n-paste/toolbar-editor/egg-toolbar-editor.h    |   63 -
 cut-n-paste/toolbar-editor/egg-toolbars-model.c    |  987 ----------
 cut-n-paste/toolbar-editor/egg-toolbars-model.h    |  190 --
 cut-n-paste/toolbar-editor/eggmarshalers.list      |    1 -
 .../update-toolbareditor-from-libegg.sh            |   33 -
 data/Makefile.am                                   |    8 +-
 data/eog-app-menu.xml                              |    4 -
 data/eog-toolbar.xml                               |   37 -
 data/eog-ui.xml                                    |  143 --
 data/eog.convert                                   |    1 -
 data/fullscreen-toolbar.ui                         |  218 +++
 data/org.gnome.eog.gschema.xml.in                  |    6 +-
 data/popup-menus.ui                                |   53 +
 doc/reference/Makefile.am                          |    2 -
 doc/reference/eog-sections.txt                     |    4 -
 po/POTFILES.in                                     |    4 +-
 src/Makefile.am                                    |    5 -
 src/eog-application-internal.h                     |    9 -
 src/eog-application.c                              |  147 +-
 src/eog-config-keys.h                              |    1 -
 src/eog-properties-dialog.c                        |   61 +-
 src/eog-properties-dialog.h                        |    4 +-
 src/eog-util.c                                     |    1 -
 src/eog-window.c                                   | 1658 ++++++-----------
 src/eog.gresource.xml                              |    3 +-
 tests/actions.feature                              |    9 -
 33 files changed, 924 insertions(+), 5555 deletions(-)
---
diff --cc src/eog.gresource.xml
index a8feb2f,a1048c0..15d8a51
--- a/src/eog.gresource.xml
+++ b/src/eog.gresource.xml
@@@ -6,8 -6,8 +6,9 @@@
      <file compressed="true" preprocess="xml-stripblanks">eog-image-properties-dialog.ui</file>
      <file compressed="true" preprocess="xml-stripblanks">eog-multiple-save-as-dialog.ui</file>
      <file compressed="true" preprocess="xml-stripblanks">eog-preferences-dialog.ui</file>
-     <file compressed="true" preprocess="xml-stripblanks">eog-ui.xml</file>
+     <file compressed="true" preprocess="xml-stripblanks">fullscreen-toolbar.ui</file>
 +    <file>pixmaps/thumbnail-frame.png</file>
+     <file compressed="true" preprocess="xml-stripblanks">popup-menus.ui</file>
    </gresource>
  </gresources>