← Back to team overview

ayatana-commits team mailing list archive

[Merge] lp:~ted/indicator-session/gvariant_fixes into lp:indicator-session

 

Ted Gould has proposed merging lp:~ted/indicator-session/gvariant_fixes into lp:indicator-session.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)
Related bugs:
  Bug #863930 in Session Menu: "indicator-session-service crashed with SIGABRT (assertion failed: (0 <= index && index < 24))"
  https://bugs.launchpad.net/indicator-session/+bug/863930

For more details, see:
https://code.launchpad.net/~ted/indicator-session/gvariant_fixes/+merge/78758

Fixing up some of our g_variant ref counting to hopefully fix a couple of bugs.
-- 
https://code.launchpad.net/~ted/indicator-session/gvariant_fixes/+merge/78758
Your team ayatana-commits is subscribed to branch lp:indicator-session.
=== modified file 'src/apt-transaction.c'
--- src/apt-transaction.c	2011-09-07 11:04:16 +0000
+++ src/apt-transaction.c	2011-10-09 14:45:27 +0000
@@ -232,7 +232,6 @@
                    0,
                    current_state);
   }
-  g_variant_unref (parameters);
 }
 
 static void

=== modified file 'src/apt-watcher.c'
--- src/apt-watcher.c	2011-09-19 20:47:59 +0000
+++ src/apt-watcher.c	2011-10-09 14:45:27 +0000
@@ -425,7 +425,7 @@
   g_return_if_fail (APT_IS_WATCHER (user_data));
   AptWatcher* self = APT_WATCHER (user_data);
 
-  g_variant_ref (parameters);
+  g_variant_ref_sink (parameters);
   GVariant *value = g_variant_get_child_value (parameters, 0);
 
   if (g_strcmp0(signal_name, "ActiveTransactionsChanged") == 0){
@@ -477,6 +477,7 @@
     }    
   } 
 
+  g_variant_unref (value);
   g_variant_unref (parameters);
 }
 


Follow ups