[Xfce4-commits] [xfce/xfdesktop] 03/04: Fix warning 'instance of invalid non-instantiatable type'

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository xfce/xfdesktop.

commit 194963ee14286649e6922d3a8f08c62f5c1853e7
Author: Thaddaeus Tintenfisch <thad.fisch at gmail.com>
Date:   Tue Feb 24 21:53:38 2015 +0100

    Fix warning 'instance of invalid non-instantiatable type'
    
    With this commit 'metadata file changed' events should be processed
    properly now.
    
    Signed-off-by: Eric Koegel <eric.koegel at gmail.com>
---
 src/xfdesktop-file-icon-manager.c |   13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c
index 2077a42..088c9ab 100644
--- a/src/xfdesktop-file-icon-manager.c
+++ b/src/xfdesktop-file-icon-manager.c
@@ -2768,8 +2768,7 @@ xfdesktop_file_icon_manager_metadata_changed(GFileMonitor     *monitor,
                                              GFileMonitorEvent event,
                                              gpointer          user_data)
 {
-    XfdesktopFileIconManager        *fmanager;
-    XfdesktopFileIconManagerPrivate *priv;
+    XfdesktopFileIconManager *fmanager;
     guint timer;
 
     /* We only care about changed events */
@@ -2781,16 +2780,12 @@ xfdesktop_file_icon_manager_metadata_changed(GFileMonitor     *monitor,
         return;
 
     fmanager = XFDESKTOP_FILE_ICON_MANAGER(user_data);
-    priv = XFDESKTOP_FILE_ICON_MANAGER_GET_PRIVATE(fmanager);
-
-    if(!priv)
-        return;
 
     XF_DEBUG("metadata file changed event");
 
      /* remove any pending metadata changes */
-    if(priv->metadata_timer != 0) {
-        g_source_remove(priv->metadata_timer);
+    if(fmanager->priv->metadata_timer != 0) {
+        g_source_remove(fmanager->priv->metadata_timer);
     }
 
     /* cool down timer so we don't call this due to multiple file
@@ -2799,7 +2794,7 @@ xfdesktop_file_icon_manager_metadata_changed(GFileMonitor     *monitor,
                                   (GSourceFunc)xfdesktop_file_icon_manager_metadata_timer,
                                   fmanager);
 
-    priv->metadata_timer = timer;
+    fmanager->priv->metadata_timer = timer;
 }
 
 static void

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.