← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gnome-do/trusty

« back to all changes in this revision

Viewing changes to Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/EnvironmentServiceExtensions.cs

  • Committer: Package Import Robot
  • Author(s): Christopher James Halse Rogers
  • Date: 2012-03-26 11:12:21 UTC
  • mfrom: (0.1.12 sid)
  • Revision ID: package-import@ubuntu.com-20120326111221-1jk143fy37zxi3e4
Tags: 0.9-1
http://bugs.debian.org/665537
* New upstream version no longer uses deprecated internal glib headers.
  (Closes: #665537)
* [59fa37b9] Fix watch file
* [63486516] Imported Upstream version 0.9
* [8c636d84] Disable testsuite for now; requires running dbus and gconf daemons
* [e46de4b9] Remove inaccurate README.Source
* [4591d677] Add git-buildpackage configuration to default to pristine-tar

Show diffs side-by-side

added added

removed removed

Lines of Context:
Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/EnvironmentServiceExtensions.cs
68
68
                        }
69
69
 
70
70
                        userDirsPath = Path.Combine (configDir, "user-dirs.dirs");
71
 
                        if (!File.Exists (userDirsPath)) {
72
 
                                return Path.Combine (homeDir, fallback);
73
 
                        }
74
71
 
75
 
                        try {
 
72
                        if (File.Exists (userDirsPath)) {
76
73
                                using (StreamReader reader = new StreamReader (userDirsPath)) {
77
74
                                        string line;
78
75
                                        while ((line = reader.ReadLine ()) != null) {
95
92
                                                }
96
93
                                        }
97
94
                                }
98
 
                        } catch (FileNotFoundException) {
99
95
                        }
100
 
                        
 
96
 
101
97
                        return fallback == null 
102
98
                                ? null
103
99
                                : Path.Combine (homeDir, fallback);