Merge lp:~unity-team/qmenumodel/nullify-state-variant into lp:qmenumodel

Proposed by Michael Terry on 2015-04-30
Status: Merged
Approved by: Albert Astals Cid on 2015-04-30
Approved revision: 117
Merged at revision: 117
Proposed branch: lp:~unity-team/qmenumodel/nullify-state-variant
Merge into: lp:qmenumodel
Diff against target: 10 lines (+1/-0)
1 file modified
libqmenumodel/src/gtk/gtkmenutrackeritem.c (+1/-0)
To merge this branch: bzr merge lp:~unity-team/qmenumodel/nullify-state-variant
Reviewer Review Type Date Requested Status
Lars Karlitski (community) Approve on 2015-04-30
Albert Astals Cid (community) 2015-04-30 Approve on 2015-04-30
PS Jenkins bot continuous-integration Approve on 2015-04-30
Review via email: mp+257902@code.launchpad.net

Commit Message

Don't leave a dangling GVariant pointer in GtkMenuTrackerItem, which can cause a crash.

Specifically, we were seeing a crash in the unity8 welcome wizard when restarting indicators after a language change.

Description of the Change

Don't leave a dangling GVariant pointer in GtkMenuTrackerItem, which can cause a crash.

Specifically, we were seeing a crash in the unity8 welcome wizard when restarting indicators after a language change.

To post a comment you must log in.
Michael Terry (mterry) wrote :

(Note that I am on holiday for the next 8 days, so if anything needs to change in this branch, please poke another member of ~unity-team to make it.)

Albert Astals Cid (aacid) wrote :

Makes sense to me.

review: Approve
Lars Karlitski (larsu) wrote :

Ya.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libqmenumodel/src/gtk/gtkmenutrackeritem.c'
2--- libqmenumodel/src/gtk/gtkmenutrackeritem.c 2013-09-02 16:35:00 +0000
3+++ libqmenumodel/src/gtk/gtkmenutrackeritem.c 2015-04-30 14:37:29 +0000
4@@ -400,6 +400,7 @@
5 if (self->action_state != NULL)
6 {
7 g_variant_unref (self->action_state);
8+ self->action_state = NULL;
9 g_object_notify_by_pspec (G_OBJECT (self), gtk_menu_tracker_item_pspecs[PROP_ACTION_STATE]);
10 }
11

Subscribers

People subscribed via source and target branches