summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2010-03-16 00:25:17 -0400
committerRay Strode <rstrode@redhat.com>2010-04-27 17:59:16 -0400
commitddc1fd619e022a91fdefbf2e6620b33b8f723df2 (patch)
treeee3b4d3037ce1c04afaa6ab7da4b99c423d44e4c
parent7bada6caaeabe92eb00eb7edc6d602c6ee01c396 (diff)
downloadgdm-ddc1fd619e022a91fdefbf2e6620b33b8f723df2.tar.gz
rearrange gdm_user_collate
This way we don't make unnecessary assignments
-rw-r--r--gui/simple-greeter/gdm-user.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/gui/simple-greeter/gdm-user.c b/gui/simple-greeter/gdm-user.c
index 4bb2b78a..dd10f916 100644
--- a/gui/simple-greeter/gdm-user.c
+++ b/gui/simple-greeter/gdm-user.c
@@ -453,18 +453,6 @@ gdm_user_collate (GdmUser *user1,
g_return_val_if_fail (GDM_IS_USER (user1), 0);
g_return_val_if_fail (GDM_IS_USER (user2), 0);
- if (user1->real_name != NULL) {
- str1 = user1->real_name;
- } else {
- str1 = user1->user_name;
- }
-
- if (user2->real_name != NULL) {
- str2 = user2->real_name;
- } else {
- str2 = user2->user_name;
- }
-
num1 = user1->login_frequency;
num2 = user2->login_frequency;
g_debug ("Login freq 1=%u 2=%u", (guint)num1, (guint)num2);
@@ -477,6 +465,18 @@ gdm_user_collate (GdmUser *user1,
}
/* if login frequency is equal try names */
+ if (user1->real_name != NULL) {
+ str1 = user1->real_name;
+ } else {
+ str1 = user1->user_name;
+ }
+
+ if (user2->real_name != NULL) {
+ str2 = user2->real_name;
+ } else {
+ str2 = user2->user_name;
+ }
+
if (str1 == NULL && str2 != NULL) {
return -1;
}