oh-puzzles: Fix merged menus (#703)

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3489 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/puzzles/files/oh-puzzles-owl-menu.patch b/meta/packages/puzzles/files/oh-puzzles-owl-menu.patch
index e280ea81bd448774922caa3f6007cf90416be2ad..99d40144d047d45dc53a72f660011aeaf53d580c 100644 (file)
--- a/meta/packages/puzzles/files/oh-puzzles-owl-menu.patch
+++ b/meta/packages/puzzles/files/oh-puzzles-owl-menu.patch
@@ -120,7 +120,7 @@ Index: src/gtk.c
 +    gtk_ui_manager_ensure_update (merge);
 +
 +    owl_set_window_menu_item (GTK_WINDOW (fe->window),
-+                            GTK_MENU_ITEM (gtk_ui_manager_get_widget (merge, "/menubar/Top")));
++                            GTK_MENU_ITEM (gtk_ui_manager_get_widget (merge, "/menubar/TopMenu")));
 +    
      setup_colours (fe);
      setup_pixbufs (fe);
@@ -157,7 +157,7 @@ Index: src/menu.xml
 -      <separator name="GameSep3"/>
 -      <menuitem name="QuitMenu" action="Quit"/>
 -</menu>
-+<menu action="Top">
++<menu name="TopMenu" action="Top">
 +      <menu name="GameMenu" action="Game">
 +              <menuitem name="NewMenu" action="New"/>
 +              <menuitem name="RestartMenu" action="Restart"/>

diff --git a/meta/packages/puzzles/oh-puzzles_svn.bb b/meta/packages/puzzles/oh-puzzles_svn.bb
index 51a3f43c80d1a3bf39374cb4b1709911cf95967d..74ee6d68c59e08bc8d932353cfaa67ba5bc9af1d 100644 (file)
--- a/meta/packages/puzzles/oh-puzzles_svn.bb
+++ b/meta/packages/puzzles/oh-puzzles_svn.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT"
 SECTION = "x11"
 DEPENDS = "gtk+ gconf intltool-native librsvg"
 PV = "0.1+svnr${SRCREV}"
-PR = "r3"
+PR = "r4"
 
 bindir = "/usr/games"