* Fixed Hildonization

* Crash when in hildon mode
* Makefile work (still no where near perfect)

git-svn-id: file:///svnroot/gc-dialer/trunk@118 c39d3808-3fe2-4d86-a59f-b7f623ee9f21

diff --git a/Makefile b/Makefile
index 4f14b5b..f671757 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 PROJECT_NAME=gc_dialer
+PROJECT_VERSION=0.8.0
 SOURCE_PATH=src
 SOURCE=$(SOURCE_PATH)/gc_dialer.py $(SOURCE_PATH)/gcbackend.py $(SOURCE_PATH)/browser_emu.py
 OBJ=$(SOURCE:.py=.pyc)
@@ -20,7 +21,7 @@ PRE_PACKAGE_PATH=./pkg-$(PLATFORM)
 PACKAGE_PATH=./deb-$(PLATFORM)
 BUILD_PATH=./build-$(PLATFORM)
 BUILD_BIN=$(BUILD_PATH)/gc_dialer.py
-DEB_PACKAGE=$(PACKAGE_PATH)/$(PROJECT_NAME)-0.7.2-$(PLATFORM).deb
+DEB_PACKAGE=$(PACKAGE_PATH)/$(PROJECT_NAME)-$(PROJECT_VERSION)_$(PLATFORM).deb
 
 DEBUGGER=winpdb
 UNIT_TEST=nosetests -w $(TEST_PATH)

diff --git a/src/gc_dialer.py b/src/gc_dialer.py
index 77acca8..ab5e3ce 100755 (executable)
--- a/src/gc_dialer.py
+++ b/src/gc_dialer.py
@@ -268,12 +268,12 @@ class Dialpad(object):
                global hildon
                self._app = None
                self._isFullScreen = False
-               if hildon is not None and isinstance(self._window, gtk.Window):
+               if hildon is not None and self._window is gtk.Window:
                        warnings.warn("Hildon installed but glade file not updated to work with hildon", UserWarning, 2)
                        hildon = None
                elif hildon is not None:
                        self._app = hildon.Program()
-                       self._window.set_title("%s - Keypad", self.__pretty_app_name__)
+                       self._window.set_title("%s - Keypad" % self.__pretty_app_name__)
                        self._app.add_window(self._window)
                        self._widgetTree.get_widget("callbackcombo").get_child().set_property('hildon-input-mode', (1 << 4))
                        self._widgetTree.get_widget("usernameentry").set_property('hildon-input-mode', 7)
@@ -634,7 +634,7 @@ class Dialpad(object):
 
                if hildon:
                        hildonTitle = self._notebook.get_tab_label(self._notebook.get_nth_page(page_num)).get_text()
-                       self._window.set_title("%s - %s", (self.__pretty_app_name__, hildonTitle))
+                       self._window.set_title("%s - %s" % (self.__pretty_app_name__, hildonTitle))
 
        def _on_dial_clicked(self, widget):
                """