diff options
| author | Ted Gould <ted@gould.cx> | 2012-10-01 17:26:44 +0000 |
|---|---|---|
| committer | Tarmac <Unknown> | 2012-10-01 17:26:44 +0000 |
| commit | f5a2bb4a0f3262196be351ac1c0b13a269f52b12 (patch) | |
| tree | 5a2b62c812c18b3ce288caaa1dbd0bfc25457f70 | |
| parent | 0b09e47f44c19644f3d6ffb7f6054c95a0530309 (diff) | |
| parent | de629aa168803833613881b954cb033089a2dd45 (diff) | |
| download | ayatana-indicator-session-f5a2bb4a0f3262196be351ac1c0b13a269f52b12.tar.gz ayatana-indicator-session-f5a2bb4a0f3262196be351ac1c0b13a269f52b12.tar.bz2 ayatana-indicator-session-f5a2bb4a0f3262196be351ac1c0b13a269f52b12.zip | |
Move UPower settings init until after the items are created. Approved by Charles Kerr, Lars Uebernickel.
| -rw-r--r-- | src/session-menu-mgr.c | 6 |
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; } |