diff -Nru xfdesktop4-4.8.3/debian/changelog xfdesktop4-4.8.3/debian/changelog --- xfdesktop4-4.8.3/debian/changelog 2012-04-04 17:54:14.000000000 +0000 +++ xfdesktop4-4.8.3/debian/changelog 2012-04-04 19:08:19.000000000 +0000 @@ -1,3 +1,11 @@ +xfdesktop4 (4.8.3-2ubuntu7) precise; urgency=low + + * debian/patches: + - xubuntu_apply-single-click-option-on-startup.patch: dropped and replaced + with the better and more minimal upstream patch 0093-….patch. + + -- Lionel Le Folgoc Wed, 04 Apr 2012 21:08:05 +0200 + xfdesktop4 (4.8.3-2ubuntu6) precise; urgency=low * debian/patches: diff -Nru xfdesktop4-4.8.3/debian/patches/0093-Apply-single-click-option-on-startup-Bug-8615.patch xfdesktop4-4.8.3/debian/patches/0093-Apply-single-click-option-on-startup-Bug-8615.patch --- xfdesktop4-4.8.3/debian/patches/0093-Apply-single-click-option-on-startup-Bug-8615.patch 1970-01-01 00:00:00.000000000 +0000 +++ xfdesktop4-4.8.3/debian/patches/0093-Apply-single-click-option-on-startup-Bug-8615.patch 2012-04-04 18:28:29.000000000 +0000 @@ -0,0 +1,80 @@ +From 127ff8a2ed9531b510e5e1bbff64690691e6ccc3 Mon Sep 17 00:00:00 2001 +From: Eric Koegel +Date: Wed, 4 Apr 2012 20:07:10 +0300 +Subject: Apply single click option on startup (Bug #8615) + +Moved the property bind function to xfdesktop_icon_view_new rather +than the init function which will allow it to work correctly when +xfdesktop starts up. +Additionally switched to using xfconf_channel_get rather than new. +--- + src/main.c | 2 +- + src/xfdesktop-icon-view.c | 22 ++++++++++------------ + 2 files changed, 11 insertions(+), 13 deletions(-) + + Slightly edited line numbers for the patch to apply cleanly in Xubuntu. + +diff --git a/src/main.c b/src/main.c +index 54dbaee..76b275b 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -347,7 +347,7 @@ main(int argc, char **argv) + g_error_free(error); + error = NULL; + } else +- channel = xfconf_channel_new(XFDESKTOP_CHANNEL); ++ channel = xfconf_channel_get(XFDESKTOP_CHANNEL); + + nscreens = gdk_display_get_n_screens(gdpy); + desktops = g_new0(GtkWidget *, nscreens); +diff --git a/src/xfdesktop-icon-view.c b/src/xfdesktop-icon-view.c +index cf2e977..ef5e869 100644 +--- a/src/xfdesktop-icon-view.c ++++ b/src/xfdesktop-icon-view.c +@@ -682,14 +682,6 @@ xfdesktop_icon_view_init(XfdesktopIconView *icon_view) + g_object_set(G_OBJECT(icon_view), "has-tooltip", TRUE, NULL); + g_signal_connect(G_OBJECT(icon_view), "query-tooltip", + G_CALLBACK(xfdesktop_icon_view_show_tooltip), NULL); +- +- icon_view->priv->channel = xfconf_channel_new (XFDESKTOP_CHANNEL); +- +- xfconf_g_property_bind(icon_view->priv->channel, +- "/desktop-icons/single-click", +- G_TYPE_BOOLEAN, +- G_OBJECT(icon_view), +- "single_click"); + + GTK_WIDGET_SET_FLAGS(GTK_WIDGET(icon_view), GTK_NO_WINDOW); + } +@@ -712,11 +704,9 @@ xfdesktop_icon_view_finalize(GObject *obj) + g_list_free(icon_view->priv->pending_icons); + /* icon_view->priv->icons should be cleared in _unrealize() */ + +- if (icon_view->priv->channel) { +- g_object_unref (icon_view->priv->channel); ++ if (icon_view->priv->channel) + icon_view->priv->channel = NULL; +- } +- ++ + G_OBJECT_CLASS(xfdesktop_icon_view_parent_class)->finalize(obj); + } + +@@ -3306,6 +3296,14 @@ xfdesktop_icon_view_new(XfdesktopIconViewManager *manager) + + icon_view = g_object_new(XFDESKTOP_TYPE_ICON_VIEW, NULL); + icon_view->priv->manager = manager; ++ ++ icon_view->priv->channel = xfconf_channel_get(XFDESKTOP_CHANNEL); ++ ++ xfconf_g_property_bind(icon_view->priv->channel, ++ "/desktop-icons/single-click", ++ G_TYPE_BOOLEAN, ++ G_OBJECT(icon_view), ++ "single_click"); + + return GTK_WIDGET(icon_view); + } +-- +1.7.9.5 + diff -Nru xfdesktop4-4.8.3/debian/patches/series xfdesktop4-4.8.3/debian/patches/series --- xfdesktop4-4.8.3/debian/patches/series 2012-04-04 17:54:02.000000000 +0000 +++ xfdesktop4-4.8.3/debian/patches/series 2012-04-04 18:26:16.000000000 +0000 @@ -15,6 +15,6 @@ 0027-Added-the-root-menu-popup-when-there-are-no-icons-sh.patch 0062-Fix-compilation.patch 0079-Fix-menu-without-desktop-icons.patch -xubuntu_apply-single-click-option-on-startup.patch +0093-Apply-single-click-option-on-startup-Bug-8615.patch xubuntu_refreshed-translations.patch xubuntu_fix-menu-icon.patch diff -Nru xfdesktop4-4.8.3/debian/patches/xubuntu_apply-single-click-option-on-startup.patch xfdesktop4-4.8.3/debian/patches/xubuntu_apply-single-click-option-on-startup.patch --- xfdesktop4-4.8.3/debian/patches/xubuntu_apply-single-click-option-on-startup.patch 2012-04-04 17:52:58.000000000 +0000 +++ xfdesktop4-4.8.3/debian/patches/xubuntu_apply-single-click-option-on-startup.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,93 +0,0 @@ -From 9291cd1bbe447201dd0be8e7b808a1785e2fd316 Mon Sep 17 00:00:00 2001 -From: Eric Koegel -Date: Wed, 4 Apr 2012 09:19:51 +0300 -Subject: [PATCH] Apply single click option on startup (Bug #8615) - -Moved the property bind function to xfdesktop_icon_view_new rather -than the init function which will allow it to work correctly when -xfdesktop starts up. -Additionally switched to using xfconf_channel_get rather than new. ---- - settings/main.c | 3 +-- - src/main.c | 2 +- - src/xfdesktop-icon-view.c | 22 ++++++++++------------ - 3 files changed, 12 insertions(+), 15 deletions(-) - - Slightly edited for Xubuntu to apply cleanly. - ---- xfdesktop4-4.8.3.orig/settings/main.c -+++ xfdesktop4-4.8.3/settings/main.c -@@ -1616,7 +1616,7 @@ main(int argc, char **argv) - return 1; - } - -- channel = xfconf_channel_new(XFDESKTOP_CHANNEL); -+ channel = xfconf_channel_get(XFDESKTOP_CHANNEL); - - gdk_threads_enter(); - -@@ -1647,7 +1647,6 @@ main(int argc, char **argv) - - gdk_threads_leave(); - -- g_object_unref(G_OBJECT(channel)); - xfconf_shutdown(); - - return 0; ---- xfdesktop4-4.8.3.orig/src/main.c -+++ xfdesktop4-4.8.3/src/main.c -@@ -347,7 +347,7 @@ main(int argc, char **argv) - g_error_free(error); - error = NULL; - } else -- channel = xfconf_channel_new(XFDESKTOP_CHANNEL); -+ channel = xfconf_channel_get(XFDESKTOP_CHANNEL); - - nscreens = gdk_display_get_n_screens(gdpy); - desktops = g_new0(GtkWidget *, nscreens); ---- xfdesktop4-4.8.3.orig/src/xfdesktop-icon-view.c -+++ xfdesktop4-4.8.3/src/xfdesktop-icon-view.c -@@ -682,14 +682,6 @@ xfdesktop_icon_view_init(XfdesktopIconVi - g_object_set(G_OBJECT(icon_view), "has-tooltip", TRUE, NULL); - g_signal_connect(G_OBJECT(icon_view), "query-tooltip", - G_CALLBACK(xfdesktop_icon_view_show_tooltip), NULL); -- -- icon_view->priv->channel = xfconf_channel_new (XFDESKTOP_CHANNEL); -- -- xfconf_g_property_bind(icon_view->priv->channel, -- "/desktop-icons/single-click", -- G_TYPE_BOOLEAN, -- G_OBJECT(icon_view), -- "single_click"); - - GTK_WIDGET_SET_FLAGS(GTK_WIDGET(icon_view), GTK_NO_WINDOW); - } -@@ -712,11 +704,9 @@ xfdesktop_icon_view_finalize(GObject *ob - g_list_free(icon_view->priv->pending_icons); - /* icon_view->priv->icons should be cleared in _unrealize() */ - -- if (icon_view->priv->channel) { -- g_object_unref (icon_view->priv->channel); -+ if (icon_view->priv->channel) - icon_view->priv->channel = NULL; -- } -- -+ - G_OBJECT_CLASS(xfdesktop_icon_view_parent_class)->finalize(obj); - } - -@@ -3306,6 +3296,14 @@ xfdesktop_icon_view_new(XfdesktopIconVie - - icon_view = g_object_new(XFDESKTOP_TYPE_ICON_VIEW, NULL); - icon_view->priv->manager = manager; -+ -+ icon_view->priv->channel = xfconf_channel_get(XFDESKTOP_CHANNEL); -+ -+ xfconf_g_property_bind(icon_view->priv->channel, -+ "/desktop-icons/single-click", -+ G_TYPE_BOOLEAN, -+ G_OBJECT(icon_view), -+ "single_click"); - - return GTK_WIDGET(icon_view); - }