← Back to branch summary

~ubuntu-branches/ubuntu/quantal/activity-log-manager/quantal-updates

« back to all changes in this revision

Viewing changes to debian/patches/07_fix_userdirs.patch

  • Committer: Package Import Robot
  • Author(s): Margarita Manterola
  • Date: 2012-11-26 17:05:56 UTC
  • Revision ID: package-import@ubuntu.com-20121126170556-tw0rw2c0q7p4y7l6
Tags: 0.9.4-0ubuntu4.2
https://launchpad.net/bugs/1024057
* 07_fix_userdirs.patch:
  - Verify that a user directory exists before adding it to the hash map.
    (LP: #1024057)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/07_fix_userdirs.patch
 
1
Index: activity-log-manager-0.9.4/src/files-widget.vala
 
2
===================================================================
 
3
--- activity-log-manager-0.9.4.orig/src/files-widget.vala       2012-03-20 17:39:25.000000000 +0100
 
4
+++ activity-log-manager-0.9.4/src/files-widget.vala    2012-11-26 13:55:33.081759039 +0100
 
5
@@ -261,15 +261,25 @@
 
6
                mime_dict.set(_("E-mail"), NMO_EMAIL);
 
7
                mime_dict.set(_("Website"), NFO_WEBSITE);
 
8
 
 
9
+                       UserDirectory[] special_dirs =
 
10
+                       {
 
11
+                               UserDirectory.DESKTOP,
 
12
+                               UserDirectory.DOCUMENTS,
 
13
+                               UserDirectory.DOWNLOAD,
 
14
+                               UserDirectory.MUSIC,
 
15
+                               UserDirectory.PICTURES,
 
16
+                               UserDirectory.PUBLIC_SHARE,
 
17
+                               UserDirectory.TEMPLATES,
 
18
+                               UserDirectory.VIDEOS
 
19
+                       };
 
20
+
 
21
                        defined_dirs = new HashMap<string, UserDirectory>(str_hash, str_equal);
 
22
-                       defined_dirs.set(Environment.get_user_special_dir(UserDirectory.DESKTOP), UserDirectory.DESKTOP);
 
23
-                       defined_dirs.set(Environment.get_user_special_dir(UserDirectory.DOCUMENTS), UserDirectory.DOCUMENTS);
 
24
-                       defined_dirs.set(Environment.get_user_special_dir(UserDirectory.DOWNLOAD), UserDirectory.DOWNLOAD);
 
25
-                       defined_dirs.set(Environment.get_user_special_dir(UserDirectory.MUSIC), UserDirectory.MUSIC);
 
26
-                       defined_dirs.set(Environment.get_user_special_dir(UserDirectory.PICTURES), UserDirectory.PICTURES);
 
27
-                       defined_dirs.set(Environment.get_user_special_dir(UserDirectory.PUBLIC_SHARE), UserDirectory.PUBLIC_SHARE);
 
28
-                       defined_dirs.set(Environment.get_user_special_dir(UserDirectory.TEMPLATES), UserDirectory.TEMPLATES);
 
29
-                       defined_dirs.set(Environment.get_user_special_dir(UserDirectory.VIDEOS), UserDirectory.VIDEOS);
 
30
+                       for(int i = 0; i < special_dirs.length; i++) {
 
31
+                               string dir_path = Environment.get_user_special_dir(special_dirs[i]);
 
32
+                               if (dir_path != null) {
 
33
+                                       defined_dirs.set(dir_path, special_dirs[i]);
 
34
+                               }
 
35
+                       }
 
36
                
 
37
                        //FIXME: Not sure if the correct icon is being fetched for stock folder
 
38
                        stock_folder_icon = this.render_icon_pixbuf(Stock.DIRECTORY, IconSize.LARGE_TOOLBAR);