aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2012-09-28 16:22:25 -0500
committerTed Gould <ted@gould.cx>2012-09-28 16:22:25 -0500
commitde629aa168803833613881b954cb033089a2dd45 (patch)
tree421927a6643e3764ca261b65735b645e0c16a0e2
parent9c40cb77e69bc7ad6b19f26f22152ed844ebc46c (diff)
downloadayatana-indicator-session-de629aa168803833613881b954cb033089a2dd45.tar.gz
ayatana-indicator-session-de629aa168803833613881b954cb033089a2dd45.tar.bz2
ayatana-indicator-session-de629aa168803833613881b954cb033089a2dd45.zip
Move the upower init to after the items are created
-rw-r--r--src/session-menu-mgr.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/session-menu-mgr.c b/src/session-menu-mgr.c
index f6cd038..2800126 100644
--- a/src/session-menu-mgr.c
+++ b/src/session-menu-mgr.c
@@ -318,7 +318,6 @@ init_upower_proxy (SessionMenuMgr * mgr)
g_clear_error (&error);
}
- on_upower_properties_changed (mgr);
g_signal_connect_swapped (mgr->upower_proxy, "changed",
G_CALLBACK(on_upower_properties_changed), mgr);
}
@@ -1193,6 +1192,11 @@ session_menu_mgr_new (SessionDbus * session_dbus,
mgr->user_menuitem_index = n;
update_user_menuitems (mgr);
build_session_menuitems (mgr);
+
+ /* After we have the session menu items built we can look to
+ align them with UPower */
+ on_upower_properties_changed (mgr);
+
return mgr;
}