[gnome-control-center/gnome-3-12] sharing: Fix crash in media preferences



commit 6087b75fdb2c2183310f0b003d8e09a0a15aa154
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Jul 21 19:10:47 2014 +0200

    sharing: Fix crash in media preferences
    
    When XDG user dirs are badly setup, g_get_user_special_dir() will return
    NULL, causing us to crash. Use g_strcmp0() instead.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=733489

 panels/sharing/cc-media-sharing.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/panels/sharing/cc-media-sharing.c b/panels/sharing/cc-media-sharing.c
index 55139a3..4588e1a 100644
--- a/panels/sharing/cc-media-sharing.c
+++ b/panels/sharing/cc-media-sharing.c
@@ -185,19 +185,19 @@ cc_media_sharing_set_preferences (gboolean   enabled,
 
   while (str_list && *str_list)
     {
-      if (g_str_equal (*str_list, g_get_user_special_dir (G_USER_DIRECTORY_MUSIC)))
+      if (g_strcmp0 (*str_list, g_get_user_special_dir (G_USER_DIRECTORY_MUSIC)) == 0)
         {
           g_free (*str_list);
           *str_list = g_strdup ("@MUSIC@");
         }
 
-      if (g_str_equal (*str_list, g_get_user_special_dir (G_USER_DIRECTORY_VIDEOS)))
+      if (g_strcmp0 (*str_list, g_get_user_special_dir (G_USER_DIRECTORY_VIDEOS)) == 0)
         {
           g_free (*str_list);
           *str_list = g_strdup ("@VIDEOS@");
         }
 
-      if (g_str_equal (*str_list, g_get_user_special_dir (G_USER_DIRECTORY_PICTURES)))
+      if (g_strcmp0 (*str_list, g_get_user_special_dir (G_USER_DIRECTORY_PICTURES)) == 0)
         {
           g_free (*str_list);
           *str_list = g_strdup ("@PICTURES@");


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]