oh-puzzles: Fix merged menus (#703)

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3489 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2008-01-15 10:05:33 +00:00
parent d59ce93963
commit 21038ec0ba
2 changed files with 3 additions and 3 deletions

View File

@@ -120,7 +120,7 @@ Index: src/gtk.c
+ gtk_ui_manager_ensure_update (merge); + gtk_ui_manager_ensure_update (merge);
+ +
+ owl_set_window_menu_item (GTK_WINDOW (fe->window), + 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_colours (fe);
setup_pixbufs (fe); setup_pixbufs (fe);
@@ -157,7 +157,7 @@ Index: src/menu.xml
- <separator name="GameSep3"/> - <separator name="GameSep3"/>
- <menuitem name="QuitMenu" action="Quit"/> - <menuitem name="QuitMenu" action="Quit"/>
-</menu> -</menu>
+<menu action="Top"> +<menu name="TopMenu" action="Top">
+ <menu name="GameMenu" action="Game"> + <menu name="GameMenu" action="Game">
+ <menuitem name="NewMenu" action="New"/> + <menuitem name="NewMenu" action="New"/>
+ <menuitem name="RestartMenu" action="Restart"/> + <menuitem name="RestartMenu" action="Restart"/>

View File

@@ -3,7 +3,7 @@ LICENSE = "MIT"
SECTION = "x11" SECTION = "x11"
DEPENDS = "gtk+ gconf intltool-native librsvg" DEPENDS = "gtk+ gconf intltool-native librsvg"
PV = "0.1+svnr${SRCREV}" PV = "0.1+svnr${SRCREV}"
PR = "r3" PR = "r4"
bindir = "/usr/games" bindir = "/usr/games"