Ubuntu One Client

Merge lp:~dobey/ubuntuone-client/fix-724882 into lp:ubuntuone-client

  1. fix-724882
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 936
Merged at revision: 942
Proposed branch: lp:~dobey/ubuntuone-client/fix-724882
Merge into: lp:ubuntuone-client
Diff against target: 13 lines (+4/-0)
1 file modified
nautilus/file-watcher.c (+4/-0)
To merge this branch: bzr merge lp:~dobey/ubuntuone-client/fix-724882
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Alejandro J. Cura (community) Approve
Review via email: mp+56629@code.launchpad.net

Commit message

Don't look up a NULL path

To post a comment you must log in.
Revision history for this message
Alejandro J. Cura (alecu) :
review: Approve
Revision history for this message
Roberto Alsina (ralsina) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nautilus/file-watcher.c'
2--- nautilus/file-watcher.c 2010-10-19 14:28:27 +0000
3+++ nautilus/file-watcher.c 2011-04-06 18:06:05 +0000
4@@ -268,6 +268,10 @@
5 FileWatcher *watcher = FILE_WATCHER (user_data);
6
7 path = g_filename_from_uri (nautilus_file_info_get_uri (NAUTILUS_FILE_INFO (where_the_object_was)), NULL, NULL);
8+
9+ if (path == NULL)
10+ return;
11+
12 if (g_hash_table_lookup (watcher->files, path))
13 g_hash_table_remove (watcher->files, path);
14

Subscribers

People subscribed via source and target branches