Merge lp:~ken-vandine/gwibber/lp_949395 into lp:gwibber

[Ken VanDine]

* Fixed xdg import and get_ui_asset to fallback to find UI assets in more places
* Protect against trying to create a pixbuf from an icon that doesn't exist (LP: #949395)

[David Klasinc (bigwhale)]

Looks good.

review: Approve

=== modified file 'gwibber/microblog/dispatcher.py'
--- gwibber/microblog/dispatcher.py	2012-03-07 21:01:20 +0000
+++ gwibber/microblog/dispatcher.py	2012-03-20 16:37:19 +0000
@@ -670,10 +670,6 @@
       if self.notified_errors[error["account"]["service"]] == error["message"]:
         return
     if util.can_notify:
-      #FIXME - we need to fix finding service icons in the service
-      #icon = util.resources.get_ui_asset("icons/breakdance/scalable/%s.svg" % error["account"]["service"])
-      if not icon:
-        icon = util.resources.get_ui_asset("gwibber.svg")
       util.notify(error["account"]["service"], error["message"], icon, 2000)
     self.notified_errors[error["account"]["service"]] = error["message"]
 
 
=== modified file 'gwibber/microblog/util/__init__.py'
--- gwibber/microblog/util/__init__.py	2012-03-04 23:44:04 +0000
+++ gwibber/microblog/util/__init__.py	2012-03-20 16:37:19 +0000
@@ -221,7 +221,10 @@
 
   def notify(title, text, icon = None, timeout = None, iconsize = 48):
     if icon is None:
-      icon = resources.get_ui_asset("gwibber.svg")
+      icon = resources.get_ui_asset("icons/hicolor/scalable/apps/gwibber.svg")
+
+    if icon is None:
+      return
     
     caps = Notify.get_server_caps()
     
 
=== modified file 'gwibber/microblog/util/resources.py'
--- gwibber/microblog/util/resources.py	2012-03-12 23:47:12 +0000
+++ gwibber/microblog/util/resources.py	2012-03-20 16:37:19 +0000
@@ -37,9 +37,9 @@
 THEME_MIN_VERSION = 2
 
 try:
-  import xdg
-  DATA_BASE_DIRS = xdg.BaseDirectory.xdg_data_dirs
-  CACHE_BASE_DIR = xdg.BaseDirectory.xdg_cache_home
+  from xdg import BaseDirectory
+  DATA_BASE_DIRS = BaseDirectory.xdg_data_dirs
+  CACHE_BASE_DIR = BaseDirectory.xdg_cache_home
 except:
   DATA_BASE_DIRS = [
     os.path.join(os.path.expanduser("~"), ".local", "share"),
@@ -179,6 +179,10 @@
     asset_path = os.path.join(base, UI_DIR_NAME, asset_name)
     if os.path.exists(asset_path):
       return asset_path
+
+    asset_path = os.path.join(base, asset_name)
+    if os.path.exists(asset_path):
+      return asset_path
   return None
 
 def get_template_dirs():