[gnome-games/gnome-2-28] aisleriot: maemo5: Show exit-fullscreen button on toolbar in fullscreen

[Christian Persch <chpe src gnome org>]

commit d57ef981e196ce203e0a5311a4e628eec3aee7d5
Author: Christian Persch <chpe gnome org>
Date:   Thu Nov 26 14:49:23 2009 +0100

    aisleriot: maemo5: Show exit-fullscreen button on toolbar in fullscreen
    
    Make sure the GAMES_STOCK_LEAVE_FULLSCREEN stock item is registered also
    on maemo5.
    (cherry picked from commit 36f4a0e3cf664e221b44fc178b906d98e025e5c7)

 aisleriot/gtkrc-maemo          |    2 --
 libgames-support/games-stock.c |    5 +++--
 2 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/aisleriot/gtkrc-maemo b/aisleriot/gtkrc-maemo
index 8ca6bc7..94963e1 100644
--- a/aisleriot/gtkrc-maemo
+++ b/aisleriot/gtkrc-maemo
@@ -6,8 +6,6 @@ style "aisleriot-icons" {
   stock["games-new-game"]         = { { @"filemanager_game_file" } }
   stock["games-restart-game"]     = { { @"general_refresh" } }
   stock["gtk-index"]              = { { @"notes_bullets" } } # or maybe camera_camera_settings ?
-#  stock["games-undo-move"]        = { { @"general_back",    LTR }, { @"general_forward", RTL } }
-#  stock["games-redo-move"]        = { { @"general_forward", LTR }, { @"general_back",    RTL } }
   stock["games-undo-move"]        = { { @"general_undo", LTR }, { @"general_redo", RTL } }
   stock["games-redo-move"]        = { { @"general_redo", LTR }, { @"general_undo", RTL } }
   stock["games-cards-deal"]       = { { @"chat_enter" } }
diff --git a/libgames-support/games-stock.c b/libgames-support/games-stock.c
index 6f6d682..27bdcb4 100644
--- a/libgames-support/games-stock.c
+++ b/libgames-support/games-stock.c
@@ -274,13 +274,14 @@ games_stock_init (void)
 #if GTK_CHECK_VERSION (2, 8, 0)
     /* This is used on hildon too, but only exists since 2.8 */
     { GAMES_STOCK_FULLSCREEN,       GTK_STOCK_FULLSCREEN },
-#endif
+    /* This is used on maemo 5 */
+    { GAMES_STOCK_LEAVE_FULLSCREEN, GTK_STOCK_LEAVE_FULLSCREEN },
+#endif /* GTK+ >= 2.8.0 */
 #ifdef HAVE_GTK_ICON_FACTORY_ADD_ALIAS
     { GAMES_STOCK_REDO_MOVE,        GTK_STOCK_REDO },
     { GAMES_STOCK_UNDO_MOVE,        GTK_STOCK_UNDO },
 #endif
 #ifndef HAVE_HILDON
-    { GAMES_STOCK_LEAVE_FULLSCREEN, GTK_STOCK_LEAVE_FULLSCREEN },
     { GAMES_STOCK_NETWORK_GAME,     GTK_STOCK_NETWORK },
     { GAMES_STOCK_NETWORK_LEAVE,    GTK_STOCK_STOP },
     { GAMES_STOCK_PLAYER_LIST,      GTK_STOCK_INFO },