On login failure, switch to accounts tab

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

diff --git a/Makefile b/Makefile
index 93ae732..9721ca8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ package: $(OBJ)
        cp $(SOURCE_PATH)/$(PROJECT_NAME).py  $(BUILD_PATH)/generic
        $(foreach file, $(DATA), cp $(file) $(BUILD_PATH)/generic/$(subst /,-,$(file)) ; )
        $(foreach file, $(SOURCE), cp $(file) $(BUILD_PATH)/generic/$(subst /,-,$(file)) ; )
-       $(foreach file, $(OBJ), cp $(file) $(BUILD_PATH)/generic/$(subst /,-,$(file)) ; )
+       #$(foreach file, $(OBJ), cp $(file) $(BUILD_PATH)/generic/$(subst /,-,$(file)) ; )
        cp support/$(PROJECT_NAME).desktop $(BUILD_PATH)/generic
        cp support/icons/hicolor/26x26/hildon/$(PROJECT_NAME).png $(BUILD_PATH)/generic/26x26-$(PROJECT_NAME).png
        cp support/icons/hicolor/64x64/hildon/$(PROJECT_NAME).png $(BUILD_PATH)/generic/64x64-$(PROJECT_NAME).png

diff --git a/src/dc_glade.py b/src/dc_glade.py
index 02c3c79..c271252 100755 (executable)
--- a/src/dc_glade.py
+++ b/src/dc_glade.py
@@ -421,6 +421,7 @@ class Dialcentral(object):
                        logging.info("Logged into %r through user request" % self._phoneBackends[serviceId])
                else:
                        serviceId = self.NULL_BACKEND
+                       self._notebook.set_current_page(self.ACCOUNT_TAB)
 
                return loggedIn, serviceId
 

diff --git a/support/builddeb.py b/support/builddeb.py
index bc98318..f322165 100755 (executable)
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -28,7 +28,9 @@ __changelog__ = """
 * Made startup more error resistant
 * Simplified menus
 * Fremantle: Making various areas pannable
+* Phone selection and SMS Message dialogs now use a tree view for the top part.  This gives highlighting of the last message, easier scrolling, easier code, etc
 * UI Tweak: Switch to accounts tab when logging in and callback is blank as a sublte hint to configure it
+* UI Tweak: Switch to accounts tab on failed login to remind the user they are not logged in
 * Bug Fix: some dependencies for Diablo
 * Bug Fix: Error on refreshing tabs when not logged in
 * Bug Fix: #4471 Notification Checkbox Won't Stay Checked (hour roll over error)
@@ -189,6 +191,7 @@ def build_package(distribution):
        py2deb.Py2deb.SECTIONS = py2deb.SECTIONS_BY_POLICY[distribution]
        p = py2deb.Py2deb(__appname__)
        p.description = __description__
+       p.upgradeDescription = __changelog__.split("\n\n", 1)[0]
        p.author = __author__
        p.mail = __email__
        p.license = "lgpl"
@@ -228,7 +231,7 @@ def build_package(distribution):
                "diablo": "26x26-dialcentral.png",
                "fremantle": "64x64-dialcentral.png", # Fremantle natively uses 48x48
                "mer": "64x64-dialcentral.png",
-       }
+       }[distribution]
        p["/usr/bin"] = [ "dialcentral.py" ]
        for relPath, files in unflatten_files(find_files(".")).iteritems():
                fullPath = "/usr/lib/dialcentral"

diff --git a/support/py2deb.py b/support/py2deb.py
index 9dc0f70..ad62a40 100644 (file)
--- a/support/py2deb.py
+++ b/support/py2deb.py
@@ -427,6 +427,7 @@ class Py2deb(object):
 
         self.name = name
         self.description = description
+        self.upgradeDescription = ""
         self.license = license
         self.depends = depends
         self.recommends = ""
@@ -665,6 +666,9 @@ Architecture: %(arch)s
 Depends: %(depends)s
 Recommends: %(recommends)s
 Description: %(description)s""" % locals()
+            if self.upgradeDescription:
+                upgradeDescription = "XB-Maemo-Upgrade-Description: %s" % self.upgradeDescription.strip()
+                txt = "\n".join((txt, "\n  ".join(upgradeDescription.split("\n")), ""))
             if self.icon:
                 f = open(self.icon, "rb")
                 try: