[gnome-robots/libgames-scores: 43/43] Merge branch 'master' into libgames-scores

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 615098922b7a0ee5ce3e1f27a2d22f7a72797e5d
Merge: b91ba3d 97d41d1
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sat Jun 21 13:28:35 2014 -0500

    Merge branch 'master' into libgames-scores
    
    Conflicts:
        src/Makefile.am

 configure.ac                      |    7 +-
 data/Makefile.am                  |    5 +-
 data/app-menu.ui                  |   39 +
 data/gnome-robots.6               |   22 +-
 data/gnome-robots.appdata.xml.in  |    3 +-
 data/org.gnome.robots.gschema.xml |    8 +-
 help/cs/cs.po                     |  365 +-
 help/el/el.po                     |  590 ++--
 help/es/es.po                     |  520 ++--
 po/POTFILES.in                    |    5 +-
 po/ca.po                          | 2836 +------------
 po/cs.po                          |  123 +-
 po/es.po                          |  229 +-
 po/pt_BR.po                       |  209 +-
 po/sl.po                          |  137 +-
 po/sv.po                          | 8882 ++-----------------------------------
 src/Makefile.am                   |   12 +-
 src/game.c                        |   45 +-
 src/games-file-list.c             |   11 +-
 src/games-fullscreen-action.c     |  228 -
 src/games-fullscreen-action.h     |   66 -
 src/games-preimage.c              |    4 -
 src/games-stock.c                 |  357 --
 src/games-stock.h                 |   62 -
 src/gnobots.c                     |  334 --
 src/gnobots.h                     |   18 -
 src/gnome-robots.c                |  477 ++
 src/gnome-robots.h                |   25 +
 src/graphics.c                    |   15 +-
 src/graphics.h                    |    3 +-
 src/menu.c                        |  367 --
 src/menu.h                        |   16 -
 src/properties.c                  |   73 +-
 src/properties.h                  |    4 +-
 src/statusbar.c                   |  312 --
 src/statusbar.h                   |   22 -
 36 files changed, 2203 insertions(+), 14228 deletions(-)
---
diff --cc configure.ac
index 0cf6f0c,0502eb1..ff6afd1
--- a/configure.ac
+++ b/configure.ac
@@@ -21,9 -22,10 +22,11 @@@ CANBERRA_GTK_REQUIRED=0.2
  
  PKG_CHECK_MODULES(ROBOTS, [
    gtk+-3.0 >= $GTK_REQUIRED
+   glib-2.0 >= $GLIB_REQUIRED
+   gio-2.0 >= $GLIB_REQUIRED
    librsvg-2.0 >= $RSVG_REQUIRED
    libcanberra-gtk3 >= $CANBERRA_GTK_REQUIRED
 +  libgames-scores
  ])
  
  AC_PATH_PROG([APPDATA_VALIDATE], [appdata-validate], [/bin/true])
diff --cc src/Makefile.am
index 2220f9d,c02dca3..63c3683
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -34,8 -28,14 +28,6 @@@ gnome_robots_SOURCES = 
        games-gridframe.h \
        games-preimage.c \
        games-preimage.h \
-       games-stock.c \
-       games-stock.h \
 -      games-score.h                   \
 -      games-score.c                   \
 -      games-scores.c                  \
 -      games-scores.h                  \
 -      games-scores-dialog.c   \
 -      games-scores-dialog.h   \
 -      games-scores-backend.c  \
 -      games-scores-backend.h  \
        cursor-down.h \
        cursor-down-left.h \
        cursor-down-right.h \