← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/files-widget.vala

  • 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:
src/files-widget.vala
261
261
                mime_dict.set(_("E-mail"), NMO_EMAIL);
262
262
                mime_dict.set(_("Website"), NFO_WEBSITE);
263
263
 
 
264
                        UserDirectory[] special_dirs =
 
265
                        {
 
266
                                UserDirectory.DESKTOP,
 
267
                                UserDirectory.DOCUMENTS,
 
268
                                UserDirectory.DOWNLOAD,
 
269
                                UserDirectory.MUSIC,
 
270
                                UserDirectory.PICTURES,
 
271
                                UserDirectory.PUBLIC_SHARE,
 
272
                                UserDirectory.TEMPLATES,
 
273
                                UserDirectory.VIDEOS
 
274
                        };
 
275
 
264
276
                        defined_dirs = new HashMap<string, UserDirectory>(str_hash, str_equal);
265
 
                        defined_dirs.set(Environment.get_user_special_dir(UserDirectory.DESKTOP), UserDirectory.DESKTOP);
266
 
                        defined_dirs.set(Environment.get_user_special_dir(UserDirectory.DOCUMENTS), UserDirectory.DOCUMENTS);
267
 
                        defined_dirs.set(Environment.get_user_special_dir(UserDirectory.DOWNLOAD), UserDirectory.DOWNLOAD);
268
 
                        defined_dirs.set(Environment.get_user_special_dir(UserDirectory.MUSIC), UserDirectory.MUSIC);
269
 
                        defined_dirs.set(Environment.get_user_special_dir(UserDirectory.PICTURES), UserDirectory.PICTURES);
270
 
                        defined_dirs.set(Environment.get_user_special_dir(UserDirectory.PUBLIC_SHARE), UserDirectory.PUBLIC_SHARE);
271
 
                        defined_dirs.set(Environment.get_user_special_dir(UserDirectory.TEMPLATES), UserDirectory.TEMPLATES);
272
 
                        defined_dirs.set(Environment.get_user_special_dir(UserDirectory.VIDEOS), UserDirectory.VIDEOS);
 
277
                        for(int i = 0; i < special_dirs.length; i++) {
 
278
                                string dir_path = Environment.get_user_special_dir(special_dirs[i]);
 
279
                                if (dir_path != null) {
 
280
                                        defined_dirs.set(dir_path, special_dirs[i]);
 
281
                                }
 
282
                        }
273
283
                
274
284
                        //FIXME: Not sure if the correct icon is being fetched for stock folder
275
285
                        stock_folder_icon = this.render_icon_pixbuf(Stock.DIRECTORY, IconSize.LARGE_TOOLBAR);