From 699923e665a4606a1b3f6822e4e4917f86a2a713 Mon Sep 17 00:00:00 2001
From: William Jon McCann <mccann@jhu.edu>
Date: Tue, 6 Mar 2007 02:31:45 -0500
Subject: check for empty strings as well as null

---
 src/ck-manager.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'src/ck-manager.c')

diff --git a/src/ck-manager.c b/src/ck-manager.c
index 6a4c75b..53b90b9 100644
--- a/src/ck-manager.c
+++ b/src/ck-manager.c
@@ -314,6 +314,8 @@ remove_seat (CkManager *manager,
         g_free (sid);
 }
 
+#define IS_STR_SET(x) (x != NULL && x[0] != '\0')
+
 static CkSeat *
 find_seat_for_session (CkManager *manager,
                        CkSession *session)
@@ -345,15 +347,15 @@ find_seat_for_session (CkManager *manager,
         ck_session_get_remote_host_name (session, &remote_host_name, NULL);
         ck_session_is_local (session, &is_local, NULL);
 
-        if (x11_display != NULL
-            && x11_display_device != NULL
-            && remote_host_name == NULL
+        if (IS_STR_SET (x11_display)
+            && IS_STR_SET (x11_display_device)
+            && ! IS_STR_SET (remote_host_name)
             && is_local == TRUE) {
                 is_static_x11 = TRUE;
-        } else if (x11_display == NULL
-                   && x11_display_device == NULL
-                   && display_device != NULL
-                   && remote_host_name == NULL
+        } else if (! IS_STR_SET (x11_display)
+                   && ! IS_STR_SET (x11_display_device)
+                   && IS_STR_SET (display_device)
+                   && ! IS_STR_SET (remote_host_name)
                    && is_local == TRUE) {
                 is_static_text = TRUE;
         }
-- 
cgit