[Xfce4-commits] <libxfce4ui:new-sm-client> use g_strcmp0() instead of custom xfce_safe_strcmp()

[Brian J. Tarricone]

Updating branch refs/heads/kelnos/new-sm-client
         to 00f1a6a61f95ffa749e9a5346e154cb76ab7593d (commit)
       from a6767cb98b36c5544623effdd29ecfb080148566 (commit)

commit 00f1a6a61f95ffa749e9a5346e154cb76ab7593d
Author: Brian J. Tarricone <brian at tarricone.org>
Date:   Mon Oct 5 13:37:04 2009 -0700

    use g_strcmp0() instead of custom xfce_safe_strcmp()

 libxfce4ui/xfce-sm-client.c |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/libxfce4ui/xfce-sm-client.c b/libxfce4ui/xfce-sm-client.c
index dc85962..c0dd427 100644
--- a/libxfce4ui/xfce-sm-client.c
+++ b/libxfce4ui/xfce-sm-client.c
@@ -73,11 +73,6 @@
 #define SM_ARG_APPEND 1
 #define SM_ARG_REMOVE 2
 
-#define xfce_safe_strcmp(s1, s2)  ( (!s1 && !s2) \
-                                    ? 0 : (!s1 \
-                                           ? -1 : (!s2 \
-                                                   ? 1 : strcmp(s1, s2))) )
-
 typedef enum
 {
     XFCE_SM_CLIENT_STATE_DISCONNECTED = 0,
@@ -636,7 +631,7 @@ static void
 xfce_sm_client_set_client_id(XfceSMClient *sm_client,
                              const gchar *client_id)
 {
-    if(!xfce_safe_strcmp(sm_client->client_id, client_id))
+    if(!g_strcmp0(sm_client->client_id, client_id))
         return;
 
     g_free(sm_client->client_id);
@@ -1784,7 +1779,7 @@ xfce_sm_client_set_desktop_file(XfceSMClient *sm_client,
     g_return_if_fail(XFCE_IS_SM_CLIENT(sm_client));
     g_return_if_fail(desktop_file);
 
-    if(!xfce_safe_strcmp(sm_client->desktop_file, desktop_file))
+    if(!g_strcmp0(sm_client->desktop_file, desktop_file))
         return;
 
     if(!g_path_is_absolute(desktop_file)) {
@@ -2011,7 +2006,7 @@ xfce_sm_client_set_current_directory(XfceSMClient *sm_client,
     g_return_if_fail(XFCE_IS_SM_CLIENT(sm_client));
     g_return_if_fail(current_directory && current_directory[0]);
 
-    if(!xfce_safe_strcmp(sm_client->current_directory, current_directory))
+    if(!g_strcmp0(sm_client->current_directory, current_directory))
         return;
 
     g_free(sm_client->current_directory);