gtg-user team mailing list archive

[Alan Gomes Alvino <alangalvino@xxxxxxxxx>]

Alan Gomes Alvino has proposed merging lp:~gtg-user/gtg/alangalvino_branch into lp:gtg.

Requested reviews:
  Izidor Matušov (izidor)
Related bugs:
  Bug #971845 in Getting Things GNOME!: "python setup.py install doesn't install icons on right place"
  https://bugs.launchpad.net/gtg/+bug/971845

For more details, see:
https://code.launchpad.net/~gtg-user/gtg/alangalvino_branch/+merge/107429

I have added to the function get_icons_directories the xdg_data_dirs, because the get_icons_directories just save the project home path and not the freedesktop_data_path(usually is /usr/local/share/).
-- 
https://code.launchpad.net/~gtg-user/gtg/alangalvino_branch/+merge/107429
Your team Gtg users is subscribed to branch lp:~gtg-user/gtg/alangalvino_branch.

=== modified file 'CHANGELOG'
--- CHANGELOG	2012-05-25 16:57:38 +0000
+++ CHANGELOG	2012-05-25 17:05:22 +0000
@@ -1,4 +1,5 @@
 2012-0?-?? Getting Things GNOME! 0.3
+    * Fix for bug #984847: setup.py install doesn't install icons on right place, by Alan Gomes
     * Hide tasks with due date someday, #931376
     * New Date class by Paul Kishimoto and Izidor Matušov
       * Parse due:3 as next 3rd day in month

=== modified file 'GTG/core/__init__.py'
--- GTG/core/__init__.py	2012-05-01 10:00:22 +0000
+++ GTG/core/__init__.py	2012-05-25 17:05:22 +0000
@@ -38,7 +38,7 @@
 
 #=== IMPORT ====================================================================
 import os
-from xdg.BaseDirectory import xdg_data_home, xdg_config_home
+from xdg.BaseDirectory import xdg_data_home, xdg_config_home, xdg_data_dirs
 from configobj         import ConfigObj
 from GTG.tools.testingmode import TestingMode
 
@@ -182,7 +182,10 @@
 
     def get_icons_directories(self):
         """ Returns the directories containing the icons """
-        return [GTG.DATA_DIR, os.path.join(GTG.DATA_DIR, "icons")]
+        icons_dirs = [os.path.join(dir, 'gtg/icons') for dir in xdg_data_dirs]
+        icons_dirs.append(os.path.join(GTG.DATA_DIR, "icons"))
+        icons_dirs.append(GTG.DATA_DIR)
+        return icons_dirs
 
     def get_data_dir(self):
         return self.data_dir