diff options
| author | Ted Gould <ted@gould.cx> | 2010-04-06 22:26:24 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-04-06 22:26:24 -0500 |
| commit | 9449b85d675c8dffbbff932197413924bda088e5 (patch) | |
| tree | 6beb5b81d69e7356ab466abfdab07e84f0fc05c0 /src/session-service.c | |
| parent | 56a250cf8262579d749a71bde854da390fcc29e2 (diff) | |
| parent | e822834a58b32ebf9ecc85a2e2dc159d416ec3ed (diff) | |
| download | ayatana-indicator-session-9449b85d675c8dffbbff932197413924bda088e5.tar.gz ayatana-indicator-session-9449b85d675c8dffbbff932197413924bda088e5.tar.bz2 ayatana-indicator-session-9449b85d675c8dffbbff932197413924bda088e5.zip | |
* Upstream Merge
* Changing 'Sleep' to 'Suspend' (LP: #547102)
* Fixing translations helper text (LP: #547131)
* Passing correct object to callback (LP: #543393)
* Ignoring malformed message (LP: #548620)
Diffstat (limited to 'src/session-service.c')
| -rw-r--r-- | src/session-service.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/session-service.c b/src/session-service.c index c1c2e57..c522748 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -545,7 +545,7 @@ rebuild_items (DbusmenuMenuitem *root, dbusmenu_menuitem_property_set (guest_mi, USER_ITEM_PROP_NAME, _("Guest Session")); dbusmenu_menuitem_property_set_bool (guest_mi, USER_ITEM_PROP_LOGGED_IN, FALSE); dbusmenu_menuitem_child_append (root, guest_mi); - g_signal_connect (G_OBJECT (guest_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_guest_session), NULL); + g_signal_connect (G_OBJECT (guest_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_guest_session), service); users_service_dbus_set_guest_item(service, guest_mi); } @@ -637,7 +637,7 @@ rebuild_items (DbusmenuMenuitem *root, if (can_suspend && allow_suspend) { suspend_mi = dbusmenu_menuitem_new(); - dbusmenu_menuitem_property_set(suspend_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Sleep")); + dbusmenu_menuitem_property_set(suspend_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Suspend")); dbusmenu_menuitem_child_append(root, suspend_mi); g_signal_connect(G_OBJECT(suspend_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(machine_sleep), "Suspend"); } |