[Xfce4-commits] [xfce/xfdesktop] 01/01: Fix build warnings with --disable-file-icons

[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 c46bb2933f49305558587b250fd3f3870f5386d7
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Sun Jul 6 16:42:15 2014 +0300

    Fix build warnings with --disable-file-icons
    
    And g_memmove was deprecated in glib 2.40.
---
 src/xfdesktop-icon-view.c           |    4 ++++
 src/xfdesktop-window-icon-manager.c |   12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/xfdesktop-icon-view.c b/src/xfdesktop-icon-view.c
index b9b325b..e4df3c0 100644
--- a/src/xfdesktop-icon-view.c
+++ b/src/xfdesktop-icon-view.c
@@ -1788,6 +1788,7 @@ xfdesktop_icon_view_drag_data_received(GtkWidget *widget,
     }
 }
 
+#ifdef ENABLE_FILE_ICONS
 static gint
 xfdesktop_icon_view_compare_icons(gconstpointer *a,
                                   gconstpointer *b)
@@ -1808,7 +1809,9 @@ xfdesktop_icon_view_compare_icons(gconstpointer *a,
 
     return g_utf8_collate(a_str, b_str);
 }
+#endif /* ENABLE_FILE_ICONS */
 
+#ifdef ENABLE_FILE_ICONS
 static void
 xfdesktop_icon_view_append_icons(XfdesktopIconView *icon_view,
                                  GList *icon_list,
@@ -1835,6 +1838,7 @@ xfdesktop_icon_view_append_icons(XfdesktopIconView *icon_view,
         xfdesktop_icon_view_invalidate_icon(icon_view, l->data, TRUE);
     }
 }
+#endif /* ENABLE_FILE_ICONS */
 
 void
 xfdesktop_icon_view_sort_icons(XfdesktopIconView *icon_view)
diff --git a/src/xfdesktop-window-icon-manager.c b/src/xfdesktop-window-icon-manager.c
index 1942c83..680ee62 100644
--- a/src/xfdesktop-window-icon-manager.c
+++ b/src/xfdesktop-window-icon-manager.c
@@ -285,9 +285,9 @@ workspace_created_cb(WnckScreen *wnck_screen,
                                                 sizeof(gpointer) * n_ws);
     
     if(ws_num != n_ws - 1) {
-        g_memmove(wmanager->priv->icon_workspaces + ws_num + 1,
-                  wmanager->priv->icon_workspaces + ws_num,
-                  sizeof(gpointer) * (n_ws - ws_num - 1));
+        memmove(wmanager->priv->icon_workspaces + ws_num + 1,
+                wmanager->priv->icon_workspaces + ws_num,
+                sizeof(gpointer) * (n_ws - ws_num - 1));
     }
     
     wmanager->priv->icon_workspaces[ws_num] = g_new0(XfdesktopWindowIconWorkspace,
@@ -314,9 +314,9 @@ workspace_destroyed_cb(WnckScreen *wnck_screen,
     g_free(wmanager->priv->icon_workspaces[ws_num]);
     
     if(ws_num != n_ws) {
-        g_memmove(wmanager->priv->icon_workspaces + ws_num,
-                  wmanager->priv->icon_workspaces + ws_num + 1,
-                  sizeof(gpointer) * (n_ws - ws_num));
+        memmove(wmanager->priv->icon_workspaces + ws_num,
+                wmanager->priv->icon_workspaces + ws_num + 1,
+                sizeof(gpointer) * (n_ws - ws_num));
     }
     
     wmanager->priv->icon_workspaces = g_realloc(wmanager->priv->icon_workspaces,

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