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

[Jackson Doak]

New upstream bugfix release

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

Unmerged revisions

97. By Jackson Doak on 2014-03-19

* Merge from debian. Remaining changes:
  - debian/patches/xubuntu_improve-nautilus-interactions.patch: added,
    should prevent nautilus from taking over the desktop if xfdesktop is
    running (and vice-versa).
  - debian/patches/xubuntu_set-accountsservice-user-bg.patch: update the
    user background property of Accountsservice on backdrop change.

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2014-03-01 16:02:38 +0000
+++ .pc/applied-patches	2014-03-19 05:52:10 +0000
@@ -1,3 +1,2 @@
-git-fix-segfault-on-session-start.patch
 xubuntu_set-accountsservice-user-bg.patch
 xubuntu_improve-nautilus-interactions.patch

=== removed directory '.pc/git-fix-segfault-on-session-start.patch'
=== removed directory '.pc/git-fix-segfault-on-session-start.patch/src'
=== removed file '.pc/git-fix-segfault-on-session-start.patch/src/xfce-desktop.c'
--- .pc/git-fix-segfault-on-session-start.patch/src/xfce-desktop.c	2014-02-28 21:52:55 +0000
+++ .pc/git-fix-segfault-on-session-start.patch/src/xfce-desktop.c	1970-01-01 00:00:00 +0000
@@ -1,1695 +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>
-
-#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
-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(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;
-
-#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 *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++) {
-        /* Sanity check */
-        if(current_workspace < desktop->priv->nworkspaces && current_workspace >= 0) {
-            /* update! */
-            new_backdrop = xfce_workspace_get_backdrop(desktop->priv->workspaces[new_workspace], i);
-            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];
-    Atom 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);
-
-    /* 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);
-   }
-
-    XSelectInput(gdk_x11_get_default_xdisplay(), xwin, PropertyChangeMask | ButtonPressMask);
-    XSetSelectionOwner(gdk_x11_get_default_xdisplay(), 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);
-    if(gtk_major_version > 2
-       || (gtk_major_version == 2 && gtk_minor_version >= 13))
-    {
-        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);
-    
-    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);
-
-    xfce_desktop_refresh(desktop);
-    desktop->priv->style_refresh_timer = 0;
-
-    return FALSE;
-}
-
-static void
-xfce_desktop_style_set(GtkWidget *w, GtkStyle *old_style)
-{
-    XfceDesktop *desktop = XFCE_DESKTOP(w);
-
-    if(desktop->priv->style_refresh_timer != 0)
-        g_source_remove(desktop->priv->style_refresh_timer);
-
-    desktop->priv->style_refresh_timer = g_timeout_add_seconds(1, (GSourceFunc)style_refresh_cb, w);
-}
-
-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;
-
-    g_return_if_fail(XFCE_IS_DESKTOP(desktop));
-
-    if(!gtk_widget_get_realized(GTK_WIDGET(desktop)))
-        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
-}

=== modified file '.pc/xubuntu_improve-nautilus-interactions.patch/src/xfce-desktop.c'
--- .pc/xubuntu_improve-nautilus-interactions.patch/src/xfce-desktop.c	2014-03-01 16:02:38 +0000
+++ .pc/xubuntu_improve-nautilus-interactions.patch/src/xfce-desktop.c	2014-03-19 05:52:10 +0000
@@ -115,7 +115,6 @@
     gboolean icons_font_size_set;
     guint icons_font_size;
     guint icons_size;
-    gint  style_refresh_timer;
     GtkWidget *icon_view;
     gdouble system_font_size;
 #endif
@@ -448,7 +447,10 @@
     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;
 
@@ -689,7 +691,7 @@
 {
     XfceDesktop *desktop = XFCE_DESKTOP(user_data);
     gint current_workspace, new_workspace, i;
-    XfceBackdrop *new_backdrop;
+    XfceBackdrop *current_backdrop, *new_backdrop;
 
     TRACE("entering");
 
@@ -710,11 +712,16 @@
         current_workspace, new_workspace);
 
     for(i = 0; i < xfce_desktop_get_n_monitors(desktop); i++) {
-        /* Sanity check */
+        /* 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) {
-            /* update! */
+            current_backdrop = xfce_workspace_get_backdrop(desktop->priv->workspaces[current_workspace], i);
             new_backdrop = xfce_workspace_get_backdrop(desktop->priv->workspaces[new_workspace], i);
-            backdrop_changed_cb(new_backdrop, user_data);
+
+            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 */
@@ -976,9 +983,6 @@
     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);
 }
 
@@ -1085,14 +1089,11 @@
     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);
-    if(gtk_major_version > 2
-       || (gtk_major_version == 2 && gtk_minor_version >= 13))
-    {
-        g_signal_connect(G_OBJECT(desktop->priv->gscreen),
-                         "monitors-changed",
-                         G_CALLBACK(xfce_desktop_monitors_changed),
-                         desktop);
-    }
+
+    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);
@@ -1299,7 +1300,8 @@
     }
     
     xfce_desktop_popup_root_menu(XFCE_DESKTOP(w), button, etime);
-    
+
+    gdk_event_free((GdkEvent*)evt);
     return TRUE;
 }
 
@@ -1338,26 +1340,45 @@
     return TRUE;
 }
 
-static gboolean
-style_refresh_cb(gpointer *w)
-{
-    XfceDesktop *desktop = XFCE_DESKTOP(w);
-
-    xfce_desktop_refresh(desktop);
-    desktop->priv->style_refresh_timer = 0;
-
-    return FALSE;
-}
-
 static void
 xfce_desktop_style_set(GtkWidget *w, GtkStyle *old_style)
 {
     XfceDesktop *desktop = XFCE_DESKTOP(w);
-
-    if(desktop->priv->style_refresh_timer != 0)
-        g_source_remove(desktop->priv->style_refresh_timer);
-
-    desktop->priv->style_refresh_timer = g_timeout_add_seconds(1, (GSourceFunc)style_refresh_cb, 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
@@ -1742,6 +1763,8 @@
 {
     gint i, current_workspace;
 
+    TRACE("entering");
+
     g_return_if_fail(XFCE_IS_DESKTOP(desktop));
 
     if(!gtk_widget_get_realized(GTK_WIDGET(desktop)))
@@ -1770,6 +1793,7 @@
     }
     xfce_desktop_setup_icon_view(desktop);
 #endif
+
 }
 
 void xfce_desktop_arrange_icons(XfceDesktop *desktop)

=== modified file '.pc/xubuntu_set-accountsservice-user-bg.patch/src/xfce-desktop.c'
--- .pc/xubuntu_set-accountsservice-user-bg.patch/src/xfce-desktop.c	2014-03-01 16:02:38 +0000
+++ .pc/xubuntu_set-accountsservice-user-bg.patch/src/xfce-desktop.c	2014-03-19 05:52:10 +0000
@@ -114,7 +114,6 @@
     gboolean icons_font_size_set;
     guint icons_font_size;
     guint icons_size;
-    gint  style_refresh_timer;
     GtkWidget *icon_view;
     gdouble system_font_size;
 #endif
@@ -367,7 +366,10 @@
     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;
 
@@ -604,7 +606,7 @@
 {
     XfceDesktop *desktop = XFCE_DESKTOP(user_data);
     gint current_workspace, new_workspace, i;
-    XfceBackdrop *new_backdrop;
+    XfceBackdrop *current_backdrop, *new_backdrop;
 
     TRACE("entering");
 
@@ -625,11 +627,16 @@
         current_workspace, new_workspace);
 
     for(i = 0; i < xfce_desktop_get_n_monitors(desktop); i++) {
-        /* Sanity check */
+        /* 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) {
-            /* update! */
+            current_backdrop = xfce_workspace_get_backdrop(desktop->priv->workspaces[current_workspace], i);
             new_backdrop = xfce_workspace_get_backdrop(desktop->priv->workspaces[new_workspace], i);
-            backdrop_changed_cb(new_backdrop, user_data);
+
+            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 */
@@ -891,9 +898,6 @@
     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);
 }
 
@@ -1000,14 +1004,11 @@
     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);
-    if(gtk_major_version > 2
-       || (gtk_major_version == 2 && gtk_minor_version >= 13))
-    {
-        g_signal_connect(G_OBJECT(desktop->priv->gscreen),
-                         "monitors-changed",
-                         G_CALLBACK(xfce_desktop_monitors_changed),
-                         desktop);
-    }
+
+    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);
@@ -1214,7 +1215,8 @@
     }
     
     xfce_desktop_popup_root_menu(XFCE_DESKTOP(w), button, etime);
-    
+
+    gdk_event_free((GdkEvent*)evt);
     return TRUE;
 }
 
@@ -1253,26 +1255,45 @@
     return TRUE;
 }
 
-static gboolean
-style_refresh_cb(gpointer *w)
-{
-    XfceDesktop *desktop = XFCE_DESKTOP(w);
-
-    xfce_desktop_refresh(desktop);
-    desktop->priv->style_refresh_timer = 0;
-
-    return FALSE;
-}
-
 static void
 xfce_desktop_style_set(GtkWidget *w, GtkStyle *old_style)
 {
     XfceDesktop *desktop = XFCE_DESKTOP(w);
-
-    if(desktop->priv->style_refresh_timer != 0)
-        g_source_remove(desktop->priv->style_refresh_timer);
-
-    desktop->priv->style_refresh_timer = g_timeout_add_seconds(1, (GSourceFunc)style_refresh_cb, 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
@@ -1657,6 +1678,8 @@
 {
     gint i, current_workspace;
 
+    TRACE("entering");
+
     g_return_if_fail(XFCE_IS_DESKTOP(desktop));
 
     if(!gtk_widget_get_realized(GTK_WIDGET(desktop)))
@@ -1685,6 +1708,7 @@
     }
     xfce_desktop_setup_icon_view(desktop);
 #endif
+
 }
 
 void xfce_desktop_arrange_icons(XfceDesktop *desktop)

=== modified file 'ChangeLog'
--- ChangeLog	2014-02-20 15:59:49 +0000
+++ ChangeLog	2014-03-19 05:52:10 +0000
@@ -1,3 +1,478 @@
+commit 46bf9f74cb3099c5f233f9e773e8a8bf937837ef
+Author: pkon <[e-mail]>
+Date:   Tue Mar 18 00:32:01 2014 +0100
+
+    I18n: Update translation da (97%).
+    
+    210 translated messages, 6 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 2f210966342c560a07cbe1ae74c1c49bcb0ba982
+Author: Eric Koegel <[e-mail]>
+Date:   Mon Mar 17 15:39:52 2014 +0300
+
+    Fix icon theme colors
+    
+    When the icon theme colors change, either thorugh gtkrc files or
+    Xfsettingd, xfdesktop will now properly reflect those changes.
+
+commit d0703cd604f3070325f9225477b5e08dc42b7569
+Author: Eric Koegel <[e-mail]>
+Date:   Sat Mar 15 23:10:44 2014 +0300
+
+    Fix a small memory leak
+
+commit d84f8bf2155728ff267bbf746f517ae971c0b37c
+Author: Eric Koegel <[e-mail]>
+Date:   Fri Mar 14 20:26:44 2014 +0300
+
+    Fix build errors
+    
+    When some flags were passed xfdesktop failed to build because
+    libexo wasn't being properly added.
+
+commit f0e5154a5ff15f4d12d08cbc7f044641fa5b768e
+Author: Eric Koegel <[e-mail]>
+Date:   Fri Mar 14 19:27:27 2014 +0300
+
+    Always depend on dbus-glib (Bug 10745)
+    
+    Thanks to Samuli Suominen for reporting the issue and proposing
+    the fix.
+
+commit 2dd0f8d716ea29b48d5bec0f6e78b0b51e315820
+Author: Eric Koegel <[e-mail]>
+Date:   Fri Mar 14 19:13:39 2014 +0300
+
+    Release the file monitor
+
+commit f04b79a8724a39880ffcdf205946318294e228ae
+Author: Eric Koegel <[e-mail]>
+Date:   Fri Mar 14 19:12:05 2014 +0300
+
+    Point to the same initial help page
+
+commit 4eb6cee987dd7279b72ea200909d9e9e658a5c49
+Author: Eric Koegel <[e-mail]>
+Date:   Wed Mar 12 19:56:21 2014 +0300
+
+    Improve cover art loading
+    
+    Moved the code to the regular file icon section. It now monitors
+    folders for the album art image and loads it if it is added.
+
+commit 81e3969103a4b2fc705322bd9afee4e415934f80
+Author: Eric Koegel <[e-mail]>
+Date:   Wed Mar 12 08:40:16 2014 +0300
+
+    Improve style changes for the desktop
+    
+    This patch changes how style-set events are handled. Instead of
+    re-creating the icon view to deal with XSettings manager changes,
+    we now reset all the styles on the icon view and let it re-set them
+    to what it needs to. This stops the icon view from destroying and
+    recreating all the icons which should make startup a little faster.
+
+commit 5d3842ff008e595b51304b0deab6ab4ab98ebcc8
+Author: Eric Koegel <[e-mail]>
+Date:   Mon Mar 10 10:39:14 2014 +0300
+
+    Keep the .desktop.in file
+    
+    The .desktop.in file is generated by the .desktop.in.in file,
+    however translations are applied against the desktop.in so we'll
+    keep it in tree so that translations continue to work. The only
+    thing that will change in the desktop.in file is the version string
+    during stable/development changes (i.e. from 4.11 to 4.12).
+
+commit d7aa645cf7a28a7add0d6b5b77bd18daf40fbdce
+Author: Nucleo <[e-mail]>
+Date:   Mon Mar 10 00:32:10 2014 +0100
+
+    I18n: Update translation hu (100%).
+    
+    216 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit dfd5d961f5e310ff6175a943ed7ca2aa9df9570c
+Author: Eric Koegel <[e-mail]>
+Date:   Sun Mar 9 20:46:15 2014 +0300
+
+    Use the macro in the .in.in desktop file
+
+commit cab928565105e1081165ba5bd398f0df88e33acd
+Author: Eric Koegel <[e-mail]>
+Date:   Sun Mar 9 20:36:53 2014 +0300
+
+    update potfiles for file rename
+
+commit d27d14f242cbd94fcfbdf881d62c6e2b60f806a7
+Author: Eric Koegel <[e-mail]>
+Date:   Sun Mar 9 16:51:52 2014 +0300
+
+    Add versioned help when a GtkPlug
+    
+    This patch calls the versioned online help docs when xfdesktop-settings
+    is embedded as a GtkPlug.
+
+commit 0eee3e53a7280235ea69da2308f550d2115d8cd2
+Author: Eric Koegel <[e-mail]>
+Date:   Sun Mar 9 08:46:32 2014 +0300
+
+    Fix a typo
+
+commit 2c357ee2b17d5438188be996cf482e45c051e7c5
+Author: Eric Koegel <[e-mail]>
+Date:   Fri Mar 7 21:09:11 2014 +0300
+
+    Change icons in settings app
+    
+    Symbolic icons have issues with some gtk2 themes where they don't
+    get colored properly. Additionally some themes don't have network-fs
+    or gnome-dev-network so change to gtk-network.
+
+commit 15df1cba1d2e1ff562cd0c08288f466cba42e736
+Author: Eric Koegel <[e-mail]>
+Date:   Mon Mar 3 19:51:30 2014 +0300
+
+    Make xfdesktop-settings pluggable again (Bug 10714)
+    
+    This changes the X-XfcePluggable back to true and forces wnck to
+    initialize instead of waiting for it in the main loop, but only
+    when the dialog is embedded. This allows xfdesktop-settings to
+    be embeeded in the settings dialog again.
+
+commit 67a8cfb24fc4131e6cd74a52901e5389cc9b6757
+Author: Eric Koegel <[e-mail]>
+Date:   Tue Mar 4 21:13:01 2014 +0300
+
+    Point to versioned help docs
+    
+    xfdesktop-settings now points to the versioned docs hosted at
+    docs.xfce.org. This version string will always point to the
+    major.minor of xfdesktop so it will auto-increment in future relases.
+
+commit 3a497b0c7c496d33b464a5882ce6a09fa4a1d289
+Author: hoek <[e-mail]>
+Date:   Mon Mar 3 12:32:14 2014 +0100
+
+    I18n: Update translation pl (100%).
+    
+    216 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit d3c13d6aab145d916d6288f013fa30b8703dacb8
+Author: Eric Koegel <[e-mail]>
+Date:   Sun Mar 2 16:30:46 2014 +0300
+
+    Update the wallpapers after user sets folder
+    
+    If the user changes to a different folder with the gtk file chooser
+    button, it can no longer be set with gtk_file_chooser_set_current_folder.
+    Now, while the button won't get updated due to this bug in GTK, at
+    least the wallpapers will be current.
+
+commit dfb8f2141ca627e25d226ff259e7fe78cbd27434
+Author: Eric Koegel <[e-mail]>
+Date:   Sun Mar 2 12:46:40 2014 +0300
+
+    Minimize grid resizes
+    
+    Don't resize the grid on _NET_WORKAREA changes when the grid size
+    doesn't actually change.
+
+commit ad533417c2e491c36cfa0705aeb4cf020adad918
+Author: asvl <[e-mail]>
+Date:   Sun Mar 2 12:32:10 2014 +0100
+
+    I18n: Update translation ru (100%).
+    
+    216 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 12b9528fd10769fff10346a503922fa280d0c293
+Author: Eric Koegel <[e-mail]>
+Date:   Sun Mar 2 10:20:56 2014 +0300
+
+    Right click edits launchers
+    
+    When performing a right click, or shift + left click, on an item
+    in the applications sub-menu of the desktop menu it will now pop
+    up the dialog to edit the launcher.
+
+commit c0c498678def0f32f24bb0a1653408c78f9495da
+Author: Eric Koegel <[e-mail]>
+Date:   Sun Mar 2 09:13:13 2014 +0300
+
+    Remove old version check
+
+commit e92af0cdace692250c289ea608568fc2b24d684d
+Author: k3lt01 <[e-mail]>
+Date:   Sat Mar 1 12:31:57 2014 +0100
+
+    I18n: Update translation en_AU (100%).
+    
+    216 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 9d88b44f661c018f24f57024f2ac8ce4b31ddd02
+Author: schizo <[e-mail]>
+Date:   Sat Mar 1 00:32:43 2014 +0100
+
+    I18n: Update translation hr (100%).
+    
+    216 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 0faa35f692b7dd073ee761188452f159905cea70
+Author: theppitak <[e-mail]>
+Date:   Fri Feb 28 18:32:17 2014 +0100
+
+    I18n: Update translation th (100%).
+    
+    216 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit c6380c59b5256de221ff06120421d87f18149d6c
+Author: abuyop <[e-mail]>
+Date:   Fri Feb 28 18:32:17 2014 +0100
+
+    I18n: Update translation ms (100%).
+    
+    216 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 830ee398e020a34656525a9e0d9319279a37e066
+Author: filorin <[e-mail]>
+Date:   Fri Feb 28 18:32:16 2014 +0100
+
+    I18n: Update translation fr (100%).
+    
+    216 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit fd8e70b4136b2a5d7590d3395b58cd9d1baa65ef
+Author: Pablo Lezaeta <[e-mail]>
+Date:   Thu Feb 27 00:32:04 2014 +0100
+
+    I18n: Update translation es (100%).
+    
+    216 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 8cdbb6f2ff2c237fc44788b24aa1018e612d93f8
+Author: Cheng-Chia Tseng <[e-mail]>
+Date:   Wed Feb 26 18:32:56 2014 +0100
+
+    I18n: Update translation zh_TW (100%).
+    
+    216 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 5da4695c33288aeeed2b8934d3b535d8ca657bda
+Author: salepetronije <[e-mail]>
+Date:   Wed Feb 26 12:32:24 2014 +0100
+
+    I18n: Update translation sr (100%).
+    
+    216 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 19df3baad37c51d2ebc8cef0d3b0dfa8ab098033
+Author: Eric Koegel <[e-mail]>
+Date:   Wed Feb 26 13:46:57 2014 +0300
+
+    Fix a runtime warning
+    
+    If one of the checks in the style refresh happened then the
+    refresh timer was destroyed with a return FALSE, but our source
+    id for that timer wasn't cleared. This fixes it.
+
+commit 22fd6840660e5154a7051647051deefea90bfe27
+Author: Eric Koegel <[e-mail]>
+Date:   Wed Feb 26 12:43:02 2014 +0300
+
+    Fix a crash when removing displays
+    
+    When a screen is extended to the right and then changed to mirrored
+    this can cause xfdesktop to crash. This patch does a sanity check
+    to ensure there is a backdrop when the backdrop_changed_cb is
+    called.
+
+commit 36387ed6c75662a42d822d32029e425ae73a556d
+Author: Eric Koegel <[e-mail]>
+Date:   Wed Feb 26 10:02:35 2014 +0300
+
+    Reload the iconview on reload
+    
+    Cut the icon view code rather than a copy. Putting it back in.
+
+commit 26feb3b13e8c3c5ea9f41a51768dec230f139f15
+Author: Eric Koegel <[e-mail]>
+Date:   Tue Feb 25 12:08:46 2014 +0300
+
+    Better migration from previous version
+    
+    This code makes xfdesktop set whatever settings it finds to xfconf.
+    This way it isn't always trying to migrate if the user never defines
+    anything. There was also a couple bugs in the migration code that
+    have been fixed. Additionally, when gtk sends a style set we only
+    recreate the icon view (to update the labels) rather than refrsh
+    the wallpaper as well. This should make xfdesktop startup a little
+    faster. The style set workaround will go away in GTK3 when we get
+    there.
+
+commit 68be2f077b28db13eb5c4c095fbdc9b9027e5143
+Author: hjudt <[e-mail]>
+Date:   Tue Feb 25 18:33:13 2014 +0100
+
+    I18n: Update translation de (100%).
+    
+    216 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 17893452c4232e2ad944758f7d319167231ec8bf
+Author: Masato HASHIMOTO <[e-mail]>
+Date:   Tue Feb 25 12:32:39 2014 +0100
+
+    I18n: Update translation ja (100%).
+    
+    216 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit d4ae634403de31bd7a43d041d1550a1c299d3465
+Author: cri <[e-mail]>
+Date:   Tue Feb 25 12:32:39 2014 +0100
+
+    I18n: Update translation it (100%).
+    
+    216 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit e911be014c1274b1c457d661290a1a3662a81026
+Author: cybercop <[e-mail]>
+Date:   Tue Feb 25 12:32:39 2014 +0100
+
+    I18n: Update translation bg (100%).
+    
+    216 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 8506c1e2dc678452b067c742d0b55569c4abd0ad
+Author: Darkcircle <[e-mail]>
+Date:   Tue Feb 25 00:32:10 2014 +0100
+
+    I18n: Update translation ko (100%).
+    
+    216 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit d1d98fb12fd461bd00b99e821cae155ccd926716
+Author: Eric Koegel <[e-mail]>
+Date:   Mon Feb 24 10:16:20 2014 +0300
+
+    Clean up some user strings
+    
+    1) Some tooltips end with a period, some do not. This has been
+    unified.
+    
+    2) "You are using more than one display, move this dialog to the
+    display you want to edit the settings for." This takes a lot of
+    space and brings along a bit of redundancy. Changed to "Move this
+    dialog to the display you want to edit the settings for."
+    
+    3) "Other items" on the third tab, below removable devices: "devices"
+    is a better term than "items". Changed.
+    
+    Thanks to Harald Judt for pointing these issues out.
+
+commit 755ae10f0b20bc4f105d9a35b2596bae956bc1ff
+Author: Eric Koegel <[e-mail]>
+Date:   Mon Feb 24 09:59:58 2014 +0300
+
+    Show add/remove workspace option is on by default
+
+commit 05adaa59dbedd89b3e0ae6001ff367572c1be7d2
+Author: Eric Koegel <[e-mail]>
+Date:   Sun Feb 23 14:49:49 2014 +0300
+
+    Fix an settings issue when plug names aren't available
+    
+    When gdk_screen_get_monitor_plug_name doesn't return a monitor
+    name we were comparing monitor numbers but that check meant the
+    first monitor never got its settings updated.
+
+commit b1a7c62d4e78dc1cee7e3d499440618c085c7d48
+Author: Eric Koegel <[e-mail]>
+Date:   Sun Feb 23 13:37:20 2014 +0300
+
+    Fix a couple runtime warnings
+
+commit d309a6949b751002b33ed432f88fd47a1384db0e
+Author: Harald Judt <[e-mail]>
+Date:   Sat Feb 22 14:58:41 2014 +0100
+
+    Remember the window size of the settings dialog.
+    
+    Signed-off-by: Eric Koegel <[e-mail]>
+
+commit 6583a1a632779e72ba6ecfa32a10f30980081876
+Author: Thaddäus Tintenfisch <[e-mail]>
+Date:   Sun Feb 23 09:02:58 2014 +0300
+
+    Fix segfault on session start
+    
+    Signed-off-by: Eric Koegel <[e-mail]>
+
+commit bdc893fd97c8820f25d9b878ce97f28e6a43bfd1
+Author: hjudt <[e-mail]>
+Date:   Sat Feb 22 12:32:13 2014 +0100
+
+    I18n: Update translation de (100%).
+    
+    216 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 7627c46b680e96c09c44f630bd0707d3184777b9
+Author: hjudt <[e-mail]>
+Date:   Sat Feb 22 00:32:15 2014 +0100
+
+    I18n: Update translation de (99%).
+    
+    214 translated messages, 2 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit e613364882c606e337bb4036cd5a5b910967393a
+Author: Eric Koegel <[e-mail]>
+Date:   Wed Feb 19 21:00:12 2014 +0300
+
+    Post release tag bump.
+
+commit ffb99ffdcc7926cae8b8d1bbee286c5797d28083
+Author: Eric Koegel <[e-mail]>
+Date:   Wed Feb 19 20:54:05 2014 +0300
+
+    Updates for release.
+
 commit 9b9bacb445ded5050ea073b9b1c784883a43456b
 Author: Eric Koegel <[e-mail]>
 Date:   Mon Feb 17 15:26:42 2014 +0300

=== modified file 'Makefile.in'
--- Makefile.in	2014-02-20 15:59:49 +0000
+++ Makefile.in	2014-03-19 05:52:10 +0000
@@ -380,6 +380,7 @@
 XFCONF_LIBS = @XFCONF_LIBS@
 XFCONF_REQUIRED_VERSION = @XFCONF_REQUIRED_VERSION@
 XFCONF_VERSION = @XFCONF_VERSION@
+XFDESKTOP_VERSION_SHORT = @XFDESKTOP_VERSION_SHORT@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_ARGS = @XGETTEXT_ARGS@
 XMKMF = @XMKMF@

=== modified file 'NEWS'
--- NEWS	2014-02-20 15:59:49 +0000
+++ NEWS	2014-03-19 05:52:10 +0000
@@ -1,3 +1,72 @@
+4.11.4
+======
+[Please note that this is a development release.]
+
+Fifth development release of xfdesktop targeting for Xfce 4.12.
+Please report all problems at bugzilla.xfce.org.
+
+* Versioned help:
+  - Point to the docs.xfce.org page for xfdesktop 4.11. (Bug 10736)
+
+* Build errors with some compiler flags:
+  - dbus-glib is now required. Since xfconf requires it and
+    xfconf is already required for xfdesktop, this shouldn't
+    change dependancies much for xfdesktop. This bug was reported
+    and fixed by Samuli Suominen. (Bug 10745)
+  - Another build failure when disabling the menu and requiring
+    exo was also resolved.
+
+* Icon changes in the settings app:
+  - Symbolic icons have issues with some gtk2 themes where they
+    don't get colored properly. Additionally some themes don't
+    have network-fs or gnome-dev-network so it has been changed
+    gtk-network.
+
+* Right click edits launchers:
+  - When performing a right click, or shift + left click, on an item
+    in the applications sub-menu of the desktop menu it will now pop
+    up the dialog to edit the launcher. Same as xfce4-appfinder.
+
+* Better migration from previous versions:
+  - Xfdesktop now does a better job of migrating any user settings
+    from 4.10 and before to the new xfconf properties.
+  - Fix an settings issue when plug names aren't available
+
+* Clean up some user strings:
+  - Some tooltips end with a period, some do not. This has been
+    unified.
+  - "You are using more than one display, move this dialog to the
+    display you want to edit the settings for." This takes a lot of
+    space and brings along a bit of redundancy. Changed to "Move this
+    dialog to the display you want to edit the settings for."
+  - "Other items" on the third tab, below removable devices: "devices"
+    replaces "items".
+    Thanks to Harald Judt for pointing these issues out.
+
+* Remember the window size of the settings dialog
+  - Patch written by Harald Judt.
+
+* Fix segfault on session start
+  - Patch written by Thaddäus Tintenfisch
+
+* Miscellaneous bug fixes:
+  - Iconview theme/gtkrc color/style issues resolved.
+  - Issues with folder cover art not loading have been fixed.
+  - Make xfdesktop-settings pluggable again (Bug 10714)
+  - Update the wallpapers after user sets folder in the settings
+    app.
+  - Minimize grid resizes, it now won't recalculate icon positions
+    if the grid size didn't actually change.
+  - Memory leaks fixed.
+  - Warnings that happened during runtime have been fixed.
+  - Fix a crash when removing displays
+  - Show add/remove workspace option is on by default
+
+* Translation updates: Bulgarian (bg), Chinese (Taiwan) (zh_TW),
+  Croatian (hr), Danish (da), German (de), English (Australia) (en_AU),
+  French (fr), Italian (it), Japanese (ja), Korean (ko), Malay (ms),
+  Russian (ru), Serbian (sr), Spanish (Castilian) (es), Thai (th)
+
 4.11.3
 ======
 [Please note that this is a development release.]

=== modified file 'README'
--- README	2014-02-20 15:59:49 +0000
+++ README	2014-03-19 05:52:10 +0000
@@ -19,13 +19,13 @@
 * intltool 0.34
 * GTK+ 2.30.0
 * libxfce4util 4.10
-* libxfce4ui 4.10
+* libxfce4ui 4.11.1
 * libwnck 2.30
 * libexo 0.6
 * xfconf 4.10
+* dbus-glib 0.84
 * garcon 0.1.2 (optional; required for apps menu)
 * thunar 1.2 (optional; required for file icons)
-* dbus-glib 0.34  (optional; required for file icons)
 * tumbler 1.6 (optional; enables thumbnail previews for file icons)
 
 

=== modified file 'backgrounds/Makefile.in'
--- backgrounds/Makefile.in	2014-02-19 20:34:01 +0000
+++ backgrounds/Makefile.in	2014-03-19 05:52:10 +0000
@@ -300,6 +300,7 @@
 XFCONF_LIBS = @XFCONF_LIBS@
 XFCONF_REQUIRED_VERSION = @XFCONF_REQUIRED_VERSION@
 XFCONF_VERSION = @XFCONF_VERSION@
+XFDESKTOP_VERSION_SHORT = @XFDESKTOP_VERSION_SHORT@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_ARGS = @XGETTEXT_ARGS@
 XMKMF = @XMKMF@

=== modified file 'common/Makefile.in'
--- common/Makefile.in	2014-02-20 15:59:49 +0000
+++ common/Makefile.in	2014-03-19 05:52:10 +0000
@@ -324,6 +324,7 @@
 XFCONF_LIBS = @XFCONF_LIBS@
 XFCONF_REQUIRED_VERSION = @XFCONF_REQUIRED_VERSION@
 XFCONF_VERSION = @XFCONF_VERSION@
+XFDESKTOP_VERSION_SHORT = @XFDESKTOP_VERSION_SHORT@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_ARGS = @XGETTEXT_ARGS@
 XMKMF = @XMKMF@

=== modified file 'common/xfdesktop-thumbnailer.c'
--- common/xfdesktop-thumbnailer.c	2014-02-20 15:59:49 +0000
+++ common/xfdesktop-thumbnailer.c	2014-03-19 05:52:10 +0000
@@ -221,7 +221,7 @@
             g_object_unref(thumbnailer->priv->proxy);
 
         if(thumbnailer->priv->supported_mimetypes)
-            g_free(thumbnailer->priv->supported_mimetypes);
+            g_strfreev(thumbnailer->priv->supported_mimetypes);
 
         g_free(thumbnailer->priv);
         thumbnailer->priv = NULL;

=== modified file 'config.h.in'
--- config.h.in	2014-02-20 15:59:49 +0000
+++ config.h.in	2014-03-19 05:52:10 +0000
@@ -182,6 +182,9 @@
 /* Version number of package */
 #undef VERSION
 
+/* Short version string of xfdesktop */
+#undef XFDESKTOP_VERSION_SHORT
+
 /* Define to 1 if the X Window System is missing or not being used. */
 #undef X_DISPLAY_MISSING
 

=== modified file 'configure'
--- configure	2014-02-20 15:59:49 +0000
+++ configure	2014-03-19 05:52:10 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xfdesktop 4.11.3.
+# Generated by GNU Autoconf 2.69 for xfdesktop 4.11.4.
 #
 # Report bugs to <http://bugzilla.xfce.org/>.
 #
@@ -590,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='xfdesktop'
 PACKAGE_TARNAME='xfdesktop'
-PACKAGE_VERSION='4.11.3'
-PACKAGE_STRING='xfdesktop 4.11.3'
+PACKAGE_VERSION='4.11.4'
+PACKAGE_STRING='xfdesktop 4.11.4'
 PACKAGE_BUGREPORT='http://bugzilla.xfce.org/'
 PACKAGE_URL=''
 
@@ -647,10 +647,6 @@
 GARCON_LIBS
 GARCON_CFLAGS
 GARCON_VERSION
-LIBEXO_REQUIRED_VERSION
-LIBEXO_LIBS
-LIBEXO_CFLAGS
-LIBEXO_VERSION
 HAVE_THUNARX_FALSE
 HAVE_THUNARX_TRUE
 THUNARX_REQUIRED_VERSION
@@ -659,10 +655,6 @@
 THUNARX_VERSION
 ENABLE_FILE_ICONS_FALSE
 ENABLE_FILE_ICONS_TRUE
-DBUS_REQUIRED_VERSION
-DBUS_LIBS
-DBUS_CFLAGS
-DBUS_VERSION
 ENABLE_DESKTOP_ICONS_FALSE
 ENABLE_DESKTOP_ICONS_TRUE
 HAVE_GIO_UNIX_FALSE
@@ -671,6 +663,10 @@
 GIO_UNIX_LIBS
 GIO_UNIX_CFLAGS
 GIO_UNIX_VERSION
+LIBEXO_REQUIRED_VERSION
+LIBEXO_LIBS
+LIBEXO_CFLAGS
+LIBEXO_VERSION
 XFCONF_REQUIRED_VERSION
 XFCONF_LIBS
 XFCONF_CFLAGS
@@ -687,6 +683,10 @@
 LIBXFCE4UTIL_LIBS
 LIBXFCE4UTIL_CFLAGS
 LIBXFCE4UTIL_VERSION
+DBUS_REQUIRED_VERSION
+DBUS_LIBS
+DBUS_CFLAGS
+DBUS_VERSION
 GTK_REQUIRED_VERSION
 GTK_LIBS
 GTK_CFLAGS
@@ -710,6 +710,7 @@
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
+XFDESKTOP_VERSION_SHORT
 DBUS_BINDING_TOOL
 LIBSM_LIBS
 LIBSM_LDFLAGS
@@ -1467,7 +1468,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xfdesktop 4.11.3 to adapt to many kinds of systems.
+\`configure' configures xfdesktop 4.11.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1541,7 +1542,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xfdesktop 4.11.3:";;
+     short | recursive ) echo "Configuration of xfdesktop 4.11.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1687,7 +1688,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xfdesktop configure 4.11.3
+xfdesktop configure 4.11.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2056,7 +2057,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xfdesktop $as_me 4.11.3, which was
+It was created by xfdesktop $as_me 4.11.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2921,7 +2922,7 @@
 
 # Define the identity of the package.
  PACKAGE='xfdesktop'
- VERSION='4.11.3'
+ VERSION='4.11.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15053,6 +15054,12 @@
 fi
 
 
+$as_echo "#define XFDESKTOP_VERSION_SHORT \"4.11\"" >>confdefs.h
+
+XFDESKTOP_VERSION_SHORT="4.11"
+
+
+
 
   # minimum supported version of pkg-config
   xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0
@@ -16167,6 +16174,201 @@
 
 
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus-glib-1 >= 0.84" >&5
+$as_echo_n "checking for dbus-glib-1 >= 0.84... " >&6; }
+  if $PKG_CONFIG "--atleast-version=0.84" "dbus-glib-1" >/dev/null 2>&1; then
+    DBUS_VERSION=`$PKG_CONFIG --modversion "dbus-glib-1"`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_VERSION" >&5
+$as_echo "$DBUS_VERSION" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking DBUS_CFLAGS" >&5
+$as_echo_n "checking DBUS_CFLAGS... " >&6; }
+    DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1"`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_CFLAGS" >&5
+$as_echo "$DBUS_CFLAGS" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking DBUS_LIBS" >&5
+$as_echo_n "checking DBUS_LIBS... " >&6; }
+    DBUS_LIBS=`$PKG_CONFIG --libs "dbus-glib-1"`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_LIBS" >&5
+$as_echo "$DBUS_LIBS" >&6; }
+
+    DBUS_REQUIRED_VERSION=0.84
+
+
+
+
+
+
+
+  elif $PKG_CONFIG --exists "dbus-glib-1" >/dev/null 2>&1; then
+    xdt_cv_version=`$PKG_CONFIG --modversion "dbus-glib-1"`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5
+$as_echo "found, but $xdt_cv_version" >&6; }
+
+
+      echo "*** The required package dbus-glib-1 was found on your system,"
+      echo "*** but the installed version ($xdt_cv_version) is too old."
+      echo "*** Please upgrade dbus-glib-1 to atleast version 0.84, or adjust"
+      echo "*** the PKG_CONFIG_PATH environment variable if you installed"
+      echo "*** the new version of the package in a nonstandard prefix so"
+      echo "*** pkg-config is able to find it."
+      exit 1
+
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+
+
+      echo "*** The required package dbus-glib-1 was not found on your system."
+      echo "*** Please install dbus-glib-1 (atleast version 0.84) or adjust"
+      echo "*** the PKG_CONFIG_PATH environment variable if you"
+      echo "*** installed the package in a nonstandard prefix so that"
+      echo "*** pkg-config is able to find it."
+      exit 1
+
+  fi
+
+
+
+  # minimum supported version of pkg-config
+  xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0
+
+
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
+fi
+
+      if test x"$PKG_CONFIG" = x""; then
+        echo
+        echo "*** Your version of pkg-config is too old. You need atleast"
+        echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
+        echo "*** from the freedesktop.org software repository at"
+        echo "***"
+        echo "***    http://www.freedesktop.org/software/pkgconfig"
+        echo "***"
+        exit 1;
+      fi
+
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4util-1.0 >= 4.10.0" >&5
 $as_echo_n "checking for libxfce4util-1.0 >= 4.10.0... " >&6; }
   if $PKG_CONFIG "--atleast-version=4.10.0" "libxfce4util-1.0" >/dev/null 2>&1; then
@@ -16362,9 +16564,9 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4ui-1 >= 4.10.0" >&5
-$as_echo_n "checking for libxfce4ui-1 >= 4.10.0... " >&6; }
-  if $PKG_CONFIG "--atleast-version=4.10.0" "libxfce4ui-1" >/dev/null 2>&1; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4ui-1 >= 4.11.1" >&5
+$as_echo_n "checking for libxfce4ui-1 >= 4.11.1... " >&6; }
+  if $PKG_CONFIG "--atleast-version=4.11.1" "libxfce4ui-1" >/dev/null 2>&1; then
     LIBXFCE4UI_VERSION=`$PKG_CONFIG --modversion "libxfce4ui-1"`
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UI_VERSION" >&5
 $as_echo "$LIBXFCE4UI_VERSION" >&6; }
@@ -16381,7 +16583,7 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UI_LIBS" >&5
 $as_echo "$LIBXFCE4UI_LIBS" >&6; }
 
-    LIBXFCE4UI_REQUIRED_VERSION=4.10.0
+    LIBXFCE4UI_REQUIRED_VERSION=4.11.1
 
 
 
@@ -16397,7 +16599,7 @@
 
       echo "*** The required package libxfce4ui-1 was found on your system,"
       echo "*** but the installed version ($xdt_cv_version) is too old."
-      echo "*** Please upgrade libxfce4ui-1 to atleast version 4.10.0, or adjust"
+      echo "*** Please upgrade libxfce4ui-1 to atleast version 4.11.1, or adjust"
       echo "*** the PKG_CONFIG_PATH environment variable if you installed"
       echo "*** the new version of the package in a nonstandard prefix so"
       echo "*** pkg-config is able to find it."
@@ -16409,7 +16611,7 @@
 
 
       echo "*** The required package libxfce4ui-1 was not found on your system."
-      echo "*** Please install libxfce4ui-1 (atleast version 4.10.0) or adjust"
+      echo "*** Please install libxfce4ui-1 (atleast version 4.11.1) or adjust"
       echo "*** the PKG_CONFIG_PATH environment variable if you"
       echo "*** installed the package in a nonstandard prefix so that"
       echo "*** pkg-config is able to find it."
@@ -16809,6 +17011,201 @@
 
 
 
+  # minimum supported version of pkg-config
+  xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0
+
+
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
+fi
+
+      if test x"$PKG_CONFIG" = x""; then
+        echo
+        echo "*** Your version of pkg-config is too old. You need atleast"
+        echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
+        echo "*** from the freedesktop.org software repository at"
+        echo "***"
+        echo "***    http://www.freedesktop.org/software/pkgconfig"
+        echo "***"
+        exit 1;
+      fi
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exo-1 >= 0.7.0" >&5
+$as_echo_n "checking for exo-1 >= 0.7.0... " >&6; }
+  if $PKG_CONFIG "--atleast-version=0.7.0" "exo-1" >/dev/null 2>&1; then
+    LIBEXO_VERSION=`$PKG_CONFIG --modversion "exo-1"`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBEXO_VERSION" >&5
+$as_echo "$LIBEXO_VERSION" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBEXO_CFLAGS" >&5
+$as_echo_n "checking LIBEXO_CFLAGS... " >&6; }
+    LIBEXO_CFLAGS=`$PKG_CONFIG --cflags "exo-1"`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBEXO_CFLAGS" >&5
+$as_echo "$LIBEXO_CFLAGS" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBEXO_LIBS" >&5
+$as_echo_n "checking LIBEXO_LIBS... " >&6; }
+    LIBEXO_LIBS=`$PKG_CONFIG --libs "exo-1"`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBEXO_LIBS" >&5
+$as_echo "$LIBEXO_LIBS" >&6; }
+
+    LIBEXO_REQUIRED_VERSION=0.7.0
+
+
+
+
+
+
+
+  elif $PKG_CONFIG --exists "exo-1" >/dev/null 2>&1; then
+    xdt_cv_version=`$PKG_CONFIG --modversion "exo-1"`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5
+$as_echo "found, but $xdt_cv_version" >&6; }
+
+
+      echo "*** The required package exo-1 was found on your system,"
+      echo "*** but the installed version ($xdt_cv_version) is too old."
+      echo "*** Please upgrade exo-1 to atleast version 0.7.0, or adjust"
+      echo "*** the PKG_CONFIG_PATH environment variable if you installed"
+      echo "*** the new version of the package in a nonstandard prefix so"
+      echo "*** pkg-config is able to find it."
+      exit 1
+
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+
+
+      echo "*** The required package exo-1 was not found on your system."
+      echo "*** Please install exo-1 (atleast version 0.7.0) or adjust"
+      echo "*** the PKG_CONFIG_PATH environment variable if you"
+      echo "*** installed the package in a nonstandard prefix so that"
+      echo "*** pkg-config is able to find it."
+      exit 1
+
+  fi
+
+
+
 
 
   # Check whether --enable-gio-unix was given.
@@ -17082,198 +17479,6 @@
 fi
 
 if test "x$enable_desktop_icons" = "xyes" -a "x$enable_file_icons" = "xyes"; then
-
-
-  # minimum supported version of pkg-config
-  xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0
-
-
-
-
-
-
-
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
-  ac_pt_PKG_CONFIG=$PKG_CONFIG
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_pt_PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_pt_PKG_CONFIG" = x; then
-    PKG_CONFIG=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    PKG_CONFIG=$ac_pt_PKG_CONFIG
-  fi
-else
-  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-		PKG_CONFIG=""
-	fi
-fi
-
-      if test x"$PKG_CONFIG" = x""; then
-        echo
-        echo "*** Your version of pkg-config is too old. You need atleast"
-        echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
-        echo "*** from the freedesktop.org software repository at"
-        echo "***"
-        echo "***    http://www.freedesktop.org/software/pkgconfig"
-        echo "***"
-        exit 1;
-      fi
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus-glib-1 >= 0.84" >&5
-$as_echo_n "checking for dbus-glib-1 >= 0.84... " >&6; }
-  if $PKG_CONFIG "--atleast-version=0.84" "dbus-glib-1" >/dev/null 2>&1; then
-    DBUS_VERSION=`$PKG_CONFIG --modversion "dbus-glib-1"`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_VERSION" >&5
-$as_echo "$DBUS_VERSION" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking DBUS_CFLAGS" >&5
-$as_echo_n "checking DBUS_CFLAGS... " >&6; }
-    DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1"`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_CFLAGS" >&5
-$as_echo "$DBUS_CFLAGS" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking DBUS_LIBS" >&5
-$as_echo_n "checking DBUS_LIBS... " >&6; }
-    DBUS_LIBS=`$PKG_CONFIG --libs "dbus-glib-1"`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_LIBS" >&5
-$as_echo "$DBUS_LIBS" >&6; }
-
-    DBUS_REQUIRED_VERSION=0.84
-
-
-
-
-
-
-
-  elif $PKG_CONFIG --exists "dbus-glib-1" >/dev/null 2>&1; then
-    xdt_cv_version=`$PKG_CONFIG --modversion "dbus-glib-1"`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5
-$as_echo "found, but $xdt_cv_version" >&6; }
-
-
-echo "*** Optional package dbus-glib-1 was either not found on your system"
-echo "*** or is too old.  Please install or upgrade to at least version"
-echo "*** 0.84, or adjust the PKG_CONFIG_PATH environment variable"
-echo "*** if you installed the new version of the package in a nonstandard"
-echo "*** prefix.  File/launcher icons will be disabled."
-
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
-
-
-echo "*** Optional package dbus-glib-1 was either not found on your system"
-echo "*** or is too old.  Please install or upgrade to at least version"
-echo "*** 0.84, or adjust the PKG_CONFIG_PATH environment variable"
-echo "*** if you installed the new version of the package in a nonstandard"
-echo "*** prefix.  File/launcher icons will be disabled."
-
-  fi
-
     enable_file_icons="no"
     if test "x$DBUS_VERSION" != "x"; then
         enable_file_icons="yes"
@@ -17531,202 +17736,6 @@
 
 
 
-
-  # minimum supported version of pkg-config
-  xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0
-
-
-
-
-
-
-
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
-  ac_pt_PKG_CONFIG=$PKG_CONFIG
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_pt_PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_pt_PKG_CONFIG" = x; then
-    PKG_CONFIG=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    PKG_CONFIG=$ac_pt_PKG_CONFIG
-  fi
-else
-  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-		PKG_CONFIG=""
-	fi
-fi
-
-      if test x"$PKG_CONFIG" = x""; then
-        echo
-        echo "*** Your version of pkg-config is too old. You need atleast"
-        echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
-        echo "*** from the freedesktop.org software repository at"
-        echo "***"
-        echo "***    http://www.freedesktop.org/software/pkgconfig"
-        echo "***"
-        exit 1;
-      fi
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exo-1 >= 0.7.0" >&5
-$as_echo_n "checking for exo-1 >= 0.7.0... " >&6; }
-  if $PKG_CONFIG "--atleast-version=0.7.0" "exo-1" >/dev/null 2>&1; then
-    LIBEXO_VERSION=`$PKG_CONFIG --modversion "exo-1"`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBEXO_VERSION" >&5
-$as_echo "$LIBEXO_VERSION" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBEXO_CFLAGS" >&5
-$as_echo_n "checking LIBEXO_CFLAGS... " >&6; }
-    LIBEXO_CFLAGS=`$PKG_CONFIG --cflags "exo-1"`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBEXO_CFLAGS" >&5
-$as_echo "$LIBEXO_CFLAGS" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBEXO_LIBS" >&5
-$as_echo_n "checking LIBEXO_LIBS... " >&6; }
-    LIBEXO_LIBS=`$PKG_CONFIG --libs "exo-1"`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBEXO_LIBS" >&5
-$as_echo "$LIBEXO_LIBS" >&6; }
-
-    LIBEXO_REQUIRED_VERSION=0.7.0
-
-
-
-
-
-
-
-  elif $PKG_CONFIG --exists "exo-1" >/dev/null 2>&1; then
-    xdt_cv_version=`$PKG_CONFIG --modversion "exo-1"`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5
-$as_echo "found, but $xdt_cv_version" >&6; }
-
-
-      echo "*** The required package exo-1 was found on your system,"
-      echo "*** but the installed version ($xdt_cv_version) is too old."
-      echo "*** Please upgrade exo-1 to atleast version 0.7.0, or adjust"
-      echo "*** the PKG_CONFIG_PATH environment variable if you installed"
-      echo "*** the new version of the package in a nonstandard prefix so"
-      echo "*** pkg-config is able to find it."
-      exit 1
-
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
-
-
-      echo "*** The required package exo-1 was not found on your system."
-      echo "*** Please install exo-1 (atleast version 0.7.0) or adjust"
-      echo "*** the PKG_CONFIG_PATH environment variable if you"
-      echo "*** installed the package in a nonstandard prefix so that"
-      echo "*** pkg-config is able to find it."
-      exit 1
-
-  fi
-
-
-
 # Check whether --enable-desktop-menu was given.
 if test "${enable_desktop_menu+set}" = set; then :
   enableval=$enable_desktop_menu; ac_cv_enable_desktop_menu=$enableval
@@ -18292,7 +18301,7 @@
   fi
 
 
-ac_config_files="$ac_config_files Makefile backgrounds/Makefile common/Makefile doc/Makefile pixmaps/Makefile po/Makefile.in settings/Makefile src/Makefile"
+ac_config_files="$ac_config_files Makefile backgrounds/Makefile common/Makefile doc/Makefile pixmaps/Makefile po/Makefile.in settings/xfce-backdrop-settings.desktop.in settings/Makefile src/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -18864,7 +18873,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xfdesktop $as_me 4.11.3, which was
+This file was extended by xfdesktop $as_me 4.11.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18930,7 +18939,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-xfdesktop config.status 4.11.3
+xfdesktop config.status 4.11.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -19347,6 +19356,7 @@
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
     "pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/Makefile" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+    "settings/xfce-backdrop-settings.desktop.in") CONFIG_FILES="$CONFIG_FILES settings/xfce-backdrop-settings.desktop.in" ;;
     "settings/Makefile") CONFIG_FILES="$CONFIG_FILES settings/Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;

=== modified file 'configure.ac'
--- configure.ac	2014-02-20 15:59:49 +0000
+++ configure.ac	2014-03-19 05:52:10 +0000
@@ -11,9 +11,9 @@
 dnl version info
 m4_define([xfdesktop_version_major], [4])
 m4_define([xfdesktop_version_minor], [11])
-m4_define([xfdesktop_version_micro], [3])
+m4_define([xfdesktop_version_micro], [4])
 m4_define([xfdesktop_version_nano], [])
-m4_define([xfdesktop_version_build], [9b9bacb])
+m4_define([xfdesktop_version_build], [46bf9f7])
 m4_define([xfdesktop_version_tag],[])
 m4_define([xfdesktop_version], [xfdesktop_version_major().xfdesktop_version_minor().xfdesktop_version_micro()ifelse(xfdesktop_version_nano(), [], [], [.xfdesktop_version_nano()])ifelse(xfdesktop_version_tag(), [git], [xfdesktop_version_tag()-xfdesktop_version_build()], [xfdesktop_version_tag()])])
 
@@ -21,7 +21,7 @@
 m4_define([glib_minimum_version], [2.30.0])
 m4_define([gtk_minimum_version], [2.24.0])
 m4_define([libxfce4util_minimum_version], [4.10.0])
-m4_define([libxfce4ui_minimum_version], [4.10.0])
+m4_define([libxfce4ui_minimum_version], [4.11.1])
 m4_define([xfce_minimum_version], [4.10.0])
 m4_define([garcon_minimum_version], [0.1.2])
 m4_define([exo_minimum_version], [0.7.0])
@@ -31,6 +31,13 @@
 m4_define([intltool_minimum_version], [0.31])
 m4_define([xfconf_minimum_version], [4.10.0])
 
+dnl define a short version string for xfdesktop
+m4_append([xfdesktop_version_short], ["])
+m4_append([xfdesktop_version_short], [xfdesktop_version_major])
+m4_append([xfdesktop_version_short], [.])
+m4_append([xfdesktop_version_short], [xfdesktop_version_minor])
+m4_append([xfdesktop_version_short], ["])
+
 dnl init autoconf
 AC_INIT([xfdesktop], [xfdesktop_version], [http://bugzilla.xfce.org/])
 AC_PREREQ([2.60])
@@ -81,18 +88,25 @@
   a custom location for it.])
 fi
 
+dnl define xfdesktop's short version (major.minor)
+AC_DEFINE([XFDESKTOP_VERSION_SHORT], [xfdesktop_version_short], [Short version string of xfdesktop])
+dnl replace the version in settings/xfce-backdrop-settings.desktop.in.in
+AC_SUBST([XFDESKTOP_VERSION_SHORT], [xfdesktop_version_short])
+
 dnl required
 XDT_CHECK_PACKAGE([GIO], [gio-2.0], [glib_minimum_version])
 XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [glib_minimum_version])
 XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [glib_minimum_version])
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [glib_minimum_version])
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [gtk_minimum_version])
+XDT_CHECK_PACKAGE([DBUS], [dbus-glib-1], [dbus_minimum_version])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0],
                   [libxfce4util_minimum_version])
 XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1],
                   [libxfce4ui_minimum_version])
 XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [wnck_minimum_version])
 XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [xfconf_minimum_version])
+XDT_CHECK_PACKAGE([LIBEXO], [exo-1], [exo_minimum_version])
 
 XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [glib_minimum_version], [gio-unix],
     [gio-unix, for special treatment of mount points on UNIX])
@@ -124,14 +138,6 @@
 fi
 
 if test "x$enable_desktop_icons" = "xyes" -a "x$enable_file_icons" = "xyes"; then
-    dnl here i shall abuse the XDT_CHECK_PACKAGE macro
-    XDT_CHECK_PACKAGE([DBUS], [dbus-glib-1], [dbus_minimum_version], [], [
-echo "*** Optional package dbus-glib-1 was either not found on your system"
-echo "*** or is too old.  Please install or upgrade to at least version"
-echo "*** dbus_minimum_version, or adjust the PKG_CONFIG_PATH environment variable"
-echo "*** if you installed the new version of the package in a nonstandard"
-echo "*** prefix.  File/launcher icons will be disabled."
-])
     enable_file_icons="no"
     if test "x$DBUS_VERSION" != "x"; then
         enable_file_icons="yes"
@@ -150,9 +156,6 @@
     [thunarx],
     [Thunar's extension mechanism, to add external features to the desktop icon implementation])
 
-dnl LIBEXO is required if file icons are enabled
-XDT_CHECK_PACKAGE([LIBEXO], [exo-1], [exo_minimum_version])
-
 
 AC_ARG_ENABLE([desktop-menu],
         AS_HELP_STRING([--disable-desktop-menu],
@@ -204,6 +207,7 @@
 doc/Makefile
 pixmaps/Makefile
 po/Makefile.in
+settings/xfce-backdrop-settings.desktop.in
 settings/Makefile
 src/Makefile
 ])

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-01 16:02:38 +0000
+++ debian/changelog	2014-03-19 05:52:10 +0000
@@ -1,3 +1,22 @@
+xfdesktop4 (4.11.4-1ubuntu1) trusty; urgency=medium
+
+  * Merge from debian. Remaining changes:
+    - debian/patches/xubuntu_improve-nautilus-interactions.patch: added,
+      should prevent nautilus from taking over the desktop if xfdesktop is
+      running (and vice-versa).
+    - debian/patches/xubuntu_set-accountsservice-user-bg.patch: update the
+      user background property of Accountsservice on backdrop change.
+
+ -- Jackson Doak <[e-mail]>  Wed, 19 Mar 2014 16:33:54 +1100
+
+xfdesktop4 (4.11.4-1) experimental; urgency=medium
+
+  [ Jackson Doak ]
+  * New upstream bugfix release
+  * Drop git-fix-segfault-on-session-start.patch, fixed upstream
+
+ -- Yves-Alexis Perez <[e-mail]>  Tue, 18 Mar 2014 22:01:11 +0100
+
 xfdesktop4 (4.11.3-2ubuntu1) trusty; urgency=medium
 
   * Merge from debian. Remaining changes:

=== removed file 'debian/patches/git-fix-segfault-on-session-start.patch'
--- debian/patches/git-fix-segfault-on-session-start.patch	2014-02-28 21:52:55 +0000
+++ debian/patches/git-fix-segfault-on-session-start.patch	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-Description: Stop segfaulting on session start
- Stop segfaulting on session start. Fix taken from upstream git
-Author: Thaddäus Tintenfisch
-Bug: https://bugzilla.xfce.org/show_bug.cgi?id=10705
-Bug-Ubuntu: https://launchpad.net/bugs/1282509
-
----
- src/xfce-desktop.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/src/xfce-desktop.c
-+++ b/src/xfce-desktop.c
-@@ -1662,6 +1662,10 @@ xfce_desktop_refresh(XfceDesktop *deskto
-     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 */

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-03-01 16:02:38 +0000
+++ debian/patches/series	2014-03-19 05:52:10 +0000
@@ -1,3 +1,2 @@
-git-fix-segfault-on-session-start.patch
 xubuntu_set-accountsservice-user-bg.patch
 xubuntu_improve-nautilus-interactions.patch

=== modified file 'debian/patches/xubuntu_improve-nautilus-interactions.patch'
--- debian/patches/xubuntu_improve-nautilus-interactions.patch	2014-02-20 15:59:49 +0000
+++ debian/patches/xubuntu_improve-nautilus-interactions.patch	2014-03-19 05:52:10 +0000
@@ -17,7 +17,7 @@
 
 --- a/src/xfce-desktop.c
 +++ b/src/xfce-desktop.c
-@@ -802,8 +802,8 @@ screen_set_selection(XfceDesktop *deskto
+@@ -809,8 +809,8 @@ screen_set_selection(XfceDesktop *deskto
  {
      Window xwin;
      gint xscreen;
@@ -28,7 +28,7 @@
      
      xwin = GDK_WINDOW_XID(gtk_widget_get_window(GTK_WIDGET(desktop)));
      xscreen = gdk_screen_get_number(desktop->priv->gscreen);
-@@ -812,6 +812,9 @@ screen_set_selection(XfceDesktop *deskto
+@@ -819,6 +819,9 @@ screen_set_selection(XfceDesktop *deskto
      selection_atom = XInternAtom(gdk_x11_get_default_xdisplay(), selection_name, False);
      manager_atom = XInternAtom(gdk_x11_get_default_xdisplay(), "MANAGER", False);
  
@@ -38,7 +38,7 @@
      /* 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) {
-@@ -819,8 +822,16 @@ screen_set_selection(XfceDesktop *deskto
+@@ -826,8 +829,16 @@ screen_set_selection(XfceDesktop *deskto
         exit(0);
     }
  

=== modified file 'debian/patches/xubuntu_set-accountsservice-user-bg.patch'
--- debian/patches/xubuntu_set-accountsservice-user-bg.patch	2014-02-20 15:59:49 +0000
+++ debian/patches/xubuntu_set-accountsservice-user-bg.patch	2014-03-19 05:52:10 +0000
@@ -17,7 +17,7 @@
  
  #ifdef ENABLE_DESKTOP_ICONS
  #include "xfdesktop-icon-view.h"
-@@ -352,6 +353,86 @@ create_bg_pixmap(GdkScreen *gscreen, gpo
+@@ -351,6 +352,86 @@ create_bg_pixmap(GdkScreen *gscreen, gpo
  }
  
  static void
@@ -104,7 +104,7 @@
  backdrop_changed_cb(XfceBackdrop *backdrop, gpointer user_data)
  {
      XfceDesktop *desktop = XFCE_DESKTOP(user_data);
-@@ -384,6 +465,10 @@ backdrop_changed_cb(XfceBackdrop *backdr
+@@ -386,6 +467,10 @@ backdrop_changed_cb(XfceBackdrop *backdr
      }
      if(monitor == -1)
          return;

=== modified file 'doc/Makefile.in'
--- doc/Makefile.in	2014-02-20 15:59:49 +0000
+++ doc/Makefile.in	2014-03-19 05:52:10 +0000
@@ -267,6 +267,7 @@
 XFCONF_LIBS = @XFCONF_LIBS@
 XFCONF_REQUIRED_VERSION = @XFCONF_REQUIRED_VERSION@
 XFCONF_VERSION = @XFCONF_VERSION@
+XFDESKTOP_VERSION_SHORT = @XFDESKTOP_VERSION_SHORT@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_ARGS = @XGETTEXT_ARGS@
 XMKMF = @XMKMF@

=== modified file 'pixmaps/Makefile.in'
--- pixmaps/Makefile.in	2014-02-20 15:59:49 +0000
+++ pixmaps/Makefile.in	2014-03-19 05:52:10 +0000
@@ -300,6 +300,7 @@
 XFCONF_LIBS = @XFCONF_LIBS@
 XFCONF_REQUIRED_VERSION = @XFCONF_REQUIRED_VERSION@
 XFCONF_VERSION = @XFCONF_VERSION@
+XFDESKTOP_VERSION_SHORT = @XFDESKTOP_VERSION_SHORT@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_ARGS = @XGETTEXT_ARGS@
 XMKMF = @XMKMF@

=== added file 'po/POTFILES.skip'
--- po/POTFILES.skip	1970-01-01 00:00:00 +0000
+++ po/POTFILES.skip	2014-03-19 05:52:10 +0000
@@ -0,0 +1,3 @@
+# List of source files that shouldn't be translated.
+
+settings/xfce-backdrop-settings.desktop.in.in

=== modified file 'po/bg.po'
--- po/bg.po	2014-02-20 15:59:49 +0000
+++ po/bg.po	2014-03-19 05:52:10 +0000
@@ -5,14 +5,14 @@
 # Translators:
 # cybercop <[e-mail]>, 2012-2013
 # cybercop <[e-mail]>, 2012
-# cybercop <[e-mail]>, 2013
+# cybercop <[e-mail]>, 2013-2014
 # Miroslav Yordanov <[e-mail]>, 2004
 msgid ""
 msgstr ""
 "Project-Id-Version: Xfdesktop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-15 00:31+0100\n"
-"PO-Revision-Date: 2013-12-15 06:54+0000\n"
+"POT-Creation-Date: 2014-02-24 12:32+0100\n"
+"PO-Revision-Date: 2014-02-25 07:31+0000\n"
 "Last-Translator: cybercop <[e-mail]>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/projects/p/xfce/language/bg/)\n"
 "MIME-Version: 1.0\n"
@@ -21,37 +21,37 @@
 "Language: bg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../settings/main.c:372 ../src/xfdesktop-special-file-icon.c:295
+#: ../settings/main.c:375 ../src/xfdesktop-special-file-icon.c:295
 #: ../src/xfdesktop-special-file-icon.c:479
 msgid "Home"
 msgstr "Домашна папка"
 
-#: ../settings/main.c:374
+#: ../settings/main.c:377
 msgid "Filesystem"
 msgstr "Файлова система"
 
-#: ../settings/main.c:376
+#: ../settings/main.c:379
 msgid "Trash"
 msgstr "Кошче"
 
-#: ../settings/main.c:378
+#: ../settings/main.c:381
 msgid "Removable Devices"
 msgstr "Преносими устройства"
 
-#: ../settings/main.c:380
+#: ../settings/main.c:383
 msgid "Network Shares"
 msgstr "Споделени в мрежата"
 
-#: ../settings/main.c:382
+#: ../settings/main.c:385
 msgid "Disks and Drives"
 msgstr "Дискове и устройства"
 
-#: ../settings/main.c:384
-msgid "Other Items"
-msgstr "Други елементи"
+#: ../settings/main.c:387
+msgid "Other Devices"
+msgstr "Други устройства"
 
 #. Display the file name, file type, and file size in the tooltip.
-#: ../settings/main.c:497
+#: ../settings/main.c:500
 #, c-format
 msgid ""
 "<b>%s</b>\n"
@@ -59,97 +59,95 @@
 "Size: %s"
 msgstr "<b>%s</b>\nТип: %s\nРазмер: %s"
 
-#: ../settings/main.c:681
+#: ../settings/main.c:686
 #, c-format
 msgid "Wallpaper for Monitor %d (%s)"
 msgstr "Изображение за Екран %d (%s)"
 
-#: ../settings/main.c:684
+#: ../settings/main.c:689
 #, c-format
 msgid "Wallpaper for Monitor %d"
 msgstr "Изображение за Екран %d"
 
-#: ../settings/main.c:690
-msgid ""
-"You are using more than one display, move this dialog to the display you "
-"want to edit the settings for."
-msgstr "Вие използвате повече от един екран. Преместете този диалог на екрана, чиито настройки искате да редактирате."
+#: ../settings/main.c:695
+msgid "Move this dialog to the display you want to edit the settings for."
+msgstr "Преместете този диалог на екрана, на който искате да промените настройките."
 
-#: ../settings/main.c:698
+#: ../settings/main.c:702
 #, c-format
 msgid "Wallpaper for %s on Monitor %d (%s)"
 msgstr "Изображение за фон %s на Монитор %d (%s)"
 
-#: ../settings/main.c:702
+#: ../settings/main.c:706
 #, c-format
 msgid "Wallpaper for %s on Monitor %d"
 msgstr "Изображение за фон %s на Монитор %d"
 
-#: ../settings/main.c:709
+#: ../settings/main.c:713
 msgid ""
-"You are using more than one display, move this dialog to the display and "
-"workspace you want to edit the settings for."
-msgstr "Вие използвате повече от един екран. Преместете този диалог на екрана и работното място, чиито настройки искате да редактирате."
+"Move this dialog to the display and workspace you want to edit the settings "
+"for."
+msgstr "Преместете този диалог на работното място, на което искате да промените настройките."
 
 #. Single monitor and single workspace
-#: ../settings/main.c:717
+#: ../settings/main.c:720
 #, c-format
 msgid "Wallpaper for my desktop"
 msgstr "Изображение за моят работен плот"
 
 #. Single monitor and per workspace wallpaper
-#: ../settings/main.c:723
+#: ../settings/main.c:726
 #, c-format
 msgid "Wallpaper for %s"
 msgstr "Изображение за %s"
 
-#: ../settings/main.c:728
+#: ../settings/main.c:731
 msgid "Move this dialog to the workspace you want to edit the settings for."
 msgstr "Преместете този диалог на работното място, чиито настройки искате да редактирате."
 
-#: ../settings/main.c:1131
+#: ../settings/main.c:1134
 msgid "Image selection is unavailable while the image style is set to None."
 msgstr "Избраното изображение не е достъпно, докато е зададен стил на показване Нищо"
 
-#: ../settings/main.c:1483
+#: ../settings/main.c:1481
 msgid "Spanning screens"
 msgstr "Разпростиращи се екрани"
 
-#: ../settings/main.c:1788
+#: ../settings/main.c:1786
 msgid "Image files"
 msgstr "Файлове с изображения"
 
-#: ../settings/main.c:1945
+#: ../settings/main.c:1958
 msgid "Settings manager socket"
 msgstr "Гнездо за управление на настройките"
 
-#: ../settings/main.c:1945
+#: ../settings/main.c:1958
 msgid "SOCKET ID"
 msgstr "SOCKET ID"
 
-#: ../settings/main.c:1946
+#: ../settings/main.c:1959
 msgid "Version information"
 msgstr "Информация за версията"
 
-#: ../settings/main.c:1973
+#: ../settings/main.c:1986
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Напишете '%s --help' за показване на потребителско ръководство."
 
-#: ../settings/main.c:1985
+#: ../settings/main.c:1998
 msgid "The Xfce development team. All rights reserved."
 msgstr "Екипът за разработка на Xfce. Всички права запазени."
 
-#: ../settings/main.c:1986
+#: ../settings/main.c:1999
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Докладвайте за грешки на <%s>."
 
-#: ../settings/main.c:1993
+#: ../settings/main.c:2006
 msgid "Desktop Settings"
 msgstr "Настройки на Работният плот"
 
-#: ../settings/main.c:1995
+#: ../settings/main.c:2008
 msgid "Unable to contact settings server"
 msgstr "Не може да се свърже със сървъра за настройки"
 
@@ -182,16 +180,16 @@
 msgstr "Папка:"
 
 #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:6
-msgid "Choose the folder to select wallpapers from"
-msgstr "Избор на папка за тапети"
+msgid "Choose the folder to select wallpapers from."
+msgstr "Изберете папката с изображения."
 
 #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:7
 msgid "St_yle:"
 msgstr "Стил:"
 
 #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:8
-msgid "Specify how the image will be resized to fit the screen"
-msgstr "Посочете как изображението ще бъде оразмерено за да се побере в екрана"
+msgid "Specify how the image will be resized to fit the screen."
+msgstr "Задайте, как изображенията да бъдат оразмерени на екрана."
 
 #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:9
 #: ../settings/xfdesktop-settings-ui.glade.h:4
@@ -227,20 +225,20 @@
 msgstr "Цвят:"
 
 #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:17
-msgid "Specify the style of the color drawn behind the backdrop image"
-msgstr "Показва стила на цвета зад фона на изображението"
+msgid "Specify the style of the color drawn behind the backdrop image."
+msgstr "Задайте стила на цвета на фона зад изображението."
 
 #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:18
-msgid "Specifies the solid color, or the \"left\" or \"top\" color of the gradient"
-msgstr "Задава плътния цвят, или  \"левия\" или \"горен\" цвят на градиента"
+msgid "Specifies the solid color, or the \"left\" or \"top\" color of the gradient."
+msgstr "Задайте плътният цвят, или \"ляв\", или \"горен\" цвят на градиента."
 
 #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:19
 msgid "Select First Color"
 msgstr "Избери първи цвят"
 
 #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:20
-msgid "Specifies the \"right\" or \"bottom\" color of the gradient"
-msgstr "Задава  \"десния\" или \"долния\" цвят на градиент"
+msgid "Specifies the \"right\" or \"bottom\" color of the gradient."
+msgstr "Задайте \"десен\" или \"долен\" цвят на градиента."
 
 #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:21
 msgid "Select Second Color"
@@ -260,8 +258,8 @@
 msgstr "Автоматично избиране на друг фон от текущата директория."
 
 #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:25
-msgid "Specify how often the background will change"
-msgstr "Задайте, колко често да се сменя фона на Работният плот"
+msgid "Specify how often the background will change."
+msgstr "Задайте, колко често да се сменя фона."
 
 #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:26
 msgid "in seconds:"
@@ -337,7 +335,7 @@
 msgid "File/launcher icons"
 msgstr "Икони на файл/стартери"
 
-#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1010
+#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1015
 msgid "Desktop"
 msgstr "Работен плот"
 
@@ -516,250 +514,249 @@
 msgid "_Remove Workspace '%s'"
 msgstr "_Премахване на работно място '%s'"
 
-#: ../src/xfdesktop-application.c:772
+#: ../src/xfdesktop-application.c:768
 msgid "Display version information"
 msgstr "Покажи информация за версията"
 
-#: ../src/xfdesktop-application.c:773
+#: ../src/xfdesktop-application.c:769
 msgid "Reload all settings"
 msgstr "Презареждане на всички настройки"
 
-#: ../src/xfdesktop-application.c:774
+#: ../src/xfdesktop-application.c:770
 msgid "Pop up the menu (at the current mouse position)"
 msgstr "Покажи изскачащо меню (в текущата позиция на мишката)"
 
-#: ../src/xfdesktop-application.c:775
+#: ../src/xfdesktop-application.c:771
 msgid "Pop up the window list (at the current mouse position)"
 msgstr "Покажи списъка с прозорци (в текущата позиция на мишката)"
 
-#: ../src/xfdesktop-application.c:777
+#: ../src/xfdesktop-application.c:773
 msgid "Automatically arrange all the icons on the desktop"
 msgstr "Автоматично подреждане на иконите върху десктопа"
 
-#: ../src/xfdesktop-application.c:779
+#: ../src/xfdesktop-application.c:775
 msgid "Do not wait for a window manager on startup"
 msgstr "Не чакайте мениджъра на прозорците да стартира"
 
-#: ../src/xfdesktop-application.c:780
+#: ../src/xfdesktop-application.c:776
 msgid "Cause xfdesktop to quit"
 msgstr "Причина за изключване на xfdesktop "
 
-#: ../src/xfdesktop-application.c:795
+#: ../src/xfdesktop-application.c:791
 #, c-format
 msgid "Failed to parse arguments: %s\n"
 msgstr "Грешка при анализ на аргументите: %s\n"
 
-#: ../src/xfdesktop-application.c:806
+#: ../src/xfdesktop-application.c:802
 #, c-format
 msgid "This is %s version %s, running on Xfce %s.\n"
 msgstr "Това е %s версия %s, работеща на Xfce %s.\n"
 
-#: ../src/xfdesktop-application.c:808
+#: ../src/xfdesktop-application.c:804
 #, c-format
 msgid "Built with GTK+ %d.%d.%d, linked with GTK+ %d.%d.%d."
 msgstr "Създаден с GTK+ %d.%d.%d, свързан с GTK+ %d.%d.%d."
 
-#: ../src/xfdesktop-application.c:812
+#: ../src/xfdesktop-application.c:808
 #, c-format
 msgid "Build options:\n"
 msgstr "Опции за изграждане:\n"
 
-#: ../src/xfdesktop-application.c:813
+#: ../src/xfdesktop-application.c:809
 #, c-format
 msgid "    Desktop Menu:        %s\n"
 msgstr "Меню на Работният плот:  %s\n"
 
-#: ../src/xfdesktop-application.c:815 ../src/xfdesktop-application.c:822
-#: ../src/xfdesktop-application.c:829
+#: ../src/xfdesktop-application.c:811 ../src/xfdesktop-application.c:818
+#: ../src/xfdesktop-application.c:825
 msgid "enabled"
 msgstr "включено"
 
-#: ../src/xfdesktop-application.c:817 ../src/xfdesktop-application.c:824
-#: ../src/xfdesktop-application.c:831
+#: ../src/xfdesktop-application.c:813 ../src/xfdesktop-application.c:820
+#: ../src/xfdesktop-application.c:827
 msgid "disabled"
 msgstr "изключено"
 
-#: ../src/xfdesktop-application.c:820
+#: ../src/xfdesktop-application.c:816
 #, c-format
 msgid "    Desktop Icons:       %s\n"
 msgstr "Икони на Работният плот:  %s\n"
 
-#: ../src/xfdesktop-application.c:827
+#: ../src/xfdesktop-application.c:823
 #, c-format
 msgid "    Desktop File Icons:  %s\n"
 msgstr "Файлове с икони на Работният плот:  %s\n"
 
-#: ../src/xfdesktop-file-icon-manager.c:578
-#: ../src/xfdesktop-file-icon-manager.c:595
+#: ../src/xfdesktop-file-icon-manager.c:522
+#: ../src/xfdesktop-file-icon-manager.c:539
 #, c-format
 msgid "Could not create the desktop folder \"%s\""
 msgstr "Не може да се създаде десктоп директорията \"%s\""
 
-#: ../src/xfdesktop-file-icon-manager.c:583
-#: ../src/xfdesktop-file-icon-manager.c:600
+#: ../src/xfdesktop-file-icon-manager.c:527
+#: ../src/xfdesktop-file-icon-manager.c:544
 msgid "Desktop Folder Error"
 msgstr "Грешка в десктоп директория"
 
-#: ../src/xfdesktop-file-icon-manager.c:602
+#: ../src/xfdesktop-file-icon-manager.c:546
 msgid ""
 "A normal file with the same name already exists. Please delete or rename it."
 msgstr "Нормален файл със същото име вече съществува. Моля, изтрийте или го преименувате."
 
-#: ../src/xfdesktop-file-icon-manager.c:685 ../src/xfdesktop-file-utils.c:716
-#: ../src/xfdesktop-file-utils.c:769
+#: ../src/xfdesktop-file-icon-manager.c:629 ../src/xfdesktop-file-utils.c:723
+#: ../src/xfdesktop-file-utils.c:776
 msgid "Rename Error"
 msgstr "Грешка при преименуване"
 
-#: ../src/xfdesktop-file-icon-manager.c:686 ../src/xfdesktop-file-utils.c:770
+#: ../src/xfdesktop-file-icon-manager.c:630 ../src/xfdesktop-file-utils.c:777
 msgid "The files could not be renamed"
 msgstr "Файловете не могат да бъдат преименувани"
 
-#: ../src/xfdesktop-file-icon-manager.c:687
+#: ../src/xfdesktop-file-icon-manager.c:631
 msgid "None of the icons selected support being renamed."
 msgstr "Нито една от избраните икони не може да бъде преименувана."
 
-#: ../src/xfdesktop-file-icon-manager.c:731
-#: ../src/xfdesktop-file-icon-manager.c:775 ../src/xfdesktop-file-utils.c:869
-#: ../src/xfdesktop-file-utils.c:906
+#: ../src/xfdesktop-file-icon-manager.c:675
+#: ../src/xfdesktop-file-icon-manager.c:719 ../src/xfdesktop-file-utils.c:876
+#: ../src/xfdesktop-file-utils.c:913
 msgid "Trash Error"
 msgstr "Грешка в Кошчето"
 
-#: ../src/xfdesktop-file-icon-manager.c:732
-#: ../src/xfdesktop-file-icon-manager.c:776
+#: ../src/xfdesktop-file-icon-manager.c:676
+#: ../src/xfdesktop-file-icon-manager.c:720
 msgid "The selected files could not be trashed"
 msgstr "Избраните файлове не могат да бъдат преместени в кошчето"
 
-#: ../src/xfdesktop-file-icon-manager.c:733
-#: ../src/xfdesktop-file-icon-manager.c:777 ../src/xfdesktop-file-utils.c:718
-#: ../src/xfdesktop-file-utils.c:771 ../src/xfdesktop-file-utils.c:821
-#: ../src/xfdesktop-file-utils.c:952 ../src/xfdesktop-file-utils.c:999
-#: ../src/xfdesktop-file-utils.c:1040 ../src/xfdesktop-file-utils.c:1081
-#: ../src/xfdesktop-file-utils.c:1183 ../src/xfdesktop-file-utils.c:1235
-#: ../src/xfdesktop-file-utils.c:1308 ../src/xfdesktop-file-utils.c:1386
+#: ../src/xfdesktop-file-icon-manager.c:677
+#: ../src/xfdesktop-file-icon-manager.c:721 ../src/xfdesktop-file-utils.c:725
+#: ../src/xfdesktop-file-utils.c:778 ../src/xfdesktop-file-utils.c:828
+#: ../src/xfdesktop-file-utils.c:959 ../src/xfdesktop-file-utils.c:1006
+#: ../src/xfdesktop-file-utils.c:1047 ../src/xfdesktop-file-utils.c:1088
+#: ../src/xfdesktop-file-utils.c:1190 ../src/xfdesktop-file-utils.c:1242
+#: ../src/xfdesktop-file-utils.c:1315 ../src/xfdesktop-file-utils.c:1393
 msgid ""
 "This feature requires a file manager service to be present (such as the one "
 "supplied by Thunar)."
 msgstr "Тази функция изисква присъствието на файлов мениджър (като тази, предоставена от Thunar)."
 
 #. printf is to be translator-friendly
-#: ../src/xfdesktop-file-icon-manager.c:877
-#: ../src/xfdesktop-file-icon-manager.c:1335
+#: ../src/xfdesktop-file-icon-manager.c:821
+#: ../src/xfdesktop-file-icon-manager.c:1279
 #, c-format
 msgid "Unable to launch \"%s\":"
 msgstr "Не може да стартира \"%s\":"
 
-#: ../src/xfdesktop-file-icon-manager.c:879
-#: ../src/xfdesktop-file-icon-manager.c:1140
-#: ../src/xfdesktop-file-icon-manager.c:1336 ../src/xfdesktop-file-utils.c:657
-#: ../src/xfdesktop-file-utils.c:1079 ../src/xfdesktop-file-utils.c:1156
-#: ../src/xfdesktop-file-utils.c:1181 ../src/xfdesktop-file-utils.c:1233
+#: ../src/xfdesktop-file-icon-manager.c:823
+#: ../src/xfdesktop-file-icon-manager.c:1084
+#: ../src/xfdesktop-file-icon-manager.c:1280 ../src/xfdesktop-file-utils.c:664
+#: ../src/xfdesktop-file-utils.c:1086 ../src/xfdesktop-file-utils.c:1163
+#: ../src/xfdesktop-file-utils.c:1188 ../src/xfdesktop-file-utils.c:1240
 msgid "Launch Error"
 msgstr "Грешка при стартиране"
 
-#: ../src/xfdesktop-file-icon-manager.c:1064
+#: ../src/xfdesktop-file-icon-manager.c:1008
 #, c-format
 msgid "_Open With \"%s\""
 msgstr "_Отваряне с \"%s\""
 
-#: ../src/xfdesktop-file-icon-manager.c:1067
+#: ../src/xfdesktop-file-icon-manager.c:1011
 #, c-format
 msgid "Open With \"%s\""
 msgstr "Отваряне с \"%s\""
 
-#: ../src/xfdesktop-file-icon-manager.c:1142
+#: ../src/xfdesktop-file-icon-manager.c:1086
 msgid ""
 "Unable to launch \"exo-desktop-item-edit\", which is required to create and "
 "edit launchers and links on the desktop."
 msgstr "Не може да се стартира \"exo-desktop-item-edit\", който е необходим за създаване и редактиране на стартери и връзките на работния плот."
 
-#: ../src/xfdesktop-file-icon-manager.c:1393
+#: ../src/xfdesktop-file-icon-manager.c:1337
 msgid "_Open all"
 msgstr "_Отваряне на всички"
 
-#: ../src/xfdesktop-file-icon-manager.c:1409
+#: ../src/xfdesktop-file-icon-manager.c:1353
 msgid "_Open in New Window"
 msgstr "_Отваряне в нов прозорец"
 
-#: ../src/xfdesktop-file-icon-manager.c:1411
-#: ../src/xfdesktop-special-file-icon.c:547 ../src/xfdesktop-volume-icon.c:810
-#: ../src/xfdesktop-volume-icon.c:814
+#: ../src/xfdesktop-file-icon-manager.c:1355
+#: ../src/xfdesktop-special-file-icon.c:547 ../src/xfdesktop-volume-icon.c:813
 msgid "_Open"
 msgstr "_Отваряне"
 
 #. create launcher item
-#: ../src/xfdesktop-file-icon-manager.c:1430
+#: ../src/xfdesktop-file-icon-manager.c:1374
 msgid "Create _Launcher..."
 msgstr "Създаване на _стартер..."
 
 #. create link item
-#: ../src/xfdesktop-file-icon-manager.c:1446
+#: ../src/xfdesktop-file-icon-manager.c:1390
 msgid "Create _URL Link..."
 msgstr "Създаване на _интернет връзка..."
 
 #. create folder item
-#: ../src/xfdesktop-file-icon-manager.c:1462
+#: ../src/xfdesktop-file-icon-manager.c:1406
 msgid "Create _Folder..."
 msgstr "Създаване на _папка..."
 
-#: ../src/xfdesktop-file-icon-manager.c:1477
+#: ../src/xfdesktop-file-icon-manager.c:1421
 msgid "Create From _Template"
 msgstr "Създаване от _шаблон"
 
-#: ../src/xfdesktop-file-icon-manager.c:1506
+#: ../src/xfdesktop-file-icon-manager.c:1450
 msgid "_Empty File"
 msgstr "_Празен файл"
 
-#: ../src/xfdesktop-file-icon-manager.c:1523
+#: ../src/xfdesktop-file-icon-manager.c:1467
 msgid "_Execute"
 msgstr "_Изпълнение"
 
-#: ../src/xfdesktop-file-icon-manager.c:1543
+#: ../src/xfdesktop-file-icon-manager.c:1487
 msgid "_Edit Launcher"
 msgstr "_Редактиране на стартер"
 
-#: ../src/xfdesktop-file-icon-manager.c:1578
+#: ../src/xfdesktop-file-icon-manager.c:1522
 msgid "Open With"
 msgstr "Отваряне с"
 
-#: ../src/xfdesktop-file-icon-manager.c:1604
+#: ../src/xfdesktop-file-icon-manager.c:1548
 msgid "Open With Other _Application..."
 msgstr "Отваряне с друга _програма..."
 
 #. Rename
-#: ../src/xfdesktop-file-icon-manager.c:1704
+#: ../src/xfdesktop-file-icon-manager.c:1651
 msgid "_Rename..."
 msgstr "_Преименуване..."
 
-#: ../src/xfdesktop-file-icon-manager.c:1732
+#: ../src/xfdesktop-file-icon-manager.c:1679
 msgid "Arrange Desktop _Icons"
 msgstr "Подреждане на иконите върху Работният плот"
 
-#: ../src/xfdesktop-file-icon-manager.c:1743
+#: ../src/xfdesktop-file-icon-manager.c:1690
 msgid "Desktop _Settings..."
 msgstr "Настройки на Работният плот..."
 
-#: ../src/xfdesktop-file-icon-manager.c:1754
-#: ../src/xfdesktop-volume-icon.c:856
+#: ../src/xfdesktop-file-icon-manager.c:1701
+#: ../src/xfdesktop-volume-icon.c:855
 msgid "P_roperties..."
 msgstr "_Свойства..."
 
-#: ../src/xfdesktop-file-icon-manager.c:2744
+#: ../src/xfdesktop-file-icon-manager.c:2716
 msgid "Load Error"
 msgstr "Грешка при зареждане"
 
-#: ../src/xfdesktop-file-icon-manager.c:2746
+#: ../src/xfdesktop-file-icon-manager.c:2718
 msgid "Failed to load the desktop folder"
 msgstr "Проблем при зареждането на десктоп папка"
 
-#: ../src/xfdesktop-file-icon-manager.c:3286
+#: ../src/xfdesktop-file-icon-manager.c:3262
 msgid "Copy _Here"
 msgstr "Копиране тук"
 
-#: ../src/xfdesktop-file-icon-manager.c:3286
+#: ../src/xfdesktop-file-icon-manager.c:3262
 msgid "_Move Here"
 msgstr "Преместване тук"
 
-#: ../src/xfdesktop-file-icon-manager.c:3286
+#: ../src/xfdesktop-file-icon-manager.c:3262
 msgid "_Link Here"
 msgstr "Връзка тук"
 
@@ -792,88 +789,88 @@
 msgid "Unknown"
 msgstr "Неизвестен"
 
-#: ../src/xfdesktop-file-utils.c:658
+#: ../src/xfdesktop-file-utils.c:665
 msgid "The folder could not be opened"
 msgstr "Папката не може да бъде отворена"
 
-#: ../src/xfdesktop-file-utils.c:675
+#: ../src/xfdesktop-file-utils.c:682
 msgid "Error"
 msgstr "Грешка"
 
-#: ../src/xfdesktop-file-utils.c:676
+#: ../src/xfdesktop-file-utils.c:683
 msgid "The requested operation could not be completed"
 msgstr "Заявената операция не може да бъде завършена"
 
-#: ../src/xfdesktop-file-utils.c:717
+#: ../src/xfdesktop-file-utils.c:724
 msgid "The file could not be renamed"
 msgstr "Файлът не може да бъде преименуван"
 
-#: ../src/xfdesktop-file-utils.c:819
+#: ../src/xfdesktop-file-utils.c:826
 msgid "Delete Error"
 msgstr "Грешка при изтриване"
 
-#: ../src/xfdesktop-file-utils.c:820
+#: ../src/xfdesktop-file-utils.c:827
 msgid "The selected files could not be deleted"
 msgstr "Избраните файлове не могат да бъдат изтрити"
 
-#: ../src/xfdesktop-file-utils.c:870
+#: ../src/xfdesktop-file-utils.c:877
 msgid "The selected files could not be moved to the trash"
 msgstr "Избраните файлове не могат да бъдат преместени в кошчето"
 
-#: ../src/xfdesktop-file-utils.c:871 ../src/xfdesktop-file-utils.c:908
+#: ../src/xfdesktop-file-utils.c:878 ../src/xfdesktop-file-utils.c:915
 msgid ""
 "This feature requires a trash service to be present (such as the one "
 "supplied by Thunar)."
 msgstr "Тази функция изисква да присъства trash service (като тази, предоставена от Thunar)."
 
-#: ../src/xfdesktop-file-utils.c:907
+#: ../src/xfdesktop-file-utils.c:914
 msgid "Could not empty the trash"
 msgstr "Не може да бъде изпразнено кошчето"
 
-#: ../src/xfdesktop-file-utils.c:950
+#: ../src/xfdesktop-file-utils.c:957
 msgid "Create File Error"
 msgstr "Грешка при създаване на файл"
 
-#: ../src/xfdesktop-file-utils.c:951
+#: ../src/xfdesktop-file-utils.c:958
 msgid "Could not create a new file"
 msgstr "Не може да се създаде нов файл"
 
-#: ../src/xfdesktop-file-utils.c:997
+#: ../src/xfdesktop-file-utils.c:1004
 msgid "Create Document Error"
 msgstr "Грешка при създаване на документ"
 
-#: ../src/xfdesktop-file-utils.c:998
+#: ../src/xfdesktop-file-utils.c:1005
 msgid "Could not create a new document from the template"
 msgstr "Не може да се създаде нов документ от шаблон"
 
-#: ../src/xfdesktop-file-utils.c:1038
+#: ../src/xfdesktop-file-utils.c:1045
 msgid "File Properties Error"
 msgstr "Грешка в свойствата на файл"
 
-#: ../src/xfdesktop-file-utils.c:1039
+#: ../src/xfdesktop-file-utils.c:1046
 msgid "The file properties dialog could not be opened"
 msgstr "Не може да се отвори диалога за свойствата на файла"
 
-#: ../src/xfdesktop-file-utils.c:1080
+#: ../src/xfdesktop-file-utils.c:1087
 msgid "The file could not be opened"
 msgstr "Файлът не може да бъде отворен"
 
-#: ../src/xfdesktop-file-utils.c:1153 ../src/xfdesktop-file-utils.c:1178
+#: ../src/xfdesktop-file-utils.c:1160 ../src/xfdesktop-file-utils.c:1185
 #, c-format
 msgid "Failed to run \"%s\""
 msgstr "Неуспех при стартиране на \"%s\""
 
-#: ../src/xfdesktop-file-utils.c:1234
+#: ../src/xfdesktop-file-utils.c:1241
 msgid "The application chooser could not be opened"
 msgstr "Изборът на програми не може да стартира"
 
-#: ../src/xfdesktop-file-utils.c:1292 ../src/xfdesktop-file-utils.c:1306
-#: ../src/xfdesktop-file-utils.c:1368 ../src/xfdesktop-file-utils.c:1384
+#: ../src/xfdesktop-file-utils.c:1299 ../src/xfdesktop-file-utils.c:1313
+#: ../src/xfdesktop-file-utils.c:1375 ../src/xfdesktop-file-utils.c:1391
 msgid "Transfer Error"
 msgstr "Грешка при пренасяне"
 
-#: ../src/xfdesktop-file-utils.c:1293 ../src/xfdesktop-file-utils.c:1307
-#: ../src/xfdesktop-file-utils.c:1369 ../src/xfdesktop-file-utils.c:1385
+#: ../src/xfdesktop-file-utils.c:1300 ../src/xfdesktop-file-utils.c:1314
+#: ../src/xfdesktop-file-utils.c:1376 ../src/xfdesktop-file-utils.c:1392
 msgid "The file transfer could not be performed"
 msgstr "Пренасянето на файлове не може да бъде изпълнено"
 
@@ -997,15 +994,15 @@
 msgid "Mount Failed"
 msgstr "Монтирането е неуспешно"
 
-#: ../src/xfdesktop-volume-icon.c:829
+#: ../src/xfdesktop-volume-icon.c:828
 msgid "E_ject Volume"
 msgstr "Изваждане на устройството"
 
-#: ../src/xfdesktop-volume-icon.c:836
+#: ../src/xfdesktop-volume-icon.c:835
 msgid "_Unmount Volume"
 msgstr "_Демонтиране на устройството"
 
-#: ../src/xfdesktop-volume-icon.c:843
+#: ../src/xfdesktop-volume-icon.c:842
 msgid "_Mount Volume"
 msgstr "_Монтиране на устройството"
 

=== modified file 'po/da.po'
--- po/da.po	2014-01-14 11:47:53 +0000
+++ po/da.po	2014-03-19 05:52:10 +0000
@@ -6,14 +6,14 @@
 # Aputsiaĸ Niels Janussen <[e-mail]>, 2013
 # cedeel <[e-mail]>, 2013
 # Jesper Berth <[e-mail]>, 2005
-# Per Kongstad <[e-mail]>, 2009
+# pkon <[e-mail]>, 2009,2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Xfdesktop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-15 00:31+0100\n"
-"PO-Revision-Date: 2013-11-18 16:57+0000\n"
-"Last-Translator: cedeel <[e-mail]>\n"
+"POT-Creation-Date: 2014-02-24 12:32+0100\n"
+"PO-Revision-Date: 2014-03-17 20:35+0000\n"
+"Last-Translator: pkon <[e-mail]>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/xfce/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,37 +21,37 @@
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../settings/main.c:371 ../src/xfdesktop-special-file-icon.c:295
+#: ../settings/main.c:375 ../src/xfdesktop-special-file-icon.c:295
 #: ../src/xfdesktop-special-file-icon.c:479
 msgid "Home"
 msgstr "Hjem"
 
-#: ../settings/main.c:373
+#: ../settings/main.c:377
 msgid "Filesystem"
 msgstr "Filsystem"
 
-#: ../settings/main.c:375
+#: ../settings/main.c:379
 msgid "Trash"
 msgstr "Papirkurv"
 
-#: ../settings/main.c:377
+#: ../settings/main.c:381
 msgid "Removable Devices"
 msgstr "Fjernbare enheder"
 
-#: ../settings/main.c:379
+#: ../settings/main.c:383
 msgid "Network Shares"
 msgstr "Netværksdrev"
 
-#: ../settings/main.c:381
+#: ../settings/main.c:385
 msgid "Disks and Drives"
 msgstr "Diske og drev"
 
-#: ../settings/main.c:383
-msgid "Other Items"
-msgstr "Andre elementer"
+#: ../settings/main.c:387
+msgid "Other Devices"
+msgstr "Andre enheder"
 
 #. Display the file name, file type, and file size in the tooltip.
-#: ../settings/main.c:496
+#: ../settings/main.c:500
 #, c-format
 msgid ""
 "<b>%s</b>\n"
@@ -59,97 +59,95 @@
 "Size: %s"
 msgstr "<b>%s</b>\nType: %s\nStørrelse: %s"
 
-#: ../settings/main.c:680
+#: ../settings/main.c:686
 #, c-format
 msgid "Wallpaper for Monitor %d (%s)"
 msgstr "Baggrundstapet for skærmen %d (%s)"
 
-#: ../settings/main.c:683
+#: ../settings/main.c:689
 #, c-format
 msgid "Wallpaper for Monitor %d"
 msgstr "Baggrundstapet for skærmen %d"
 
-#: ../settings/main.c:689
-msgid ""
-"You are using more than one display, move this dialog to the display you "
-"want to edit the settings for."
-msgstr "Du benytter mere end en skærm, flyt dette vindue til den skærm du ønsker at ændre indstillingerne for."
+#: ../settings/main.c:695
+msgid "Move this dialog to the display you want to edit the settings for."
+msgstr "Flyt dette vindue til skærmen som du ønsker at ændre indstillingerne for."
 
-#: ../settings/main.c:697
+#: ../settings/main.c:702
 #, c-format
 msgid "Wallpaper for %s on Monitor %d (%s)"
 msgstr "Baggrundstapet for %s på skærmen %d (%s)"
 
-#: ../settings/main.c:701
+#: ../settings/main.c:706
 #, c-format
 msgid "Wallpaper for %s on Monitor %d"
 msgstr "Baggrundstapet for %s på skærmen %d"
 
-#: ../settings/main.c:708
+#: ../settings/main.c:713
 msgid ""
-"You are using more than one display, move this dialog to the display and "
-"workspace you want to edit the settings for."
-msgstr "Du benytter mere end en skærm, flyt dette vindue til den skærm og det arbejdsområde du ønsker at ændre indstillingerne for."
+"Move this dialog to the display and workspace you want to edit the settings "
+"for."
+msgstr ""
 
 #. Single monitor and single workspace
-#: ../settings/main.c:716
+#: ../settings/main.c:720
 #, c-format
 msgid "Wallpaper for my desktop"
 msgstr "Baggrundstapet for mit skrivebord"
 
 #. Single monitor and per workspace wallpaper
-#: ../settings/main.c:722
+#: ../settings/main.c:726
 #, c-format
 msgid "Wallpaper for %s"
 msgstr "Baggrundstapet for %s"
 
-#: ../settings/main.c:727
+#: ../settings/main.c:731
 msgid "Move this dialog to the workspace you want to edit the settings for."
 msgstr "Flyt dette vindue til det arbejdsområde du ønsker at ændre indstillingerne for."
 
-#: ../settings/main.c:1130
+#: ../settings/main.c:1134
 msgid "Image selection is unavailable while the image style is set to None."
 msgstr "Billedmarkering er ikke tilgængelig, så længe billedstilen ikke er angivet."
 
-#: ../settings/main.c:1482
+#: ../settings/main.c:1481
 msgid "Spanning screens"
 msgstr "På tværs af skærme"
 
-#: ../settings/main.c:1787
+#: ../settings/main.c:1786
 msgid "Image files"
 msgstr "Billedfiler"
 
-#: ../settings/main.c:1939
+#: ../settings/main.c:1958
 msgid "Settings manager socket"
 msgstr "Sokkel for indstillingshåndtering"
 
-#: ../settings/main.c:1939
+#: ../settings/main.c:1958
 msgid "SOCKET ID"
 msgstr "SOKKEL-ID"
 
-#: ../settings/main.c:1940
+#: ../settings/main.c:1959
 msgid "Version information"
 msgstr "Versionsinformation"
 
-#: ../settings/main.c:1967
+#: ../settings/main.c:1986
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Tast '%s --help' for brug."
 
-#: ../settings/main.c:1979
+#: ../settings/main.c:1998
 msgid "The Xfce development team. All rights reserved."
 msgstr "Xfce-udviklingsholdet. Alle rettigheder forbeholdes."
 
-#: ../settings/main.c:1980
+#: ../settings/main.c:1999
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Rapportér venligst fejl til <%s>."
 
-#: ../settings/main.c:1987
+#: ../settings/main.c:2006
 msgid "Desktop Settings"
 msgstr "Skrivebordsindstillinger"
 
-#: ../settings/main.c:1989
+#: ../settings/main.c:2008
 msgid "Unable to contact settings server"
 msgstr "Kunne ikke forbinde til indstilllingsserver"
 
@@ -182,16 +180,16 @@
 msgstr "_Mappe:"
 
 #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:6
-msgid "Choose the folder to select wallpapers from"
-msgstr "Vælg mappen som der vælges baggrundstapeter fra"
+msgid "Choose the folder to select wallpapers from."
+msgstr "Vælg mappen at vælge skærmbaggrunde fra"
 
 #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:7
 msgid "St_yle:"
 msgstr "S_til:"
 
 #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:8
-msgid "Specify how the image will be resized to fit the screen"
-msgstr "Angiv, hvordan billede vil blive tilpasset til at passe til skærmen"
+msgid "Specify how the image will be resized to fit the screen."
+msgstr ""
 
 #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:9
 #: ../settings/xfdesktop-settings-ui.glade.h:4
@@ -227,20 +225,20 @@
 msgstr "_Farve:"
 
 #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:17
-msgid "Specify the style of the color drawn behind the backdrop image"
-msgstr "Angiv stilen til farven bag baggrundbillede"
+msgid "Specify the style of the color drawn behind the backdrop image."
+msgstr ""
 
 #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:18
-msgid "Specifies the solid color, or the \"left\" or \"top\" color of the gradient"
-msgstr "Angiver den ensartede farve, eller \"venstre\" eller \"'top\" af farveaftagningen"
+msgid "Specifies the solid color, or the \"left\" or \"top\" color of the gradient."
+msgstr ""
 
 #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:19
 msgid "Select First Color"
 msgstr "Vælg første farve"
 
 #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:20
-msgid "Specifies the \"right\" or \"bottom\" color of the gradient"
-msgstr "Angiver den \"højre\" eller \"'bund\" af farveaftagningen"
+msgid "Specifies the \"right\" or \"bottom\" color of the gradient."
+msgstr ""
 
 #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:21
 msgid "Select Second Color"
@@ -260,8 +258,8 @@
 msgstr "Vælg automatisk en anden baggrund fra nuværende mappe."
 
 #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:25
-msgid "Specify how often the background will change"
-msgstr "Angiv hvor ofte baggrunden skal skifte"
+msgid "Specify how often the background will change."
+msgstr ""
 
 #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:26
 msgid "in seconds:"
@@ -337,7 +335,7 @@
 msgid "File/launcher icons"
 msgstr "Fil-/opstartsikoner"
 
-#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1016
+#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1015
 msgid "Desktop"
 msgstr "Skrivebord"
 
@@ -402,56 +400,60 @@
 msgstr "Vis kun _klæbende vinduer i aktive arbejdsområder"
 
 #: ../settings/xfdesktop-settings-ui.glade.h:26
+msgid "Show a_dd and remove workspace options in list"
+msgstr "Vis til_føj og fjern arbejdspladstilvalg i liste"
+
+#: ../settings/xfdesktop-settings-ui.glade.h:27
 msgid "<b>Window List Menu</b>"
 msgstr "<b>Vindueslistemenu</b>"
 
-#: ../settings/xfdesktop-settings-ui.glade.h:27
+#: ../settings/xfdesktop-settings-ui.glade.h:28
 msgid "_Menus"
 msgstr "_Menuer"
 
-#: ../settings/xfdesktop-settings-ui.glade.h:28
+#: ../settings/xfdesktop-settings-ui.glade.h:29
 msgid "Icon _type:"
 msgstr "Ikon_type:"
 
-#: ../settings/xfdesktop-settings-ui.glade.h:29
+#: ../settings/xfdesktop-settings-ui.glade.h:30
 msgid "Icon _size:"
 msgstr "Ikon_størrelse:"
 
-#: ../settings/xfdesktop-settings-ui.glade.h:30
+#: ../settings/xfdesktop-settings-ui.glade.h:31
 msgid "Show t_humbnails"
 msgstr "Vis _miniaturer"
 
-#: ../settings/xfdesktop-settings-ui.glade.h:31
+#: ../settings/xfdesktop-settings-ui.glade.h:32
 msgid ""
 "Select this option to display preview-able files on the desktop as "
 "automatically generated thumbnail icons."
 msgstr "Tilvælg dette for at vise filer som kan forhåndsvises på skrivebordet som automatisk generede miniatureikoner."
 
-#: ../settings/xfdesktop-settings-ui.glade.h:32
+#: ../settings/xfdesktop-settings-ui.glade.h:33
 msgid "Single _click to activate items"
 msgstr "_Enkeltklik for at aktivere element"
 
-#: ../settings/xfdesktop-settings-ui.glade.h:33
+#: ../settings/xfdesktop-settings-ui.glade.h:34
 msgid "Show icon tooltips. Size:"
 msgstr "Vis værktøjstips for ikoner. Størrelse:"
 
-#: ../settings/xfdesktop-settings-ui.glade.h:34
+#: ../settings/xfdesktop-settings-ui.glade.h:35
 msgid "Size of the tooltip preview image."
 msgstr "Størren på forhåndsvist billede af værktøjstip."
 
-#: ../settings/xfdesktop-settings-ui.glade.h:35
+#: ../settings/xfdesktop-settings-ui.glade.h:36
 msgid "Use custom _font size:"
 msgstr "Brug _tilpasset skriftstørrelse:"
 
-#: ../settings/xfdesktop-settings-ui.glade.h:36
+#: ../settings/xfdesktop-settings-ui.glade.h:37
 msgid "<b>Appearance</b>"
 msgstr "<b>Udseende</b>"
 
-#: ../settings/xfdesktop-settings-ui.glade.h:37
+#: ../settings/xfdesktop-settings-ui.glade.h:38
 msgid "<b>Default Icons</b>"
 msgstr "<b>Standardikoner</b>"