diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2013-06-24 10:16:43 -0500 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2013-06-24 10:16:43 -0500 |
| commit | 463ed782d3f2480126cb11d3e18630e275526d9e (patch) | |
| tree | ee53a421307c7f09a50063a8210044e2e1cc42d6 /src/backend-dbus/backend-dbus.c | |
| parent | d7bb2123f7afffd93524110b4174ad855043f57d (diff) | |
| download | ayatana-indicator-session-463ed782d3f2480126cb11d3e18630e275526d9e.tar.gz ayatana-indicator-session-463ed782d3f2480126cb11d3e18630e275526d9e.tar.bz2 ayatana-indicator-session-463ed782d3f2480126cb11d3e18630e275526d9e.zip | |
update which proxies the dbus utils helper creates
Diffstat (limited to 'src/backend-dbus/backend-dbus.c')
| -rw-r--r-- | src/backend-dbus/backend-dbus.c | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/src/backend-dbus/backend-dbus.c b/src/backend-dbus/backend-dbus.c index ea8f0ec..547c6ab 100644 --- a/src/backend-dbus/backend-dbus.c +++ b/src/backend-dbus/backend-dbus.c @@ -31,38 +31,36 @@ struct dbus_world_data IndicatorSessionGuestDbus * guest; }; -static void -on_proxies_ready (ConsoleKitManager * ck_manager, +static void +on_proxies_ready (Login1Manager * login1_manager, + Login1Seat * login1_seat, + DisplayManagerSeat * display_manager_seat, Accounts * account_manager, - DisplayManagerSeat * dm_seat, - ConsoleKitSeat * ck_seat, - ConsoleKitSession * ck_session, - AccountsUser * active_user G_GNUC_UNUSED, - const GError * error, + GCancellable * cancellable, gpointer gdata) { struct dbus_world_data * data = gdata; - if (error == NULL) + if (!g_cancellable_is_cancelled (cancellable)) { if (data->actions != NULL) indicator_session_actions_dbus_set_proxies (data->actions, - ck_manager, - dm_seat, - ck_seat); + login1_manager, + login1_seat, + display_manager_seat); if (data->users != NULL) indicator_session_users_dbus_set_proxies (data->users, - account_manager, - dm_seat, - ck_seat); + login1_manager, + login1_seat, + display_manager_seat, + account_manager); if (data->guest != NULL) indicator_session_guest_dbus_set_proxies (data->guest, - account_manager, - dm_seat, - ck_seat, - ck_session); + login1_manager, + login1_seat, + display_manager_seat); } g_free (data); |