Fixed a few bugs

Due to using maemo-optify, fremantle paths are the same as diablo,
so removed /opt/mevemon/imgs/ path.

Starting mEveMon with invalid credentials caused an unhandled exception,
so we handle it by returning the placeholder_chars

diff --git a/package/Makefile b/package/Makefile
index 0596cfc..d7fcd3c 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -5,7 +5,7 @@
 #edit these when creating a new release
 MAJOR_VER='0'
 MINOR_VER='2'
-PKG_VER='1'
+PKG_VER='4'
 
 compile:
        perl -ni -e 'print; exit if /^XB-Maemo-Icon-26:$$/' debian/control

diff --git a/package/debian/changelog b/package/debian/changelog
index 32d06e0..bc51122 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,5 +1,5 @@
-mevemon (0.2-1) stable; urgency=low
+mevemon (0.2-4) stable; urgency=low
 
-  * Fixed a missing dependency on 'gnome-python'
+  * Handle it better when user inputs invalid credentials
 
- -- Ryan Campbell <campbellr@gmail.com>  Fri, 28 Apr 2010 12:23:20 +0000
+ -- Ryan Campbell <campbellr@gmail.com>  Wed, 28 Apr 2010 13:41:23 -0007

diff --git a/package/debian/files b/package/debian/files
index 81457af..749face 100644 (file)
--- a/package/debian/files
+++ b/package/debian/files
@@ -1 +1 @@
-mevemon_0.2-1_all.deb user/utilities extra
+mevemon_0.2-4_all.deb user/utilities extra

diff --git a/package/src/fetchimg.py b/package/src/fetchimg.py
index 1f0043c..6f78188 100644 (file)
--- a/package/src/fetchimg.py
+++ b/package/src/fetchimg.py
@@ -3,10 +3,7 @@ import os.path
 
 def portrait_filename( char_id, img_size ):
 
-    err_img = '/opt/mevemon/imgs/error.jpg'
-    if not os.path.isfile(err_img):
-        #diablo location
-        err_img = "/usr/share/mevemon/imgs/error.jpg"
+    err_img = "/usr/share/mevemon/imgs/error.jpg"
    
     img_dir = os.path.expanduser("~/.mevemon/imgs/")
 

diff --git a/package/src/mevemon.py b/package/src/mevemon.py
index cd1e6ea..07a044f 100755 (executable)
--- a/package/src/mevemon.py
+++ b/package/src/mevemon.py
@@ -123,10 +123,7 @@ class mEveMon():
         name, if there's a problem. FIXME --danny
         """
         ui_char_list = []
-        if is_fremantle:
-            err_img = "/opt/mevemon/imgs/error.jpg"
-        else:
-            err_img = "/usr/share/mevemon/imgs/error.jpg"
+        err_img = "/usr/share/mevemon/imgs/error.jpg"
 
         placeholder_chars = [("Please check your API settings.", err_img)]
         if not self.auth: return placeholder_chars
@@ -138,7 +135,8 @@ class mEveMon():
                 ui_char_list.append( ( character.name, fetchimg.portrait_filename( character.characterID, 64 ) ) )
         except eveapi.Error, e:
             # again, we need to handle this... --danny
-            raise
+            return placeholder_chars
+            #raise
 
         return ui_char_list
 

diff --git a/package/src/ui/diablo/gui.py b/package/src/ui/diablo/gui.py
index 461d440..e4ceb2b 100644 (file)
--- a/package/src/ui/diablo/gui.py
+++ b/package/src/ui/diablo/gui.py
@@ -93,7 +93,7 @@ class BaseUI():
             self.controller.set_api_key(apiEntry.get_text())
             self.controller.set_uid(uidEntry.get_text())
             self.controller.set_auth()
-            self.update_model(self.char_model)
+            self.char_model.get_characters()
         
         dialog.destroy()
 

diff --git a/package/src/ui/fremantle/gui.py b/package/src/ui/fremantle/gui.py
index adfa4e4..e634c94 100644 (file)
--- a/package/src/ui/fremantle/gui.py
+++ b/package/src/ui/fremantle/gui.py
@@ -101,7 +101,7 @@ class BaseUI():
             self.controller.set_api_key(apiEntry.get_text())
             self.controller.set_uid(uidEntry.get_text())
             self.controller.set_auth()
-            self.update_model(self.char_model)
+            self.char_model.get_characters()
 
         
         dialog.destroy()