← Back to branch summary

~ubuntu-branches/ubuntu/saucy/activity-log-manager/saucy-proposed

« back to all changes in this revision

Viewing changes to debian/patches/05_fix_userdirs.patch

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher, Margarita Manterola
  • Date: 2012-11-26 15:45:31 UTC
  • Revision ID: package-import@ubuntu.com-20121126154531-j5av6vafrl5i2l1l
Tags: 0.9.4-0ubuntu6.1
https://launchpad.net/bugs/1061930
https://launchpad.net/bugs/1024057
* debian/patches/06_add_unity_dash_privacy.patch:
  - drop trailing period from the online result label (lp: #1061930)

[ Margarita Manterola ]
* 05_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/05_fix_userdirs.patch
 
1
Index: activity-log-manager-0.9.4/src/Makefile.in
 
2
===================================================================
 
3
--- activity-log-manager-0.9.4.orig/src/Makefile.in     2012-03-20 19:15:07.000000000 +0100
 
4
+++ activity-log-manager-0.9.4/src/Makefile.in  2012-11-26 13:53:53.000000000 +0100
 
5
@@ -379,8 +379,7 @@
 
6
        --pkg gtk+-3.0 \
 
7
        --pkg gee-1.0  \
 
8
        --target-glib=2.26 \
 
9
-       --pkg gio-unix-2.0 \
 
10
-       config.vapi
 
11
+       --pkg gio-unix-2.0
 
12
 
 
13
 SHARED_CFLAGS = \
 
14
        -Wall \
 
15
Index: activity-log-manager-0.9.4/src/files-widget.vala
 
16
===================================================================
 
17
--- activity-log-manager-0.9.4.orig/src/files-widget.vala       2012-03-20 17:39:25.000000000 +0100
 
18
+++ activity-log-manager-0.9.4/src/files-widget.vala    2012-11-26 13:55:33.081759039 +0100
 
19
@@ -261,15 +261,25 @@
 
20
                mime_dict.set(_("E-mail"), NMO_EMAIL);
 
21
                mime_dict.set(_("Website"), NFO_WEBSITE);
 
22
 
 
23
+                       UserDirectory[] special_dirs =
 
24
+                       {
 
25
+                               UserDirectory.DESKTOP,
 
26
+                               UserDirectory.DOCUMENTS,
 
27
+                               UserDirectory.DOWNLOAD,
 
28
+                               UserDirectory.MUSIC,
 
29
+                               UserDirectory.PICTURES,
 
30
+                               UserDirectory.PUBLIC_SHARE,
 
31
+                               UserDirectory.TEMPLATES,
 
32
+                               UserDirectory.VIDEOS
 
33
+                       };
 
34
+
 
35
                        defined_dirs = new HashMap<string, UserDirectory>(str_hash, str_equal);
 
36
-                       defined_dirs.set(Environment.get_user_special_dir(UserDirectory.DESKTOP), UserDirectory.DESKTOP);
 
37
-                       defined_dirs.set(Environment.get_user_special_dir(UserDirectory.DOCUMENTS), UserDirectory.DOCUMENTS);
 
38
-                       defined_dirs.set(Environment.get_user_special_dir(UserDirectory.DOWNLOAD), UserDirectory.DOWNLOAD);
 
39
-                       defined_dirs.set(Environment.get_user_special_dir(UserDirectory.MUSIC), UserDirectory.MUSIC);
 
40
-                       defined_dirs.set(Environment.get_user_special_dir(UserDirectory.PICTURES), UserDirectory.PICTURES);
 
41
-                       defined_dirs.set(Environment.get_user_special_dir(UserDirectory.PUBLIC_SHARE), UserDirectory.PUBLIC_SHARE);
 
42
-                       defined_dirs.set(Environment.get_user_special_dir(UserDirectory.TEMPLATES), UserDirectory.TEMPLATES);
 
43
-                       defined_dirs.set(Environment.get_user_special_dir(UserDirectory.VIDEOS), UserDirectory.VIDEOS);
 
44
+                       for(int i = 0; i < special_dirs.length; i++) {
 
45
+                               string dir_path = Environment.get_user_special_dir(special_dirs[i]);
 
46
+                               if (dir_path != null) {
 
47
+                                       defined_dirs.set(dir_path, special_dirs[i]);
 
48
+                               }
 
49
+                       }
 
50
                
 
51
                        //FIXME: Not sure if the correct icon is being fetched for stock folder
 
52
                        stock_folder_icon = this.render_icon_pixbuf(Stock.DIRECTORY, IconSize.LARGE_TOOLBAR);