Merge lp:~ted/indicator-session/gvariant_fixes into lp:indicator-session/0.1

Proposed by Ted Gould on 2011-10-09
Status: Merged
Merged at revision: 225
Proposed branch: lp:~ted/indicator-session/gvariant_fixes
Merge into: lp:indicator-session/0.1
Diff against target: 31 lines (+2/-2)
2 files modified
src/apt-transaction.c (+0/-1)
src/apt-watcher.c (+2/-1)
To merge this branch: bzr merge lp:~ted/indicator-session/gvariant_fixes
Reviewer Review Type Date Requested Status
Indicator Applet Developers 2011-10-09 Pending
Review via email: mp+78758@code.launchpad.net

Description of the change

Fixing up some of our g_variant ref counting to hopefully fix a couple of bugs.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/apt-transaction.c'
2--- src/apt-transaction.c 2011-09-07 11:04:16 +0000
3+++ src/apt-transaction.c 2011-10-09 14:45:27 +0000
4@@ -232,7 +232,6 @@
5 0,
6 current_state);
7 }
8- g_variant_unref (parameters);
9 }
10
11 static void
12
13=== modified file 'src/apt-watcher.c'
14--- src/apt-watcher.c 2011-09-19 20:47:59 +0000
15+++ src/apt-watcher.c 2011-10-09 14:45:27 +0000
16@@ -425,7 +425,7 @@
17 g_return_if_fail (APT_IS_WATCHER (user_data));
18 AptWatcher* self = APT_WATCHER (user_data);
19
20- g_variant_ref (parameters);
21+ g_variant_ref_sink (parameters);
22 GVariant *value = g_variant_get_child_value (parameters, 0);
23
24 if (g_strcmp0(signal_name, "ActiveTransactionsChanged") == 0){
25@@ -477,6 +477,7 @@
26 }
27 }
28
29+ g_variant_unref (value);
30 g_variant_unref (parameters);
31 }
32

Subscribers

People subscribed via source and target branches