[Xfce4-commits] <xfconf:xfce-4.6> Don't use g_strcmp0 (bug #6079).

[Nick Schermer]

Updating branch refs/heads/xfce-4.6
         to a90671ca1bd30568bde0cf483e1c82d5932b584a (commit)
       from 32117dac37f99bab5a5c72078ce343a38a15b190 (commit)

commit a90671ca1bd30568bde0cf483e1c82d5932b584a
Author: Nick Schermer <nick at xfce.org>
Date:   Mon Jul 19 20:01:19 2010 +0200

    Don't use g_strcmp0 (bug #6079).

 xfconfd/xfconf-backend-perchannel-xml.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/xfconfd/xfconf-backend-perchannel-xml.c b/xfconfd/xfconf-backend-perchannel-xml.c
index 98fa0c3..ec0139f 100644
--- a/xfconfd/xfconf-backend-perchannel-xml.c
+++ b/xfconfd/xfconf-backend-perchannel-xml.c
@@ -1673,7 +1673,7 @@ xfconf_backend_perchannel_xml_load_channel(XfconfBackendPerchannelXml *xbpx,
      * follow the xdg spec, see bug #6079 for more information */
     length = g_strv_length(filenames);
     for(i = length - 1; i >= 0; --i) {
-        if(!g_strcmp0(user_file, filenames[i]))
+        if(user_file && !strcmp(user_file, filenames[i]))
             continue;
         xfconf_backend_perchannel_xml_merge_file(xbpx, filenames[i], TRUE,
                                                  channel, NULL);