Ubuntu One Client

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

  1. fix-570261
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: Tim Cole
Approved revision: 511
Merged at revision: not available
Proposed branch: lp:~dobey/ubuntuone-client/fix-570261
Merge into: lp:ubuntuone-client
Diff against target: 16 lines (+4/-2)
1 file modified
nautilus/ubuntuone-nautilus.c (+4/-2)
To merge this branch: bzr merge lp:~dobey/ubuntuone-client/fix-570261
Reviewer Review Type Date Requested Status
Tim Cole (community) Approve
Rodrigo Moya (community) Approve
Review via email: mp+24157@code.launchpad.net

Commit message

As path can be NULL, guard against calling hash_remove with it

To post a comment you must log in.
Revision history for this message
Rodrigo Moya (rodrigo-moya) wrote :

looks good

review: Approve
Revision history for this message
Tim Cole (tcole) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nautilus/ubuntuone-nautilus.c'
2--- nautilus/ubuntuone-nautilus.c 2010-04-16 16:23:19 +0000
3+++ nautilus/ubuntuone-nautilus.c 2010-04-26 19:24:21 +0000
4@@ -1475,8 +1475,10 @@
5 gchar * path;
6
7 path = g_hash_table_lookup (hash, "path");
8- g_hash_table_remove (uon->udfs, path);
9- ubuntuone_nautilus_reset_emblem (uon, path);
10+ if (path != NULL) {
11+ g_hash_table_remove (uon->udfs, path);
12+ ubuntuone_nautilus_reset_emblem (uon, path);
13+ }
14 }
15
16 static void ubuntuone_nautilus_udf_error (DBusGProxy * proxy,

Subscribers

People subscribed via source and target branches