aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Vert <johnv@valvesoftware.com>2013-02-14 21:13:57 +0000
committerTarmac <Unknown>2013-02-14 21:13:57 +0000
commit59c3e10241b93f39b18f5adef9029b2b4306a1c3 (patch)
tree9ebe583fc4d8e16ed0a20e7d4124a5e90c532d7e
parent93b038ea20fefa72253baa4ea423624bb503b7e3 (diff)
parent6e84cff5605b462764ccf371003ce46701ac3a73 (diff)
downloadlibayatana-appindicator-59c3e10241b93f39b18f5adef9029b2b4306a1c3.tar.gz
libayatana-appindicator-59c3e10241b93f39b18f5adef9029b2b4306a1c3.tar.bz2
libayatana-appindicator-59c3e10241b93f39b18f5adef9029b2b4306a1c3.zip
in app_indicator_init(), finish initializing self's fields before calling g_bus_get(). Fixes: https://bugs.launchpad.net/bugs/1122596.
Approved by PS Jenkins bot, Lars Uebernickel.
-rw-r--r--src/app-indicator.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/app-indicator.c b/src/app-indicator.c
index 0bc33af..d64866d 100644
--- a/src/app-indicator.c
+++ b/src/app-indicator.c
@@ -611,6 +611,8 @@ app_indicator_init (AppIndicator *self)
priv->sec_activate_target = NULL;
priv->sec_activate_enabled = FALSE;
+ self->priv = priv;
+
/* Start getting the session bus */
g_object_ref(self); /* ref for the bus creation callback */
g_bus_get(G_BUS_TYPE_SESSION, NULL, bus_creation, self);
@@ -618,8 +620,6 @@ app_indicator_init (AppIndicator *self)
g_signal_connect(G_OBJECT(gtk_icon_theme_get_default()),
"changed", G_CALLBACK(theme_changed_cb), self);
- self->priv = priv;
-
return;
}