Merge lp:~gtg-user/gtg/alangalvino_branch into lp:~gtg/gtg/old-trunk

Proposed by Alan Gomes Alvino on 2012-05-25
Status: Merged
Merged at revision: 1222
Proposed branch: lp:~gtg-user/gtg/alangalvino_branch
Merge into: lp:~gtg/gtg/old-trunk
Diff against target: 34 lines (+6/-2)
2 files modified
CHANGELOG (+1/-0)
GTG/core/__init__.py (+5/-2)
To merge this branch: bzr merge lp:~gtg-user/gtg/alangalvino_branch
Reviewer Review Type Date Requested Status
Bertrand Rousseau (community) code Approve on 2012-08-08
Izidor Matušov 2012-05-25 Pending
Review via email: mp+107429@code.launchpad.net

Description of the change

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/).

To post a comment you must log in.

This code seems ok for me.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CHANGELOG'
2--- CHANGELOG 2012-05-25 16:57:38 +0000
3+++ CHANGELOG 2012-05-25 17:05:22 +0000
4@@ -1,4 +1,5 @@
5 2012-0?-?? Getting Things GNOME! 0.3
6+ * Fix for bug #984847: setup.py install doesn't install icons on right place, by Alan Gomes
7 * Hide tasks with due date someday, #931376
8 * New Date class by Paul Kishimoto and Izidor Matušov
9 * Parse due:3 as next 3rd day in month
10
11=== modified file 'GTG/core/__init__.py'
12--- GTG/core/__init__.py 2012-05-01 10:00:22 +0000
13+++ GTG/core/__init__.py 2012-05-25 17:05:22 +0000
14@@ -38,7 +38,7 @@
15
16 #=== IMPORT ====================================================================
17 import os
18-from xdg.BaseDirectory import xdg_data_home, xdg_config_home
19+from xdg.BaseDirectory import xdg_data_home, xdg_config_home, xdg_data_dirs
20 from configobj import ConfigObj
21 from GTG.tools.testingmode import TestingMode
22
23@@ -182,7 +182,10 @@
24
25 def get_icons_directories(self):
26 """ Returns the directories containing the icons """
27- return [GTG.DATA_DIR, os.path.join(GTG.DATA_DIR, "icons")]
28+ icons_dirs = [os.path.join(dir, 'gtg/icons') for dir in xdg_data_dirs]
29+ icons_dirs.append(os.path.join(GTG.DATA_DIR, "icons"))
30+ icons_dirs.append(GTG.DATA_DIR)
31+ return icons_dirs
32
33 def get_data_dir(self):
34 return self.data_dir

Subscribers

People subscribed via source and target branches

to status/vote changes: