diff options
| author | Ray Strode <rstrode@redhat.com> | 2010-10-06 10:41:37 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2010-10-06 11:22:54 -0400 |
| commit | d4552a9bc748f4b7e45d1d825797b52c14a98e4d (patch) | |
| tree | 17e45fdcc36c29157540719a9051af36cac82762 | |
| parent | 44f7ff504517fdb2e16db3cd39ea93f116898f21 (diff) | |
| download | gdm-d4552a9bc748f4b7e45d1d825797b52c14a98e4d.tar.gz | |
user-manager: Clean up accounts service defines
The names don't really follow a consistent scheme.
| -rw-r--r-- | gui/simple-greeter/gdm-user.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gui/simple-greeter/gdm-user.c b/gui/simple-greeter/gdm-user.c index 58152d8b..710510a4 100644 --- a/gui/simple-greeter/gdm-user.c +++ b/gui/simple-greeter/gdm-user.c @@ -42,8 +42,8 @@ #define GLOBAL_FACEDIR DATADIR "/faces" #define MAX_FILE_SIZE 65536 -#define USER_ACCOUNTS_NAME "org.freedesktop.Accounts" -#define USER_ACCOUNTS_INTERFACE "org.freedesktop.Accounts.User" +#define ACCOUNTS_NAME "org.freedesktop.Accounts" +#define ACCOUNTS_USER_INTERFACE "org.freedesktop.Accounts.User" enum { PROP_0, @@ -1006,7 +1006,7 @@ update_info (GdmUser *user) DBusGProxyCall *call; proxy = dbus_g_proxy_new_for_name (user->connection, - USER_ACCOUNTS_NAME, + ACCOUNTS_NAME, user->object_path, DBUS_INTERFACE_PROPERTIES); @@ -1017,7 +1017,7 @@ update_info (GdmUser *user) user, NULL, G_TYPE_STRING, - USER_ACCOUNTS_INTERFACE, + ACCOUNTS_USER_INTERFACE, G_TYPE_INVALID); if (call == NULL) { @@ -1065,9 +1065,9 @@ _gdm_user_update_from_object_path (GdmUser *user, user->object_path = g_strdup (object_path); user->accounts_proxy = dbus_g_proxy_new_for_name (user->connection, - USER_ACCOUNTS_NAME, + ACCOUNTS_NAME, user->object_path, - USER_ACCOUNTS_INTERFACE); + ACCOUNTS_USER_INTERFACE); dbus_g_proxy_set_default_timeout (user->accounts_proxy, INT_MAX); dbus_g_proxy_add_signal (user->accounts_proxy, "Changed", G_TYPE_INVALID); |