Merge lp:~noskcaj/ubuntu/trusty/xfdesktop4/4.11.5 into lp:ubuntu/trusty/xfdesktop4

[Jackson Doak]

New upstream bugfix release. needed for Xubuntu 14.04

[Sebastien Bacher (seb128)]

thanks

review: Approve

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2014-03-28 07:16:04 +0000
+++ .pc/applied-patches	2014-04-01 20:08:43 +0000
@@ -1,5 +1,2 @@
 xubuntu_set-accountsservice-user-bg.patch
 xubuntu_improve-nautilus-interactions.patch
-git-desktop-icons-have-background.patch
-git-missing-images-in-settings-app.patch
-git-fix-default-icon-size.patch

=== removed directory '.pc/git-desktop-icons-have-background.patch'
=== removed directory '.pc/git-desktop-icons-have-background.patch/src'
=== removed file '.pc/git-desktop-icons-have-background.patch/src/xfce-desktop.c'
--- .pc/git-desktop-icons-have-background.patch/src/xfce-desktop.c	2014-03-28 07:16:04 +0000
+++ .pc/git-desktop-icons-have-background.patch/src/xfce-desktop.c	1970-01-01 00:00:00 +0000
@@ -1,1821 +0,0 @@
-/*
- *  xfdesktop - xfce4's desktop manager
- *
- *  Copyright (c) 2004-2007 Brian Tarricone, <[e-mail]>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software Foundation,
- *  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- *
- *  Random portions taken from or inspired by the original xfdesktop for xfce4:
- *     Copyright (C) 2002-2003 Jasper Huijsmans ([e-mail])
- *     Copyright (C) 2003 Benedikt Meurer <[e-mail]>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-
-#include <ctype.h>
-#include <errno.h>
-
-#ifdef HAVE_TIME_H
-#include <time.h>
-#endif
-
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-
-#include <glib.h>
-#include <gdk/gdkx.h>
-#include <gtk/gtk.h>
-#include <gio/gio.h>
-
-#ifdef ENABLE_DESKTOP_ICONS
-#include "xfdesktop-icon-view.h"
-#include "xfdesktop-window-icon-manager.h"
-# ifdef ENABLE_FILE_ICONS
-# include "xfdesktop-file-icon-manager.h"
-# include "xfdesktop-special-file-icon.h"
-# endif
-#endif
-
-#include <libxfce4util/libxfce4util.h>
-#include <libxfce4ui/libxfce4ui.h>
-
-#include <xfconf/xfconf.h>
-#include <libwnck/libwnck.h>
-
-#include "xfdesktop-common.h"
-#include "xfce-desktop.h"
-#include "xfce-desktop-enum-types.h"
-#include "xfce-workspace.h"
-
-/* disable setting the x background for bug 7442 */
-//#define DISABLE_FOR_BUG7442
-
-struct _XfceDesktopPriv
-{
-    GdkScreen *gscreen;
-    WnckScreen *wnck_screen;
-    gboolean updates_frozen;
-
-    XfconfChannel *channel;
-    gchar *property_prefix;
-    
-    GdkPixmap *bg_pixmap;
-    
-    gint nworkspaces;
-    XfceWorkspace **workspaces;
-    gint current_workspace;
-
-    gboolean single_workspace_mode;
-    gint single_workspace_num;
-
-    SessionLogoutFunc session_logout_func;
-
-    guint32 grab_time;
-
-#ifdef ENABLE_DESKTOP_ICONS
-    XfceDesktopIconStyle icons_style;
-    gboolean icons_font_size_set;
-    guint icons_font_size;
-    guint icons_size;
-    GtkWidget *icon_view;
-    gdouble system_font_size;
-#endif
-};
-
-enum
-{
-    SIG_POPULATE_ROOT_MENU = 0,
-    SIG_POPULATE_SECONDARY_ROOT_MENU,
-    N_SIGNALS
-};
-
-enum
-{
-    PROP_0 = 0,
-#ifdef ENABLE_DESKTOP_ICONS
-    PROP_ICON_STYLE,
-    PROP_ICON_SIZE,
-    PROP_ICON_FONT_SIZE,
-    PROP_ICON_FONT_SIZE_SET,
-#endif
-    PROP_SINGLE_WORKSPACE_MODE,
-    PROP_SINGLE_WORKSPACE_NUMBER,
-};
-
-
-static void xfce_desktop_finalize(GObject *object);
-static void xfce_desktop_set_property(GObject *object,
-                                      guint property_id,
-                                      const GValue *value,
-                                      GParamSpec *pspec);
-static void xfce_desktop_get_property(GObject *object,
-                                      guint property_id,
-                                      GValue *value,
-                                      GParamSpec *pspec);
-
-static void xfce_desktop_realize(GtkWidget *widget);
-static void xfce_desktop_unrealize(GtkWidget *widget);
-static gboolean xfce_desktop_button_press_event(GtkWidget *widget,
-                                                GdkEventButton *evt);
-static gboolean xfce_desktop_button_release_event(GtkWidget *widget,
-                                                  GdkEventButton *evt);
-static gboolean xfce_desktop_popup_menu(GtkWidget *widget);
-
-static gboolean xfce_desktop_expose(GtkWidget *w,
-                                    GdkEventExpose *evt);
-static gboolean xfce_desktop_delete_event(GtkWidget *w,
-                                          GdkEventAny *evt);
-static void xfce_desktop_style_set(GtkWidget *w,
-                                   GtkStyle *old_style);
-
-static void xfce_desktop_set_single_workspace_mode(XfceDesktop *desktop,
-                                                   gboolean single_workspace);
-static void xfce_desktop_set_single_workspace_number(XfceDesktop *desktop,
-                                                     gint workspace_num);
-
-static gboolean xfce_desktop_get_single_workspace_mode(XfceDesktop *desktop);
-static gint xfce_desktop_get_current_workspace(XfceDesktop *desktop);
-
-static guint signals[N_SIGNALS] = { 0, };
-
-/* private functions */
-
-#ifdef ENABLE_DESKTOP_ICONS
-static gdouble
-xfce_desktop_ensure_system_font_size(XfceDesktop *desktop)
-{
-    GdkScreen *gscreen;
-    GtkSettings *settings;
-    gchar *font_name = NULL;
-    PangoFontDescription *pfd;
-    
-    gscreen = gtk_widget_get_screen(GTK_WIDGET(desktop));
-    
-    settings = gtk_settings_get_for_screen(gscreen);
-    g_object_get(G_OBJECT(settings), "gtk-font-name", &font_name, NULL);
-    
-    pfd = pango_font_description_from_string(font_name);
-    desktop->priv->system_font_size = pango_font_description_get_size(pfd);
-    /* FIXME: this seems backwards from the documentation */
-    if(!pango_font_description_get_size_is_absolute(pfd)) {
-        DBG("dividing by PANGO_SCALE");
-        desktop->priv->system_font_size /= PANGO_SCALE;
-    }
-    DBG("system font size is %.05f", desktop->priv->system_font_size);
-    
-    g_free(font_name);
-    pango_font_description_free(pfd);
-    
-    return desktop->priv->system_font_size;
-}
-
-static void
-xfce_desktop_setup_icon_view(XfceDesktop *desktop)
-{
-    XfdesktopIconViewManager *manager = NULL;
-    
-    switch(desktop->priv->icons_style) {
-        case XFCE_DESKTOP_ICON_STYLE_NONE:
-            /* nada */
-            break;
-        
-        case XFCE_DESKTOP_ICON_STYLE_WINDOWS:
-            manager = xfdesktop_window_icon_manager_new(desktop->priv->gscreen);
-            break;
-        
-#ifdef ENABLE_FILE_ICONS
-        case XFCE_DESKTOP_ICON_STYLE_FILES:
-            {
-                GFile *file;
-                const gchar *desktop_path;
-                
-                desktop_path = g_get_user_special_dir(G_USER_DIRECTORY_DESKTOP);
-                file = g_file_new_for_path(desktop_path);
-                manager = xfdesktop_file_icon_manager_new(file, desktop->priv->channel);
-                g_object_unref(file);
-            }
-            break;
-#endif
-        
-        default:
-            g_critical("Unusable XfceDesktopIconStyle: %d.  Unable to " \
-                       "display desktop icons.",
-                       desktop->priv->icons_style);
-            break;
-    }
-    
-    if(manager) {
-        xfce_desktop_ensure_system_font_size(desktop);
-        
-        desktop->priv->icon_view = xfdesktop_icon_view_new(manager);
-        /* If the user set a custom font size, use it. Otherwise use the system
-         * font size */
-        xfdesktop_icon_view_set_font_size(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view),
-                                          (!desktop->priv->icons_font_size_set)
-                                          ? desktop->priv->system_font_size
-                                          : desktop->priv->icons_font_size);
-        if(desktop->priv->icons_size > 0) {
-            xfdesktop_icon_view_set_icon_size(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view),
-                                              desktop->priv->icons_size);
-        }
-        gtk_widget_show(desktop->priv->icon_view);
-        gtk_container_add(GTK_CONTAINER(desktop), desktop->priv->icon_view);
-    }
-    
-    gtk_widget_queue_draw(GTK_WIDGET(desktop));
-}
-#endif
-
-static void
-set_imgfile_root_property(XfceDesktop *desktop, const gchar *filename,
-        gint monitor)
-{
-    gchar property_name[128];
-    
-    gdk_error_trap_push();
-    
-    g_snprintf(property_name, 128, XFDESKTOP_IMAGE_FILE_FMT, monitor);
-    if(filename) {
-        gdk_property_change(gdk_screen_get_root_window(desktop->priv->gscreen),
-                            gdk_atom_intern(property_name, FALSE),
-                            gdk_x11_xatom_to_atom(XA_STRING), 8,
-                            GDK_PROP_MODE_REPLACE,
-                            (guchar *)filename, strlen(filename)+1);
-    } else {
-        gdk_property_delete(gdk_screen_get_root_window(desktop->priv->gscreen),
-                            gdk_atom_intern(property_name, FALSE));
-    }
-    
-    gdk_error_trap_pop();
-}
-
-static void
-set_real_root_window_pixmap(GdkScreen *gscreen,
-                            GdkPixmap *pmap)
-{
-#ifndef DISABLE_FOR_BUG7442
-    Window xid;
-    GdkWindow *groot;
-    
-    xid = GDK_DRAWABLE_XID(pmap);
-    groot = gdk_screen_get_root_window(gscreen);
-    
-    gdk_error_trap_push();
-    
-    /* set root property for transparent Eterms */
-    gdk_property_change(groot,
-            gdk_atom_intern("_XROOTPMAP_ID", FALSE),
-            gdk_atom_intern("PIXMAP", FALSE), 32,
-            GDK_PROP_MODE_REPLACE, (guchar *)&xid, 1);
-    /* and set the root window's BG pixmap, because aterm is somewhat lame. */
-    gdk_window_set_back_pixmap(groot, pmap, FALSE);
-    /* there really should be a standard for this crap... */
-
-    gdk_error_trap_pop();
-#endif
-}
-
-static GdkPixmap *
-create_bg_pixmap(GdkScreen *gscreen, gpointer user_data)
-{
-    XfceDesktop *desktop = user_data;
-    gint w, h;
-
-    TRACE("entering");
-
-    g_return_val_if_fail(XFCE_IS_DESKTOP(desktop), NULL);
-
-    /* If the workspaces haven't been created yet there's no need to do the
-     * background pixmap */
-    if(desktop->priv->workspaces == NULL) {
-        DBG("exiting, desktop->priv->workspaces == NULL");
-        return NULL;
-    }
-
-    TRACE("really entering");
-
-    w = gdk_screen_get_width(gscreen);
-    h = gdk_screen_get_height(gscreen);
-    gtk_widget_set_size_request(GTK_WIDGET(desktop), w, h);
-    gtk_window_resize(GTK_WINDOW(desktop), w, h);
-
-    if(desktop->priv->bg_pixmap)
-        g_object_unref(G_OBJECT(desktop->priv->bg_pixmap));
-    desktop->priv->bg_pixmap = gdk_pixmap_new(GDK_DRAWABLE(gtk_widget_get_window(GTK_WIDGET(desktop))),
-                                              w, h, -1);
-
-    if(!GDK_IS_PIXMAP(desktop->priv->bg_pixmap))
-        return NULL;
-
-    gdk_window_set_back_pixmap(gtk_widget_get_window(GTK_WIDGET(desktop)),
-                               desktop->priv->bg_pixmap, FALSE);
-
-    return desktop->priv->bg_pixmap;
-}
-
-static void
-set_accountsservice_user_bg(const gchar *filename)
-{
-    GDBusProxy *proxy = NULL;
-    GDBusProxy *user = NULL;
-    GVariant *variant = NULL;
-    GError *error = NULL;
-    gchar *object_path = NULL;
-    const gchar *user_name = g_get_user_name();
-
-    proxy = g_dbus_proxy_new_for_bus_sync(G_BUS_TYPE_SYSTEM,
-                                          G_DBUS_PROXY_FLAGS_NONE,
-                                          NULL,
-                                          "org.freedesktop.Accounts",
-                                          "/org/freedesktop/Accounts",
-                                          "org.freedesktop.Accounts",
-                                          NULL,
-                                          &error);
-
-    if(!proxy) {
-        DBG("Failed to contact accounts service: %s", error->message);
-        g_error_free(error);
-        return;
-    }
-
-    variant = g_dbus_proxy_call_sync(proxy,
-                                     "FindUserByName",
-                                     g_variant_new("(s)", user_name),
-                                     G_DBUS_CALL_FLAGS_NONE,
-                                     -1,
-                                     NULL,
-                                     &error);
-
-    if(!variant) {
-        DBG("Could not contact accounts service to look up '%s': %s",
-            user_name, error->message);
-        g_error_free(error);
-        goto bail;
-    }
-
-    g_variant_get(variant, "(o)", &object_path);
-    user = g_dbus_proxy_new_for_bus_sync(G_BUS_TYPE_SYSTEM,
-                                         G_DBUS_PROXY_FLAGS_NONE,
-                                         NULL,
-                                         "org.freedesktop.Accounts",
-                                         object_path,
-                                         "org.freedesktop.Accounts.User",
-                                         NULL,
-                                         &error);
-    g_free(object_path);
-
-    if(!user) {
-        DBG("Could not create proxy for user '%s': %s",
-            g_variant_get_string(variant, NULL), error->message);
-        g_error_free(error);
-        goto bail;
-    }
-    g_variant_unref(variant);
-
-    variant = g_dbus_proxy_call_sync(user,
-                                     "SetBackgroundFile",
-                                     g_variant_new("(s)", filename),
-                                     G_DBUS_CALL_FLAGS_NONE,
-                                     -1,
-                                     NULL,
-                                     &error);
-
-    if(!variant) {
-        DBG("Failed to set the background '%s': %s", filename, error->message);
-        g_error_free(error);
-        goto bail;
-    }
-
-bail:
-    if(user)
-        g_object_unref(user);
-    if(proxy)
-        g_object_unref(proxy);
-    if(variant)
-        g_variant_unref(variant);
-}
-
-static void
-backdrop_changed_cb(XfceBackdrop *backdrop, gpointer user_data)
-{
-    XfceDesktop *desktop = XFCE_DESKTOP(user_data);
-    GdkPixmap *pmap = desktop->priv->bg_pixmap;
-    GdkScreen *gscreen = desktop->priv->gscreen;
-    GdkRectangle rect;
-    GdkRegion *clip_region = NULL;
-    gint i, monitor = -1, current_workspace;
-#ifdef G_ENABLE_DEBUG
-    gchar *monitor_name = NULL;
-#endif
-
-    TRACE("entering");
-    
-    g_return_if_fail(XFCE_IS_DESKTOP(desktop));
-
-    if(!XFCE_IS_BACKDROP(backdrop))
-        return;
-
-    if(desktop->priv->updates_frozen || !gtk_widget_get_realized(GTK_WIDGET(desktop)))
-        return;
-
-    TRACE("really entering");
-
-    current_workspace = xfce_desktop_get_current_workspace(desktop);
-
-    /* Find out which monitor the backdrop is on */
-    for(i = 0; i < xfce_desktop_get_n_monitors(desktop); i++) {
-        if(backdrop == xfce_workspace_get_backdrop(desktop->priv->workspaces[current_workspace], i)) {
-            monitor = i;
-            break;
-        }
-    }
-    if(monitor == -1)
-        return;
-    /* notify Accountsservice of the new bg (only for monitor0) */
-    if(monitor == 0)
-        if (xfce_desktop_get_current_workspace(desktop) == 0)
-            set_accountsservice_user_bg(xfce_backdrop_get_image_filename(backdrop));
-
-#ifdef G_ENABLE_DEBUG
-    monitor_name = gdk_screen_get_monitor_plug_name(gscreen, monitor);
-
-    DBG("backdrop changed for workspace %d, monitor %d (%s)", current_workspace, monitor, monitor_name);
-
-    g_free(monitor_name);
-#endif
-
-    if(xfce_desktop_get_n_monitors(desktop) > 1
-       && xfce_workspace_get_xinerama_stretch(desktop->priv->workspaces[current_workspace])) {
-        /* Spanning screens */
-        GdkRectangle monitor_rect;
-
-        gdk_screen_get_monitor_geometry(gscreen, 0, &rect);
-        /* Get the lowest x and y value for all the monitors in
-         * case none of them start at 0,0 for whatever reason.
-         */
-        for(i = 1; i < xfce_desktop_get_n_monitors(desktop); i++) {
-            gdk_screen_get_monitor_geometry(gscreen, i, &monitor_rect);
-
-            if(monitor_rect.x < rect.x)
-                rect.x = monitor_rect.x;
-            if(monitor_rect.y < rect.y)
-                rect.y = monitor_rect.y;
-        }
-
-        rect.width = gdk_screen_get_width(gscreen);
-        rect.height = gdk_screen_get_height(gscreen);
-        DBG("xinerama_stretch x %d, y %d, width %d, height %d",
-            rect.x, rect.y, rect.width, rect.height);
-    } else {
-        gdk_screen_get_monitor_geometry(gscreen, monitor, &rect);
-        DBG("monitor x %d, y %d, width %d, height %d",
-            rect.x, rect.y, rect.width, rect.height);
-    }
-
-    xfce_backdrop_set_size(backdrop, rect.width, rect.height);
-
-    if(monitor > 0
-       && !xfce_workspace_get_xinerama_stretch(desktop->priv->workspaces[current_workspace])) {
-        clip_region = gdk_region_rectangle(&rect);
-
-        DBG("clip_region: x: %d, y: %d, w: %d, h: %d",
-            rect.x, rect.y, rect.width, rect.height);
-
-        /* If we are not monitor 0 on a multi-monitor setup we need to subtract
-         * all the previous monitor regions so we don't draw over them. This
-         * should prevent the overlap and double backdrop drawing bugs.
-         */
-        for(i = 0; i < monitor; i++) {
-            GdkRectangle previous_monitor;
-            GdkRegion *previous_region;
-            gdk_screen_get_monitor_geometry(gscreen, i, &previous_monitor);
-
-            DBG("previous_monitor: x: %d, y: %d, w: %d, h: %d",
-                previous_monitor.x, previous_monitor.y,
-                previous_monitor.width, previous_monitor.height);
-
-            previous_region = gdk_region_rectangle(&previous_monitor);
-
-            gdk_region_subtract(clip_region, previous_region);
-
-            gdk_region_destroy(previous_region);
-        }
-    }
-
-    if(clip_region != NULL) {
-        /* Update the area to redraw to limit the icons/area painted */
-        gdk_region_get_clipbox(clip_region, &rect);
-        DBG("area to update: x: %d, y: %d, w: %d, h: %d",
-            rect.x, rect.y, rect.width, rect.height);
-    }
-
-    if(rect.width != 0 && rect.height != 0) {
-        /* get the composited backdrop pixmap */
-        GdkPixbuf *pix = xfce_backdrop_get_pixbuf(backdrop);
-        cairo_t *cr;
-
-        /* create the backdrop if needed */
-        if(!pix) {
-            xfce_backdrop_generate_async(backdrop);
-
-            if(clip_region != NULL)
-                gdk_region_destroy(clip_region);
-
-            return;
-        }
-
-        /* Create the background pixmap if it isn't already */
-        if(!GDK_IS_PIXMAP(pmap)) {
-            pmap = create_bg_pixmap(gscreen, desktop);
-
-            if(!GDK_IS_PIXMAP(pmap)) {
-                g_object_unref(pix);
-
-                if(clip_region != NULL)
-                    gdk_region_destroy(clip_region);
-
-                return;
-            }
-        }
-
-        cr = gdk_cairo_create(GDK_DRAWABLE(pmap));
-        gdk_cairo_set_source_pixbuf(cr, pix, rect.x, rect.y);
-
-        /* clip the area so we don't draw over a previous wallpaper */
-        if(clip_region != NULL) {
-            gdk_cairo_region(cr, clip_region);
-            cairo_clip(cr);
-        }
-
-        cairo_paint(cr);
-
-        /* tell gtk to redraw the repainted area */
-        gtk_widget_queue_draw_area(GTK_WIDGET(desktop), rect.x, rect.y,
-                                   rect.width, rect.height);
-
-        set_imgfile_root_property(desktop,
-                                  xfce_backdrop_get_image_filename(backdrop),
-                                  monitor);
-
-        /* do this again so apps watching the root win notice the update */
-        set_real_root_window_pixmap(gscreen, pmap);
-
-        g_object_unref(G_OBJECT(pix));
-        cairo_destroy(cr);
-        gtk_widget_show(GTK_WIDGET(desktop));
-    }
-
-    if(clip_region != NULL)
-        gdk_region_destroy(clip_region);
-}
-
-static void
-screen_size_changed_cb(GdkScreen *gscreen, gpointer user_data)
-{
-    XfceDesktop *desktop = user_data;
-    gint current_workspace;
-
-    TRACE("entering");
-
-    current_workspace = xfce_desktop_get_current_workspace(desktop);
-
-    if(desktop->priv->nworkspaces <= current_workspace)
-        return;
-
-    if(current_workspace < 0)
-        return;
-
-    /* release the bg_pixmap since the dimensions may have changed */
-    if(desktop->priv->bg_pixmap) {
-        g_object_unref(desktop->priv->bg_pixmap);
-        desktop->priv->bg_pixmap = NULL;
-    }
-
-    /* special case for 1 backdrop to handle xinerama stretching */
-    if(xfce_workspace_get_xinerama_stretch(desktop->priv->workspaces[current_workspace])) {
-       backdrop_changed_cb(xfce_workspace_get_backdrop(desktop->priv->workspaces[current_workspace], 0), desktop);
-    } else {
-        gint i;
-
-        for(i = 0; i < xfce_desktop_get_n_monitors(desktop); i++) {
-            XfceBackdrop *current_backdrop;
-            current_backdrop = xfce_workspace_get_backdrop(desktop->priv->workspaces[current_workspace], i);
-            backdrop_changed_cb(current_backdrop, desktop);
-        }
-    }
-}
-
-static void
-screen_composited_changed_cb(GdkScreen *gscreen,
-                             gpointer user_data)
-{
-    TRACE("entering");
-    /* fake a screen size changed, so the background is properly set */
-    screen_size_changed_cb(gscreen, user_data);
-}
-
-static void
-xfce_desktop_monitors_changed(GdkScreen *gscreen,
-                              gpointer user_data)
-{
-    XfceDesktop *desktop = XFCE_DESKTOP(user_data);
-    gint i;
-
-    TRACE("entering");
-
-    /* Update the workspaces */
-    for(i = 0; i < desktop->priv->nworkspaces; i++) {
-        xfce_workspace_monitors_changed(desktop->priv->workspaces[i],
-                                        gscreen);
-    }
-
-    /* fake a screen size changed, so the background is properly set */
-    screen_size_changed_cb(gscreen, user_data);
-}
-
-static void
-workspace_backdrop_changed_cb(XfceWorkspace *workspace,
-                              XfceBackdrop  *backdrop,
-                              gpointer user_data)
-{
-    XfceDesktop *desktop = XFCE_DESKTOP(user_data);
-
-    TRACE("entering");
-
-    g_return_if_fail(XFCE_IS_WORKSPACE(workspace) && XFCE_IS_BACKDROP(backdrop));
-
-    if(xfce_desktop_get_current_workspace(desktop) == xfce_workspace_get_workspace_num(workspace))
-        backdrop_changed_cb(backdrop, user_data);
-}
-
-static void
-workspace_changed_cb(WnckScreen *wnck_screen,
-                     WnckWorkspace *previously_active_space,
-                     gpointer user_data)
-{
-    XfceDesktop *desktop = XFCE_DESKTOP(user_data);
-    gint current_workspace, new_workspace, i;
-    XfceBackdrop *current_backdrop, *new_backdrop;
-
-    TRACE("entering");
-
-    /* Ignore workspace changes in single workspace mode so long as we
-     * already have the bg_pixmap loaded */
-    if(xfce_desktop_get_single_workspace_mode(desktop) && desktop->priv->bg_pixmap)
-        return;
-
-    current_workspace = desktop->priv->current_workspace;
-    new_workspace = xfce_desktop_get_current_workspace(desktop);
-
-    if(new_workspace < 0 || new_workspace >= desktop->priv->nworkspaces)
-        return;
-
-    desktop->priv->current_workspace = new_workspace;
-
-    DBG("current_workspace %d, new_workspace %d",
-        current_workspace, new_workspace);
-
-    for(i = 0; i < xfce_desktop_get_n_monitors(desktop); i++) {
-        /* We want to compare the current workspace backdrop with the new one
-         * and see if we can avoid changing them if they are the same image/style */
-        if(current_workspace < desktop->priv->nworkspaces && current_workspace >= 0) {
-            current_backdrop = xfce_workspace_get_backdrop(desktop->priv->workspaces[current_workspace], i);
-            new_backdrop = xfce_workspace_get_backdrop(desktop->priv->workspaces[new_workspace], i);
-
-            if(!xfce_backdrop_compare_backdrops(current_backdrop, new_backdrop) || !desktop->priv->bg_pixmap) {
-                /* only update monitors that require it */
-                backdrop_changed_cb(new_backdrop, user_data);
-            }
-        } else {
-            /* If current_workspace was removed or never existed, get the new
-             * backdrop and apply it */
-            new_backdrop = xfce_workspace_get_backdrop(desktop->priv->workspaces[new_workspace], i);
-            backdrop_changed_cb(new_backdrop, user_data);
-        }
-
-        /* When we're spanning screens we only care about the first monitor */
-        if(xfce_workspace_get_xinerama_stretch(desktop->priv->workspaces[new_workspace]))
-            break;
-    }
-}
-
-static void
-workspace_created_cb(WnckScreen *wnck_screen,
-                     WnckWorkspace *new_workspace,
-                     gpointer user_data)
-{
-    XfceDesktop *desktop = XFCE_DESKTOP(user_data);
-    gint nlast_workspace;
-    TRACE("entering");
-
-    nlast_workspace = desktop->priv->nworkspaces;
-
-    /* add one more workspace */
-    desktop->priv->nworkspaces = nlast_workspace + 1;
-
-    /* allocate size for it */
-    desktop->priv->workspaces = g_realloc(desktop->priv->workspaces,
-                                          desktop->priv->nworkspaces * sizeof(XfceWorkspace *));
-
-    /* create the new workspace and set it up */
-    desktop->priv->workspaces[nlast_workspace] = xfce_workspace_new(desktop->priv->gscreen,
-                                                                    desktop->priv->channel,
-                                                                    desktop->priv->property_prefix,
-                                                                    nlast_workspace);
-
-    /* Tell workspace whether to cache pixbufs */
-    xfce_workspace_set_cache_pixbufs(desktop->priv->workspaces[nlast_workspace],
-                                     !desktop->priv->single_workspace_mode);
-
-    xfce_workspace_monitors_changed(desktop->priv->workspaces[nlast_workspace],
-                                    desktop->priv->gscreen);
-
-    g_signal_connect(desktop->priv->workspaces[nlast_workspace],
-                     "workspace-backdrop-changed",
-                     G_CALLBACK(workspace_backdrop_changed_cb), desktop);
-}
-
-static void
-workspace_destroyed_cb(WnckScreen *wnck_screen,
-                     WnckWorkspace *old_workspace,
-                     gpointer user_data)
-{
-    XfceDesktop *desktop = XFCE_DESKTOP(user_data);
-    gint nlast_workspace;
-    TRACE("entering");
-
-    g_return_if_fail(XFCE_IS_DESKTOP(desktop));
-    g_return_if_fail(desktop->priv->nworkspaces - 1 >= 0);
-    g_return_if_fail(XFCE_IS_WORKSPACE(desktop->priv->workspaces[desktop->priv->nworkspaces-1]));
-
-    nlast_workspace = desktop->priv->nworkspaces - 1;
-
-    g_signal_handlers_disconnect_by_func(desktop->priv->workspaces[nlast_workspace],
-                                         G_CALLBACK(workspace_backdrop_changed_cb),
-                                         desktop);
-
-    g_object_unref(desktop->priv->workspaces[nlast_workspace]);
-
-    /* Remove one workspace */
-    desktop->priv->nworkspaces = nlast_workspace;
-
-    /* deallocate it */
-    desktop->priv->workspaces = g_realloc(desktop->priv->workspaces,
-                                          desktop->priv->nworkspaces * sizeof(XfceWorkspace *));
-
-    /* Make sure we stay within bounds now that we removed a workspace */
-    if(desktop->priv->current_workspace > desktop->priv->nworkspaces)
-        desktop->priv->current_workspace = desktop->priv->nworkspaces;
-}
-
-static void
-screen_set_selection(XfceDesktop *desktop)
-{
-    Window xwin;
-    gint xscreen;
-    gchar selection_name[100], common_selection_name[32];
-    Atom selection_atom, common_selection_atom, manager_atom;
-    
-    xwin = GDK_WINDOW_XID(gtk_widget_get_window(GTK_WIDGET(desktop)));
-    xscreen = gdk_screen_get_number(desktop->priv->gscreen);
-    
-    g_snprintf(selection_name, 100, XFDESKTOP_SELECTION_FMT, xscreen);
-    selection_atom = XInternAtom(gdk_x11_get_default_xdisplay(), selection_name, False);
-    manager_atom = XInternAtom(gdk_x11_get_default_xdisplay(), "MANAGER", False);
-
-    g_snprintf(common_selection_name, 32, "_NET_DESKTOP_MANAGER_S%d", xscreen);
-    common_selection_atom = XInternAtom(gdk_x11_get_default_xdisplay(), common_selection_name, False);
-
-    /* the previous check in src/main.c occurs too early, so workaround by
-     * adding this one. */
-   if(XGetSelectionOwner(gdk_x11_get_default_xdisplay(), selection_atom) != None) {
-       g_warning("%s: already running, quitting.", PACKAGE);
-       exit(0);
-   }
-
-    /* Check that _NET_DESKTOP_MANAGER_S%d isn't set, as it means another
-     * desktop manager is running, e.g. nautilus */
-    if(XGetSelectionOwner (gdk_x11_get_default_xdisplay(), common_selection_atom) != None) {
-        g_warning("%s: another desktop manager is running.", PACKAGE);
-        exit(1);
-    }
-
-    XSelectInput(gdk_x11_get_default_xdisplay(), xwin, PropertyChangeMask | ButtonPressMask);
-    XSetSelectionOwner(gdk_x11_get_default_xdisplay(), selection_atom, xwin, GDK_CURRENT_TIME);
-    XSetSelectionOwner(gdk_x11_get_default_xdisplay(), common_selection_atom, xwin, GDK_CURRENT_TIME);
-
-    /* Check to see if we managed to claim the selection. If not,
-     * we treat it as if we got it then immediately lost it */
-    if(XGetSelectionOwner(gdk_x11_get_default_xdisplay(), selection_atom) == xwin) {
-        XClientMessageEvent xev;
-        Window xroot = GDK_WINDOW_XID(gdk_screen_get_root_window(desktop->priv->gscreen));
-        
-        xev.type = ClientMessage;
-        xev.window = xroot;
-        xev.message_type = manager_atom;
-        xev.format = 32;
-        xev.data.l[0] = GDK_CURRENT_TIME;
-        xev.data.l[1] = selection_atom;
-        xev.data.l[2] = xwin;
-        xev.data.l[3] = 0;    /* manager specific data */
-        xev.data.l[4] = 0;    /* manager specific data */
-
-        XSendEvent(gdk_x11_get_default_xdisplay(), xroot, False, StructureNotifyMask, (XEvent *)&xev);
-    } else {
-        g_error("%s: could not set selection ownership", PACKAGE);
-        exit(1);
-    }
-}
-
-
-
-/* gobject-related functions */
-
-
-G_DEFINE_TYPE(XfceDesktop, xfce_desktop, GTK_TYPE_WINDOW)
-
-
-static void
-xfce_desktop_class_init(XfceDesktopClass *klass)
-{
-    GObjectClass *gobject_class = (GObjectClass *)klass;
-    GtkWidgetClass *widget_class = (GtkWidgetClass *)klass;
-    
-    g_type_class_add_private(klass, sizeof(XfceDesktopPriv));
-    
-    gobject_class->finalize = xfce_desktop_finalize;
-    gobject_class->set_property = xfce_desktop_set_property;
-    gobject_class->get_property = xfce_desktop_get_property;
-    
-    widget_class->realize = xfce_desktop_realize;
-    widget_class->unrealize = xfce_desktop_unrealize;
-    widget_class->button_press_event = xfce_desktop_button_press_event;
-    widget_class->button_release_event = xfce_desktop_button_release_event;
-    widget_class->expose_event = xfce_desktop_expose;
-    widget_class->delete_event = xfce_desktop_delete_event;
-    widget_class->popup_menu = xfce_desktop_popup_menu;
-    widget_class->style_set = xfce_desktop_style_set;
-    
-    signals[SIG_POPULATE_ROOT_MENU] = g_signal_new("populate-root-menu",
-                                                   XFCE_TYPE_DESKTOP,
-                                                   G_SIGNAL_RUN_LAST,
-                                                   G_STRUCT_OFFSET(XfceDesktopClass,
-                                                                   populate_root_menu),
-                                                   NULL, NULL,
-                                                   g_cclosure_marshal_VOID__OBJECT,
-                                                   G_TYPE_NONE, 1,
-                                                   GTK_TYPE_MENU_SHELL);
-    
-    signals[SIG_POPULATE_SECONDARY_ROOT_MENU] = g_signal_new("populate-secondary-root-menu",
-                                                             XFCE_TYPE_DESKTOP,
-                                                             G_SIGNAL_RUN_LAST,
-                                                             G_STRUCT_OFFSET(XfceDesktopClass,
-                                                                             populate_secondary_root_menu),
-                                                             NULL, NULL,
-                                                             g_cclosure_marshal_VOID__OBJECT,
-                                                             G_TYPE_NONE, 1,
-                                                             GTK_TYPE_MENU_SHELL);
-
-#define XFDESKTOP_PARAM_FLAGS  (G_PARAM_READWRITE \
-                                | G_PARAM_CONSTRUCT \
-                                | G_PARAM_STATIC_NAME \
-                                | G_PARAM_STATIC_NICK \
-                                | G_PARAM_STATIC_BLURB)
-
-#ifdef ENABLE_DESKTOP_ICONS
-    g_object_class_install_property(gobject_class, PROP_ICON_STYLE,
-                                    g_param_spec_enum("icon-style",
-                                                      "icon style",
-                                                      "icon style",
-                                                      XFCE_TYPE_DESKTOP_ICON_STYLE,
-#ifdef ENABLE_FILE_ICONS
-                                                      XFCE_DESKTOP_ICON_STYLE_FILES,
-#else
-                                                      XFCE_DESKTOP_ICON_STYLE_WINDOWS,
-#endif /* ENABLE_FILE_ICONS */
-                                                      XFDESKTOP_PARAM_FLAGS));
-
-    g_object_class_install_property(gobject_class, PROP_ICON_SIZE,
-                                    g_param_spec_uint("icon-size",
-                                                      "icon size",
-                                                      "icon size",
-                                                      8, 192, 36,
-                                                      XFDESKTOP_PARAM_FLAGS));
-
-    g_object_class_install_property(gobject_class, PROP_ICON_FONT_SIZE,
-                                    g_param_spec_uint("icon-font-size",
-                                                      "icon font size",
-                                                      "icon font size",
-                                                      0, 144, 12,
-                                                      XFDESKTOP_PARAM_FLAGS));
-
-    g_object_class_install_property(gobject_class, PROP_ICON_FONT_SIZE_SET,
-                                    g_param_spec_boolean("icon-font-size-set",
-                                                         "icon font size set",
-                                                         "icon font size set",
-                                                         FALSE,
-                                                         XFDESKTOP_PARAM_FLAGS));
-
-#endif /* ENABLE_DESKTOP_ICONS */
-
-    g_object_class_install_property(gobject_class, PROP_SINGLE_WORKSPACE_MODE,
-                                    g_param_spec_boolean("single-workspace-mode",
-                                                         "single-workspace-mode",
-                                                         "single-workspace-mode",
-                                                         TRUE,
-                                                         XFDESKTOP_PARAM_FLAGS));
-
-    g_object_class_install_property(gobject_class, PROP_SINGLE_WORKSPACE_NUMBER,
-                                    g_param_spec_int("single-workspace-number",
-                                                     "single-workspace-number",
-                                                     "single-workspace-number",
-                                                     0, G_MAXINT16, 0,
-                                                     XFDESKTOP_PARAM_FLAGS));
-
-#undef XFDESKTOP_PARAM_FLAGS
-}
-
-static void
-xfce_desktop_init(XfceDesktop *desktop)
-{
-    desktop->priv = G_TYPE_INSTANCE_GET_PRIVATE(desktop, XFCE_TYPE_DESKTOP,
-                                                XfceDesktopPriv);
-    
-    gtk_window_set_type_hint(GTK_WINDOW(desktop), GDK_WINDOW_TYPE_HINT_DESKTOP);
-    /* Accept focus is needed for the menu pop up either by the menu key on
-     * the keyboard or Shift+F10. */
-    gtk_window_set_accept_focus(GTK_WINDOW(desktop), TRUE);
-    /* Can focus is needed for the gtk_grab_add/remove commands */
-    gtk_widget_set_can_focus(GTK_WIDGET(desktop), TRUE);
-    gtk_window_set_resizable(GTK_WINDOW(desktop), FALSE);
-}
-
-static void
-xfce_desktop_finalize(GObject *object)
-{
-    XfceDesktop *desktop = XFCE_DESKTOP(object);
-
-    g_object_unref(G_OBJECT(desktop->priv->channel));
-    g_free(desktop->priv->property_prefix);
-
-    G_OBJECT_CLASS(xfce_desktop_parent_class)->finalize(object);
-}
-
-static void
-xfce_desktop_set_property(GObject *object,
-                          guint property_id,
-                          const GValue *value,
-                          GParamSpec *pspec)
-{
-    XfceDesktop *desktop = XFCE_DESKTOP(object);
-
-    switch(property_id) {
-#ifdef ENABLE_DESKTOP_ICONS
-        case PROP_ICON_STYLE:
-            xfce_desktop_set_icon_style(desktop,
-                                        g_value_get_enum(value));
-            break;
-
-        case PROP_ICON_SIZE:
-            xfce_desktop_set_icon_size(desktop,
-                                       g_value_get_uint(value));
-            break;
-
-        case PROP_ICON_FONT_SIZE:
-            xfce_desktop_set_icon_font_size(desktop,
-                                            g_value_get_uint(value));
-            break;
-
-        case PROP_ICON_FONT_SIZE_SET:
-            xfce_desktop_set_use_icon_font_size(desktop,
-                                                g_value_get_boolean(value));
-            break;
-
-#endif
-        case PROP_SINGLE_WORKSPACE_MODE:
-            xfce_desktop_set_single_workspace_mode(desktop,
-                                                   g_value_get_boolean(value));
-            break;
-
-        case PROP_SINGLE_WORKSPACE_NUMBER:
-            xfce_desktop_set_single_workspace_number(desktop,
-                                                     g_value_get_int(value));
-            break;
-
-        default:
-            G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
-            break;
-    }
-}
-
-static void
-xfce_desktop_get_property(GObject *object,
-                          guint property_id,
-                          GValue *value,
-                          GParamSpec *pspec)
-{
-    XfceDesktop *desktop = XFCE_DESKTOP(object);
-
-    switch(property_id) {
-#ifdef ENABLE_DESKTOP_ICONS
-        case PROP_ICON_STYLE:
-            g_value_set_enum(value, desktop->priv->icons_style);
-            break;
-
-        case PROP_ICON_SIZE:
-            g_value_set_uint(value, desktop->priv->icons_size);
-            break;
-
-        case PROP_ICON_FONT_SIZE:
-            g_value_set_uint(value, desktop->priv->icons_font_size);
-            break;
-
-        case PROP_ICON_FONT_SIZE_SET:
-            g_value_set_boolean(value, desktop->priv->icons_font_size_set);
-            break;
-
-#endif
-        case PROP_SINGLE_WORKSPACE_MODE:
-            g_value_set_boolean(value, desktop->priv->single_workspace_mode);
-            break;
-
-        case PROP_SINGLE_WORKSPACE_NUMBER:
-            g_value_set_int(value, desktop->priv->single_workspace_num);
-            break;
-
-        default:
-            G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
-            break;
-    }
-}
-
-static void
-xfce_desktop_realize(GtkWidget *widget)
-{
-    XfceDesktop *desktop = XFCE_DESKTOP(widget);
-    GdkAtom atom;
-    gint sw, sh;
-    Window xid;
-    GdkWindow *groot;
-    WnckScreen *wnck_screen;
-    
-    TRACE("entering");
-
-    gtk_window_set_screen(GTK_WINDOW(desktop), desktop->priv->gscreen);
-    sw = gdk_screen_get_width(desktop->priv->gscreen);
-    sh = gdk_screen_get_height(desktop->priv->gscreen);
-
-    g_signal_connect(G_OBJECT(desktop->priv->gscreen),
-                     "monitors-changed",
-                     G_CALLBACK(xfce_desktop_monitors_changed),
-                     desktop);
-    
-    /* chain up */
-    GTK_WIDGET_CLASS(xfce_desktop_parent_class)->realize(widget);
-    
-    gtk_window_set_title(GTK_WINDOW(desktop), _("Desktop"));
-    
-    gtk_widget_set_size_request(GTK_WIDGET(desktop), sw, sh);
-    gtk_window_move(GTK_WINDOW(desktop), 0, 0);
-    
-    atom = gdk_atom_intern("_NET_WM_WINDOW_TYPE_DESKTOP", FALSE);
-    gdk_property_change(gtk_widget_get_window(GTK_WIDGET(desktop)),
-            gdk_atom_intern("_NET_WM_WINDOW_TYPE", FALSE),
-            gdk_atom_intern("ATOM", FALSE), 32,
-            GDK_PROP_MODE_REPLACE, (guchar *)&atom, 1);
-
-    xid = GDK_WINDOW_XID(gtk_widget_get_window(GTK_WIDGET(desktop)));
-    groot = gdk_screen_get_root_window(desktop->priv->gscreen);
-    
-    gdk_property_change(groot,
-            gdk_atom_intern("XFCE_DESKTOP_WINDOW", FALSE),
-            gdk_atom_intern("WINDOW", FALSE), 32,
-            GDK_PROP_MODE_REPLACE, (guchar *)&xid, 1);
-    
-    gdk_property_change(groot,
-            gdk_atom_intern("NAUTILUS_DESKTOP_WINDOW_ID", FALSE),
-            gdk_atom_intern("WINDOW", FALSE), 32,
-            GDK_PROP_MODE_REPLACE, (guchar *)&xid, 1);
-    
-    screen_set_selection(desktop);
-
-    wnck_screen = wnck_screen_get(gdk_screen_get_number(desktop->priv->gscreen));
-    desktop->priv->wnck_screen = wnck_screen;
-
-    /* Watch for single workspace setting changes */
-    xfconf_g_property_bind(desktop->priv->channel,
-                           SINGLE_WORKSPACE_MODE, G_TYPE_BOOLEAN,
-                           G_OBJECT(desktop), "single-workspace-mode");
-    xfconf_g_property_bind(desktop->priv->channel,
-                           SINGLE_WORKSPACE_NUMBER, G_TYPE_INT,
-                           G_OBJECT(desktop), "single-workspace-number");
-
-    /* watch for workspace changes */
-    g_signal_connect(desktop->priv->wnck_screen, "active-workspace-changed",
-                     G_CALLBACK(workspace_changed_cb), desktop);
-    g_signal_connect(desktop->priv->wnck_screen, "workspace-created",
-                     G_CALLBACK(workspace_created_cb), desktop);
-    g_signal_connect(desktop->priv->wnck_screen, "workspace-destroyed",
-                     G_CALLBACK(workspace_destroyed_cb), desktop);
-
-    /* watch for screen changes */
-    g_signal_connect(G_OBJECT(desktop->priv->gscreen), "size-changed",
-            G_CALLBACK(screen_size_changed_cb), desktop);
-    g_signal_connect(G_OBJECT(desktop->priv->gscreen), "composited-changed",
-            G_CALLBACK(screen_composited_changed_cb), desktop);
-
-    gtk_widget_add_events(GTK_WIDGET(desktop), GDK_EXPOSURE_MASK);
-    
-#ifdef ENABLE_DESKTOP_ICONS
-    xfce_desktop_setup_icon_view(desktop);
-#endif
-
-    TRACE("exiting");
-}
-
-static void
-xfce_desktop_unrealize(GtkWidget *widget)
-{
-    XfceDesktop *desktop = XFCE_DESKTOP(widget);
-    gint i;
-    GdkWindow *groot;
-    gchar property_name[128];
-    
-    g_return_if_fail(XFCE_IS_DESKTOP(desktop));
-
-    /* disconnect all the xfconf settings to this desktop */
-    xfconf_g_property_unbind_all(G_OBJECT(desktop));
-
-    g_signal_handlers_disconnect_by_func(G_OBJECT(desktop->priv->gscreen),
-                                         G_CALLBACK(xfce_desktop_monitors_changed),
-                                         desktop);
-    
-    if(gtk_widget_get_mapped(widget))
-        gtk_widget_unmap(widget);
-    gtk_widget_set_mapped(widget, FALSE);
-    
-    gtk_container_forall(GTK_CONTAINER(widget),
-                         (GtkCallback)gtk_widget_unrealize,
-                         NULL);
-    
-    g_signal_handlers_disconnect_by_func(G_OBJECT(desktop->priv->gscreen),
-            G_CALLBACK(screen_size_changed_cb), desktop);
-    g_signal_handlers_disconnect_by_func(G_OBJECT(desktop->priv->gscreen),
-            G_CALLBACK(screen_composited_changed_cb), desktop);
-
-    gdk_error_trap_push();
-    
-    groot = gdk_screen_get_root_window(desktop->priv->gscreen);
-    gdk_property_delete(groot, gdk_atom_intern("XFCE_DESKTOP_WINDOW", FALSE));
-    gdk_property_delete(groot, gdk_atom_intern("NAUTILUS_DESKTOP_WINDOW_ID", FALSE));
-
-#ifndef DISABLE_FOR_BUG7442
-    gdk_property_delete(groot, gdk_atom_intern("_XROOTPMAP_ID", FALSE));
-    gdk_property_delete(groot, gdk_atom_intern("ESETROOT_PMAP_ID", FALSE));
-    gdk_window_set_back_pixmap(groot, NULL, FALSE);
-#endif
-
-    if(desktop->priv->workspaces) {
-        for(i = 0; i < desktop->priv->nworkspaces; i++) {
-            g_snprintf(property_name, 128, XFDESKTOP_IMAGE_FILE_FMT, i);
-            gdk_property_delete(groot, gdk_atom_intern(property_name, FALSE));
-            g_object_unref(G_OBJECT(desktop->priv->workspaces[i]));
-        }
-        g_free(desktop->priv->workspaces);
-        desktop->priv->workspaces = NULL;
-    }
-
-    gdk_flush();
-    gdk_error_trap_pop();
-
-    if(desktop->priv->bg_pixmap) {
-        g_object_unref(G_OBJECT(desktop->priv->bg_pixmap));
-        desktop->priv->bg_pixmap = NULL;
-    }
-    
-    gtk_window_set_icon(GTK_WINDOW(widget), NULL);
-
-    gtk_style_detach(gtk_widget_get_style(widget));
-    g_object_unref(G_OBJECT(gtk_widget_get_window(widget)));
-    gtk_widget_set_window(widget, NULL);
-
-    gtk_selection_remove_all(widget);
-    
-    gtk_widget_set_realized(widget, FALSE);
-}
-
-static gboolean
-xfce_desktop_button_press_event(GtkWidget *w,
-                                GdkEventButton *evt)
-{
-    guint button = evt->button;
-    guint state = evt->state;
-    XfceDesktop *desktop = XFCE_DESKTOP(w);
-
-    TRACE("entering");
-
-    g_return_val_if_fail(XFCE_IS_DESKTOP(w), FALSE);
-
-    if(evt->type == GDK_BUTTON_PRESS) {
-        if(button == 3 || (button == 1 && (state & GDK_SHIFT_MASK))) {
-#ifdef ENABLE_DESKTOP_ICONS
-            /* Let the icon view handle these menu pop ups */
-            if(desktop->priv->icons_style != XFCE_DESKTOP_ICON_STYLE_NONE)
-                return FALSE;
-#endif
-            /* no icons on the desktop, grab the focus and pop up the menu */
-            if(!gtk_widget_has_grab(w))
-                gtk_grab_add(w);
-
-                xfce_desktop_popup_root_menu(desktop, button, evt->time);
-                return TRUE;
-        } else if(button == 2 || (button == 1 && (state & GDK_SHIFT_MASK)
-                                  && (state & GDK_CONTROL_MASK)))
-        {
-            /* always grab the focus and pop up the menu */
-            if(!gtk_widget_has_grab(w))
-                gtk_grab_add(w);
-
-            xfce_desktop_popup_secondary_root_menu(desktop, button, evt->time);
-            return TRUE;
-        }
-    }
-    
-    return FALSE;
-}
-
-static gboolean
-xfce_desktop_button_release_event(GtkWidget *w,
-                                  GdkEventButton *evt)
-{
-    TRACE("entering");
-
-    gtk_grab_remove(w);
-
-    return FALSE;
-}
-
-/* This function gets called when the user presses the menu key on the keyboard.
- * Or Shift+F10 or whatever key binding the user has chosen. */
-static gboolean
-xfce_desktop_popup_menu(GtkWidget *w)
-{
-    GdkEventButton *evt;
-    guint button, etime;
-
-    TRACE("entering");
-
-    evt = (GdkEventButton *)gtk_get_current_event();
-    if(evt && GDK_BUTTON_PRESS == evt->type) {
-        button = evt->button;
-        etime = evt->time;
-    } else {
-        button = 0;
-        etime = gtk_get_current_event_time();
-    }
-    
-    xfce_desktop_popup_root_menu(XFCE_DESKTOP(w), button, etime);
-
-    gdk_event_free((GdkEvent*)evt);
-    return TRUE;
-}
-
-static gboolean
-xfce_desktop_expose(GtkWidget *w,
-                    GdkEventExpose *evt)
-{
-    GList *children, *l;
-    
-    /*TRACE("entering");*/
-    
-    if(evt->count != 0)
-        return FALSE;
-    
-    gdk_window_clear_area(gtk_widget_get_window(w), evt->area.x, evt->area.y,
-                          evt->area.width, evt->area.height);
-    
-    children = gtk_container_get_children(GTK_CONTAINER(w));
-    for(l = children; l; l = l->next) {
-        gtk_container_propagate_expose(GTK_CONTAINER(w),
-                                       GTK_WIDGET(l->data),
-                                       evt);
-    }
-    g_list_free(children);
-    
-    return FALSE;
-}
-
-static gboolean
-xfce_desktop_delete_event(GtkWidget *w,
-                          GdkEventAny *evt)
-{
-    if(XFCE_DESKTOP(w)->priv->session_logout_func)
-        XFCE_DESKTOP(w)->priv->session_logout_func();
-    
-    return TRUE;
-}
-
-static void
-xfce_desktop_style_set(GtkWidget *w, GtkStyle *old_style)
-{
-    XfceDesktop *desktop = XFCE_DESKTOP(w);
-#ifdef ENABLE_DESKTOP_ICONS
-    gdouble old_font_size;
-#endif
-
-    TRACE("entering");
-
-    g_return_if_fail(XFCE_IS_DESKTOP(desktop));
-
-    if(!gtk_widget_get_realized(GTK_WIDGET(desktop)))
-        return;
-
-    if(desktop->priv->workspaces == NULL)
-        return;
-
-    if(GDK_IS_WINDOW(desktop->priv->bg_pixmap))
-        gdk_window_set_back_pixmap(gtk_widget_get_window(GTK_WIDGET(desktop)), desktop->priv->bg_pixmap, FALSE);
-
-    gtk_widget_queue_draw(GTK_WIDGET(desktop));
-
-#ifdef ENABLE_DESKTOP_ICONS
-    if(!desktop->priv->icon_view || !XFDESKTOP_IS_ICON_VIEW(desktop->priv->icon_view))
-        return;
-
-    /* reset the icon view style */
-    gtk_widget_set_style(desktop->priv->icon_view, NULL);
-    gtk_widget_reset_rc_styles(desktop->priv->icon_view);
-
-    old_font_size = desktop->priv->system_font_size;
-    if(xfce_desktop_ensure_system_font_size(desktop) != old_font_size
-       && desktop->priv->icon_view && !desktop->priv->icons_font_size_set)
-    {
-        xfdesktop_icon_view_set_font_size(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view),
-                                          desktop->priv->system_font_size);
-    }
-#endif
-}
-
-static void
-xfce_desktop_connect_settings(XfceDesktop *desktop)
-{
-#ifdef ENABLE_DESKTOP_ICONS
-#define ICONS_PREFIX "/desktop-icons/"
-    XfconfChannel *channel = desktop->priv->channel;
-
-    xfce_desktop_freeze_updates(desktop);
-
-    xfconf_g_property_bind(channel, ICONS_PREFIX "style",
-                           XFCE_TYPE_DESKTOP_ICON_STYLE,
-                           G_OBJECT(desktop), "icon-style");
-    xfconf_g_property_bind(channel, ICONS_PREFIX "icon-size", G_TYPE_UINT,
-                           G_OBJECT(desktop), "icon-size");
-    xfconf_g_property_bind(channel, ICONS_PREFIX "font-size", G_TYPE_UINT,
-                           G_OBJECT(desktop), "icon-font-size");
-    xfconf_g_property_bind(channel, ICONS_PREFIX "use-custom-font-size",
-                           G_TYPE_BOOLEAN,
-                           G_OBJECT(desktop), "icon-font-size-set");
-
-    xfce_desktop_thaw_updates(desktop);
-#undef ICONS_PREFIX
-#endif
-}
-
-static gboolean
-xfce_desktop_get_single_workspace_mode(XfceDesktop *desktop)
-{
-    g_return_val_if_fail(XFCE_IS_DESKTOP(desktop), TRUE);
-
-    return desktop->priv->single_workspace_mode;
-}
-
-static gint
-xfce_desktop_get_current_workspace(XfceDesktop *desktop)
-{
-    WnckWorkspace *wnck_workspace;
-    gint workspace_num, current_workspace;
-
-    g_return_val_if_fail(XFCE_IS_DESKTOP(desktop), -1);
-
-    wnck_workspace = wnck_screen_get_active_workspace(desktop->priv->wnck_screen);
-
-    if(wnck_workspace != NULL) {
-        workspace_num = wnck_workspace_get_number(wnck_workspace);
-    } else {
-        workspace_num = desktop->priv->nworkspaces;
-    }
-
-    /* If we're in single_workspace mode we need to return the workspace that
-     * it was set to, if possible, otherwise return the current workspace */
-    if(xfce_desktop_get_single_workspace_mode(desktop) &&
-       desktop->priv->single_workspace_num < desktop->priv->nworkspaces) {
-        current_workspace = desktop->priv->single_workspace_num;
-    } else {
-        current_workspace = workspace_num;
-    }
-
-    DBG("workspace_num %d, single_workspace_num %d, current_workspace %d, max workspaces %d",
-        workspace_num, desktop->priv->single_workspace_num, current_workspace,
-        desktop->priv->nworkspaces);
-
-    return current_workspace;
-}
-
-/* public api */
-
-/**
- * xfce_desktop_new:
- * @gscreen: The current #GdkScreen.
- * @channel: An #XfconfChannel to use for settings.
- * @property_prefix: String prefix for per-screen properties.
- *
- * Creates a new #XfceDesktop for the specified #GdkScreen.  If @gscreen is
- * %NULL, the default screen will be used.
- *
- * Return value: A new #XfceDesktop.
- **/
-GtkWidget *
-xfce_desktop_new(GdkScreen *gscreen,
-                 XfconfChannel *channel,
-                 const gchar *property_prefix)
-{
-    XfceDesktop *desktop;
-    
-    g_return_val_if_fail(channel && property_prefix, NULL);
-
-    desktop = g_object_new(XFCE_TYPE_DESKTOP, NULL);
-
-    if(!gscreen)
-        gscreen = gdk_display_get_default_screen(gdk_display_get_default());
-    gtk_window_set_screen(GTK_WINDOW(desktop), gscreen);
-    desktop->priv->gscreen = gscreen;
-    
-    desktop->priv->channel = g_object_ref(G_OBJECT(channel));
-    desktop->priv->property_prefix = g_strdup(property_prefix);
-
-    xfce_desktop_connect_settings(desktop);
-    
-    return GTK_WIDGET(desktop);
-}
-
-gint
-xfce_desktop_get_n_monitors(XfceDesktop *desktop)
-{
-    g_return_val_if_fail(XFCE_IS_DESKTOP(desktop), 0);
-    
-    return gdk_screen_get_n_monitors(desktop->priv->gscreen);
-}
-
-gint
-xfce_desktop_get_width(XfceDesktop *desktop)
-{
-    g_return_val_if_fail(XFCE_IS_DESKTOP(desktop), -1);
-    
-    return gdk_screen_get_width(desktop->priv->gscreen);
-}
-
-gint
-xfce_desktop_get_height(XfceDesktop *desktop)
-{
-    g_return_val_if_fail(XFCE_IS_DESKTOP(desktop), -1);
-    
-    return gdk_screen_get_height(desktop->priv->gscreen);
-}
-
-void
-xfce_desktop_set_icon_style(XfceDesktop *desktop,
-                            XfceDesktopIconStyle style)
-{
-    g_return_if_fail(XFCE_IS_DESKTOP(desktop)
-                     && style <= XFCE_DESKTOP_ICON_STYLE_FILES);
-    
-#ifdef ENABLE_DESKTOP_ICONS
-    if(style == desktop->priv->icons_style)
-        return;
-    
-    if(desktop->priv->icon_view) {
-        gtk_widget_destroy(desktop->priv->icon_view);
-        desktop->priv->icon_view = NULL;
-    }
-    
-    desktop->priv->icons_style = style;
-    if(gtk_widget_get_realized(GTK_WIDGET(desktop)))
-        xfce_desktop_setup_icon_view(desktop);
-#endif
-}
-
-XfceDesktopIconStyle
-xfce_desktop_get_icon_style(XfceDesktop *desktop)
-{
-    g_return_val_if_fail(XFCE_IS_DESKTOP(desktop), XFCE_DESKTOP_ICON_STYLE_NONE);
-    
-#ifdef ENABLE_DESKTOP_ICONS
-    return desktop->priv->icons_style;
-#else
-    return XFCE_DESKTOP_ICON_STYLE_NONE;
-#endif
-}
-
-void
-xfce_desktop_set_icon_size(XfceDesktop *desktop,
-                           guint icon_size)
-{
-    g_return_if_fail(XFCE_IS_DESKTOP(desktop));
-    
-#ifdef ENABLE_DESKTOP_ICONS
-    if(icon_size == desktop->priv->icons_size)
-        return;
-    
-    desktop->priv->icons_size = icon_size;
-    
-    if(desktop->priv->icon_view) {
-        xfdesktop_icon_view_set_icon_size(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view),
-                                          icon_size);
-    }
-#endif
-}
-
-void
-xfce_desktop_set_icon_font_size(XfceDesktop *desktop,
-                                guint font_size_points)
-{
-    g_return_if_fail(XFCE_IS_DESKTOP(desktop));
-    
-#ifdef ENABLE_DESKTOP_ICONS
-    if(font_size_points == desktop->priv->icons_font_size)
-        return;
-    
-    desktop->priv->icons_font_size = font_size_points;
-    
-    if(desktop->priv->icons_font_size_set && desktop->priv->icon_view) {
-        xfdesktop_icon_view_set_font_size(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view),
-                                          font_size_points);
-    }
-#endif
-}
-
-void
-xfce_desktop_set_use_icon_font_size(XfceDesktop *desktop,
-                                    gboolean use_icon_font_size)
-{
-    g_return_if_fail(XFCE_IS_DESKTOP(desktop));
-    
-#ifdef ENABLE_DESKTOP_ICONS
-    if(use_icon_font_size == desktop->priv->icons_font_size_set)
-        return;
-    
-    desktop->priv->icons_font_size_set = use_icon_font_size;
-    
-    if(desktop->priv->icon_view) {
-        if(!use_icon_font_size) {
-            xfce_desktop_ensure_system_font_size(desktop);
-            xfdesktop_icon_view_set_font_size(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view),
-                                              desktop->priv->system_font_size);
-        } else {
-            xfdesktop_icon_view_set_font_size(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view),
-                                              desktop->priv->icons_font_size);
-        }
-    }
-#endif
-}
-
-static void
-xfce_desktop_set_single_workspace_mode(XfceDesktop *desktop,
-                                       gboolean single_workspace)
-{
-    gint i;
-
-    g_return_if_fail(XFCE_IS_DESKTOP(desktop));
-
-    if(single_workspace == desktop->priv->single_workspace_mode)
-        return;
-
-    desktop->priv->single_workspace_mode = single_workspace;
-
-    DBG("single_workspace_mode now %s", single_workspace ? "TRUE" : "FALSE");
-
-    /* update the workspaces & backdrops if they should cache their pixbuf */
-    if(desktop->priv->workspaces) {
-        for(i = 0; i < desktop->priv->nworkspaces; i++) {
-            /* set cache to TRUE when single_workspace is FALSE */
-            xfce_workspace_set_cache_pixbufs(desktop->priv->workspaces[i], !single_workspace);
-        }
-    }
-
-    /* If the desktop has been realized then fake a screen size change to
-     * update the backdrop. There's no reason to if there's no desktop yet */
-    if(gtk_widget_get_realized(GTK_WIDGET(desktop)))
-        screen_size_changed_cb(desktop->priv->gscreen, desktop);
-}
-
-static void
-xfce_desktop_set_single_workspace_number(XfceDesktop *desktop,
-                                         gint workspace_num)
-{
-    g_return_if_fail(XFCE_IS_DESKTOP(desktop));
-
-    if(workspace_num == desktop->priv->single_workspace_num)
-        return;
-
-    DBG("single_workspace_num now %d", workspace_num);
-
-    desktop->priv->single_workspace_num = workspace_num;
-
-    if(xfce_desktop_get_single_workspace_mode(desktop)) {
-        /* Fake a screen size changed to update the backdrop */
-        screen_size_changed_cb(desktop->priv->gscreen, desktop);
-    }
-}
-
-void
-xfce_desktop_set_session_logout_func(XfceDesktop *desktop,
-                                     SessionLogoutFunc logout_func)
-{
-    g_return_if_fail(XFCE_IS_DESKTOP(desktop));
-    desktop->priv->session_logout_func = logout_func;
-}
-
-void
-xfce_desktop_freeze_updates(XfceDesktop *desktop)
-{
-    g_return_if_fail(XFCE_IS_DESKTOP(desktop));
-    desktop->priv->updates_frozen = TRUE;
-}
-
-void
-xfce_desktop_thaw_updates(XfceDesktop *desktop)
-{
-    g_return_if_fail(XFCE_IS_DESKTOP(desktop));
-    
-    desktop->priv->updates_frozen = FALSE;
-    if(gtk_widget_get_realized(GTK_WIDGET(desktop)))
-        xfce_desktop_monitors_changed(desktop->priv->gscreen, desktop);
-}
-
-static gboolean
-xfce_desktop_menu_destroy_idled(gpointer data)
-{
-    gtk_widget_destroy(GTK_WIDGET(data));
-    return FALSE;
-}
-
-static void
-xfce_desktop_do_menu_popup(XfceDesktop *desktop,
-                           guint button,
-                           guint activate_time,
-                           guint populate_signal)
-{
-    GdkScreen *screen;
-    GtkWidget *menu;
-    GList *menu_children;
-    
-    TRACE("entering");
-    
-    if(gtk_widget_has_screen(GTK_WIDGET(desktop)))
-        screen = gtk_widget_get_screen(GTK_WIDGET(desktop));
-    else
-        screen = gdk_display_get_default_screen(gdk_display_get_default());
-
-    menu = gtk_menu_new();
-    gtk_menu_set_screen(GTK_MENU(menu), screen);
-    g_signal_connect_swapped(G_OBJECT(menu), "deactivate",
-                             G_CALLBACK(g_idle_add),
-                             (gpointer)xfce_desktop_menu_destroy_idled);
-
-    g_signal_emit(G_OBJECT(desktop), populate_signal, 0, menu);
-
-    /* if nobody populated the menu, don't do anything */
-    menu_children = gtk_container_get_children(GTK_CONTAINER(menu));
-    if(!menu_children) {
-        gtk_widget_destroy(menu);
-        return;
-    }
-
-    g_list_free(menu_children);
-
-    gtk_menu_attach_to_widget(GTK_MENU(menu), GTK_WIDGET(desktop), NULL);
-
-    /* Per gtk_menu_popup's documentation "for conflict-resolve initiation of
-     * concurrent requests for mouse/keyboard grab requests." */
-    if(activate_time == 0)
-        activate_time = gtk_get_current_event_time();
-
-    gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, button, activate_time);
-}
-
-void
-xfce_desktop_popup_root_menu(XfceDesktop *desktop,
-                             guint button,
-                             guint activate_time)
-{
-    TRACE("entering");
-
-    /* If it's launched by xfdesktop --menu we won't have an event time.
-     * Grab the keyboard focus */
-    if(activate_time == 0)
-        activate_time = xfdesktop_popup_keyboard_grab_available(gtk_widget_get_window(GTK_WIDGET(desktop)));
-
-    xfce_desktop_do_menu_popup(desktop, button, activate_time,
-                               signals[SIG_POPULATE_ROOT_MENU]);
-
-}
-
-void
-xfce_desktop_popup_secondary_root_menu(XfceDesktop *desktop,
-                                       guint button,
-                                       guint activate_time)
-{
-    /* If it's launched by xfdesktop --windowlist we won't have an event time.
-     * Grab the keyboard focus */
-    if(activate_time == 0)
-        activate_time = xfdesktop_popup_keyboard_grab_available(gtk_widget_get_window(GTK_WIDGET(desktop)));
-
-    xfce_desktop_do_menu_popup(desktop, button, activate_time,
-                               signals[SIG_POPULATE_SECONDARY_ROOT_MENU]);
-}
-void
-xfce_desktop_refresh(XfceDesktop *desktop)
-{
-    gint i, current_workspace;
-
-    TRACE("entering");
-
-    g_return_if_fail(XFCE_IS_DESKTOP(desktop));
-
-    if(!gtk_widget_get_realized(GTK_WIDGET(desktop)))
-        return;
-
-    if(desktop->priv->workspaces == NULL) {
-        return;
-    }
-
-    current_workspace = xfce_desktop_get_current_workspace(desktop);
-
-    /* reload backgrounds */
-    for(i = 0; i < xfce_desktop_get_n_monitors(desktop); i++) {
-        XfceBackdrop *backdrop;
-
-        backdrop = xfce_workspace_get_backdrop(desktop->priv->workspaces[current_workspace], i);
-
-        backdrop_changed_cb(backdrop, desktop);
-    }
-
-#ifdef ENABLE_DESKTOP_ICONS
-    /* reload icon view */
-    if(desktop->priv->icon_view) {
-        gtk_widget_destroy(desktop->priv->icon_view);
-        desktop->priv->icon_view = NULL;
-    }
-    xfce_desktop_setup_icon_view(desktop);
-#endif
-
-}
-
-void xfce_desktop_arrange_icons(XfceDesktop *desktop)
-{
-    g_return_if_fail(XFCE_IS_DESKTOP(desktop));
-
-#ifdef ENABLE_DESKTOP_ICONS
-    g_return_if_fail(XFDESKTOP_IS_ICON_VIEW(desktop->priv->icon_view));
-
-    xfdesktop_icon_view_sort_icons(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view));
-#endif
-}

=== removed directory '.pc/git-fix-default-icon-size.patch'
=== removed directory '.pc/git-fix-default-icon-size.patch/src'
=== removed file '.pc/git-fix-default-icon-size.patch/src/xfce-desktop.c'
--- .pc/git-fix-default-icon-size.patch/src/xfce-desktop.c	2014-03-28 07:16:04 +0000
+++ .pc/git-fix-default-icon-size.patch/src/xfce-desktop.c	1970-01-01 00:00:00 +0000
@@ -1,1847 +0,0 @@
-/*
- *  xfdesktop - xfce4's desktop manager
- *
- *  Copyright (c) 2004-2007 Brian Tarricone, <[e-mail]>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software Foundation,
- *  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- *
- *  Random portions taken from or inspired by the original xfdesktop for xfce4:
- *     Copyright (C) 2002-2003 Jasper Huijsmans ([e-mail])
- *     Copyright (C) 2003 Benedikt Meurer <[e-mail]>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-
-#include <ctype.h>
-#include <errno.h>
-
-#ifdef HAVE_TIME_H
-#include <time.h>
-#endif
-
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-
-#include <glib.h>
-#include <gdk/gdkx.h>
-#include <gtk/gtk.h>
-#include <gio/gio.h>
-
-#ifdef ENABLE_DESKTOP_ICONS
-#include "xfdesktop-icon-view.h"
-#include "xfdesktop-window-icon-manager.h"
-# ifdef ENABLE_FILE_ICONS
-# include "xfdesktop-file-icon-manager.h"
-# include "xfdesktop-special-file-icon.h"
-# endif
-#endif
-
-#include <libxfce4util/libxfce4util.h>
-#include <libxfce4ui/libxfce4ui.h>
-
-#include <xfconf/xfconf.h>
-#include <libwnck/libwnck.h>
-
-#include "xfdesktop-common.h"
-#include "xfce-desktop.h"
-#include "xfce-desktop-enum-types.h"
-#include "xfce-workspace.h"
-
-/* disable setting the x background for bug 7442 */
-//#define DISABLE_FOR_BUG7442
-
-struct _XfceDesktopPriv
-{
-    GdkScreen *gscreen;
-    WnckScreen *wnck_screen;
-    gboolean updates_frozen;
-
-    XfconfChannel *channel;
-    gchar *property_prefix;
-    
-    GdkPixmap *bg_pixmap;
-    
-    gint nworkspaces;
-    XfceWorkspace **workspaces;
-    gint current_workspace;
-
-    gboolean single_workspace_mode;
-    gint single_workspace_num;
-
-    SessionLogoutFunc session_logout_func;
-
-    guint32 grab_time;
-
-#ifdef ENABLE_DESKTOP_ICONS
-    XfceDesktopIconStyle icons_style;
-    gboolean icons_font_size_set;
-    guint icons_font_size;
-    guint icons_size;
-    gint  style_refresh_timer;
-    GtkWidget *icon_view;
-    gdouble system_font_size;
-#endif
-};
-
-enum
-{
-    SIG_POPULATE_ROOT_MENU = 0,
-    SIG_POPULATE_SECONDARY_ROOT_MENU,
-    N_SIGNALS
-};
-
-enum
-{
-    PROP_0 = 0,
-#ifdef ENABLE_DESKTOP_ICONS
-    PROP_ICON_STYLE,
-    PROP_ICON_SIZE,
-    PROP_ICON_FONT_SIZE,
-    PROP_ICON_FONT_SIZE_SET,
-#endif
-    PROP_SINGLE_WORKSPACE_MODE,
-    PROP_SINGLE_WORKSPACE_NUMBER,
-};
-
-
-static void xfce_desktop_finalize(GObject *object);
-static void xfce_desktop_set_property(GObject *object,
-                                      guint property_id,
-                                      const GValue *value,
-                                      GParamSpec *pspec);
-static void xfce_desktop_get_property(GObject *object,
-                                      guint property_id,
-                                      GValue *value,
-                                      GParamSpec *pspec);
-
-static void xfce_desktop_realize(GtkWidget *widget);
-static void xfce_desktop_unrealize(GtkWidget *widget);
-static gboolean xfce_desktop_button_press_event(GtkWidget *widget,
-                                                GdkEventButton *evt);
-static gboolean xfce_desktop_button_release_event(GtkWidget *widget,
-                                                  GdkEventButton *evt);
-static gboolean xfce_desktop_popup_menu(GtkWidget *widget);
-
-static gboolean xfce_desktop_expose(GtkWidget *w,
-                                    GdkEventExpose *evt);
-static gboolean xfce_desktop_delete_event(GtkWidget *w,
-                                          GdkEventAny *evt);
-static void xfce_desktop_style_set(GtkWidget *w,
-                                   GtkStyle *old_style);
-
-static void xfce_desktop_set_single_workspace_mode(XfceDesktop *desktop,
-                                                   gboolean single_workspace);
-static void xfce_desktop_set_single_workspace_number(XfceDesktop *desktop,
-                                                     gint workspace_num);
-
-static gboolean xfce_desktop_get_single_workspace_mode(XfceDesktop *desktop);
-static gint xfce_desktop_get_current_workspace(XfceDesktop *desktop);
-
-static guint signals[N_SIGNALS] = { 0, };
-
-/* private functions */
-
-#ifdef ENABLE_DESKTOP_ICONS
-static gdouble
-xfce_desktop_ensure_system_font_size(XfceDesktop *desktop)
-{
-    GdkScreen *gscreen;
-    GtkSettings *settings;
-    gchar *font_name = NULL;
-    PangoFontDescription *pfd;
-    
-    gscreen = gtk_widget_get_screen(GTK_WIDGET(desktop));
-    
-    settings = gtk_settings_get_for_screen(gscreen);
-    g_object_get(G_OBJECT(settings), "gtk-font-name", &font_name, NULL);
-    
-    pfd = pango_font_description_from_string(font_name);
-    desktop->priv->system_font_size = pango_font_description_get_size(pfd);
-    /* FIXME: this seems backwards from the documentation */
-    if(!pango_font_description_get_size_is_absolute(pfd)) {
-        DBG("dividing by PANGO_SCALE");
-        desktop->priv->system_font_size /= PANGO_SCALE;
-    }
-    DBG("system font size is %.05f", desktop->priv->system_font_size);
-    
-    g_free(font_name);
-    pango_font_description_free(pfd);
-    
-    return desktop->priv->system_font_size;
-}
-
-static void
-xfce_desktop_setup_icon_view(XfceDesktop *desktop)
-{
-    XfdesktopIconViewManager *manager = NULL;
-    
-    switch(desktop->priv->icons_style) {
-        case XFCE_DESKTOP_ICON_STYLE_NONE:
-            /* nada */
-            break;
-        
-        case XFCE_DESKTOP_ICON_STYLE_WINDOWS:
-            manager = xfdesktop_window_icon_manager_new(desktop->priv->gscreen);
-            break;
-        
-#ifdef ENABLE_FILE_ICONS
-        case XFCE_DESKTOP_ICON_STYLE_FILES:
-            {
-                GFile *file;
-                const gchar *desktop_path;
-                
-                desktop_path = g_get_user_special_dir(G_USER_DIRECTORY_DESKTOP);
-                file = g_file_new_for_path(desktop_path);
-                manager = xfdesktop_file_icon_manager_new(file, desktop->priv->channel);
-                g_object_unref(file);
-            }
-            break;
-#endif
-        
-        default:
-            g_critical("Unusable XfceDesktopIconStyle: %d.  Unable to " \
-                       "display desktop icons.",
-                       desktop->priv->icons_style);
-            break;
-    }
-    
-    if(manager) {
-        xfce_desktop_ensure_system_font_size(desktop);
-        
-        desktop->priv->icon_view = xfdesktop_icon_view_new(manager);
-        /* If the user set a custom font size, use it. Otherwise use the system
-         * font size */
-        xfdesktop_icon_view_set_font_size(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view),
-                                          (!desktop->priv->icons_font_size_set)
-                                          ? desktop->priv->system_font_size
-                                          : desktop->priv->icons_font_size);
-        if(desktop->priv->icons_size > 0) {
-            xfdesktop_icon_view_set_icon_size(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view),
-                                              desktop->priv->icons_size);
-        }
-        gtk_widget_show(desktop->priv->icon_view);
-        gtk_container_add(GTK_CONTAINER(desktop), desktop->priv->icon_view);
-    }
-    
-    gtk_widget_queue_draw(GTK_WIDGET(desktop));
-}
-#endif
-
-static void
-set_imgfile_root_property(XfceDesktop *desktop, const gchar *filename,
-        gint monitor)
-{
-    gchar property_name[128];
-    
-    gdk_error_trap_push();
-    
-    g_snprintf(property_name, 128, XFDESKTOP_IMAGE_FILE_FMT, monitor);
-    if(filename) {
-        gdk_property_change(gdk_screen_get_root_window(desktop->priv->gscreen),
-                            gdk_atom_intern(property_name, FALSE),
-                            gdk_x11_xatom_to_atom(XA_STRING), 8,
-                            GDK_PROP_MODE_REPLACE,
-                            (guchar *)filename, strlen(filename)+1);
-    } else {
-        gdk_property_delete(gdk_screen_get_root_window(desktop->priv->gscreen),
-                            gdk_atom_intern(property_name, FALSE));
-    }
-    
-    gdk_error_trap_pop();
-}
-
-static void
-set_real_root_window_pixmap(GdkScreen *gscreen,
-                            GdkPixmap *pmap)
-{
-#ifndef DISABLE_FOR_BUG7442
-    Window xid;
-    GdkWindow *groot;
-    
-    xid = GDK_DRAWABLE_XID(pmap);
-    groot = gdk_screen_get_root_window(gscreen);
-    
-    gdk_error_trap_push();
-    
-    /* set root property for transparent Eterms */
-    gdk_property_change(groot,
-            gdk_atom_intern("_XROOTPMAP_ID", FALSE),
-            gdk_atom_intern("PIXMAP", FALSE), 32,
-            GDK_PROP_MODE_REPLACE, (guchar *)&xid, 1);
-    /* and set the root window's BG pixmap, because aterm is somewhat lame. */
-    gdk_window_set_back_pixmap(groot, pmap, FALSE);
-    /* there really should be a standard for this crap... */
-
-    gdk_error_trap_pop();
-#endif
-}
-
-static GdkPixmap *
-create_bg_pixmap(GdkScreen *gscreen, gpointer user_data)
-{
-    XfceDesktop *desktop = user_data;
-    gint w, h;
-
-    TRACE("entering");
-
-    g_return_val_if_fail(XFCE_IS_DESKTOP(desktop), NULL);
-
-    /* If the workspaces haven't been created yet there's no need to do the
-     * background pixmap */
-    if(desktop->priv->workspaces == NULL) {
-        DBG("exiting, desktop->priv->workspaces == NULL");
-        return NULL;
-    }
-
-    TRACE("really entering");
-
-    w = gdk_screen_get_width(gscreen);
-    h = gdk_screen_get_height(gscreen);
-    gtk_widget_set_size_request(GTK_WIDGET(desktop), w, h);
-    gtk_window_resize(GTK_WINDOW(desktop), w, h);
-
-    if(desktop->priv->bg_pixmap)
-        g_object_unref(G_OBJECT(desktop->priv->bg_pixmap));
-    desktop->priv->bg_pixmap = gdk_pixmap_new(GDK_DRAWABLE(gtk_widget_get_window(GTK_WIDGET(desktop))),
-                                              w, h, -1);
-
-    if(!GDK_IS_PIXMAP(desktop->priv->bg_pixmap))
-        return NULL;
-
-    gdk_window_set_back_pixmap(gtk_widget_get_window(GTK_WIDGET(desktop)),
-                               desktop->priv->bg_pixmap, FALSE);
-
-    return desktop->priv->bg_pixmap;
-}
-
-static void
-set_accountsservice_user_bg(const gchar *filename)
-{
-    GDBusProxy *proxy = NULL;
-    GDBusProxy *user = NULL;
-    GVariant *variant = NULL;
-    GError *error = NULL;
-    gchar *object_path = NULL;
-    const gchar *user_name = g_get_user_name();
-
-    proxy = g_dbus_proxy_new_for_bus_sync(G_BUS_TYPE_SYSTEM,
-                                          G_DBUS_PROXY_FLAGS_NONE,
-                                          NULL,
-                                          "org.freedesktop.Accounts",
-                                          "/org/freedesktop/Accounts",
-                                          "org.freedesktop.Accounts",
-                                          NULL,
-                                          &error);
-
-    if(!proxy) {
-        DBG("Failed to contact accounts service: %s", error->message);
-        g_error_free(error);
-        return;
-    }
-
-    variant = g_dbus_proxy_call_sync(proxy,
-                                     "FindUserByName",
-                                     g_variant_new("(s)", user_name),
-                                     G_DBUS_CALL_FLAGS_NONE,
-                                     -1,
-                                     NULL,
-                                     &error);
-
-    if(!variant) {
-        DBG("Could not contact accounts service to look up '%s': %s",
-            user_name, error->message);
-        g_error_free(error);
-        goto bail;
-    }
-
-    g_variant_get(variant, "(o)", &object_path);
-    user = g_dbus_proxy_new_for_bus_sync(G_BUS_TYPE_SYSTEM,
-                                         G_DBUS_PROXY_FLAGS_NONE,
-                                         NULL,
-                                         "org.freedesktop.Accounts",
-                                         object_path,
-                                         "org.freedesktop.Accounts.User",
-                                         NULL,
-                                         &error);
-    g_free(object_path);
-
-    if(!user) {
-        DBG("Could not create proxy for user '%s': %s",
-            g_variant_get_string(variant, NULL), error->message);
-        g_error_free(error);
-        goto bail;
-    }
-    g_variant_unref(variant);
-
-    variant = g_dbus_proxy_call_sync(user,
-                                     "SetBackgroundFile",
-                                     g_variant_new("(s)", filename),
-                                     G_DBUS_CALL_FLAGS_NONE,
-                                     -1,
-                                     NULL,
-                                     &error);
-
-    if(!variant) {
-        DBG("Failed to set the background '%s': %s", filename, error->message);
-        g_error_free(error);
-        goto bail;
-    }
-
-bail:
-    if(user)
-        g_object_unref(user);
-    if(proxy)
-        g_object_unref(proxy);
-    if(variant)
-        g_variant_unref(variant);
-}
-
-static void
-backdrop_changed_cb(XfceBackdrop *backdrop, gpointer user_data)
-{
-    XfceDesktop *desktop = XFCE_DESKTOP(user_data);
-    GdkPixmap *pmap = desktop->priv->bg_pixmap;
-    GdkScreen *gscreen = desktop->priv->gscreen;
-    GdkRectangle rect;
-    GdkRegion *clip_region = NULL;
-    gint i, monitor = -1, current_workspace;
-#ifdef G_ENABLE_DEBUG
-    gchar *monitor_name = NULL;
-#endif
-
-    TRACE("entering");
-    
-    g_return_if_fail(XFCE_IS_DESKTOP(desktop));
-
-    if(!XFCE_IS_BACKDROP(backdrop))
-        return;
-
-    if(desktop->priv->updates_frozen || !gtk_widget_get_realized(GTK_WIDGET(desktop)))
-        return;
-
-    TRACE("really entering");
-
-    current_workspace = xfce_desktop_get_current_workspace(desktop);
-
-    /* Find out which monitor the backdrop is on */
-    for(i = 0; i < xfce_desktop_get_n_monitors(desktop); i++) {
-        if(backdrop == xfce_workspace_get_backdrop(desktop->priv->workspaces[current_workspace], i)) {
-            monitor = i;
-            break;
-        }
-    }
-    if(monitor == -1)
-        return;
-    /* notify Accountsservice of the new bg (only for monitor0) */
-    if(monitor == 0)
-        if (xfce_desktop_get_current_workspace(desktop) == 0)
-            set_accountsservice_user_bg(xfce_backdrop_get_image_filename(backdrop));
-
-#ifdef G_ENABLE_DEBUG
-    monitor_name = gdk_screen_get_monitor_plug_name(gscreen, monitor);
-
-    DBG("backdrop changed for workspace %d, monitor %d (%s)", current_workspace, monitor, monitor_name);
-
-    g_free(monitor_name);
-#endif
-
-    if(xfce_desktop_get_n_monitors(desktop) > 1
-       && xfce_workspace_get_xinerama_stretch(desktop->priv->workspaces[current_workspace])) {
-        /* Spanning screens */
-        GdkRectangle monitor_rect;
-
-        gdk_screen_get_monitor_geometry(gscreen, 0, &rect);
-        /* Get the lowest x and y value for all the monitors in
-         * case none of them start at 0,0 for whatever reason.
-         */
-        for(i = 1; i < xfce_desktop_get_n_monitors(desktop); i++) {
-            gdk_screen_get_monitor_geometry(gscreen, i, &monitor_rect);
-
-            if(monitor_rect.x < rect.x)
-                rect.x = monitor_rect.x;
-            if(monitor_rect.y < rect.y)
-                rect.y = monitor_rect.y;
-        }
-
-        rect.width = gdk_screen_get_width(gscreen);
-        rect.height = gdk_screen_get_height(gscreen);
-        DBG("xinerama_stretch x %d, y %d, width %d, height %d",
-            rect.x, rect.y, rect.width, rect.height);
-    } else {
-        gdk_screen_get_monitor_geometry(gscreen, monitor, &rect);
-        DBG("monitor x %d, y %d, width %d, height %d",
-            rect.x, rect.y, rect.width, rect.height);
-    }
-
-    xfce_backdrop_set_size(backdrop, rect.width, rect.height);
-
-    if(monitor > 0
-       && !xfce_workspace_get_xinerama_stretch(desktop->priv->workspaces[current_workspace])) {
-        clip_region = gdk_region_rectangle(&rect);
-
-        DBG("clip_region: x: %d, y: %d, w: %d, h: %d",
-            rect.x, rect.y, rect.width, rect.height);
-
-        /* If we are not monitor 0 on a multi-monitor setup we need to subtract
-         * all the previous monitor regions so we don't draw over them. This
-         * should prevent the overlap and double backdrop drawing bugs.
-         */
-        for(i = 0; i < monitor; i++) {
-            GdkRectangle previous_monitor;
-            GdkRegion *previous_region;
-            gdk_screen_get_monitor_geometry(gscreen, i, &previous_monitor);
-
-            DBG("previous_monitor: x: %d, y: %d, w: %d, h: %d",
-                previous_monitor.x, previous_monitor.y,
-                previous_monitor.width, previous_monitor.height);
-
-            previous_region = gdk_region_rectangle(&previous_monitor);
-
-            gdk_region_subtract(clip_region, previous_region);
-
-            gdk_region_destroy(previous_region);
-        }
-    }
-
-    if(clip_region != NULL) {
-        /* Update the area to redraw to limit the icons/area painted */
-        gdk_region_get_clipbox(clip_region, &rect);
-        DBG("area to update: x: %d, y: %d, w: %d, h: %d",
-            rect.x, rect.y, rect.width, rect.height);
-    }
-
-    if(rect.width != 0 && rect.height != 0) {
-        /* get the composited backdrop pixmap */
-        GdkPixbuf *pix = xfce_backdrop_get_pixbuf(backdrop);
-        cairo_t *cr;
-
-        /* create the backdrop if needed */
-        if(!pix) {
-            xfce_backdrop_generate_async(backdrop);
-
-            if(clip_region != NULL)
-                gdk_region_destroy(clip_region);
-
-            return;
-        }
-
-        /* Create the background pixmap if it isn't already */
-        if(!GDK_IS_PIXMAP(pmap)) {
-            pmap = create_bg_pixmap(gscreen, desktop);
-
-            if(!GDK_IS_PIXMAP(pmap)) {
-                g_object_unref(pix);
-
-                if(clip_region != NULL)
-                    gdk_region_destroy(clip_region);
-
-                return;
-            }
-        }
-
-        cr = gdk_cairo_create(GDK_DRAWABLE(pmap));
-        gdk_cairo_set_source_pixbuf(cr, pix, rect.x, rect.y);
-
-        /* clip the area so we don't draw over a previous wallpaper */
-        if(clip_region != NULL) {
-            gdk_cairo_region(cr, clip_region);
-            cairo_clip(cr);
-        }
-
-        cairo_paint(cr);
-
-        /* tell gtk to redraw the repainted area */
-        gtk_widget_queue_draw_area(GTK_WIDGET(desktop), rect.x, rect.y,
-                                   rect.width, rect.height);
-
-        set_imgfile_root_property(desktop,
-                                  xfce_backdrop_get_image_filename(backdrop),
-                                  monitor);
-
-        /* do this again so apps watching the root win notice the update */
-        set_real_root_window_pixmap(gscreen, pmap);
-
-        g_object_unref(G_OBJECT(pix));
-        cairo_destroy(cr);
-        gtk_widget_show(GTK_WIDGET(desktop));
-    }
-
-    if(clip_region != NULL)
-        gdk_region_destroy(clip_region);
-}
-
-static void
-screen_size_changed_cb(GdkScreen *gscreen, gpointer user_data)
-{
-    XfceDesktop *desktop = user_data;
-    gint current_workspace;
-
-    TRACE("entering");
-
-    current_workspace = xfce_desktop_get_current_workspace(desktop);
-
-    if(desktop->priv->nworkspaces <= current_workspace)
-        return;
-
-    if(current_workspace < 0)
-        return;
-
-    /* release the bg_pixmap since the dimensions may have changed */
-    if(desktop->priv->bg_pixmap) {
-        g_object_unref(desktop->priv->bg_pixmap);
-        desktop->priv->bg_pixmap = NULL;
-    }
-
-    /* special case for 1 backdrop to handle xinerama stretching */
-    if(xfce_workspace_get_xinerama_stretch(desktop->priv->workspaces[current_workspace])) {
-       backdrop_changed_cb(xfce_workspace_get_backdrop(desktop->priv->workspaces[current_workspace], 0), desktop);
-    } else {
-        gint i;
-
-        for(i = 0; i < xfce_desktop_get_n_monitors(desktop); i++) {
-            XfceBackdrop *current_backdrop;
-            current_backdrop = xfce_workspace_get_backdrop(desktop->priv->workspaces[current_workspace], i);
-            backdrop_changed_cb(current_backdrop, desktop);
-        }
-    }
-}
-
-static void
-screen_composited_changed_cb(GdkScreen *gscreen,
-                             gpointer user_data)
-{
-    TRACE("entering");
-    /* fake a screen size changed, so the background is properly set */
-    screen_size_changed_cb(gscreen, user_data);
-}
-
-static void
-xfce_desktop_monitors_changed(GdkScreen *gscreen,
-                              gpointer user_data)
-{
-    XfceDesktop *desktop = XFCE_DESKTOP(user_data);
-    gint i;
-
-    TRACE("entering");
-
-    /* Update the workspaces */
-    for(i = 0; i < desktop->priv->nworkspaces; i++) {
-        xfce_workspace_monitors_changed(desktop->priv->workspaces[i],
-                                        gscreen);
-    }
-
-    /* fake a screen size changed, so the background is properly set */
-    screen_size_changed_cb(gscreen, user_data);
-}
-
-static void
-workspace_backdrop_changed_cb(XfceWorkspace *workspace,
-                              XfceBackdrop  *backdrop,
-                              gpointer user_data)
-{
-    XfceDesktop *desktop = XFCE_DESKTOP(user_data);
-
-    TRACE("entering");
-
-    g_return_if_fail(XFCE_IS_WORKSPACE(workspace) && XFCE_IS_BACKDROP(backdrop));
-
-    if(xfce_desktop_get_current_workspace(desktop) == xfce_workspace_get_workspace_num(workspace))
-        backdrop_changed_cb(backdrop, user_data);
-}
-
-static void
-workspace_changed_cb(WnckScreen *wnck_screen,
-                     WnckWorkspace *previously_active_space,
-                     gpointer user_data)
-{
-    XfceDesktop *desktop = XFCE_DESKTOP(user_data);
-    gint current_workspace, new_workspace, i;
-    XfceBackdrop *current_backdrop, *new_backdrop;
-
-    TRACE("entering");
-
-    /* Ignore workspace changes in single workspace mode so long as we
-     * already have the bg_pixmap loaded */
-    if(xfce_desktop_get_single_workspace_mode(desktop) && desktop->priv->bg_pixmap)
-        return;
-
-    current_workspace = desktop->priv->current_workspace;
-    new_workspace = xfce_desktop_get_current_workspace(desktop);
-
-    if(new_workspace < 0 || new_workspace >= desktop->priv->nworkspaces)
-        return;
-
-    desktop->priv->current_workspace = new_workspace;
-
-    DBG("current_workspace %d, new_workspace %d",
-        current_workspace, new_workspace);
-
-    for(i = 0; i < xfce_desktop_get_n_monitors(desktop); i++) {
-        /* We want to compare the current workspace backdrop with the new one
-         * and see if we can avoid changing them if they are the same image/style */
-        if(current_workspace < desktop->priv->nworkspaces && current_workspace >= 0) {
-            current_backdrop = xfce_workspace_get_backdrop(desktop->priv->workspaces[current_workspace], i);
-            new_backdrop = xfce_workspace_get_backdrop(desktop->priv->workspaces[new_workspace], i);
-
-            if(!xfce_backdrop_compare_backdrops(current_backdrop, new_backdrop) || !desktop->priv->bg_pixmap) {
-                /* only update monitors that require it */
-                backdrop_changed_cb(new_backdrop, user_data);
-            }
-        } else {
-            /* If current_workspace was removed or never existed, get the new
-             * backdrop and apply it */
-            new_backdrop = xfce_workspace_get_backdrop(desktop->priv->workspaces[new_workspace], i);
-            backdrop_changed_cb(new_backdrop, user_data);
-        }
-
-        /* When we're spanning screens we only care about the first monitor */
-        if(xfce_workspace_get_xinerama_stretch(desktop->priv->workspaces[new_workspace]))
-            break;
-    }
-}
-
-static void
-workspace_created_cb(WnckScreen *wnck_screen,
-                     WnckWorkspace *new_workspace,
-                     gpointer user_data)
-{
-    XfceDesktop *desktop = XFCE_DESKTOP(user_data);
-    gint nlast_workspace;
-    TRACE("entering");
-
-    nlast_workspace = desktop->priv->nworkspaces;
-
-    /* add one more workspace */
-    desktop->priv->nworkspaces = nlast_workspace + 1;
-
-    /* allocate size for it */
-    desktop->priv->workspaces = g_realloc(desktop->priv->workspaces,
-                                          desktop->priv->nworkspaces * sizeof(XfceWorkspace *));
-
-    /* create the new workspace and set it up */
-    desktop->priv->workspaces[nlast_workspace] = xfce_workspace_new(desktop->priv->gscreen,
-                                                                    desktop->priv->channel,
-                                                                    desktop->priv->property_prefix,
-                                                                    nlast_workspace);
-
-    /* Tell workspace whether to cache pixbufs */
-    xfce_workspace_set_cache_pixbufs(desktop->priv->workspaces[nlast_workspace],
-                                     !desktop->priv->single_workspace_mode);
-
-    xfce_workspace_monitors_changed(desktop->priv->workspaces[nlast_workspace],
-                                    desktop->priv->gscreen);
-
-    g_signal_connect(desktop->priv->workspaces[nlast_workspace],
-                     "workspace-backdrop-changed",
-                     G_CALLBACK(workspace_backdrop_changed_cb), desktop);
-}
-
-static void
-workspace_destroyed_cb(WnckScreen *wnck_screen,
-                     WnckWorkspace *old_workspace,
-                     gpointer user_data)
-{
-    XfceDesktop *desktop = XFCE_DESKTOP(user_data);
-    gint nlast_workspace;
-    TRACE("entering");
-
-    g_return_if_fail(XFCE_IS_DESKTOP(desktop));
-    g_return_if_fail(desktop->priv->nworkspaces - 1 >= 0);
-    g_return_if_fail(XFCE_IS_WORKSPACE(desktop->priv->workspaces[desktop->priv->nworkspaces-1]));
-
-    nlast_workspace = desktop->priv->nworkspaces - 1;
-
-    g_signal_handlers_disconnect_by_func(desktop->priv->workspaces[nlast_workspace],
-                                         G_CALLBACK(workspace_backdrop_changed_cb),
-                                         desktop);
-
-    g_object_unref(desktop->priv->workspaces[nlast_workspace]);
-
-    /* Remove one workspace */
-    desktop->priv->nworkspaces = nlast_workspace;
-
-    /* deallocate it */
-    desktop->priv->workspaces = g_realloc(desktop->priv->workspaces,
-                                          desktop->priv->nworkspaces * sizeof(XfceWorkspace *));
-
-    /* Make sure we stay within bounds now that we removed a workspace */
-    if(desktop->priv->current_workspace > desktop->priv->nworkspaces)
-        desktop->priv->current_workspace = desktop->priv->nworkspaces;
-}
-
-static void
-screen_set_selection(XfceDesktop *desktop)
-{
-    Window xwin;
-    gint xscreen;
-    gchar selection_name[100], common_selection_name[32];
-    Atom selection_atom, common_selection_atom, manager_atom;
-    
-    xwin = GDK_WINDOW_XID(gtk_widget_get_window(GTK_WIDGET(desktop)));
-    xscreen = gdk_screen_get_number(desktop->priv->gscreen);
-    
-    g_snprintf(selection_name, 100, XFDESKTOP_SELECTION_FMT, xscreen);
-    selection_atom = XInternAtom(gdk_x11_get_default_xdisplay(), selection_name, False);
-    manager_atom = XInternAtom(gdk_x11_get_default_xdisplay(), "MANAGER", False);
-
-    g_snprintf(common_selection_name, 32, "_NET_DESKTOP_MANAGER_S%d", xscreen);
-    common_selection_atom = XInternAtom(gdk_x11_get_default_xdisplay(), common_selection_name, False);
-
-    /* the previous check in src/main.c occurs too early, so workaround by
-     * adding this one. */
-   if(XGetSelectionOwner(gdk_x11_get_default_xdisplay(), selection_atom) != None) {
-       g_warning("%s: already running, quitting.", PACKAGE);
-       exit(0);
-   }
-
-    /* Check that _NET_DESKTOP_MANAGER_S%d isn't set, as it means another
-     * desktop manager is running, e.g. nautilus */
-    if(XGetSelectionOwner (gdk_x11_get_default_xdisplay(), common_selection_atom) != None) {
-        g_warning("%s: another desktop manager is running.", PACKAGE);
-        exit(1);
-    }
-
-    XSelectInput(gdk_x11_get_default_xdisplay(), xwin, PropertyChangeMask | ButtonPressMask);
-    XSetSelectionOwner(gdk_x11_get_default_xdisplay(), selection_atom, xwin, GDK_CURRENT_TIME);
-    XSetSelectionOwner(gdk_x11_get_default_xdisplay(), common_selection_atom, xwin, GDK_CURRENT_TIME);
-
-    /* Check to see if we managed to claim the selection. If not,
-     * we treat it as if we got it then immediately lost it */
-    if(XGetSelectionOwner(gdk_x11_get_default_xdisplay(), selection_atom) == xwin) {
-        XClientMessageEvent xev;
-        Window xroot = GDK_WINDOW_XID(gdk_screen_get_root_window(desktop->priv->gscreen));
-        
-        xev.type = ClientMessage;
-        xev.window = xroot;
-        xev.message_type = manager_atom;
-        xev.format = 32;
-        xev.data.l[0] = GDK_CURRENT_TIME;
-        xev.data.l[1] = selection_atom;
-        xev.data.l[2] = xwin;
-        xev.data.l[3] = 0;    /* manager specific data */
-        xev.data.l[4] = 0;    /* manager specific data */
-
-        XSendEvent(gdk_x11_get_default_xdisplay(), xroot, False, StructureNotifyMask, (XEvent *)&xev);
-    } else {
-        g_error("%s: could not set selection ownership", PACKAGE);
-        exit(1);
-    }
-}
-
-
-
-/* gobject-related functions */
-
-
-G_DEFINE_TYPE(XfceDesktop, xfce_desktop, GTK_TYPE_WINDOW)
-
-
-static void
-xfce_desktop_class_init(XfceDesktopClass *klass)
-{
-    GObjectClass *gobject_class = (GObjectClass *)klass;
-    GtkWidgetClass *widget_class = (GtkWidgetClass *)klass;
-    
-    g_type_class_add_private(klass, sizeof(XfceDesktopPriv));
-    
-    gobject_class->finalize = xfce_desktop_finalize;
-    gobject_class->set_property = xfce_desktop_set_property;
-    gobject_class->get_property = xfce_desktop_get_property;
-    
-    widget_class->realize = xfce_desktop_realize;
-    widget_class->unrealize = xfce_desktop_unrealize;
-    widget_class->button_press_event = xfce_desktop_button_press_event;
-    widget_class->button_release_event = xfce_desktop_button_release_event;
-    widget_class->expose_event = xfce_desktop_expose;
-    widget_class->delete_event = xfce_desktop_delete_event;
-    widget_class->popup_menu = xfce_desktop_popup_menu;
-    widget_class->style_set = xfce_desktop_style_set;
-    
-    signals[SIG_POPULATE_ROOT_MENU] = g_signal_new("populate-root-menu",
-                                                   XFCE_TYPE_DESKTOP,
-                                                   G_SIGNAL_RUN_LAST,
-                                                   G_STRUCT_OFFSET(XfceDesktopClass,
-                                                                   populate_root_menu),
-                                                   NULL, NULL,
-                                                   g_cclosure_marshal_VOID__OBJECT,
-                                                   G_TYPE_NONE, 1,
-                                                   GTK_TYPE_MENU_SHELL);
-    
-    signals[SIG_POPULATE_SECONDARY_ROOT_MENU] = g_signal_new("populate-secondary-root-menu",
-                                                             XFCE_TYPE_DESKTOP,
-                                                             G_SIGNAL_RUN_LAST,
-                                                             G_STRUCT_OFFSET(XfceDesktopClass,
-                                                                             populate_secondary_root_menu),
-                                                             NULL, NULL,
-                                                             g_cclosure_marshal_VOID__OBJECT,
-                                                             G_TYPE_NONE, 1,
-                                                             GTK_TYPE_MENU_SHELL);
-
-#define XFDESKTOP_PARAM_FLAGS  (G_PARAM_READWRITE \
-                                | G_PARAM_CONSTRUCT \
-                                | G_PARAM_STATIC_NAME \
-                                | G_PARAM_STATIC_NICK \
-                                | G_PARAM_STATIC_BLURB)
-
-#ifdef ENABLE_DESKTOP_ICONS
-    g_object_class_install_property(gobject_class, PROP_ICON_STYLE,
-                                    g_param_spec_enum("icon-style",
-                                                      "icon style",
-                                                      "icon style",
-                                                      XFCE_TYPE_DESKTOP_ICON_STYLE,
-#ifdef ENABLE_FILE_ICONS
-                                                      XFCE_DESKTOP_ICON_STYLE_FILES,
-#else
-                                                      XFCE_DESKTOP_ICON_STYLE_WINDOWS,
-#endif /* ENABLE_FILE_ICONS */
-                                                      XFDESKTOP_PARAM_FLAGS));
-
-    g_object_class_install_property(gobject_class, PROP_ICON_SIZE,
-                                    g_param_spec_uint("icon-size",
-                                                      "icon size",
-                                                      "icon size",
-                                                      8, 192, 36,
-                                                      XFDESKTOP_PARAM_FLAGS));
-
-    g_object_class_install_property(gobject_class, PROP_ICON_FONT_SIZE,
-                                    g_param_spec_uint("icon-font-size",
-                                                      "icon font size",
-                                                      "icon font size",
-                                                      0, 144, 12,
-                                                      XFDESKTOP_PARAM_FLAGS));
-
-    g_object_class_install_property(gobject_class, PROP_ICON_FONT_SIZE_SET,
-                                    g_param_spec_boolean("icon-font-size-set",
-                                                         "icon font size set",
-                                                         "icon font size set",
-                                                         FALSE,
-                                                         XFDESKTOP_PARAM_FLAGS));
-
-#endif /* ENABLE_DESKTOP_ICONS */
-
-    g_object_class_install_property(gobject_class, PROP_SINGLE_WORKSPACE_MODE,
-                                    g_param_spec_boolean("single-workspace-mode",
-                                                         "single-workspace-mode",
-                                                         "single-workspace-mode",
-                                                         TRUE,
-                                                         XFDESKTOP_PARAM_FLAGS));
-
-    g_object_class_install_property(gobject_class, PROP_SINGLE_WORKSPACE_NUMBER,
-                                    g_param_spec_int("single-workspace-number",
-                                                     "single-workspace-number",
-                                                     "single-workspace-number",
-                                                     0, G_MAXINT16, 0,
-                                                     XFDESKTOP_PARAM_FLAGS));
-
-#undef XFDESKTOP_PARAM_FLAGS
-}
-
-static void
-xfce_desktop_init(XfceDesktop *desktop)
-{
-    desktop->priv = G_TYPE_INSTANCE_GET_PRIVATE(desktop, XFCE_TYPE_DESKTOP,
-                                                XfceDesktopPriv);
-    
-    gtk_window_set_type_hint(GTK_WINDOW(desktop), GDK_WINDOW_TYPE_HINT_DESKTOP);
-    /* Accept focus is needed for the menu pop up either by the menu key on
-     * the keyboard or Shift+F10. */
-    gtk_window_set_accept_focus(GTK_WINDOW(desktop), TRUE);
-    /* Can focus is needed for the gtk_grab_add/remove commands */
-    gtk_widget_set_can_focus(GTK_WIDGET(desktop), TRUE);
-    gtk_window_set_resizable(GTK_WINDOW(desktop), FALSE);
-}
-
-static void
-xfce_desktop_finalize(GObject *object)
-{
-    XfceDesktop *desktop = XFCE_DESKTOP(object);
-
-    g_object_unref(G_OBJECT(desktop->priv->channel));
-    g_free(desktop->priv->property_prefix);
-
-    if(desktop->priv->style_refresh_timer != 0)
-        g_source_remove(desktop->priv->style_refresh_timer);
-
-    G_OBJECT_CLASS(xfce_desktop_parent_class)->finalize(object);
-}
-
-static void
-xfce_desktop_set_property(GObject *object,
-                          guint property_id,
-                          const GValue *value,
-                          GParamSpec *pspec)
-{
-    XfceDesktop *desktop = XFCE_DESKTOP(object);
-
-    switch(property_id) {
-#ifdef ENABLE_DESKTOP_ICONS
-        case PROP_ICON_STYLE:
-            xfce_desktop_set_icon_style(desktop,
-                                        g_value_get_enum(value));
-            break;
-
-        case PROP_ICON_SIZE:
-            xfce_desktop_set_icon_size(desktop,
-                                       g_value_get_uint(value));
-            break;
-
-        case PROP_ICON_FONT_SIZE:
-            xfce_desktop_set_icon_font_size(desktop,
-                                            g_value_get_uint(value));
-            break;
-
-        case PROP_ICON_FONT_SIZE_SET:
-            xfce_desktop_set_use_icon_font_size(desktop,
-                                                g_value_get_boolean(value));
-            break;
-
-#endif
-        case PROP_SINGLE_WORKSPACE_MODE:
-            xfce_desktop_set_single_workspace_mode(desktop,
-                                                   g_value_get_boolean(value));
-            break;
-
-        case PROP_SINGLE_WORKSPACE_NUMBER:
-            xfce_desktop_set_single_workspace_number(desktop,
-                                                     g_value_get_int(value));
-            break;
-
-        default:
-            G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
-            break;
-    }
-}
-
-static void
-xfce_desktop_get_property(GObject *object,
-                          guint property_id,
-                          GValue *value,
-                          GParamSpec *pspec)
-{
-    XfceDesktop *desktop = XFCE_DESKTOP(object);
-
-    switch(property_id) {
-#ifdef ENABLE_DESKTOP_ICONS
-        case PROP_ICON_STYLE:
-            g_value_set_enum(value, desktop->priv->icons_style);
-            break;
-
-        case PROP_ICON_SIZE:
-            g_value_set_uint(value, desktop->priv->icons_size);
-            break;
-
-        case PROP_ICON_FONT_SIZE:
-            g_value_set_uint(value, desktop->priv->icons_font_size);
-            break;
-
-        case PROP_ICON_FONT_SIZE_SET:
-            g_value_set_boolean(value, desktop->priv->icons_font_size_set);
-            break;
-
-#endif
-        case PROP_SINGLE_WORKSPACE_MODE:
-            g_value_set_boolean(value, desktop->priv->single_workspace_mode);
-            break;
-
-        case PROP_SINGLE_WORKSPACE_NUMBER:
-            g_value_set_int(value, desktop->priv->single_workspace_num);
-            break;
-
-        default:
-            G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
-            break;
-    }
-}
-
-static void
-xfce_desktop_realize(GtkWidget *widget)
-{
-    XfceDesktop *desktop = XFCE_DESKTOP(widget);
-    GdkAtom atom;
-    gint sw, sh;
-    Window xid;
-    GdkWindow *groot;
-    WnckScreen *wnck_screen;
-    
-    TRACE("entering");
-
-    gtk_window_set_screen(GTK_WINDOW(desktop), desktop->priv->gscreen);
-    sw = gdk_screen_get_width(desktop->priv->gscreen);
-    sh = gdk_screen_get_height(desktop->priv->gscreen);
-
-    g_signal_connect(G_OBJECT(desktop->priv->gscreen),
-                     "monitors-changed",
-                     G_CALLBACK(xfce_desktop_monitors_changed),
-                     desktop);
-    
-    /* chain up */
-    GTK_WIDGET_CLASS(xfce_desktop_parent_class)->realize(widget);
-    
-    gtk_window_set_title(GTK_WINDOW(desktop), _("Desktop"));
-    
-    gtk_widget_set_size_request(GTK_WIDGET(desktop), sw, sh);
-    gtk_window_move(GTK_WINDOW(desktop), 0, 0);
-    
-    atom = gdk_atom_intern("_NET_WM_WINDOW_TYPE_DESKTOP", FALSE);
-    gdk_property_change(gtk_widget_get_window(GTK_WIDGET(desktop)),
-            gdk_atom_intern("_NET_WM_WINDOW_TYPE", FALSE),
-            gdk_atom_intern("ATOM", FALSE), 32,
-            GDK_PROP_MODE_REPLACE, (guchar *)&atom, 1);
-
-    xid = GDK_WINDOW_XID(gtk_widget_get_window(GTK_WIDGET(desktop)));
-    groot = gdk_screen_get_root_window(desktop->priv->gscreen);
-    
-    gdk_property_change(groot,
-            gdk_atom_intern("XFCE_DESKTOP_WINDOW", FALSE),
-            gdk_atom_intern("WINDOW", FALSE), 32,
-            GDK_PROP_MODE_REPLACE, (guchar *)&xid, 1);
-    
-    gdk_property_change(groot,
-            gdk_atom_intern("NAUTILUS_DESKTOP_WINDOW_ID", FALSE),
-            gdk_atom_intern("WINDOW", FALSE), 32,
-            GDK_PROP_MODE_REPLACE, (guchar *)&xid, 1);
-    
-    screen_set_selection(desktop);
-
-    wnck_screen = wnck_screen_get(gdk_screen_get_number(desktop->priv->gscreen));
-    desktop->priv->wnck_screen = wnck_screen;
-
-    /* Watch for single workspace setting changes */
-    xfconf_g_property_bind(desktop->priv->channel,
-                           SINGLE_WORKSPACE_MODE, G_TYPE_BOOLEAN,
-                           G_OBJECT(desktop), "single-workspace-mode");
-    xfconf_g_property_bind(desktop->priv->channel,
-                           SINGLE_WORKSPACE_NUMBER, G_TYPE_INT,
-                           G_OBJECT(desktop), "single-workspace-number");
-
-    /* watch for workspace changes */
-    g_signal_connect(desktop->priv->wnck_screen, "active-workspace-changed",
-                     G_CALLBACK(workspace_changed_cb), desktop);
-    g_signal_connect(desktop->priv->wnck_screen, "workspace-created",
-                     G_CALLBACK(workspace_created_cb), desktop);
-    g_signal_connect(desktop->priv->wnck_screen, "workspace-destroyed",
-                     G_CALLBACK(workspace_destroyed_cb), desktop);
-
-    /* watch for screen changes */
-    g_signal_connect(G_OBJECT(desktop->priv->gscreen), "size-changed",
-            G_CALLBACK(screen_size_changed_cb), desktop);
-    g_signal_connect(G_OBJECT(desktop->priv->gscreen), "composited-changed",
-            G_CALLBACK(screen_composited_changed_cb), desktop);
-
-    gtk_widget_add_events(GTK_WIDGET(desktop), GDK_EXPOSURE_MASK);
-    
-#ifdef ENABLE_DESKTOP_ICONS
-    xfce_desktop_setup_icon_view(desktop);
-#endif
-
-    TRACE("exiting");
-}
-
-static void
-xfce_desktop_unrealize(GtkWidget *widget)
-{
-    XfceDesktop *desktop = XFCE_DESKTOP(widget);
-    gint i;
-    GdkWindow *groot;
-    gchar property_name[128];
-    
-    g_return_if_fail(XFCE_IS_DESKTOP(desktop));
-
-    /* disconnect all the xfconf settings to this desktop */
-    xfconf_g_property_unbind_all(G_OBJECT(desktop));
-
-    g_signal_handlers_disconnect_by_func(G_OBJECT(desktop->priv->gscreen),
-                                         G_CALLBACK(xfce_desktop_monitors_changed),
-                                         desktop);
-    
-    if(gtk_widget_get_mapped(widget))
-        gtk_widget_unmap(widget);
-    gtk_widget_set_mapped(widget, FALSE);
-    
-    gtk_container_forall(GTK_CONTAINER(widget),
-                         (GtkCallback)gtk_widget_unrealize,
-                         NULL);
-    
-    g_signal_handlers_disconnect_by_func(G_OBJECT(desktop->priv->gscreen),
-            G_CALLBACK(screen_size_changed_cb), desktop);
-    g_signal_handlers_disconnect_by_func(G_OBJECT(desktop->priv->gscreen),
-            G_CALLBACK(screen_composited_changed_cb), desktop);
-
-    gdk_error_trap_push();
-    
-    groot = gdk_screen_get_root_window(desktop->priv->gscreen);
-    gdk_property_delete(groot, gdk_atom_intern("XFCE_DESKTOP_WINDOW", FALSE));
-    gdk_property_delete(groot, gdk_atom_intern("NAUTILUS_DESKTOP_WINDOW_ID", FALSE));
-
-#ifndef DISABLE_FOR_BUG7442
-    gdk_property_delete(groot, gdk_atom_intern("_XROOTPMAP_ID", FALSE));
-    gdk_property_delete(groot, gdk_atom_intern("ESETROOT_PMAP_ID", FALSE));
-    gdk_window_set_back_pixmap(groot, NULL, FALSE);
-#endif
-
-    if(desktop->priv->workspaces) {
-        for(i = 0; i < desktop->priv->nworkspaces; i++) {
-            g_snprintf(property_name, 128, XFDESKTOP_IMAGE_FILE_FMT, i);
-            gdk_property_delete(groot, gdk_atom_intern(property_name, FALSE));
-            g_object_unref(G_OBJECT(desktop->priv->workspaces[i]));
-        }
-        g_free(desktop->priv->workspaces);
-        desktop->priv->workspaces = NULL;
-    }
-
-    gdk_flush();
-    gdk_error_trap_pop();
-
-    if(desktop->priv->bg_pixmap) {
-        g_object_unref(G_OBJECT(desktop->priv->bg_pixmap));
-        desktop->priv->bg_pixmap = NULL;
-    }
-    
-    gtk_window_set_icon(GTK_WINDOW(widget), NULL);
-
-    gtk_style_detach(gtk_widget_get_style(widget));
-    g_object_unref(G_OBJECT(gtk_widget_get_window(widget)));
-    gtk_widget_set_window(widget, NULL);
-
-    gtk_selection_remove_all(widget);
-    
-    gtk_widget_set_realized(widget, FALSE);
-}
-
-static gboolean
-xfce_desktop_button_press_event(GtkWidget *w,
-                                GdkEventButton *evt)
-{
-    guint button = evt->button;
-    guint state = evt->state;
-    XfceDesktop *desktop = XFCE_DESKTOP(w);
-
-    TRACE("entering");
-
-    g_return_val_if_fail(XFCE_IS_DESKTOP(w), FALSE);
-
-    if(evt->type == GDK_BUTTON_PRESS) {
-        if(button == 3 || (button == 1 && (state & GDK_SHIFT_MASK))) {
-#ifdef ENABLE_DESKTOP_ICONS
-            /* Let the icon view handle these menu pop ups */
-            if(desktop->priv->icons_style != XFCE_DESKTOP_ICON_STYLE_NONE)
-                return FALSE;
-#endif
-            /* no icons on the desktop, grab the focus and pop up the menu */
-            if(!gtk_widget_has_grab(w))
-                gtk_grab_add(w);
-
-                xfce_desktop_popup_root_menu(desktop, button, evt->time);
-                return TRUE;
-        } else if(button == 2 || (button == 1 && (state & GDK_SHIFT_MASK)
-                                  && (state & GDK_CONTROL_MASK)))
-        {
-            /* always grab the focus and pop up the menu */
-            if(!gtk_widget_has_grab(w))
-                gtk_grab_add(w);
-
-            xfce_desktop_popup_secondary_root_menu(desktop, button, evt->time);
-            return TRUE;
-        }
-    }
-    
-    return FALSE;
-}
-
-static gboolean
-xfce_desktop_button_release_event(GtkWidget *w,
-                                  GdkEventButton *evt)
-{
-    TRACE("entering");
-
-    gtk_grab_remove(w);
-
-    return FALSE;
-}
-
-/* This function gets called when the user presses the menu key on the keyboard.
- * Or Shift+F10 or whatever key binding the user has chosen. */
-static gboolean
-xfce_desktop_popup_menu(GtkWidget *w)
-{
-    GdkEventButton *evt;
-    guint button, etime;
-
-    TRACE("entering");
-
-    evt = (GdkEventButton *)gtk_get_current_event();
-    if(evt && GDK_BUTTON_PRESS == evt->type) {
-        button = evt->button;
-        etime = evt->time;
-    } else {
-        button = 0;
-        etime = gtk_get_current_event_time();
-    }
-    
-    xfce_desktop_popup_root_menu(XFCE_DESKTOP(w), button, etime);
-
-    gdk_event_free((GdkEvent*)evt);
-    return TRUE;
-}
-
-static gboolean
-xfce_desktop_expose(GtkWidget *w,
-                    GdkEventExpose *evt)
-{
-    GList *children, *l;
-    
-    /*TRACE("entering");*/
-    
-    if(evt->count != 0)
-        return FALSE;
-    
-    gdk_window_clear_area(gtk_widget_get_window(w), evt->area.x, evt->area.y,
-                          evt->area.width, evt->area.height);
-    
-    children = gtk_container_get_children(GTK_CONTAINER(w));
-    for(l = children; l; l = l->next) {
-        gtk_container_propagate_expose(GTK_CONTAINER(w),
-                                       GTK_WIDGET(l->data),
-                                       evt);
-    }
-    g_list_free(children);
-    
-    return FALSE;
-}
-
-static gboolean
-xfce_desktop_delete_event(GtkWidget *w,
-                          GdkEventAny *evt)
-{
-    if(XFCE_DESKTOP(w)->priv->session_logout_func)
-        XFCE_DESKTOP(w)->priv->session_logout_func();
-    
-    return TRUE;
-}
-
-static gboolean
-style_refresh_cb(gpointer *w)
-{
-    XfceDesktop *desktop = XFCE_DESKTOP(w);
-#ifdef ENABLE_DESKTOP_ICONS
-    gdouble old_font_size;
-#endif
-
-    TRACE("entering");
-
-    desktop->priv->style_refresh_timer = 0;
-
-    g_return_val_if_fail(XFCE_IS_DESKTOP(desktop), FALSE);
-
-    if(!gtk_widget_get_realized(GTK_WIDGET(desktop)))
-        return FALSE;
-
-    if(desktop->priv->workspaces == NULL)
-        return FALSE;
-
-    if(GDK_IS_WINDOW(desktop->priv->bg_pixmap))
-        gdk_window_set_back_pixmap(gtk_widget_get_window(GTK_WIDGET(desktop)), desktop->priv->bg_pixmap, FALSE);
-
-    gtk_widget_queue_draw(GTK_WIDGET(desktop));
-
-#ifdef ENABLE_DESKTOP_ICONS
-    if(!desktop->priv->icon_view || !XFDESKTOP_IS_ICON_VIEW(desktop->priv->icon_view))
-        return FALSE;
-
-    /* reset the icon view style */
-    gtk_widget_set_style(desktop->priv->icon_view, NULL);
-    gtk_widget_reset_rc_styles(desktop->priv->icon_view);
-
-    old_font_size = desktop->priv->system_font_size;
-    if(xfce_desktop_ensure_system_font_size(desktop) != old_font_size
-       && desktop->priv->icon_view && !desktop->priv->icons_font_size_set)
-    {
-        xfdesktop_icon_view_set_font_size(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view),
-                                          desktop->priv->system_font_size);
-    }
-#endif
-
-    return FALSE;
-}
-
-static void
-xfce_desktop_style_set(GtkWidget *w, GtkStyle *old_style)
-{
-    XfceDesktop *desktop = XFCE_DESKTOP(w);
-
-    TRACE("entering");
-
-    if(desktop->priv->style_refresh_timer != 0)
-        g_source_remove(desktop->priv->style_refresh_timer);
-
-    desktop->priv->style_refresh_timer = g_idle_add_full(G_PRIORITY_LOW,
-                                                         (GSourceFunc)style_refresh_cb,
-                                                         w,
-                                                         NULL);
-
-    GTK_WIDGET_CLASS(xfce_desktop_parent_class)->style_set(w, old_style);
-}
-
-static void
-xfce_desktop_connect_settings(XfceDesktop *desktop)
-{
-#ifdef ENABLE_DESKTOP_ICONS
-#define ICONS_PREFIX "/desktop-icons/"
-    XfconfChannel *channel = desktop->priv->channel;
-
-    xfce_desktop_freeze_updates(desktop);
-
-    xfconf_g_property_bind(channel, ICONS_PREFIX "style",
-                           XFCE_TYPE_DESKTOP_ICON_STYLE,
-                           G_OBJECT(desktop), "icon-style");
-    xfconf_g_property_bind(channel, ICONS_PREFIX "icon-size", G_TYPE_UINT,
-                           G_OBJECT(desktop), "icon-size");
-    xfconf_g_property_bind(channel, ICONS_PREFIX "font-size", G_TYPE_UINT,
-                           G_OBJECT(desktop), "icon-font-size");
-    xfconf_g_property_bind(channel, ICONS_PREFIX "use-custom-font-size",
-                           G_TYPE_BOOLEAN,
-                           G_OBJECT(desktop), "icon-font-size-set");
-
-    xfce_desktop_thaw_updates(desktop);
-#undef ICONS_PREFIX
-#endif
-}
-
-static gboolean
-xfce_desktop_get_single_workspace_mode(XfceDesktop *desktop)
-{
-    g_return_val_if_fail(XFCE_IS_DESKTOP(desktop), TRUE);
-
-    return desktop->priv->single_workspace_mode;
-}
-
-static gint
-xfce_desktop_get_current_workspace(XfceDesktop *desktop)
-{
-    WnckWorkspace *wnck_workspace;
-    gint workspace_num, current_workspace;
-
-    g_return_val_if_fail(XFCE_IS_DESKTOP(desktop), -1);
-
-    wnck_workspace = wnck_screen_get_active_workspace(desktop->priv->wnck_screen);
-
-    if(wnck_workspace != NULL) {
-        workspace_num = wnck_workspace_get_number(wnck_workspace);
-    } else {
-        workspace_num = desktop->priv->nworkspaces;
-    }
-
-    /* If we're in single_workspace mode we need to return the workspace that
-     * it was set to, if possible, otherwise return the current workspace */
-    if(xfce_desktop_get_single_workspace_mode(desktop) &&
-       desktop->priv->single_workspace_num < desktop->priv->nworkspaces) {
-        current_workspace = desktop->priv->single_workspace_num;
-    } else {
-        current_workspace = workspace_num;
-    }
-
-    DBG("workspace_num %d, single_workspace_num %d, current_workspace %d, max workspaces %d",
-        workspace_num, desktop->priv->single_workspace_num, current_workspace,
-        desktop->priv->nworkspaces);
-
-    return current_workspace;
-}
-
-/* public api */
-
-/**
- * xfce_desktop_new:
- * @gscreen: The current #GdkScreen.
- * @channel: An #XfconfChannel to use for settings.
- * @property_prefix: String prefix for per-screen properties.
- *
- * Creates a new #XfceDesktop for the specified #GdkScreen.  If @gscreen is
- * %NULL, the default screen will be used.
- *
- * Return value: A new #XfceDesktop.
- **/
-GtkWidget *
-xfce_desktop_new(GdkScreen *gscreen,
-                 XfconfChannel *channel,
-                 const gchar *property_prefix)
-{
-    XfceDesktop *desktop;
-    
-    g_return_val_if_fail(channel && property_prefix, NULL);
-
-    desktop = g_object_new(XFCE_TYPE_DESKTOP, NULL);
-
-    if(!gscreen)
-        gscreen = gdk_display_get_default_screen(gdk_display_get_default());
-    gtk_window_set_screen(GTK_WINDOW(desktop), gscreen);
-    desktop->priv->gscreen = gscreen;
-    
-    desktop->priv->channel = g_object_ref(G_OBJECT(channel));
-    desktop->priv->property_prefix = g_strdup(property_prefix);
-
-    xfce_desktop_connect_settings(desktop);
-    
-    return GTK_WIDGET(desktop);
-}
-
-gint
-xfce_desktop_get_n_monitors(XfceDesktop *desktop)
-{
-    g_return_val_if_fail(XFCE_IS_DESKTOP(desktop), 0);
-    
-    return gdk_screen_get_n_monitors(desktop->priv->gscreen);
-}
-
-gint
-xfce_desktop_get_width(XfceDesktop *desktop)
-{
-    g_return_val_if_fail(XFCE_IS_DESKTOP(desktop), -1);
-    
-    return gdk_screen_get_width(desktop->priv->gscreen);
-}
-
-gint
-xfce_desktop_get_height(XfceDesktop *desktop)
-{
-    g_return_val_if_fail(XFCE_IS_DESKTOP(desktop), -1);
-    
-    return gdk_screen_get_height(desktop->priv->gscreen);
-}
-
-void
-xfce_desktop_set_icon_style(XfceDesktop *desktop,
-                            XfceDesktopIconStyle style)
-{
-    g_return_if_fail(XFCE_IS_DESKTOP(desktop)
-                     && style <= XFCE_DESKTOP_ICON_STYLE_FILES);
-    
-#ifdef ENABLE_DESKTOP_ICONS
-    if(style == desktop->priv->icons_style)
-        return;
-    
-    if(desktop->priv->icon_view) {
-        gtk_widget_destroy(desktop->priv->icon_view);
-        desktop->priv->icon_view = NULL;
-    }
-    
-    desktop->priv->icons_style = style;
-    if(gtk_widget_get_realized(GTK_WIDGET(desktop)))
-        xfce_desktop_setup_icon_view(desktop);
-#endif
-}
-
-XfceDesktopIconStyle
-xfce_desktop_get_icon_style(XfceDesktop *desktop)
-{
-    g_return_val_if_fail(XFCE_IS_DESKTOP(desktop), XFCE_DESKTOP_ICON_STYLE_NONE);
-    
-#ifdef ENABLE_DESKTOP_ICONS
-    return desktop->priv->icons_style;
-#else
-    return XFCE_DESKTOP_ICON_STYLE_NONE;
-#endif
-}
-
-void
-xfce_desktop_set_icon_size(XfceDesktop *desktop,
-                           guint icon_size)
-{
-    g_return_if_fail(XFCE_IS_DESKTOP(desktop));
-    
-#ifdef ENABLE_DESKTOP_ICONS
-    if(icon_size == desktop->priv->icons_size)
-        return;
-    
-    desktop->priv->icons_size = icon_size;
-    
-    if(desktop->priv->icon_view) {
-        xfdesktop_icon_view_set_icon_size(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view),
-                                          icon_size);
-    }
-#endif
-}
-
-void
-xfce_desktop_set_icon_font_size(XfceDesktop *desktop,
-                                guint font_size_points)
-{
-    g_return_if_fail(XFCE_IS_DESKTOP(desktop));
-    
-#ifdef ENABLE_DESKTOP_ICONS
-    if(font_size_points == desktop->priv->icons_font_size)
-        return;
-    
-    desktop->priv->icons_font_size = font_size_points;
-    
-    if(desktop->priv->icons_font_size_set && desktop->priv->icon_view) {
-        xfdesktop_icon_view_set_font_size(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view),
-                                          font_size_points);
-    }
-#endif
-}
-
-void
-xfce_desktop_set_use_icon_font_size(XfceDesktop *desktop,
-                                    gboolean use_icon_font_size)
-{
-    g_return_if_fail(XFCE_IS_DESKTOP(desktop));
-    
-#ifdef ENABLE_DESKTOP_ICONS
-    if(use_icon_font_size == desktop->priv->icons_font_size_set)
-        return;
-    
-    desktop->priv->icons_font_size_set = use_icon_font_size;
-    
-    if(desktop->priv->icon_view) {
-        if(!use_icon_font_size) {
-            xfce_desktop_ensure_system_font_size(desktop);
-            xfdesktop_icon_view_set_font_size(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view),
-                                              desktop->priv->system_font_size);
-        } else {
-            xfdesktop_icon_view_set_font_size(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view),
-                                              desktop->priv->icons_font_size);
-        }
-    }
-#endif
-}
-
-static void
-xfce_desktop_set_single_workspace_mode(XfceDesktop *desktop,
-                                       gboolean single_workspace)
-{
-    gint i;
-
-    g_return_if_fail(XFCE_IS_DESKTOP(desktop));
-
-    if(single_workspace == desktop->priv->single_workspace_mode)
-        return;
-
-    desktop->priv->single_workspace_mode = single_workspace;
-
-    DBG("single_workspace_mode now %s", single_workspace ? "TRUE" : "FALSE");
-
-    /* update the workspaces & backdrops if they should cache their pixbuf */
-    if(desktop->priv->workspaces) {
-        for(i = 0; i < desktop->priv->nworkspaces; i++) {
-            /* set cache to TRUE when single_workspace is FALSE */
-            xfce_workspace_set_cache_pixbufs(desktop->priv->workspaces[i], !single_workspace);
-        }
-    }
-
-    /* If the desktop has been realized then fake a screen size change to
-     * update the backdrop. There's no reason to if there's no desktop yet */
-    if(gtk_widget_get_realized(GTK_WIDGET(desktop)))
-        screen_size_changed_cb(desktop->priv->gscreen, desktop);
-}
-
-static void
-xfce_desktop_set_single_workspace_number(XfceDesktop *desktop,
-                                         gint workspace_num)
-{
-    g_return_if_fail(XFCE_IS_DESKTOP(desktop));
-
-    if(workspace_num == desktop->priv->single_workspace_num)
-        return;
-
-    DBG("single_workspace_num now %d", workspace_num);
-
-    desktop->priv->single_workspace_num = workspace_num;
-
-    if(xfce_desktop_get_single_workspace_mode(desktop)) {
-        /* Fake a screen size changed to update the backdrop */
-        screen_size_changed_cb(desktop->priv->gscreen, desktop);
-    }
-}
-
-void
-xfce_desktop_set_session_logout_func(XfceDesktop *desktop,
-                                     SessionLogoutFunc logout_func)
-{
-    g_return_if_fail(XFCE_IS_DESKTOP(desktop));
-    desktop->priv->session_logout_func = logout_func;
-}
-
-void
-xfce_desktop_freeze_updates(XfceDesktop *desktop)
-{
-    g_return_if_fail(XFCE_IS_DESKTOP(desktop));
-    desktop->priv->updates_frozen = TRUE;
-}
-
-void
-xfce_desktop_thaw_updates(XfceDesktop *desktop)
-{
-    g_return_if_fail(XFCE_IS_DESKTOP(desktop));
-    
-    desktop->priv->updates_frozen = FALSE;
-    if(gtk_widget_get_realized(GTK_WIDGET(desktop)))
-        xfce_desktop_monitors_changed(desktop->priv->gscreen, desktop);
-}
-
-static gboolean
-xfce_desktop_menu_destroy_idled(gpointer data)
-{
-    gtk_widget_destroy(GTK_WIDGET(data));
-    return FALSE;
-}
-
-static void
-xfce_desktop_do_menu_popup(XfceDesktop *desktop,
-                           guint button,
-                           guint activate_time,
-                           guint populate_signal)
-{
-    GdkScreen *screen;
-    GtkWidget *menu;
-    GList *menu_children;
-    
-    TRACE("entering");
-    
-    if(gtk_widget_has_screen(GTK_WIDGET(desktop)))
-        screen = gtk_widget_get_screen(GTK_WIDGET(desktop));
-    else
-        screen = gdk_display_get_default_screen(gdk_display_get_default());
-
-    menu = gtk_menu_new();
-    gtk_menu_set_screen(GTK_MENU(menu), screen);
-    g_signal_connect_swapped(G_OBJECT(menu), "deactivate",
-                             G_CALLBACK(g_idle_add),
-                             (gpointer)xfce_desktop_menu_destroy_idled);
-
-    g_signal_emit(G_OBJECT(desktop), populate_signal, 0, menu);
-
-    /* if nobody populated the menu, don't do anything */
-    menu_children = gtk_container_get_children(GTK_CONTAINER(menu));
-    if(!menu_children) {
-        gtk_widget_destroy(menu);
-        return;
-    }
-
-    g_list_free(menu_children);
-
-    gtk_menu_attach_to_widget(GTK_MENU(menu), GTK_WIDGET(desktop), NULL);
-
-    /* Per gtk_menu_popup's documentation "for conflict-resolve initiation of
-     * concurrent requests for mouse/keyboard grab requests." */
-    if(activate_time == 0)
-        activate_time = gtk_get_current_event_time();
-
-    gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, button, activate_time);
-}
-
-void
-xfce_desktop_popup_root_menu(XfceDesktop *desktop,
-                             guint button,
-                             guint activate_time)
-{
-    TRACE("entering");
-
-    /* If it's launched by xfdesktop --menu we won't have an event time.
-     * Grab the keyboard focus */
-    if(activate_time == 0)
-        activate_time = xfdesktop_popup_keyboard_grab_available(gtk_widget_get_window(GTK_WIDGET(desktop)));
-
-    xfce_desktop_do_menu_popup(desktop, button, activate_time,
-                               signals[SIG_POPULATE_ROOT_MENU]);
-
-}
-
-void
-xfce_desktop_popup_secondary_root_menu(XfceDesktop *desktop,
-                                       guint button,
-                                       guint activate_time)
-{
-    /* If it's launched by xfdesktop --windowlist we won't have an event time.
-     * Grab the keyboard focus */
-    if(activate_time == 0)
-        activate_time = xfdesktop_popup_keyboard_grab_available(gtk_widget_get_window(GTK_WIDGET(desktop)));
-
-    xfce_desktop_do_menu_popup(desktop, button, activate_time,
-                               signals[SIG_POPULATE_SECONDARY_ROOT_MENU]);
-}
-void
-xfce_desktop_refresh(XfceDesktop *desktop)
-{
-    gint i, current_workspace;
-
-    TRACE("entering");
-
-    g_return_if_fail(XFCE_IS_DESKTOP(desktop));
-
-    if(!gtk_widget_get_realized(GTK_WIDGET(desktop)))
-        return;
-
-    if(desktop->priv->workspaces == NULL) {
-        return;
-    }
-
-    current_workspace = xfce_desktop_get_current_workspace(desktop);
-
-    /* reload backgrounds */
-    for(i = 0; i < xfce_desktop_get_n_monitors(desktop); i++) {
-        XfceBackdrop *backdrop;
-
-        backdrop = xfce_workspace_get_backdrop(desktop->priv->workspaces[current_workspace], i);
-
-        backdrop_changed_cb(backdrop, desktop);
-    }
-
-#ifdef ENABLE_DESKTOP_ICONS
-    /* reload icon view */
-    if(desktop->priv->icon_view) {
-        gtk_widget_destroy(desktop->priv->icon_view);
-        desktop->priv->icon_view = NULL;
-    }
-    xfce_desktop_setup_icon_view(desktop);
-#endif
-
-}
-
-void xfce_desktop_arrange_icons(XfceDesktop *desktop)
-{
-    g_return_if_fail(XFCE_IS_DESKTOP(desktop));
-
-#ifdef ENABLE_DESKTOP_ICONS
-    g_return_if_fail(XFDESKTOP_IS_ICON_VIEW(desktop->priv->icon_view));
-
-    xfdesktop_icon_view_sort_icons(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view));
-#endif
-}

=== removed directory '.pc/git-missing-images-in-settings-app.patch'
=== removed directory '.pc/git-missing-images-in-settings-app.patch/settings'
=== removed file '.pc/git-missing-images-in-settings-app.patch/settings/main.c'
--- .pc/git-missing-images-in-settings-app.patch/settings/main.c	2014-03-28 07:16:04 +0000
+++ .pc/git-missing-images-in-settings-app.patch/settings/main.c	1970-01-01 00:00:00 +0000
@@ -1,2101 +0,0 @@
-/*
- *  xfdesktop
- *
- *  Copyright (c) 2008 Stephan Arts <[e-mail]>
- *  Copyright (c) 2008 Brian Tarricone <[e-mail]>
- *  Copyright (c) 2008 Jérôme Guelfucci <[e-mail]>
- *  Copyright (c) 2011 Jannis Pohlmann <[e-mail]>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software Foundation,
- *  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-#ifdef HAVE_ERRNO_H
-#include <errno.h>
-#endif
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
-
-#include <libxfce4util/libxfce4util.h>
-#include <xfconf/xfconf.h>
-#include <libxfce4ui/libxfce4ui.h>
-#include <libwnck/libwnck.h>
-#include <exo/exo.h>
-
-#include "xfdesktop-common.h"
-#include "xfdesktop-thumbnailer.h"
-#include "xfdesktop-settings-ui.h"
-#include "xfdesktop-settings-appearance-frame-ui.h"
-/* for XfceBackdropImageStyle && XfceBackdropColorStyle */
-#include "xfce-backdrop.h"
-
-#define MAX_ASPECT_RATIO 1.5f
-#define PREVIEW_HEIGHT   96
-#define PREVIEW_WIDTH    (PREVIEW_HEIGHT * MAX_ASPECT_RATIO)
-
-
-#define SETTINGS_WINDOW_LAST_WIDTH           "/last/window-width"
-#define SETTINGS_WINDOW_LAST_HEIGHT          "/last/window-height"
-
-#define SHOW_DESKTOP_MENU_PROP               "/desktop-menu/show"
-#define DESKTOP_MENU_SHOW_ICONS_PROP         "/desktop-menu/show-icons"
-
-#define WINLIST_SHOW_WINDOWS_MENU_PROP       "/windowlist-menu/show"
-#define WINLIST_SHOW_APP_ICONS_PROP          "/windowlist-menu/show-icons"
-#define WINLIST_SHOW_STICKY_WIN_ONCE_PROP    "/windowlist-menu/show-sticky-once"
-#define WINLIST_SHOW_WS_NAMES_PROP           "/windowlist-menu/show-workspace-names"
-#define WINLIST_SHOW_WS_SUBMENUS_PROP        "/windowlist-menu/show-submenus"
-#define WINLIST_SHOW_ADD_REMOVE_WORKSPACES_PROP "/windowlist-menu/show-add-remove-workspaces"
-
-#define DESKTOP_ICONS_STYLE_PROP             "/desktop-icons/style"
-#define DESKTOP_ICONS_ICON_SIZE_PROP         "/desktop-icons/icon-size"
-#define DESKTOP_ICONS_FONT_SIZE_PROP         "/desktop-icons/font-size"
-#define DESKTOP_ICONS_CUSTOM_FONT_SIZE_PROP  "/desktop-icons/use-custom-font-size"
-#define DESKTOP_ICONS_SHOW_TOOLTIP_PROP      "/desktop-icons/show-tooltips"
-#define DESKTOP_ICONS_TOOLTIP_SIZE_PROP      "/desktop-icons/tooltip-size"
-#define DESKTOP_ICONS_SINGLE_CLICK_PROP      "/desktop-icons/single-click"
-
-typedef struct
-{
-    GtkTreeModel *model;
-    GtkTreeIter *iter;
-} PreviewData;
-
-typedef struct
-{
-    XfconfChannel *channel;
-    gint screen;
-    gint monitor;
-    gint workspace;
-    gchar *monitor_name;
-    gulong image_list_loaded:1;
-
-    WnckWindow *wnck_window;
-    /* We keep track of the current workspace number because
-     * wnck_screen_get_active_workspace sometimes has to return NULL. */
-    gint active_workspace;
-
-    GtkWidget *infobar;
-    GtkWidget *infobar_label;
-    GtkWidget *label_header;
-    GtkWidget *image_iconview;
-    GtkWidget *btn_folder;
-    GtkWidget *chk_apply_to_all;
-    GtkWidget *image_style_combo;
-    GtkWidget *color_style_combo;
-    GtkWidget *color1_btn;
-    GtkWidget *color2_btn;
-
-    gulong color1_btn_id;
-    gulong color2_btn_id;
-
-    /* backdrop cycling options */
-    GtkWidget *backdrop_cycle_chkbox;
-    GtkWidget *combo_backdrop_cycle_period;
-    GtkWidget *backdrop_cycle_spinbox;
-    GtkWidget *random_backdrop_order_chkbox;
-
-    GThread *preview_thread;
-    GAsyncQueue *preview_queue;
-
-    XfdesktopThumbnailer *thumbnailer;
-
-    GFile *selected_folder;
-    GCancellable *cancel_enumeration;
-    guint add_dir_idle_id;
-
-} AppearancePanel;
-
-typedef struct
-{
-    GFileEnumerator *file_enumerator;
-    GtkListStore *ls;
-    GtkTreeIter *selected_iter;
-    gchar *last_image;
-    gchar *file_path;
-    AppearancePanel *panel;
-} AddDirData;
-
-enum
-{
-    COL_PIX = 0,
-    COL_NAME,
-    COL_FILENAME,
-    COL_THUMBNAIL,
-    COL_COLLATE_KEY,
-    N_COLS,
-};
-
-enum
-{
-    COL_ICON_PIX = 0,
-    COL_ICON_NAME,
-    COL_ICON_ENABLED,
-    COL_ICON_PROPERTY,
-    N_ICON_COLS,
-};
-
-static void cb_xfdesktop_chk_apply_to_all(GtkCheckButton *button,
-                                          gpointer user_data);
-static gchar *xfdesktop_settings_generate_per_workspace_binding_string(AppearancePanel *panel,
-                                                                       const gchar* property);
-static gchar *xfdesktop_settings_get_backdrop_image(AppearancePanel *panel);
-
-static void
-xfdesktop_settings_do_single_preview(GtkTreeModel *model,
-                                     GtkTreeIter *iter)
-{
-    gchar *filename = NULL, *thumbnail = NULL;
-    GdkPixbuf *pix;
-
-    gtk_tree_model_get(model, iter,
-                       COL_FILENAME, &filename,
-                       COL_THUMBNAIL, &thumbnail,
-                       -1);
-
-    /* If we didn't create a thumbnail there might not be a thumbnailer service
-     * or it may not support that format */
-    if(thumbnail == NULL) {
-        pix = gdk_pixbuf_new_from_file_at_scale(filename,
-                                                PREVIEW_WIDTH, PREVIEW_HEIGHT,
-                                                TRUE, NULL);
-    } else {
-        pix = gdk_pixbuf_new_from_file_at_scale(thumbnail,
-                                                PREVIEW_WIDTH, PREVIEW_HEIGHT,
-                                                TRUE, NULL);
-        g_free(thumbnail);
-    }
-
-    g_free(filename);
-
-    if(pix) {
-        gtk_list_store_set(GTK_LIST_STORE(model), iter,
-                           COL_PIX, pix,
-                           -1);
-
-        g_object_unref(G_OBJECT(pix));
-    }
-}
-
-static void
-xfdesktop_settings_free_pdata(gpointer data)
-{
-    PreviewData *pdata = data;
-    g_object_unref(G_OBJECT(pdata->model));
-    gtk_tree_iter_free(pdata->iter);
-    g_free(pdata);
-}
-
-static gpointer
-xfdesktop_settings_create_previews(gpointer data)
-{
-    AppearancePanel *panel = data;
-
-    while(panel->preview_queue != NULL) {
-        PreviewData *pdata = NULL;
-
-        /* Block and wait for another preview to create */
-        pdata = g_async_queue_pop(panel->preview_queue);
-
-        xfdesktop_settings_do_single_preview(pdata->model, pdata->iter);
-
-        xfdesktop_settings_free_pdata(pdata);
-    }
-
-    return NULL;
-}
-
-static void
-xfdesktop_settings_add_file_to_queue(AppearancePanel *panel, PreviewData *pdata)
-{
-    TRACE("entering");
-
-    g_return_if_fail(panel != NULL);
-    g_return_if_fail(pdata != NULL);
-
-    /* Create the queue if it doesn't exist */
-    if(panel->preview_queue == NULL) {
-        panel->preview_queue = g_async_queue_new_full(xfdesktop_settings_free_pdata);
-    }
-
-    g_async_queue_push(panel->preview_queue, pdata);
-
-    /* Create the thread if it doesn't exist */
-    if(panel->preview_thread == NULL) {
-#if GLIB_CHECK_VERSION(2, 32, 0)
-        panel->preview_thread = g_thread_try_new("create_previews",
-                                                 xfdesktop_settings_create_previews,
-                                                 panel, NULL);
-#else
-        panel->preview_thread = g_thread_create(xfdesktop_settings_create_previews,
-                                                panel, FALSE, NULL);
-#endif
-        if(panel->preview_thread == NULL)
-        {
-                g_critical("Unable to create thread for image previews.");
-                /* Don't block but try to remove the data from the queue
-                 * since we won't be creating previews */
-                if(g_async_queue_try_pop(panel->preview_queue))
-                    xfdesktop_settings_free_pdata(pdata);
-        }
-    }
-}
-
-static void
-cb_thumbnail_ready(XfdesktopThumbnailer *thumbnailer,
-                   gchar *src_file, gchar *thumb_file,
-                   gpointer user_data)
-{
-    AppearancePanel *panel = user_data;
-    GtkTreeModel *model = gtk_icon_view_get_model(GTK_ICON_VIEW(panel->image_iconview));
-    GtkTreeIter iter;
-    PreviewData *pdata = NULL;
-
-    if(gtk_tree_model_get_iter_first(model, &iter)) {
-        do {
-            gchar *filename = NULL;
-            gtk_tree_model_get(model, &iter, COL_FILENAME, &filename, -1);
-
-            /* We're looking for the src_file */
-            if(g_strcmp0(filename, src_file) == 0) {
-                /* Add the thumb_file to it */
-                gtk_list_store_set(GTK_LIST_STORE(model), &iter,
-                                   COL_THUMBNAIL, thumb_file, -1);
-
-                pdata = g_new0(PreviewData, 1);
-                pdata->model = g_object_ref(G_OBJECT(model));
-                pdata->iter = gtk_tree_iter_copy(&iter);
-
-                /* Create the preview image */
-                xfdesktop_settings_add_file_to_queue(panel, pdata);
-
-                g_free(filename);
-                return;
-            }
-
-            g_free(filename);
-        } while(gtk_tree_model_iter_next(model, &iter));
-    }
-}
-
-static void
-xfdesktop_settings_queue_preview(GtkTreeModel *model,
-                                 GtkTreeIter *iter,
-                                 AppearancePanel *panel)
-{
-    gchar *filename = NULL;
-
-    gtk_tree_model_get(model, iter, COL_FILENAME, &filename, -1);
-
-    /* Attempt to use the thumbnailer if possible */
-    if(!xfdesktop_thumbnailer_queue_thumbnail(panel->thumbnailer, filename)) {
-        /* Thumbnailing not possible, add it to the queue to be loaded manually */
-        PreviewData *pdata;
-        pdata = g_new0(PreviewData, 1);
-        pdata->model = g_object_ref(G_OBJECT(model));
-        pdata->iter = gtk_tree_iter_copy(iter);
-
-        xfdesktop_settings_add_file_to_queue(panel, pdata);
-    }
-
-    if(filename)
-        g_free(filename);
-}
-
-static void
-cb_special_icon_toggled(GtkCellRendererToggle *render, gchar *path, gpointer user_data)
-{
-    XfconfChannel *channel = g_object_get_data(G_OBJECT(user_data),
-                                               "xfconf-channel");
-    GtkTreePath *tree_path = gtk_tree_path_new_from_string(path);
-    GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(user_data));
-    GtkTreeIter iter;
-    gboolean show_icon;
-    gchar *icon_property = NULL;
-
-    gtk_tree_model_get_iter(model, &iter, tree_path);
-    gtk_tree_model_get(model, &iter, COL_ICON_ENABLED, &show_icon,
-                       COL_ICON_PROPERTY, &icon_property, -1);
-
-    show_icon = !show_icon;
-
-    xfconf_channel_set_bool(channel, icon_property, show_icon);
-
-    gtk_tree_store_set(GTK_TREE_STORE(model), &iter,
-                       COL_ICON_ENABLED, show_icon, -1);
-
-    gtk_tree_path_free(tree_path);
-    g_free(icon_property);
-}
-
-static void
-setup_special_icon_list(GtkBuilder *gxml,
-                        XfconfChannel *channel)
-{
-    GtkWidget *treeview;
-    GtkTreeStore *ts;
-    GtkTreeViewColumn *col;
-    GtkCellRenderer *render;
-    GtkTreeIter iter, parent_iter, child_iter;
-    const struct {
-        const gchar *name;
-        const gchar *icon;
-        const gchar *icon_fallback;
-        const gchar *xfconf_property;
-        gboolean state;
-    } icons[] = {
-        { N_("Home"), "user-home", "gnome-fs-desktop",
-          DESKTOP_ICONS_SHOW_HOME, TRUE },
-        { N_("Filesystem"), "drive-harddisk", "gnome-dev-harddisk",
-          DESKTOP_ICONS_SHOW_FILESYSTEM, TRUE },
-        { N_("Trash"), "user-trash", "gnome-fs-trash-empty",
-          DESKTOP_ICONS_SHOW_TRASH, TRUE },
-        { N_("Removable Devices"), "drive-removable-media", "gnome-dev-removable",
-          DESKTOP_ICONS_SHOW_REMOVABLE, TRUE },
-        { N_("Network Shares"), "gtk-network", "gnome-dev-network",
-          DESKTOP_ICONS_SHOW_NETWORK_REMOVABLE, TRUE },
-        { N_("Disks and Drives"), "drive-harddisk-usb", "gnome-dev-removable-usb",
-          DESKTOP_ICONS_SHOW_DEVICE_REMOVABLE, TRUE },
-        { N_("Other Devices"), "multimedia-player", "phone",
-          DESKTOP_ICONS_SHOW_UNKNWON_REMOVABLE, TRUE },
-        { NULL, NULL, NULL, NULL, FALSE },
-    };
-    const int REMOVABLE_DEVICES = 4;
-    int i, w;
-    GtkIconTheme *itheme = gtk_icon_theme_get_default();
-
-    gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &w, NULL);
-
-    ts = gtk_tree_store_new(N_ICON_COLS, GDK_TYPE_PIXBUF, G_TYPE_STRING,
-                            G_TYPE_BOOLEAN, G_TYPE_STRING);
-    for(i = 0; icons[i].name; ++i) {
-        GdkPixbuf *pix = NULL;
-
-        if(gtk_icon_theme_has_icon(itheme, icons[i].icon))
-            pix = gtk_icon_theme_load_icon(itheme, icons[i].icon, w, 0, NULL);
-        else
-            pix = gtk_icon_theme_load_icon(itheme, icons[i].icon_fallback, w, 0, NULL);
-
-        if(i < REMOVABLE_DEVICES) {
-            gtk_tree_store_append(ts, &parent_iter, NULL);
-            iter = parent_iter;
-        } else {
-            gtk_tree_store_append(ts, &child_iter, &parent_iter);
-            iter = child_iter;
-        }
-
-        gtk_tree_store_set(ts, &iter,
-                           COL_ICON_NAME, _(icons[i].name),
-                           COL_ICON_PIX, pix,
-                           COL_ICON_PROPERTY, icons[i].xfconf_property,
-                           COL_ICON_ENABLED,
-                           xfconf_channel_get_bool(channel,
-                                                   icons[i].xfconf_property,
-                                                   icons[i].state),
-                           -1);
-        if(pix)
-            g_object_unref(G_OBJECT(pix));
-    }
-
-    treeview = GTK_WIDGET(gtk_builder_get_object(gxml, "treeview_default_icons"));
-    g_object_set_data(G_OBJECT(treeview), "xfconf-channel", channel);
-    col = gtk_tree_view_column_new();
-    gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), col);
-
-    render = gtk_cell_renderer_toggle_new();
-    gtk_tree_view_column_pack_start(col, render, FALSE);
-    gtk_tree_view_column_add_attribute(col, render, "active", COL_ICON_ENABLED);
-
-    g_signal_connect(G_OBJECT(render), "toggled",
-                     G_CALLBACK(cb_special_icon_toggled), treeview);
-
-    render = gtk_cell_renderer_pixbuf_new();
-    gtk_tree_view_column_pack_start(col, render, FALSE);
-    gtk_tree_view_column_add_attribute(col, render, "pixbuf", COL_ICON_PIX);
-
-    render = gtk_cell_renderer_text_new();
-    gtk_tree_view_column_pack_start(col, render, TRUE);
-    gtk_tree_view_column_add_attribute(col, render, "text", COL_ICON_NAME);
-
-    gtk_tree_view_set_model(GTK_TREE_VIEW(treeview), GTK_TREE_MODEL(ts));
-    g_object_unref(G_OBJECT(ts));
-}
-
-
-static gint
-image_list_compare(GtkTreeModel *model,
-                   const gchar *a,
-                   GtkTreeIter *b)
-{
-    gchar *key_b = NULL;
-    gint ret;
-
-    gtk_tree_model_get(model, b, COL_COLLATE_KEY, &key_b, -1);
-
-    ret = g_strcmp0(a, key_b);
-
-    g_free(key_b);
-
-    return ret;
-}
-
-static GtkTreeIter *
-xfdesktop_settings_image_iconview_add(GtkTreeModel *model,
-                                      const char *path,
-                                      GFileInfo *info,
-                                      AppearancePanel *panel)
-{
-    gboolean added = FALSE, found = FALSE, valid = FALSE;
-    GtkTreeIter iter, search_iter;
-    gchar *name = NULL, *name_utf8 = NULL, *name_markup = NULL, *size_string = NULL;
-    gchar *collate_key = NULL;
-    gint position = 0;
-    const gchar *content_type = g_file_info_get_content_type(info);
-    goffset file_size = g_file_info_get_size(info);
-
-    if(!xfdesktop_image_file_is_valid(path))
-        return NULL;
-
-    name = g_path_get_basename(path);
-    if(name) {
-        guint name_length = strlen(name);
-        name_utf8 = g_filename_to_utf8(name, name_length,
-                                       NULL, NULL, NULL);
-        if(name_utf8) {
-#if GLIB_CHECK_VERSION (2, 30, 0)
-            size_string = g_format_size(file_size);
-#else
-            size_string = g_format_size_for_display(file_size);
-#endif
-
-            /* Display the file name, file type, and file size in the tooltip. */
-            name_markup = g_markup_printf_escaped(_("<b>%s</b>\nType: %s\nSize: %s"),
-                                                  name_utf8, content_type, size_string);
-
-            /* create a case sensitive collation key for sorting filenames like
-             * Thunar does */
-            collate_key = g_utf8_collate_key_for_filename(name, name_length);
-
-            /* Insert sorted */
-            valid = gtk_tree_model_get_iter_first(model, &search_iter);
-            while(valid && !found) {
-                if(image_list_compare(model, collate_key, &search_iter) <= 0) {
-                    found = TRUE;
-                } else {
-                    valid = gtk_tree_model_iter_next(model, &search_iter);
-                    position++;
-                }
-            }
-
-            gtk_list_store_insert_with_values(GTK_LIST_STORE(model),
-                                              &iter,
-                                              position,
-                                              COL_NAME, name_markup,
-                                              COL_FILENAME, path,
-                                              COL_COLLATE_KEY, collate_key,
-                                              -1);
-            xfdesktop_settings_queue_preview(model, &iter, panel);
-
-            added = TRUE;
-        }
-    }
-
-    g_free(name);
-    g_free(name_utf8);
-    g_free(name_markup);
-    g_free(size_string);
-    g_free(collate_key);
-
-    if(added)
-        return gtk_tree_iter_copy(&iter);
-    else
-        return NULL;
-}
-
-static void
-cb_destroy_add_dir_enumeration(gpointer user_data)
-{
-    AddDirData *dir_data = user_data;
-    AppearancePanel *panel = dir_data->panel;
-
-    TRACE("entering");
-
-    g_free(dir_data->file_path);
-    g_free(dir_data->last_image);
-
-    if(G_IS_FILE_ENUMERATOR(dir_data->file_enumerator))
-        g_object_unref(dir_data->file_enumerator);
-
-    g_free(dir_data);
-
-    if(panel->cancel_enumeration) {
-        g_object_unref(panel->cancel_enumeration);
-        panel->cancel_enumeration = NULL;
-    }
-
-    panel->add_dir_idle_id = 0;
-}
-
-static gboolean
-xfdesktop_image_list_add_item(gpointer user_data)
-{
-    AddDirData *dir_data = user_data;
-    AppearancePanel *panel = dir_data->panel;
-    GFileInfo *info;
-    GtkTreeIter *iter;
-
-    /* If the enumeration gets canceled/destroyed return and
-     * cb_destroy_add_dir_enumeration will get called to clean up */
-    if(!G_IS_FILE_ENUMERATOR(dir_data->file_enumerator))
-        return FALSE;
-
-    /* Add one item to the icon view at a time so we don't block the UI */
-    if((info = g_file_enumerator_next_file(dir_data->file_enumerator, NULL, NULL))) {
-        const gchar *file_name = g_file_info_get_name(info);
-        gchar *buf = g_strconcat(dir_data->file_path, "/", file_name, NULL);
-
-        iter = xfdesktop_settings_image_iconview_add(GTK_TREE_MODEL(dir_data->ls), buf, info, panel);
-        if(iter) {
-            if(!dir_data->selected_iter &&
-               !strcmp(buf, dir_data->last_image))
-            {
-                dir_data->selected_iter = iter;
-            } else {
-                gtk_tree_iter_free(iter);
-            }
-        }
-
-        g_free(buf);
-        g_object_unref(info);
-
-        /* continue on the next idle callback so the user's events get priority */
-        return TRUE;
-    }
-
-    /* If we get here we're done enumerating files in the directory */
-
-    gtk_icon_view_set_model(GTK_ICON_VIEW(panel->image_iconview),
-                            GTK_TREE_MODEL(dir_data->ls));
-
-    /* last_image is in the directory added then it should be selected */
-    if(dir_data->selected_iter) {
-        GtkTreePath *path;
-        path = gtk_tree_model_get_path(GTK_TREE_MODEL(dir_data->ls), dir_data->selected_iter);
-        if(path) {
-            gtk_icon_view_select_path(GTK_ICON_VIEW(panel->image_iconview), path);
-            gtk_tree_iter_free(dir_data->selected_iter);
-            gtk_tree_path_free(path);
-        }
-     }
-
-    /* cb_destroy_add_dir_enumeration will get called to clean up */
-    return FALSE;
-}
-
-static void
-xfdesktop_image_list_add_dir(GObject *source_object,
-                             GAsyncResult *res,
-                             gpointer user_data)
-{
-    AppearancePanel *panel = user_data;
-    AddDirData *dir_data = g_new0(AddDirData, 1);
-
-    TRACE("entering");
-
-    dir_data->panel = panel;
-
-    dir_data->ls = gtk_list_store_new(N_COLS, GDK_TYPE_PIXBUF, G_TYPE_STRING,
-                                      G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
-
-    /* Get the last image/current image displayed so we can select it in the
-     * icon view */
-    dir_data->last_image = xfdesktop_settings_get_backdrop_image(panel);
-
-    dir_data->file_path = g_file_get_path(panel->selected_folder);
-
-    dir_data->file_enumerator = g_file_enumerate_children_finish(panel->selected_folder,
-                                                                 res,
-                                                                 NULL);
-
-    /* Individual items are added in an idle callback so everything is more
-     * responsive */
-    panel->add_dir_idle_id = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE,
-                                             xfdesktop_image_list_add_item,
-                                             dir_data,
-                                             cb_destroy_add_dir_enumeration);
-}
-
-static void
-xfdesktop_settings_update_iconview_frame_name(AppearancePanel *panel,
-                                              WnckWorkspace *wnck_workspace)
-{
-    gchar buf[1024];
-    gchar *workspace_name;
-    WnckScreen *screen;
-    WnckWorkspace *workspace;
-
-    /* Don't update the name until we find our window */
-    if(panel->wnck_window == NULL)
-        return;
-
-    g_return_if_fail(panel->monitor >= 0 && panel->workspace >= 0);
-
-    /* If it's a pinned window get the active workspace */
-    if(wnck_workspace == NULL) {
-        screen = wnck_window_get_screen(panel->wnck_window);
-        workspace = wnck_screen_get_workspace(screen, panel->active_workspace);
-    } else {
-        workspace = wnck_workspace;
-    }
-
-    workspace_name = g_strdup(wnck_workspace_get_name(workspace));
-
-    if(gdk_screen_get_n_monitors(gtk_widget_get_screen(panel->chk_apply_to_all)) > 1) {
-        if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(panel->chk_apply_to_all))) {
-            /* Multi-monitor single workspace */
-            if(panel->monitor_name) {
-                g_snprintf(buf, sizeof(buf),
-                           _("Wallpaper for Monitor %d (%s)"),
-                           panel->monitor, panel->monitor_name);
-            } else {
-                g_snprintf(buf, sizeof(buf), _("Wallpaper for Monitor %d"), panel->monitor);
-            }
-
-            /* This is for the infobar letting the user know how to configure
-             * multiple monitor setups */
-            gtk_label_set_text(GTK_LABEL(panel->infobar_label),
-                               _("Move this dialog to the display you "
-                                 "want to edit the settings for."));
-            gtk_widget_set_visible(panel->infobar, TRUE);
-        } else {
-            /* Multi-monitor per workspace wallpaper */
-            if(panel->monitor_name) {
-                g_snprintf(buf, sizeof(buf),
-                           _("Wallpaper for %s on Monitor %d (%s)"),
-                           workspace_name, panel->monitor, panel->monitor_name);
-            } else {
-                g_snprintf(buf, sizeof(buf),
-                           _("Wallpaper for %s on Monitor %d"),
-                           workspace_name, panel->monitor);
-            }
-
-            /* This is for the infobar letting the user know how to configure
-             * multiple monitor/workspace setups */
-            gtk_label_set_text(GTK_LABEL(panel->infobar_label),
-                               _("Move this dialog to the display and "
-                                 "workspace you want to edit the settings for."));
-            gtk_widget_set_visible(panel->infobar, TRUE);
-        }
-    } else {
-        if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(panel->chk_apply_to_all))) {
-            /* Single monitor and single workspace */
-            g_snprintf(buf, sizeof(buf), _("Wallpaper for my desktop"));
-
-            /* No need for the infobar */
-            gtk_widget_set_visible(panel->infobar, FALSE);
-        } else {
-            /* Single monitor and per workspace wallpaper */
-            g_snprintf(buf, sizeof(buf), _("Wallpaper for %s"), workspace_name);
-
-            /* This is for the infobar letting the user know how to configure
-             * multiple workspace setups */
-            gtk_label_set_text(GTK_LABEL(panel->infobar_label),
-                               _("Move this dialog to the workspace you "
-                                 "want to edit the settings for."));
-            gtk_widget_set_visible(panel->infobar, TRUE);
-        }
-    }
-
-    /* This label is for which workspace/monitor we're on */
-    gtk_label_set_text(GTK_LABEL(panel->label_header), buf);
-
-    g_free(workspace_name);
-}
-
-/* Free the returned string when done using it */
-static gchar*
-xfdesktop_settings_generate_per_workspace_binding_string(AppearancePanel *panel,
-                                                         const gchar* property)
-{
-    gchar *buf = NULL;
-
-    if(panel->monitor_name == NULL) {
-        buf = g_strdup_printf("/backdrop/screen%d/monitor%d/workspace%d/%s",
-                              panel->screen, panel->monitor, panel->workspace,
-                              property);
-    } else {
-        buf = g_strdup_printf("/backdrop/screen%d/monitor%s/workspace%d/%s",
-                              panel->screen, panel->monitor_name, panel->workspace,
-                              property);
-    }
-
-    DBG("name %s", buf);
-
-    return buf;
-}
-
-static gchar*
-xfdesktop_settings_generate_old_binding_string(AppearancePanel *panel,
-                                               const gchar* property)
-{
-    gchar *buf = NULL;
-
-    buf = g_strdup_printf("/backdrop/screen%d/monitor%d/%s",
-                          panel->screen, panel->monitor, property);
-
-    DBG("name %s", buf);
-
-    return buf;
-}
-
-/* Attempts to load the backdrop from the current location followed by using
- * how previous versions of xfdesktop (before 4.11) did. This matches how
- * xfdesktop searches for backdrops.
- * Free the returned string when done using it. */
-static gchar *
-xfdesktop_settings_get_backdrop_image(AppearancePanel *panel)
-{
-    gchar *last_image;
-    gchar *property, *old_property = NULL;
-
-    /* Get the last image/current image displayed, if available */
-    property = xfdesktop_settings_generate_per_workspace_binding_string(panel, "last-image");
-
-    last_image = xfconf_channel_get_string(panel->channel, property, NULL);
-
-    /* Try the previous version or fall back to our provided default */
-    if(last_image == NULL) {
-        old_property = xfdesktop_settings_generate_old_binding_string(panel,
-                                                                      "image-path");
-        last_image = xfconf_channel_get_string(panel->channel,
-                                               old_property,
-                                               DEFAULT_BACKDROP);
-    }
-
-    g_free(property);
-    if(old_property)
-        g_free(old_property);
-
-    return last_image;
-}
-
-static void
-cb_image_selection_changed(GtkIconView *icon_view,
-                           gpointer user_data)
-{
-    AppearancePanel *panel = user_data;
-    GtkTreeModel *model = gtk_icon_view_get_model(icon_view);
-    GtkTreeIter iter;
-    GList *selected_items = NULL;
-    gchar *filename = NULL, *current_filename = NULL;
-    gchar *buf = NULL;
-
-    TRACE("entering");
-
-    if(panel->image_list_loaded && GTK_IS_TREE_MODEL(model))
-        return;
-
-    selected_items = gtk_icon_view_get_selected_items(icon_view);
-
-    /* We only care about the first selected item because the iconview
-     * should be set to single selection mode */
-    if(!selected_items || g_list_first(selected_items) == NULL)
-        return;
-
-    if(!gtk_tree_model_get_iter(model, &iter, g_list_first(selected_items)->data))
-        return;
-
-    gtk_tree_model_get(model, &iter, COL_FILENAME, &filename, -1);
-
-    /* Get the current/last image, handles migrating from old versions */
-    current_filename = xfdesktop_settings_get_backdrop_image(panel);
-
-    /* check to see if the selection actually did change */
-    if(g_strcmp0(current_filename, filename) != 0) {
-        if(panel->monitor_name == NULL) {
-            DBG("got %s, applying to screen %d monitor %d workspace %d", filename,
-                panel->screen, panel->monitor, panel->workspace);
-        } else {
-            DBG("got %s, applying to screen %d monitor %s workspace %d", filename,
-                panel->screen, panel->monitor_name, panel->workspace);
-        }
-
-        /* Get the property location to save our changes, always save to new
-         * location */
-        buf = xfdesktop_settings_generate_per_workspace_binding_string(panel,
-                                                                       "last-image");
-        DBG("Saving to %s/%s", buf, filename);
-        xfconf_channel_set_string(panel->channel, buf, filename);
-    }
-
-    g_list_foreach (selected_items, (GFunc)gtk_tree_path_free, NULL);
-    g_list_free(selected_items);
-    g_free(current_filename);
-    if(buf)
-        g_free(buf);
-}
-
-static gint
-xfdesktop_settings_get_active_workspace(AppearancePanel *panel,
-                                        WnckWindow *wnck_window)
-{
-    WnckWorkspace *wnck_workspace;
-    gboolean single_workspace;
-    gint workspace_num, single_workspace_num;
-    WnckScreen *wnck_screen = wnck_window_get_screen(wnck_window);
-
-    wnck_workspace = wnck_window_get_workspace(wnck_window);
-
-    /* If wnck_workspace is NULL that means it's pinned and we just need to
-     * use the active/current workspace */
-    if(wnck_workspace != NULL) {
-        workspace_num = wnck_workspace_get_number(wnck_workspace);
-    } else {
-        workspace_num = panel->active_workspace;
-    }
-
-    single_workspace = xfconf_channel_get_bool(panel->channel,
-                                               SINGLE_WORKSPACE_MODE,
-                                               TRUE);
-
-    /* If we're in single_workspace mode we need to return the workspace that
-     * it was set to, if that workspace exists, otherwise return the current
-     * workspace and turn off the single workspace mode */
-    if(single_workspace) {
-        single_workspace_num = xfconf_channel_get_int(panel->channel,
-                                                      SINGLE_WORKSPACE_NUMBER,
-                                                      0);
-        if(single_workspace_num < wnck_screen_get_workspace_count(wnck_screen)) {
-            return single_workspace_num;
-        } else {
-            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(panel->chk_apply_to_all),
-                                         FALSE);
-        }
-    }
-
-    return workspace_num;
-}
-
-/* This works for both the custom font size and show tooltips check buttons,
- * it just enables the associated spin button */
-static void
-cb_xfdesktop_chk_button_toggled(GtkCheckButton *button,
-                                gpointer user_data)
-{
-    GtkWidget *spin_button = GTK_WIDGET(user_data);
-
-    TRACE("entering");
-
-    gtk_widget_set_sensitive(spin_button,
-                             gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
-}
-
-static void
-update_backdrop_random_order_chkbox(AppearancePanel *panel)
-{
-    gboolean sensitive = FALSE;
-    gint period;
-
-    /* For the random check box to be active the combo_backdrop_cycle_period
-     * needs to be active and needs to not be set to chronological */
-    if(gtk_widget_get_sensitive(panel->combo_backdrop_cycle_period)) {
-        period = gtk_combo_box_get_active(GTK_COMBO_BOX(panel->combo_backdrop_cycle_period));
-        if(period != XFCE_BACKDROP_PERIOD_CHRONOLOGICAL)
-            sensitive = TRUE;
-    }
-
-    gtk_widget_set_sensitive(panel->random_backdrop_order_chkbox, sensitive);
-}
-
-static void
-update_backdrop_cycle_spinbox(AppearancePanel *panel)
-{
-    gboolean sensitive = FALSE;
-    gint period;
-
-    /* For the spinbox to be active the combo_backdrop_cycle_period needs to be
-     * active and needs to be set to something where the spinbox would apply */
-    if(gtk_widget_get_sensitive(panel->combo_backdrop_cycle_period)) {
-        period = gtk_combo_box_get_active(GTK_COMBO_BOX(panel->combo_backdrop_cycle_period));
-        if(period == XFCE_BACKDROP_PERIOD_SECONDS ||
-           period == XFCE_BACKDROP_PERIOD_MINUES  ||
-           period == XFCE_BACKDROP_PERIOD_HOURS)
-        {
-            sensitive = TRUE;
-        }
-    }
-
-    gtk_widget_set_sensitive(panel->backdrop_cycle_spinbox, sensitive);
-}
-
-static void
-cb_combo_backdrop_cycle_period_change(GtkComboBox *combo,
-                                      gpointer user_data)
-{
-    AppearancePanel *panel = user_data;
-
-    /* determine if the spin box should be sensitive */
-    update_backdrop_cycle_spinbox(panel);
-    /* determine if the random check box should be sensitive */
-    update_backdrop_random_order_chkbox(panel);
-}
-
-static void
-cb_xfdesktop_chk_cycle_backdrop_toggled(GtkCheckButton *button,
-                                        gpointer user_data)
-{
-    AppearancePanel *panel = user_data;
-    gboolean sensitive = FALSE;
-
-    TRACE("entering");
-
-    if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(panel->backdrop_cycle_chkbox))) {
-           sensitive = TRUE;
-    }
-
-    /* The cycle backdrop toggles the period and random widgets */
-    gtk_widget_set_sensitive(panel->combo_backdrop_cycle_period, sensitive);
-    /* determine if the spin box should be sensitive */
-    update_backdrop_cycle_spinbox(panel);
-    /* determine if the random check box should be sensitive */
-    update_backdrop_random_order_chkbox(panel);
-}
-
-static gboolean
-xfdesktop_spin_icon_size_timer(GtkSpinButton *button)
-{
-    XfconfChannel *channel = g_object_get_data(G_OBJECT(button), "xfconf-chanel");
-
-    TRACE("entering");
-
-    g_return_val_if_fail(XFCONF_IS_CHANNEL(channel), FALSE);
-
-    xfconf_channel_set_uint(channel,
-                            DESKTOP_ICONS_ICON_SIZE_PROP,
-                            gtk_spin_button_get_value(button));
-
-    return FALSE;
-}
-
-static void
-cb_xfdesktop_spin_icon_size_changed(GtkSpinButton *button,
-                                    gpointer user_data)
-{
-    guint timer_id = 0;
-
-    TRACE("entering");
-
-    g_object_set_data(G_OBJECT(button), "xfconf-chanel", user_data);
-
-    timer_id = GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(button), "timer-id"));
-    if(timer_id != 0) {
-        g_source_remove(timer_id);
-        timer_id = 0;
-    }
-
-    timer_id = g_timeout_add(500,
-                             (GSourceFunc)xfdesktop_spin_icon_size_timer,
-                             button);
-
-    g_object_set_data(G_OBJECT(button), "timer-id", GUINT_TO_POINTER(timer_id));
-}
-
-static void
-xfdesktop_settings_stop_image_loading(AppearancePanel *panel)
-{
-    /* stop any thumbnailing in progress */
-    xfdesktop_thumbnailer_dequeue_all_thumbnails(panel->thumbnailer);
-
-    /* Remove the previews in the message queue */
-    if(panel->preview_queue != NULL) {
-        while(g_async_queue_length(panel->preview_queue) > 0) {
-            gpointer data = g_async_queue_try_pop(panel->preview_queue);
-            if(data)
-                xfdesktop_settings_free_pdata(data);
-        }
-    }
-
-    /* Cancel any file enumeration that's running */
-    if(panel->cancel_enumeration != NULL) {
-        g_cancellable_cancel(panel->cancel_enumeration);
-        g_object_unref(panel->cancel_enumeration);
-        panel->cancel_enumeration = NULL;
-    }
-
-    /* Cancel the file enumeration for populating the icon view */
-    if(panel->add_dir_idle_id != 0) {
-        g_source_remove(panel->add_dir_idle_id);
-        panel->add_dir_idle_id = 0;
-    }
-}
-
-static void
-cb_xfdesktop_bnt_exit_clicked(GtkButton *button, gpointer user_data)
-{
-    AppearancePanel *panel = user_data;
-
-    xfdesktop_settings_stop_image_loading(panel);
-}
-
-static void
-cb_folder_selection_changed(GtkWidget *button,
-                            gpointer user_data)
-{
-    AppearancePanel *panel = user_data;
-    gchar *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(button));
-    gchar *previous_filename = NULL;
-
-    TRACE("entering");
-
-    if(panel->selected_folder != NULL)
-        previous_filename = g_file_get_path(panel->selected_folder);
-
-    /* Check to see if the folder actually did change */
-    if(g_strcmp0(filename, previous_filename) == 0) {
-        const gchar *current_folder = xfdesktop_settings_get_backdrop_image(panel);
-        gchar *dirname;
-
-        dirname = g_path_get_dirname(current_folder);
-
-        /* workaround another gtk bug - if the user sets the file chooser
-         * button to something then it can't be changed with a set folder
-         * call anymore. */
-        if(g_strcmp0(filename, dirname) == 0) {
-            DBG("folder didn't change");
-            g_free(dirname);
-            g_free(filename);
-            g_free(previous_filename);
-            return;
-        } else {
-            g_free(filename);
-            filename = dirname;
-        }
-    }
-
-    TRACE("folder changed to: %s", filename);
-
-    if(panel->selected_folder != NULL)
-        g_object_unref(panel->selected_folder);
-
-    panel->selected_folder = g_file_new_for_path(filename);
-
-    /* Stop any previous loading since something changed */
-    xfdesktop_settings_stop_image_loading(panel);
-
-    panel->cancel_enumeration = g_cancellable_new();
-
-    g_file_enumerate_children_async(panel->selected_folder,
-                                    XFDESKTOP_FILE_INFO_NAMESPACE,
-                                    G_FILE_QUERY_INFO_NONE,
-                                    G_PRIORITY_DEFAULT,
-                                    panel->cancel_enumeration,
-                                    xfdesktop_image_list_add_dir,
-                                    panel);
-
-    g_free(filename);
-    g_free(previous_filename);
-}
-
-static void
-cb_xfdesktop_combo_image_style_changed(GtkComboBox *combo,
-                                       gpointer user_data)
-{
-    AppearancePanel *panel = user_data;
-
-    TRACE("entering");
-
-    if(gtk_combo_box_get_active(combo) == XFCE_BACKDROP_IMAGE_NONE) {
-        /* No wallpaper so set the iconview to insensitive so the user doesn't
-         * pick wallpapers that have no effect. Stop popping up tooltips for
-         * the now insensitive iconview and provide a tooltip explaining why
-         * the iconview is insensitive. */
-        gtk_widget_set_sensitive(panel->image_iconview, FALSE);
-        g_object_set(G_OBJECT(panel->image_iconview),
-                     "tooltip-column", -1,
-                     NULL);
-        gtk_widget_set_tooltip_text(panel->image_iconview,
-                                    _("Image selection is unavailable while the image style is set to None."));
-    } else {
-        gint tooltip_column;
-
-        /* We are expected to provide a wallpaper so make the iconview active.
-         * Additionally, if we were insensitive then we need to remove the
-         * global iconview tooltip and enable the individual tooltips again. */
-        gtk_widget_set_sensitive(panel->image_iconview, TRUE);
-        g_object_get(G_OBJECT(panel->image_iconview),
-                     "tooltip-column", &tooltip_column,
-                     NULL);
-        if(tooltip_column == -1) {
-            gtk_widget_set_tooltip_text(panel->image_iconview, NULL);
-            g_object_set(G_OBJECT(panel->image_iconview),
-                         "tooltip-column", COL_NAME,
-                         NULL);
-        }
-    }
-}
-
-static void
-cb_xfdesktop_combo_color_changed(GtkComboBox *combo,
-                                 gpointer user_data)
-{
-    enum {
-        COLORS_SOLID = 0,
-        COLORS_HGRADIENT,
-        COLORS_VGRADIENT,
-        COLORS_NONE,
-    };
-    AppearancePanel *panel = user_data;
-
-    TRACE("entering");
-
-    if(gtk_combo_box_get_active(combo) == COLORS_SOLID) {
-        gtk_widget_set_sensitive(panel->color1_btn, TRUE);
-        gtk_widget_set_sensitive(panel->color2_btn, FALSE);
-    } else if(gtk_combo_box_get_active(combo) == COLORS_NONE) {
-        gtk_widget_set_sensitive(panel->color1_btn, FALSE);
-        gtk_widget_set_sensitive(panel->color2_btn, FALSE);
-    } else {
-        gtk_widget_set_sensitive(panel->color1_btn, TRUE);
-        gtk_widget_set_sensitive(panel->color2_btn, TRUE);
-    }
-}
-
-static void
-xfdesktop_settings_update_iconview_folder(AppearancePanel *panel)
-{
-    gchar *current_folder, *dirname;
-
-    /* If we haven't found our window return now and wait for that */
-    if(panel->wnck_window == NULL)
-        return;
-
-    TRACE("entering");
-
-    current_folder = xfdesktop_settings_get_backdrop_image(panel);
-    dirname = g_path_get_dirname(current_folder);
-
-    DBG("current_folder %s, dirname %s", current_folder, dirname);
-
-    gtk_file_chooser_set_current_folder((GtkFileChooser*)panel->btn_folder, dirname);
-
-    /* Workaround for a bug in GTK */
-    cb_folder_selection_changed(panel->btn_folder, panel);
-
-    g_free(current_folder);
-    g_free(dirname);
-}
-
-/* This function is to add or remove all the bindings for the background
- * tab. It's intended to be used when the app changes monitors or workspaces.
- * It reverts the items back to their defaults before binding any new settings
- * that way if the setting isn't present, the default correctly displays. */
-static void
-xfdesktop_settings_background_tab_change_bindings(AppearancePanel *panel,
-                                                  gboolean remove_binding)
-{
-    gchar *buf, *old_property = NULL;
-    XfconfChannel *channel = panel->channel;
-
-    /* Image style combo box */
-    buf = xfdesktop_settings_generate_per_workspace_binding_string(panel, "image-style");
-    if(remove_binding) {
-        xfconf_g_property_unbind_by_property(channel, buf,
-                               G_OBJECT(panel->image_style_combo), "active");
-    } else {
-        /* If the current image style doesn't exist, try to load the old one */
-        if(!xfconf_channel_has_property(channel, buf)) {
-            gint image_style;
-            old_property = xfdesktop_settings_generate_old_binding_string(panel, "image-style");
-
-            /* default to stretched when trying to migrate */
-            image_style = xfconf_channel_get_int(channel, old_property, XFCE_BACKDROP_IMAGE_STRETCHED);
-
-            /* xfce_translate_image_styles will do sanity checking */
-            gtk_combo_box_set_active(GTK_COMBO_BOX(panel->image_style_combo),
-                                     xfce_translate_image_styles(image_style));
-
-            g_free(old_property);
-        }
-
-        xfconf_g_property_bind(channel, buf, G_TYPE_INT,
-                               G_OBJECT(panel->image_style_combo), "active");
-        /* determine if the iconview is sensitive */
-        cb_xfdesktop_combo_image_style_changed(GTK_COMBO_BOX(panel->image_style_combo), panel);
-    }
-    g_free(buf);
-
-    /* Color style combo box */
-    buf = xfdesktop_settings_generate_per_workspace_binding_string(panel, "color-style");
-    if(remove_binding) {
-        xfconf_g_property_unbind_by_property(channel, buf,
-                           G_OBJECT(panel->color_style_combo), "active");
-    } else {
-        /* If the current color style doesn't exist, try to load the old one */
-        if(!xfconf_channel_has_property(channel, buf)) {
-            gint color_style;
-            old_property = xfdesktop_settings_generate_old_binding_string(panel, "color-style");
-
-            /* default to solid when trying to migrate */
-            color_style = xfconf_channel_get_int(channel, old_property, XFCE_BACKDROP_COLOR_SOLID);
-
-            /* sanity check */
-            if(color_style < 0 || color_style > XFCE_BACKDROP_COLOR_TRANSPARENT) {
-                g_warning("invalid color style, setting to solid");
-                color_style = XFCE_BACKDROP_COLOR_SOLID;
-            }
-
-            gtk_combo_box_set_active(GTK_COMBO_BOX(panel->color_style_combo),
-                                     color_style);
-            g_free(old_property);
-        }
-
-        xfconf_g_property_bind(channel, buf, G_TYPE_INT,
-                               G_OBJECT(panel->color_style_combo), "active");
-        /* update the color button sensitivity */
-        cb_xfdesktop_combo_color_changed(GTK_COMBO_BOX(panel->color_style_combo), panel);
-    }
-    g_free(buf);
-
-    /* color 1 button */
-    buf = xfdesktop_settings_generate_per_workspace_binding_string(panel, "color1");
-    if(remove_binding) {
-        xfconf_g_property_unbind(panel->color1_btn_id);
-    } else {
-        /* If the first color doesn't exist, try to load the old one */
-        if(!xfconf_channel_has_property(channel, buf)) {
-            GValue value = { 0, };
-            old_property = xfdesktop_settings_generate_old_binding_string(panel, "color2");
-
-            xfconf_channel_get_property(channel, old_property, &value);
-
-            if(G_VALUE_HOLDS_BOXED(&value)) {
-                gtk_color_button_set_color(GTK_COLOR_BUTTON(panel->color2_btn),
-                                           g_value_get_boxed(&value));
-                g_value_unset(&value);