aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bzrignore17
-rw-r--r--src/session-menu-mgr.c6
2 files changed, 21 insertions, 2 deletions
diff --git a/.bzrignore b/.bzrignore
index 5afa682..3f895ca 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -50,7 +50,7 @@ src/status-provider-mc5-marshal.h
data/indicator-session.schemas
src/accounts-service-client.h
src/accounts-service-user-client.h
-indicator-session-[0-9].[0-9].[0-9].tar.gz
+indicator-session-[0-9]*.[0-9]*.[0-9]*.tar.gz
indicator-session-[0-9].[0-9].tar.gz
indicator-session-[0-9].[0-9].[0-9].tar.gz.asc
indicator-session-[0-9].[0-9].tar.gz.asc
@@ -241,3 +241,18 @@ po/ta_LK.gmo
po/tt.gmo
po/ur.gmo
po/vec.gmo
+dbus-accounts.c
+dbus-accounts.h
+dbus-consolekit-manager.c
+dbus-consolekit-manager.h
+dbus-consolekit-seat.c
+dbus-consolekit-seat.h
+dbus-consolekit-session.c
+dbus-consolekit-session.h
+dbus-display-manager.c
+dbus-display-manager.h
+dbus-upower.c
+dbus-upower.h
+dbus-user.c
+dbus-user.h
+tests/test-service
diff --git a/src/session-menu-mgr.c b/src/session-menu-mgr.c
index c6ae5b5..f5b5bcf 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);
}
@@ -1190,6 +1189,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;
}