From f97d39a5ced73421ef7685836bbef0c1e0c6d9e3 Mon Sep 17 00:00:00 2001
From: epage <eopage@byu.net>
Date: Sat, 7 Nov 2009 03:17:01 +0000
Subject: [PATCH] Fixing up some more Fremantle issues

git-svn-id: file:///svnroot/quicknote/trunk@70 bb7704e3-badb-4cfa-9ab3-9374dc87eaa2
---
 src/quicknote_gtk.py |   23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/quicknote_gtk.py b/src/quicknote_gtk.py
index 20d52cb..b03209e 100644
--- a/src/quicknote_gtk.py
+++ b/src/quicknote_gtk.py
@@ -25,10 +25,8 @@ import gtk
 
 try:
 	import hildon
-	IS_HILDON = True
 except ImportError:
 	import fakehildon as hildon
-	IS_HILDON = False
 
 try:
 	import osso
@@ -60,20 +58,11 @@ class QuicknoteProgram(hildonize.get_app_class()):
 
 	def __init__(self):
 		super(QuicknoteProgram, self).__init__()
-		if IS_HILDON:
-			gtk.set_application_name(constants.__pretty_app_name__)
 
 		dblog = os.path.join(self._user_data, "quicknote.log")
 
 		_moduleLogger.info('Starting quicknote')
-
-		if osso is not None:
-			self._osso_c = osso.Context(constants.__app_name__, constants.__version__, False)
-			self._deviceState = osso.DeviceState(self._osso_c)
-			self._deviceState.set_device_state_callback(self._on_device_state_change, 0)
-		else:
-			self._osso_c = None
-			self._deviceState = None
+		self._wordWrapEnabled = False
 
 		self._window_in_fullscreen = False #The window isn't in full screen mode initially.
 		self._isZoomEnabled = False
@@ -127,7 +116,6 @@ class QuicknoteProgram(hildonize.get_app_class()):
 			menu_items = gtk.MenuItem(_("Word Wrap"))
 			viewmenu.append(menu_items)
 			menu_items.connect("activate", self._on_toggle_word_wrap, None)
-			self._wordWrapEnabled = False
 
 			view_menu = gtk.MenuItem(_("View"))
 			view_menu.show()
@@ -189,6 +177,15 @@ class QuicknoteProgram(hildonize.get_app_class()):
 		if not hildonize.IS_HILDON_SUPPORTED:
 			_moduleLogger.info("No hildonization support")
 
+		if osso is not None:
+			self._osso_c = osso.Context(constants.__app_name__, constants.__version__, False)
+			self._deviceState = osso.DeviceState(self._osso_c)
+			self._deviceState.set_device_state_callback(self._on_device_state_change, 0)
+		else:
+			_moduleLogger.info("No osso support")
+			self._osso_c = None
+			self._deviceState = None
+
 		self._prepare_sync_dialog()
 
 		self._window.show_all()
-- 
1.7.9.5