Merge lp:~larsu/ubuntu-system-settings/fix-variant-unref into lp:ubuntu-system-settings

[Lars Karlitski]

notification-manager: fix issues with GVariant API usage

notification-manager: fix issues with GVariant API usage

[Sebastien Bacher (seb128)]

Thanks

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1143
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1663/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6075/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4145
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/855
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5704/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7327
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7327/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14875
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3506
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4488
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4488/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1663/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1143
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1665/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6086/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4150
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/857
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5714/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7338
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7338/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14888
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3511
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4494
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4494/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1665/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/notifications/notification_manager.cpp'
--- plugins/notifications/notification_manager.cpp	2014-08-28 07:22:28 +0000
+++ plugins/notifications/notification_manager.cpp	2014-10-20 18:46:33 +0000
@@ -190,7 +190,8 @@
         }
     }
     // Save the config settings
-    GVariantBuilder *builder = g_variant_builder_new(G_VARIANT_TYPE("a(ss)"));
+    GVariantBuilder builder;
+    g_variant_builder_init(&builder, G_VARIANT_TYPE("a(ss)"));
     QList<QString> keys = m_blacklist.keys();
     for (int j = 0; j < keys.size(); ++j) {
         // Keys are in the form package::::app for click or appid::::appid for legacy apps
@@ -201,12 +202,9 @@
         }
         QString pkgname = splitted.at(0);
         QString appname = splitted.at(1);
-        g_variant_builder_add(builder, "(ss)", pkgname.toUtf8().constData(), appname.toUtf8().constData());
+        g_variant_builder_add(&builder, "(ss)", pkgname.toUtf8().constData(), appname.toUtf8().constData());
     }
-    GVariant *bl = g_variant_new("a(ss)", builder);
-    g_variant_builder_unref (builder);
-    g_settings_set_value(m_pushSettings, BLACKLIST_KEY, bl);
-    g_variant_unref (bl);
+    g_settings_set_value(m_pushSettings, BLACKLIST_KEY, g_variant_builder_end (&builder));
 }
 
 }