diff options
| author | Conor Curran <conor.curran@canonical.com> | 2011-07-07 10:29:47 +0100 |
|---|---|---|
| committer | Conor Curran <conor.curran@canonical.com> | 2011-07-07 10:29:47 +0100 |
| commit | d0532a06fb80e286901e984f7097a35641f037c2 (patch) | |
| tree | f00af06e0f39666f7cfd45e2acd4e7bc26af5e15 | |
| parent | b2a247c043866468fd7b898c8e904611fc087388 (diff) | |
| parent | 097f3b178651f6f8dc8d5759abd65cfa8cf0554a (diff) | |
| download | ayatana-indicator-session-d0532a06fb80e286901e984f7097a35641f037c2.tar.gz ayatana-indicator-session-d0532a06fb80e286901e984f7097a35641f037c2.tar.bz2 ayatana-indicator-session-d0532a06fb80e286901e984f7097a35641f037c2.zip | |
merged ted's fixes
| -rw-r--r-- | src/dbus-shared-names.h | 7 | ||||
| -rw-r--r-- | src/users-service-dbus.c | 3 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/dbus-shared-names.h b/src/dbus-shared-names.h index f97dddc..fd19e5f 100644 --- a/src/dbus-shared-names.h +++ b/src/dbus-shared-names.h @@ -24,12 +24,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #ifndef __DBUS_SHARED_NAMES_H__ #define __DBUS_SHARED_NAMES_H__ 1 -#define INDICATOR_STATUS_DBUS_NAME "com.canonical.indicator.status" -#define INDICATOR_STATUS_DBUS_OBJECT "/com/canonical/indicator/status/menu" -#define INDICATOR_STATUS_SERVICE_DBUS_OBJECT "/com/canonical/indicator/status/service" -#define INDICATOR_STATUS_SERVICE_DBUS_INTERFACE "com.canonical.indicator.status.service" - -#define INDICATOR_USERS_DBUS_NAME "com.canonical.indicator.users" +#define INDICATOR_USERS_DBUS_NAME INDICATOR_SESSION_DBUS_NAME #define INDICATOR_USERS_DBUS_OBJECT "/com/canonical/indicator/users/menu" #define INDICATOR_USERS_SERVICE_DBUS_OBJECT "/org/gnome/DisplayManager/UserManager" #define INDICATOR_USERS_SERVICE_DBUS_INTERFACE "org.gnome.DisplayManager.UserManager" diff --git a/src/users-service-dbus.c b/src/users-service-dbus.c index 11ee497..07a81b1 100644 --- a/src/users-service-dbus.c +++ b/src/users-service-dbus.c @@ -586,7 +586,6 @@ seat_proxy_session_added (DBusGProxy *seat_proxy, g_return_if_fail(IS_USERS_SERVICE_DBUS(service)); UsersServiceDbusPrivate *priv = USERS_SERVICE_DBUS_GET_PRIVATE (service); uid_t uid; - gboolean res; struct passwd *pwent; UserData *user; @@ -621,7 +620,7 @@ seat_proxy_session_added (DBusGProxy *seat_proxy, return; } - res = do_add_session (service, user, session_id); + do_add_session (service, user, session_id); } static void |