diffstat for xfdesktop4-4.11.6 xfdesktop4-4.11.6 changelog | 164 ++++++++++++++++++++ control | 3 patches/series | 2 patches/xubuntu_improve-nautilus-interactions.patch | 57 ++++++ patches/xubuntu_set-accountsservice-user-bg.patch | 119 ++++++++++++++ 5 files changed, 344 insertions(+), 1 deletion(-) diff -Nru xfdesktop4-4.11.6/debian/changelog xfdesktop4-4.11.6/debian/changelog --- xfdesktop4-4.11.6/debian/changelog 2014-04-08 05:49:32.000000000 +0000 +++ xfdesktop4-4.11.6/debian/changelog 2014-04-09 07:36:35.000000000 +0000 @@ -1,15 +1,69 @@ +xfdesktop4 (4.11.6-1ubuntu1) trusty; urgency=medium + + * Merge from Debian experimental. 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 Wed, 09 Apr 2014 15:55:54 +1000 + xfdesktop4 (4.11.6-1) experimental; urgency=medium * New upstream development release. -- Yves-Alexis Perez Tue, 08 Apr 2014 07:49:31 +0200 +xfdesktop4 (4.11.5-1ubuntu1) trusty; urgency=medium + + * Merge from Debian experimental. 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. + + -- Logan Rosen Mon, 07 Apr 2014 15:39:01 -0400 + xfdesktop4 (4.11.5-1) experimental; urgency=medium * New upstream development release. -- Yves-Alexis Perez Tue, 01 Apr 2014 23:20:47 +0200 +xfdesktop4 (4.11.5-0ubuntu1) trusty; urgency=medium + + * New upstream release. LP: #1294209 + * Drop patches taken from git, fixed upstream. + + -- Jackson Doak Wed, 02 Apr 2014 06:58:37 +1100 + +xfdesktop4 (4.11.4-1ubuntu2) trusty; urgency=medium + + * Add patches from upstream git: + - git-desktop-icons-have-background.patch. LP: #1270261 + Makes desktop icons not have their own background + - git-missing-images-in-settings-app.patch. LP: #1282227 + Fixes some images not appearing in xfdesktop settings + - git-fix-default-icon-size.patch. LP: #1272057 + Explicitly define the desktop icon size + * Refresh xubuntu_set-accountsservice-user-bg.patch to fix + a memory leak. LP: #1295614 + + -- Jackson Doak Fri, 28 Mar 2014 07:16:04 +1100 + +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 Wed, 19 Mar 2014 16:33:54 +1100 + xfdesktop4 (4.11.4-1) experimental; urgency=medium [ Jackson Doak ] @@ -18,6 +72,17 @@ -- Yves-Alexis Perez Tue, 18 Mar 2014 22:01:11 +0100 +xfdesktop4 (4.11.3-2ubuntu1) 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 Sat, 01 Mar 2014 16:02:38 +1100 + xfdesktop4 (4.11.3-2) experimental; urgency=medium [ Jackson Doak ] @@ -25,12 +90,47 @@ -- Yves-Alexis Perez Fri, 28 Feb 2014 21:52:55 +0100 +xfdesktop4 (4.11.3-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 Thu, 20 Feb 2014 15:59:49 +1100 + xfdesktop4 (4.11.3-1) experimental; urgency=medium * New upstream development release. -- Yves-Alexis Perez Wed, 19 Feb 2014 20:34:01 +0100 +xfdesktop4 (4.11.2-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. + * Improve existing xubuntu patches + + -- Jackson Doak Wed, 22 Jan 2014 11:02:26 +1100 + +xfdesktop4 (4.11.2-0ubuntu1) trusty; urgency=medium + + * Merged from debian unreleased SVN. 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. + * Drop debian/patches/xubuntu_fix-duplicate-volumes.patch, no longer needed + + -- Jackson Doak Tue, 14 Jan 2014 11:47:53 +1100 + xfdesktop4 (4.11.2-1) experimental; urgency=low [ Evgeni Golov ] @@ -53,6 +153,20 @@ -- Yves-Alexis Perez Thu, 16 Jan 2014 22:55:26 +0100 +xfdesktop4 (4.10.2-3ubuntu1) saucy; urgency=low + + * Merged 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_fix-duplicate-volumes.patch: fix duplicate + volumes appearing randomly on the desktop. + - debian/patches/xubuntu_set-accountsservice-user-bg.patch: update the + user background property of Accountsservice on backdrop change. + - debian/control: recommends tumbler for thumbnailing support + + -- Jackson Doak Mon, 12 Aug 2013 08:07:42 +1000 + xfdesktop4 (4.10.2-3) unstable; urgency=low * debian/control: @@ -73,6 +187,25 @@ -- Lionel Le Folgoc Sun, 07 Apr 2013 15:17:13 +0200 +xfdesktop4 (4.10.2-0ubuntu1) raring; urgency=low + + * New upstream bugfix release. + + -- Lionel Le Folgoc Sun, 10 Mar 2013 12:45:38 +0100 + +xfdesktop4 (4.10.1-1ubuntu1) raring; urgency=low + + * Merge from Debian experimental. 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_fix-duplicate-volumes.patch: fix duplicate + volumes appearing randomly on the desktop. + - debian/patches/xubuntu_set-accountsservice-user-bg.patch: update the + user background property of Accountsservice on backdrop change. + + -- Logan Rosen Mon, 04 Mar 2013 15:43:27 -0500 + xfdesktop4 (4.10.1-1) experimental; urgency=low * New upstream release. @@ -81,6 +214,12 @@ -- Yves-Alexis Perez Sun, 03 Mar 2013 15:35:09 +0100 +xfdesktop4 (4.10.1-0ubuntu1) raring; urgency=low + + * New upstream release. + + -- Lionel Le Folgoc Sun, 03 Mar 2013 11:58:50 +0100 + xfdesktop4 (4.10.0-2) experimental; urgency=low * debian/control: @@ -88,6 +227,31 @@ -- Yves-Alexis Perez Mon, 21 May 2012 07:04:47 +0200 +xfdesktop4 (4.10.0-1ubuntu3) raring; urgency=low + + * debian/patches: + - xubuntu_set-accountsservice-user-bg.patch: update the user background + property of Accountsservice on backdrop change. + + -- Lionel Le Folgoc Sat, 03 Nov 2012 12:57:19 +0100 + +xfdesktop4 (4.10.0-1ubuntu2) raring; urgency=low + + * debian/patches: + - xubuntu_fix-duplicate-volumes.patch: fix duplicate volumes appearing + randomly on the desktop. lp: #1072137 + + -- Lionel Le Folgoc Mon, 29 Oct 2012 12:00:16 +0100 + +xfdesktop4 (4.10.0-1ubuntu1) quantal; urgency=low + + * Merge from Debian experimental, remaining Ubuntu change: + - debian/patches/xubuntu_improve-nautilus-interactions.patch: added, + should prevent nautilus from taking over the desktop if xfdesktop is + running (and vice-versa). + + -- Lionel Le Folgoc Fri, 18 May 2012 22:18:02 +0200 + xfdesktop4 (4.10.0-1) experimental; urgency=low * New upstream stable release. diff -Nru xfdesktop4-4.11.6/debian/control xfdesktop4-4.11.6/debian/control --- xfdesktop4-4.11.6/debian/control 2013-12-22 14:21:04.000000000 +0000 +++ xfdesktop4-4.11.6/debian/control 2014-04-09 07:35:36.000000000 +0000 @@ -1,7 +1,8 @@ Source: xfdesktop4 Section: xfce Priority: optional -Maintainer: Debian Xfce Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Xfce Maintainers Uploaders: Yves-Alexis Perez , Lionel Le Folgoc Build-Depends: debhelper (>= 9), libglib2.0-dev, libgtk2.0-dev, diff -Nru xfdesktop4-4.11.6/debian/patches/series xfdesktop4-4.11.6/debian/patches/series --- xfdesktop4-4.11.6/debian/patches/series 2014-03-18 19:55:02.000000000 +0000 +++ xfdesktop4-4.11.6/debian/patches/series 2014-04-09 07:35:36.000000000 +0000 @@ -0,0 +1,2 @@ +xubuntu_set-accountsservice-user-bg.patch +xubuntu_improve-nautilus-interactions.patch diff -Nru xfdesktop4-4.11.6/debian/patches/xubuntu_improve-nautilus-interactions.patch xfdesktop4-4.11.6/debian/patches/xubuntu_improve-nautilus-interactions.patch --- xfdesktop4-4.11.6/debian/patches/xubuntu_improve-nautilus-interactions.patch 1970-01-01 00:00:00.000000000 +0000 +++ xfdesktop4-4.11.6/debian/patches/xubuntu_improve-nautilus-interactions.patch 2014-04-09 07:35:36.000000000 +0000 @@ -0,0 +1,57 @@ +Description: Get/set _NET_DESKTOP_MANAGER_S atom + This atom is used by at least nautilus, so don't start xfdesktop + if it is set already. If it isn't, try to set it in order to + prevent a later call to nautilus to override the desktop. + . + Not forwardable, because it's a hack/test for the current xubuntu + development release. I don't know how it will affect other GNOME apps. + I'll reevaluate its correctness/usefulness before the precise release, + and decide whether to disable or forward it at that time. +Author: Lionel Le Folgoc +Forwarded: not-needed +Last-Update: 2012-04-17 + +--- + src/xfce-desktop.c | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +--- a/src/xfce-desktop.c ++++ b/src/xfce-desktop.c +@@ -790,8 +790,8 @@ screen_set_selection(XfceDesktop *deskto + { + Window xwin; + gint xscreen; +- gchar selection_name[100]; +- Atom selection_atom, manager_atom; ++ gchar selection_name[100], common_selection_name[32]; ++ Atom selection_atom, common_selection_atom, manager_atom; + + xwin = GDK_WINDOW_XID(gtk_widget_get_window(GTK_WIDGET(desktop))); + xscreen = gdk_screen_get_number(desktop->priv->gscreen); +@@ -800,6 +800,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); + ++ g_snprintf(common_selection_name, 32, "_NET_DESKTOP_MANAGER_S%d", xscreen); ++ common_selection_atom = XInternAtom(gdk_x11_get_default_xdisplay(), common_selection_name, False); ++ + /* the previous check in src/main.c occurs too early, so workaround by + * adding this one. */ + if(XGetSelectionOwner(gdk_x11_get_default_xdisplay(), selection_atom) != None) { +@@ -807,8 +810,16 @@ screen_set_selection(XfceDesktop *deskto + exit(0); + } + ++ /* Check that _NET_DESKTOP_MANAGER_S%d isn't set, as it means another ++ * desktop manager is running, e.g. nautilus */ ++ if(XGetSelectionOwner (gdk_x11_get_default_xdisplay(), common_selection_atom) != None) { ++ g_warning("%s: another desktop manager is running.", PACKAGE); ++ exit(1); ++ } ++ + XSelectInput(gdk_x11_get_default_xdisplay(), xwin, PropertyChangeMask | ButtonPressMask); + XSetSelectionOwner(gdk_x11_get_default_xdisplay(), selection_atom, xwin, GDK_CURRENT_TIME); ++ XSetSelectionOwner(gdk_x11_get_default_xdisplay(), common_selection_atom, xwin, GDK_CURRENT_TIME); + + /* Check to see if we managed to claim the selection. If not, + * we treat it as if we got it then immediately lost it */ diff -Nru xfdesktop4-4.11.6/debian/patches/xubuntu_set-accountsservice-user-bg.patch xfdesktop4-4.11.6/debian/patches/xubuntu_set-accountsservice-user-bg.patch --- xfdesktop4-4.11.6/debian/patches/xubuntu_set-accountsservice-user-bg.patch 1970-01-01 00:00:00.000000000 +0000 +++ xfdesktop4-4.11.6/debian/patches/xubuntu_set-accountsservice-user-bg.patch 2014-04-09 07:35:36.000000000 +0000 @@ -0,0 +1,119 @@ +Description: Update the Accountsservice user background + accountsservice outside ubuntu doesn't have the wallpaper/background setting +Author: Lionel Le Folgoc +Forwarded: not-needed + +--- + src/xfce-desktop.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 87 insertions(+) + +--- a/src/xfce-desktop.c ++++ b/src/xfce-desktop.c +@@ -63,6 +63,7 @@ + #include + #include + #include ++#include + + #ifdef ENABLE_DESKTOP_ICONS + #include "xfdesktop-icon-view.h" +@@ -352,6 +353,88 @@ create_bg_pixmap(GdkScreen *gscreen, gpo + } + + static void ++set_accountsservice_user_bg(const gchar *filename) ++{ ++ GDBusProxy *proxy = NULL; ++ GDBusProxy *user = NULL; ++ GVariant *variant = NULL; ++ GError *error = NULL; ++ gchar *object_path = NULL; ++ const gchar *user_name = g_get_user_name(); ++ ++ proxy = g_dbus_proxy_new_for_bus_sync(G_BUS_TYPE_SYSTEM, ++ G_DBUS_PROXY_FLAGS_NONE, ++ NULL, ++ "org.freedesktop.Accounts", ++ "/org/freedesktop/Accounts", ++ "org.freedesktop.Accounts", ++ NULL, ++ &error); ++ ++ if(!proxy) { ++ DBG("Failed to contact accounts service: %s", error->message); ++ g_error_free(error); ++ return; ++ } ++ ++ variant = g_dbus_proxy_call_sync(proxy, ++ "FindUserByName", ++ g_variant_new("(s)", user_name), ++ G_DBUS_CALL_FLAGS_NONE, ++ -1, ++ NULL, ++ &error); ++ ++ if(!variant) { ++ DBG("Could not contact accounts service to look up '%s': %s", ++ user_name, error->message); ++ g_error_free(error); ++ goto bail; ++ } ++ ++ g_variant_get(variant, "(o)", &object_path); ++ user = g_dbus_proxy_new_for_bus_sync(G_BUS_TYPE_SYSTEM, ++ G_DBUS_PROXY_FLAGS_NONE, ++ NULL, ++ "org.freedesktop.Accounts", ++ object_path, ++ "org.freedesktop.Accounts.User", ++ NULL, ++ &error); ++ g_free(object_path); ++ ++ if(!user) { ++ DBG("Could not create proxy for user '%s': %s", ++ g_variant_get_string(variant, NULL), error->message); ++ g_error_free(error); ++ goto bail; ++ } ++ g_variant_unref(variant); ++ ++ variant = g_dbus_proxy_call_sync(user, ++ "SetBackgroundFile", ++ g_variant_new("(s)", filename), ++ G_DBUS_CALL_FLAGS_NONE, ++ -1, ++ NULL, ++ &error); ++ ++ if(!variant) { ++ DBG("Failed to set the background '%s': %s", filename, error->message); ++ g_error_free(error); ++ goto bail; ++ } ++ ++bail: ++ if(user) ++ g_object_unref(user); ++ if(proxy) ++ g_object_unref(proxy); ++ if(variant) ++ g_variant_unref(variant); ++} ++ ++static void + backdrop_changed_cb(XfceBackdrop *backdrop, gpointer user_data) + { + XfceDesktop *desktop = XFCE_DESKTOP(user_data); +@@ -387,6 +470,10 @@ backdrop_changed_cb(XfceBackdrop *backdr + } + if(monitor == -1) + return; ++ /* notify Accountsservice of the new bg (only for monitor0) */ ++ if(monitor == 0) ++ if (xfce_desktop_get_current_workspace(desktop) == 0) ++ set_accountsservice_user_bg(xfce_backdrop_get_image_filename(backdrop)); + + #ifdef G_ENABLE_DEBUG + monitor_name = gdk_screen_get_monitor_plug_name(gscreen, monitor);