[Xfce4-commits] <xfdesktop:master> Fix a couple runtime warnings

[Eric Koegel]

Updating branch refs/heads/master
         to b1a7c62d4e78dc1cee7e3d499440618c085c7d48 (commit)
       from d309a6949b751002b33ed432f88fd47a1384db0e (commit)

commit b1a7c62d4e78dc1cee7e3d499440618c085c7d48
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Sun Feb 23 13:37:20 2014 +0300

    Fix a couple runtime warnings

 settings/main.c                   |    2 ++
 src/xfdesktop-file-icon-manager.c |    7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/settings/main.c b/settings/main.c
index a34256e..7fe6da6 100644
--- a/settings/main.c
+++ b/settings/main.c
@@ -560,6 +560,8 @@ cb_destroy_add_dir_enumeration(gpointer user_data)
         g_object_unref(panel->cancel_enumeration);
         panel->cancel_enumeration = NULL;
     }
+
+    panel->add_dir_idle_id = 0;
 }
 
 static gboolean
diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c
index 9e9ad3c..f5bc994 100644
--- a/src/xfdesktop-file-icon-manager.c
+++ b/src/xfdesktop-file-icon-manager.c
@@ -2736,7 +2736,12 @@ xfdesktop_file_icon_manager_files_ready(GFileEnumerator *enumerator,
          * send notification messages when monitored files change */
         if(!fmanager->priv->metadata_monitor) {
             gchar *location = xfce_resource_lookup(XFCE_RESOURCE_DATA, "gvfs-metadata/");
-            GFile *metadata_location = g_file_new_for_path(location);
+            GFile *metadata_location;
+
+            if(location == NULL)
+                return;
+
+            metadata_location = g_file_new_for_path(location);
 
             fmanager->priv->metadata_monitor = g_file_monitor(metadata_location,
                                                               G_FILE_MONITOR_NONE,