summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-01-15 10:05:33 +0000
committerRichard Purdie <richard@openedhand.com>2008-01-15 10:05:33 +0000
commit21038ec0bab6d34de08d197e26f4f98e39a22d72 (patch)
treedcc6474a424c97c3bea8a776f6a3b8a758e6ee3c /meta
parentd59ce9396345073b4f3c40c528feb284472c073d (diff)
downloadpoky-21038ec0bab6d34de08d197e26f4f98e39a22d72.tar.gz
oh-puzzles: Fix merged menus (#703)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3489 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/puzzles/files/oh-puzzles-owl-menu.patch4
-rw-r--r--meta/packages/puzzles/oh-puzzles_svn.bb2
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/packages/puzzles/files/oh-puzzles-owl-menu.patch b/meta/packages/puzzles/files/oh-puzzles-owl-menu.patch
index e280ea81bd..99d40144d0 100644
--- 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
120+ gtk_ui_manager_ensure_update (merge); 120+ gtk_ui_manager_ensure_update (merge);
121+ 121+
122+ owl_set_window_menu_item (GTK_WINDOW (fe->window), 122+ owl_set_window_menu_item (GTK_WINDOW (fe->window),
123+ GTK_MENU_ITEM (gtk_ui_manager_get_widget (merge, "/menubar/Top"))); 123+ GTK_MENU_ITEM (gtk_ui_manager_get_widget (merge, "/menubar/TopMenu")));
124+ 124+
125 setup_colours (fe); 125 setup_colours (fe);
126 setup_pixbufs (fe); 126 setup_pixbufs (fe);
@@ -157,7 +157,7 @@ Index: src/menu.xml
157- <separator name="GameSep3"/> 157- <separator name="GameSep3"/>
158- <menuitem name="QuitMenu" action="Quit"/> 158- <menuitem name="QuitMenu" action="Quit"/>
159-</menu> 159-</menu>
160+<menu action="Top"> 160+<menu name="TopMenu" action="Top">
161+ <menu name="GameMenu" action="Game"> 161+ <menu name="GameMenu" action="Game">
162+ <menuitem name="NewMenu" action="New"/> 162+ <menuitem name="NewMenu" action="New"/>
163+ <menuitem name="RestartMenu" action="Restart"/> 163+ <menuitem name="RestartMenu" action="Restart"/>
diff --git a/meta/packages/puzzles/oh-puzzles_svn.bb b/meta/packages/puzzles/oh-puzzles_svn.bb
index 51a3f43c80..74ee6d68c5 100644
--- a/meta/packages/puzzles/oh-puzzles_svn.bb
+++ b/meta/packages/puzzles/oh-puzzles_svn.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT"
3SECTION = "x11" 3SECTION = "x11"
4DEPENDS = "gtk+ gconf intltool-native librsvg" 4DEPENDS = "gtk+ gconf intltool-native librsvg"
5PV = "0.1+svnr${SRCREV}" 5PV = "0.1+svnr${SRCREV}"
6PR = "r3" 6PR = "r4"
7 7
8bindir = "/usr/games" 8bindir = "/usr/games"
9 9