[gnome-panel] Revert "panel-applet-container: remove floating reference from data->parameters"
- From: Alberts MuktupÄvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-panel] Revert "panel-applet-container: remove floating reference from data->parameters"
- Date: Thu, 11 Feb 2016 13:24:15 +0000 (UTC)
commit 26e6b137be384db59331b7491d5e72d020b43341
Author: Alberts MuktupÄvels <alberts muktupavels gmail com>
Date: Thu Feb 11 15:24:01 2016 +0200
Revert "panel-applet-container: remove floating reference from data->parameters"
This reverts commit 6f6557480094d012c10107e6f55d6edb5a558422.
.../panel-applet-container.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
---
diff --git a/gnome-panel/libpanel-applet-private/panel-applet-container.c
b/gnome-panel/libpanel-applet-private/panel-applet-container.c
index af57ee3..fea6bfe 100644
--- a/gnome-panel/libpanel-applet-private/panel-applet-container.c
+++ b/gnome-panel/libpanel-applet-private/panel-applet-container.c
@@ -427,8 +427,6 @@ applet_factory_data_free (AppletFactoryData *data)
if (data->cancellable)
g_object_unref (data->cancellable);
- g_variant_unref (data->parameters);
-
g_free (data);
}
@@ -472,7 +470,6 @@ panel_applet_container_get_applet (PanelAppletContainer *container,
{
GTask *task;
AppletFactoryData *data;
- GVariant *parameters;
gint screen_number;
gchar *bus_name;
gchar *factory_id;
@@ -498,12 +495,11 @@ panel_applet_container_get_applet (PanelAppletContainer *container,
/* we can't use the screen of the container widget since it's not in a
* widget hierarchy yet */
screen_number = gdk_screen_get_number (screen);
- parameters = g_variant_new ("(si*)", applet_id, screen_number, props);
data = g_new (AppletFactoryData, 1);
data->task = task;
data->factory_id = factory_id;
- data->parameters = g_variant_ref_sink (parameters);
+ data->parameters = g_variant_new ("(si*)", applet_id, screen_number, props);
data->cancellable = cancellable ? g_object_ref (cancellable) : NULL;
bus_name = g_strdup_printf (PANEL_APPLET_BUS_NAME, factory_id);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]