From: Ed Page <eopage@byu.net>
Date: Tue, 5 Oct 2010 12:51:36 +0000 (-0500)
Subject: Fixing a Maemo 5 issue
X-Git-Url: http://git.maemo.org/git/?p=watersofshiloah;a=commitdiff_plain;h=d0799512e99e286826e555b6cfa56fc2200c13a5

Fixing a Maemo 5 issue
---

diff --git a/src/constants.py b/src/constants.py
index e34d464..9da8b69 100644
--- a/src/constants.py
+++ b/src/constants.py
@@ -2,7 +2,7 @@ import os
 
 __pretty_app_name__ = "Waters of Shiloah"
 __app_name__ = "watersofshiloah"
-__version__ = "1.0.3"
+__version__ = "1.0.4"
 __build__ = 0
 __app_magic__ = 0x1AFF5
 _data_path_ = os.path.join(os.path.expanduser("~"), ".%s" % __app_name__)
diff --git a/src/windows/_base.py b/src/windows/_base.py
index cbd7ca8..8a14489 100644
--- a/src/windows/_base.py
+++ b/src/windows/_base.py
@@ -95,6 +95,10 @@ class BasicWindow(gobject.GObject, go_utils.AutoSignal):
 			menuBar.append(helpMenuItem)
 
 			self._layout.pack_start(menuBar, False, False)
+			menuBar = hildonize.hildonize_menu(
+				self._window,
+				menuBar,
+			)
 		else:
 			aboutMenuItem = gtk.Button("About")
 			aboutMenuItem.connect("clicked", self._on_about)
@@ -103,10 +107,6 @@ class BasicWindow(gobject.GObject, go_utils.AutoSignal):
 			appMenu.append(aboutMenuItem)
 			appMenu.show_all()
 			self._window.set_app_menu(appMenu)
-		menuBar = hildonize.hildonize_menu(
-			self._window,
-			menuBar,
-		)
 
 		self._layout.pack_start(self._errorBanner.toplevel, False, True)
 
diff --git a/support/builddeb.py b/support/builddeb.py
index e0f0d00..9bdfe22 100755
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -27,6 +27,7 @@ __email__ = "eopage@byu.net"
 __version__ = constants.__version__
 __build__ = constants.__build__
 __changelog__ = """
+* Fixing a Maemo 5 issue introduced in 1.0.3
 """
 
 
diff --git a/www/watersofshiloah.deb b/www/watersofshiloah.deb
index 29b3a2e..e09dbf9 100644
Binary files a/www/watersofshiloah.deb and b/www/watersofshiloah.deb differ