Make it compile

gnome/gdesktop.c

@@ -7,14 +7,16 @@
  */
 #if 1
 #include <config.h>
+#include "fs.h"
 #include <gnome.h>
 #include "dialog.h"
 #include "gdesktop.h"
 #include "gdesktop-icon.h"
 #include "gmetadata.h"
-#include "fs.h"
 #include "../vfs/vfs.h"
 
+/* use grid? */
+int icons_snap_to_grid = 1;
 
 /* Name of the user's desktop directory (i.e. ~/Desktop) */
 #define DESKTOP_DIR_NAME "desktop"
@@ -501,8 +503,6 @@ enum {
 /* The X11 root window */
 static GnomeRootWin *root_window;
 
-/* use grid? */
-int icons_snap_to_grid = 1;
 
 /* The full name of the desktop directory ~/desktop */
 char *desktop_directory;

gnome/gdesktop.h

@@ -23,6 +23,9 @@ extern int desktop_use_shaped_icons;		/* Whether to use shaped icons or not (for
 extern int desktop_auto_placement;		/* Whether to auto-place icons or not (user placement) */
 extern int desktop_snap_icons;			/* Whether to snap icons to the grid or not */
 
+extern int want_transparent_icons;
+extern int want_transparent_text;
+extern int icons_snap_to_grid;
 
 /* Initializes the desktop -- init DnD, load the default desktop icons, etc. */
 void desktop_init (void);
@@ -131,8 +134,6 @@ void desktop_icon_delete     (GtkWidget *widget, desktop_icon_t *di);
 /* Pops up the context sensitive menu for a WPanel or a desktop_icon_t */
 void file_popup (GdkEventButton *event, void *WPanel_pointer, void *desktop_icon_t_pointer, int row, char *filename);
 
-extern int icons_snap_to_grid;
-
 #endif
 
 #endif