aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/dbus-shared-names.h7
-rw-r--r--src/users-service-dbus.c3
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