[Xfce4-commits] [xfce/xfdesktop] 11/13: Fix another warning

noreply at xfce.org noreply at xfce.org
Tue Mar 3 18:21:08 CET 2015


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

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

commit 488f11607c7a73d543986832fdfac8cc198798cb
Author: Thaddaeus Tintenfisch <thad.fisch at gmail.com>
Date:   Tue Mar 3 01:09:08 2015 +0100

    Fix another warning
    
    instance of invalid non-instantiatable type 'XfdesktopFileIconManager'
    
    Signed-off-by: Eric Koegel <eric.koegel at gmail.com>
---
 src/xfdesktop-file-icon-manager.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c
index 5eba11f..31de677 100644
--- a/src/xfdesktop-file-icon-manager.c
+++ b/src/xfdesktop-file-icon-manager.c
@@ -2190,7 +2190,6 @@ icon_view_resized(XfdesktopIconView *icon_view,
 {
     GQueue *new_queue;
     XfdesktopIcon *icon;
-    XfdesktopFileIconManagerPrivate *priv = XFDESKTOP_FILE_ICON_MANAGER_GET_PRIVATE(fmanager);
     const gchar *name;
     gchar *identifier;
     gint16 row, col;
@@ -2201,12 +2200,12 @@ icon_view_resized(XfdesktopIconView *icon_view,
         return;
 
     /* No pending icons, nothing to do */
-    if(priv == NULL || priv->pending_icons == NULL || g_queue_is_empty(priv->pending_icons))
+    if(fmanager->priv->pending_icons == NULL || g_queue_is_empty(fmanager->priv->pending_icons))
         return;
 
     new_queue = g_queue_new();
 
-    while((icon = g_queue_pop_head(priv->pending_icons))) {
+    while((icon = g_queue_pop_head(fmanager->priv->pending_icons))) {
         name = xfdesktop_icon_peek_label(XFDESKTOP_ICON(icon));
         identifier = xfdesktop_icon_get_identifier(XFDESKTOP_ICON(icon));
 
@@ -2231,8 +2230,8 @@ icon_view_resized(XfdesktopIconView *icon_view,
     }
 
     /* Free the old queue and replace it with the new one */
-    g_queue_free(priv->pending_icons);
-    priv->pending_icons = new_queue;
+    g_queue_free(fmanager->priv->pending_icons);
+    fmanager->priv->pending_icons = new_queue;
 }
 
 static void

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


More information about the Xfce4-commits mailing list