Merge lp:~pitti/gtimelog/pygi into lp:~gtimelog-dev/gtimelog/trunk

[Martin Pitt]

This fixes a regression from r183, which caused a startup failure if appindicator is available:

Traceback (most recent call last):
  File "./gtimelog", line 12, in <module>
    main()
  File "./src/gtimelog/main.py", line 2041, in main
    tray_icon = icon_class(main_window)
  File "./src/gtimelog/main.py", line 1124, in __init__
    if appindicator is None:
NameError: global name 'appindicator' is not defined

[Marius Gedminas (mgedmin)]

Thanks a lot!

review: Approve

[lp:~pitti/gtimelog/pygi]

186. By Marius Gedminas on 2011-02-02

Fix crash on startup if PyGTK is not available, but PyGI and appindicator are.

=== modified file 'src/gtimelog/main.py'
--- src/gtimelog/main.py	2011-01-31 21:58:30 +0000
+++ src/gtimelog/main.py	2011-02-02 15:08:06 +0000
@@ -38,7 +38,7 @@
         APPINDICATOR_ACTIVE = appindicator.STATUS_ACTIVE
     except ImportError:
         # apt-get install python-appindicator on Ubuntu
-        appindicator = None
+        new_app_indicator = None
 
 except ImportError:
     import gi
@@ -60,7 +60,7 @@
         APPINDICATOR_CATEGORY = AppIndicator.IndicatorCategory.APPLICATION_STATUS
         APPINDICATOR_ACTIVE = AppIndicator.IndicatorStatus.ACTIVE
     except (ImportError, gi._gi.RepositoryError):
-        appindicator = None
+        new_app_indicator = None
 
 try:
     import dbus
@@ -1120,7 +1120,7 @@
         self.gtimelog_window = gtimelog_window
         self.timelog = gtimelog_window.timelog
         self.indicator = None
-        if appindicator is None:
+        if new_app_indicator is None:
             return
         self.indicator = new_app_indicator("gtimelog", self.icon_name,
                                            APPINDICATOR_CATEGORY)