Ubuntu One Client

Merge lp:~chrisccoulson/ubuntuone-client/lp744758 into lp:ubuntuone-client

  1. lp744758
  2. Merge into trunk
Proposed by Chris Coulson
Status: Merged
Merge reported by: dobey
Merged at revision: not available
Proposed branch: lp:~chrisccoulson/ubuntuone-client/lp744758
Merge into: lp:ubuntuone-client
Diff against target: 21 lines (+1/-3)
1 file modified
gsd-plugin/gsd-ubuntuone.c (+1/-3)
To merge this branch: bzr merge lp:~chrisccoulson/ubuntuone-client/lp744758
Reviewer Review Type Date Requested Status
dobey (community) Approve
Rodrigo Moya (community) Approve
Review via email: mp+56300@code.launchpad.net

Description of the change

Don't call gsd_ubuntuone_dispose recursively on shutdown, by correctly changing up the dispose function to its parent. Fixes LP: #744758

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

I approve of this, but I had already made another branch to fix this and the other crash as well, before seeing this proposal. So I am just setting it to Merged. Thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gsd-plugin/gsd-ubuntuone.c'
2--- gsd-plugin/gsd-ubuntuone.c 2011-01-12 23:04:54 +0000
3+++ gsd-plugin/gsd-ubuntuone.c 2011-04-05 08:14:15 +0000
4@@ -308,8 +308,6 @@
5 gsd_ubuntuone_dispose (GObject *object)
6 {
7 GsdUbuntuOne *plugin = GSD_UBUNTUONE (object);
8- GsdUbuntuOneClass *klass = GSD_UBUNTUONE_GET_CLASS (object);
9- GObjectClass *parent_class = G_OBJECT_CLASS (klass);
10
11 if (plugin->syncdaemon != NULL)
12 g_object_unref (plugin->syncdaemon);
13@@ -317,7 +315,7 @@
14 if (plugin->map_quota_dialogs != NULL)
15 g_hash_table_destroy (plugin->map_quota_dialogs);
16
17- parent_class->dispose (object);
18+ G_OBJECT_CLASS (gsd_ubuntuone_parent_class)->dispose (object);
19 }
20
21 static void

Subscribers

People subscribed via source and target branches