Index: xfdesktop-4.6.1/src/xfdesktop-icon-view.c
===================================================================
--- xfdesktop-4.6.1.orig/src/xfdesktop-icon-view.c
+++ xfdesktop-4.6.1/src/xfdesktop-icon-view.c
@@ -2143,12 +2143,14 @@ xfdesktop_icon_view_paint_icon(Xfdesktop
     GdkRectangle pix_area, text_area, intersection, adj_area;
     const gchar *label;
     guint16 row, col;
+    gboolean ret = FALSE;
     gchar x_offset = 0, y_offset = 0;
     GdkColor *sh_text_col = NULL;
     
     /*TRACE("entering (%s)", xfdesktop_icon_peek_label(icon));*/
-    
-    g_return_if_fail(xfdesktop_icon_get_position(icon, &row, &col));
+
+    ret = xfdesktop_icon_get_position(icon, &row, &col);
+    g_return_if_fail(ret);
     
     if(g_list_find(icon_view->priv->selected_icons, icon)) {
         if(GTK_WIDGET_FLAGS(widget) & GTK_HAS_FOCUS)
@@ -2494,8 +2496,10 @@ xfdesktop_grid_unset_position_free(Xfdes
                                    XfdesktopIcon *icon)
 {
     guint16 row, col;
-    
-    g_return_val_if_fail(xfdesktop_icon_get_position(icon, &row, &col), FALSE);
+    gboolean ret = FALSE;
+
+    ret = xfdesktop_icon_get_position(icon, &row, &col);
+    g_return_val_if_fail(ret, FALSE);
     
     return xfdesktop_grid_unset_position_free_raw(icon_view, row, col, icon);
 }
@@ -2738,9 +2742,11 @@ xfdesktop_icon_view_add_item_internal(Xf
 {
     guint16 row, col;
     GdkRectangle fake_area;
+    gboolean ret = FALSE;
     
     /* sanity check: at this point this should be taken care of */
-    g_return_if_fail(xfdesktop_icon_get_position(icon, &row, &col));
+    ret = xfdesktop_icon_get_position(icon, &row, &col);
+    g_return_if_fail(ret);
     
     xfdesktop_grid_unset_position_free(icon_view, icon);