Merge lp:~noskcaj/ubuntu/trusty/xfdesktop4/git-patches into lp:ubuntu/trusty/xfdesktop4

[Jackson Doak]

Add patches from upstream git for xubuntu 14.04

[lp:~noskcaj/ubuntu/trusty/xfdesktop4/git-patches]

102. By Jackson Doak on 2014-03-28

Refresh xubuntu_set-accountsservice-user-bg.patch to fix
a memory leak. LP: #1295614

[Alistair Buxton (a-j-buxton)]

Ack for accounts service memory leak fix.

[Sebastien Bacher (seb128)]

Thanks

review: Approve

=== added file '.pc/xubuntu_improve-nautilus-interactions.patch/.timestamp'
=== modified file '.pc/xubuntu_improve-nautilus-interactions.patch/src/xfce-desktop.c'
--- .pc/xubuntu_improve-nautilus-interactions.patch/src/xfce-desktop.c	2014-03-19 16:33:54 +0000
+++ .pc/xubuntu_improve-nautilus-interactions.patch/src/xfce-desktop.c	2014-03-28 19:37:23 +0000
@@ -425,6 +425,8 @@
     }
 
 bail:
+    if(user)
+        g_object_unref(user);
     if(proxy)
         g_object_unref(proxy);
     if(variant)

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-19 16:33:54 +0000
+++ debian/changelog	2014-03-28 19:37:23 +0000
@@ -1,3 +1,17 @@
+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 <[e-mail]>  Fri, 28 Mar 2014 07:16:04 +1100
+
 xfdesktop4 (4.11.4-1ubuntu1) trusty; urgency=medium
 
   * Merge from debian. Remaining changes:

=== added file 'debian/patches/git-desktop-icons-have-background.patch'
--- debian/patches/git-desktop-icons-have-background.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/git-desktop-icons-have-background.patch	2014-03-28 19:37:23 +0000
@@ -0,0 +1,104 @@
+Origin: upstream
+Author: Eric Koegel <[e-mail]>
+Description: Reset the icon_view style on style change
+ Since xfdesktop now properly responds to xfsettingsd changes we
+ need to handle the race condition at launch. This patch changes
+ it so that the style change for the icon view happens in a low
+ priority callback. This ensures that the style gets reset only
+ once if there's a batch of changes to process and will happen
+ after xfdesktop has loaded. This is different from the previous
+ callback patch in that the entire icon view doesn't get recreated.
+Bug: https://bugzilla.xfce.org/show_bug.cgi?id=10605
+Bug-Ubuntu: https://launchpad.net/bugs/1270261
+Applied-Upstream: commit:cdbba947379540fa2c89fda34b96bf336070fe47
+
+---
+ src/xfce-desktop.c |   38 ++++++++++++++++++++++++++++++++------
+ 1 file changed, 32 insertions(+), 6 deletions(-)
+
+--- a/src/xfce-desktop.c
++++ b/src/xfce-desktop.c
+@@ -115,6 +115,7 @@ struct _XfceDesktopPriv
+     gboolean icons_font_size_set;
+     guint icons_font_size;
+     guint icons_size;
++    gint  style_refresh_timer;
+     GtkWidget *icon_view;
+     gdouble system_font_size;
+ #endif
+@@ -994,6 +995,9 @@ xfce_desktop_finalize(GObject *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);
+ }
+ 
+@@ -1351,8 +1355,8 @@ xfce_desktop_delete_event(GtkWidget *w,
+     return TRUE;
+ }
+ 
+-static void
+-xfce_desktop_style_set(GtkWidget *w, GtkStyle *old_style)
++static gboolean
++style_refresh_cb(gpointer *w)
+ {
+     XfceDesktop *desktop = XFCE_DESKTOP(w);
+ #ifdef ENABLE_DESKTOP_ICONS
+@@ -1361,13 +1365,15 @@ xfce_desktop_style_set(GtkWidget *w, Gtk
+ 
+     TRACE("entering");
+ 
+-    g_return_if_fail(XFCE_IS_DESKTOP(desktop));
++    desktop->priv->style_refresh_timer = 0;
++
++    g_return_val_if_fail(XFCE_IS_DESKTOP(desktop), FALSE);
+ 
+     if(!gtk_widget_get_realized(GTK_WIDGET(desktop)))
+-        return;
++        return FALSE;
+ 
+     if(desktop->priv->workspaces == NULL)
+-        return;
++        return FALSE;
+ 
+     if(GDK_IS_WINDOW(desktop->priv->bg_pixmap))
+         gdk_window_set_back_pixmap(gtk_widget_get_window(GTK_WIDGET(desktop)), desktop->priv->bg_pixmap, FALSE);
+@@ -1376,7 +1382,7 @@ xfce_desktop_style_set(GtkWidget *w, Gtk
+ 
+ #ifdef ENABLE_DESKTOP_ICONS
+     if(!desktop->priv->icon_view || !XFDESKTOP_IS_ICON_VIEW(desktop->priv->icon_view))
+-        return;
++        return FALSE;
+ 
+     /* reset the icon view style */
+     gtk_widget_set_style(desktop->priv->icon_view, NULL);
+@@ -1390,6 +1396,26 @@ xfce_desktop_style_set(GtkWidget *w, Gtk
+                                           desktop->priv->system_font_size);
+     }
+ #endif
++
++    return FALSE;
++}
++
++static void
++xfce_desktop_style_set(GtkWidget *w, GtkStyle *old_style)
++{
++    XfceDesktop *desktop = XFCE_DESKTOP(w);
++
++    TRACE("entering");
++
++    if(desktop->priv->style_refresh_timer != 0)
++        g_source_remove(desktop->priv->style_refresh_timer);
++
++    desktop->priv->style_refresh_timer = g_idle_add_full(G_PRIORITY_LOW,
++                                                         (GSourceFunc)style_refresh_cb,
++                                                         w,
++                                                         NULL);
++
++    GTK_WIDGET_CLASS(xfce_desktop_parent_class)->style_set(w, old_style);
+ }
+ 
+ static void

=== added file 'debian/patches/git-fix-default-icon-size.patch'
--- debian/patches/git-fix-default-icon-size.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/git-fix-default-icon-size.patch	2014-03-28 19:37:23 +0000
@@ -0,0 +1,22 @@
+Origin: upstream
+Author: Eric Koegel <[e-mail]>
+Description: Explicitly define the desktop icon size
+Bug: https://bugzilla.xfce.org/show_bug.cgi?id=9199
+Bug-Ubuntu: https://launchpad.net/bugs/1272057
+Applied-Upstream: commit:5203d9aa93e40dbddc81895fa60c8d1c99dd95f3 
+
+---
+ src/xfce-desktop.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/xfce-desktop.c
++++ b/src/xfce-desktop.c
+@@ -936,7 +936,7 @@ xfce_desktop_class_init(XfceDesktopClass
+                                     g_param_spec_uint("icon-size",
+                                                       "icon size",
+                                                       "icon size",
+-                                                      8, 192, 36,
++                                                      8, 192, DEFAULT_ICON_SIZE,
+                                                       XFDESKTOP_PARAM_FLAGS));
+ 
+     g_object_class_install_property(gobject_class, PROP_ICON_FONT_SIZE,

=== added file 'debian/patches/git-missing-images-in-settings-app.patch'
--- debian/patches/git-missing-images-in-settings-app.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/git-missing-images-in-settings-app.patch	2014-03-28 19:37:23 +0000
@@ -0,0 +1,125 @@
+Origin: upstream
+Author: Eric Koegel <[e-mail]>
+Description: Fix for images not appearing in settings app
+ We need to add images to the list in the main thread and not our
+ worker thread. Otherwise images won't always display right away,
+ espeically when the system is under a high load.
+Bug: https://bugzilla.xfce.org/show_bug.cgi?id=10695
+Bug-Ubuntu: https://launchpad.net/bugs/1282227
+Applied-Upstream: commit:565ccdfd80f0b4c6e6c67314224bb5c8128177c2
+
+---
+ settings/main.c |   65 ++++++++++++++++++++++++++++++++++++++++----------------
+ 1 file changed, 47 insertions(+), 18 deletions(-)
+
+--- a/settings/main.c
++++ b/settings/main.c
+@@ -87,6 +87,7 @@ typedef struct
+ {
+     GtkTreeModel *model;
+     GtkTreeIter *iter;
++    GdkPixbuf *pix;
+ } PreviewData;
+ 
+ typedef struct
+@@ -169,13 +170,50 @@ static gchar *xfdesktop_settings_generat
+                                                                        const gchar* property);
+ static gchar *xfdesktop_settings_get_backdrop_image(AppearancePanel *panel);
+ 
++
++
++static void
++xfdesktop_settings_free_pdata(gpointer data)
++{
++    PreviewData *pdata = data;
++
++    g_object_unref(pdata->model);
++
++    gtk_tree_iter_free(pdata->iter);
++
++    if(pdata->pix)
++        g_object_unref(pdata->pix);
++
++    g_free(pdata);
++}
++
++static gboolean
++list_store_set(PreviewData *pdata)
++{
++    g_return_val_if_fail(pdata, FALSE);
++
++    gtk_list_store_set(GTK_LIST_STORE(pdata->model), pdata->iter,
++                       COL_PIX, pdata->pix,
++                       -1);
++
++    xfdesktop_settings_free_pdata(pdata);
++
++    return FALSE;
++}
++
+ static void
+-xfdesktop_settings_do_single_preview(GtkTreeModel *model,
+-                                     GtkTreeIter *iter)
++xfdesktop_settings_do_single_preview(PreviewData *pdata)
+ {
++    GtkTreeModel *model;
++    GtkTreeIter *iter;
+     gchar *filename = NULL, *thumbnail = NULL;
+     GdkPixbuf *pix;
+ 
++    g_return_if_fail(pdata);
++
++    model = pdata->model;
++    iter = pdata->iter;
++
+     gtk_tree_model_get(model, iter,
+                        COL_FILENAME, &filename,
+                        COL_THUMBNAIL, &thumbnail,
+@@ -197,23 +235,15 @@ xfdesktop_settings_do_single_preview(Gtk
+     g_free(filename);
+ 
+     if(pix) {
+-        gtk_list_store_set(GTK_LIST_STORE(model), iter,
+-                           COL_PIX, pix,
+-                           -1);
++        pdata->pix = pix;
+ 
+-        g_object_unref(G_OBJECT(pix));
++        /* We must add the images to the list in the main thread */
++        g_main_context_invoke(NULL, (GSourceFunc)list_store_set, pdata);
++    } else {
++        xfdesktop_settings_free_pdata(pdata);
+     }
+ }
+ 
+-static void
+-xfdesktop_settings_free_pdata(gpointer data)
+-{
+-    PreviewData *pdata = data;
+-    g_object_unref(G_OBJECT(pdata->model));
+-    gtk_tree_iter_free(pdata->iter);
+-    g_free(pdata);
+-}
+-
+ static gpointer
+ xfdesktop_settings_create_previews(gpointer data)
+ {
+@@ -225,9 +255,7 @@ xfdesktop_settings_create_previews(gpoin
+         /* Block and wait for another preview to create */
+         pdata = g_async_queue_pop(panel->preview_queue);
+ 
+-        xfdesktop_settings_do_single_preview(pdata->model, pdata->iter);
+-
+-        xfdesktop_settings_free_pdata(pdata);
++        xfdesktop_settings_do_single_preview(pdata);
+     }
+ 
+     return NULL;
+@@ -293,6 +321,7 @@ cb_thumbnail_ready(XfdesktopThumbnailer
+                 pdata = g_new0(PreviewData, 1);
+                 pdata->model = g_object_ref(G_OBJECT(model));
+                 pdata->iter = gtk_tree_iter_copy(&iter);
++                pdata->pix = NULL;
+ 
+                 /* Create the preview image */
+                 xfdesktop_settings_add_file_to_queue(panel, pdata);

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-03-19 16:33:54 +0000
+++ debian/patches/series	2014-03-28 19:37:23 +0000
@@ -1,2 +1,5 @@
 xubuntu_set-accountsservice-user-bg.patch
 xubuntu_improve-nautilus-interactions.patch
+git-desktop-icons-have-background.patch
+git-missing-images-in-settings-app.patch
+git-fix-default-icon-size.patch

=== modified file 'debian/patches/xubuntu_improve-nautilus-interactions.patch'
--- debian/patches/xubuntu_improve-nautilus-interactions.patch	2014-03-19 16:33:54 +0000
+++ debian/patches/xubuntu_improve-nautilus-interactions.patch	2014-03-28 19:37:23 +0000
@@ -17,7 +17,7 @@
 
 --- a/src/xfce-desktop.c
 +++ b/src/xfce-desktop.c
-@@ -809,8 +809,8 @@ screen_set_selection(XfceDesktop *deskto
+@@ -811,8 +811,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);
-@@ -819,6 +819,9 @@ screen_set_selection(XfceDesktop *deskto
+@@ -821,6 +821,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) {
-@@ -826,8 +829,16 @@ screen_set_selection(XfceDesktop *deskto
+@@ -828,8 +831,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-03-19 16:33:54 +0000
+++ debian/patches/xubuntu_set-accountsservice-user-bg.patch	2014-03-28 19:37:23 +0000
@@ -4,8 +4,8 @@
 Forwarded: not-needed
 
 ---
- src/xfce-desktop.c |   85 +++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 85 insertions(+)
+ src/xfce-desktop.c |   87 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 87 insertions(+)
 
 --- a/src/xfce-desktop.c
 +++ b/src/xfce-desktop.c
@@ -17,7 +17,7 @@
  
  #ifdef ENABLE_DESKTOP_ICONS
  #include "xfdesktop-icon-view.h"
-@@ -351,6 +352,86 @@ create_bg_pixmap(GdkScreen *gscreen, gpo
+@@ -351,6 +352,88 @@ create_bg_pixmap(GdkScreen *gscreen, gpo
  }
  
  static void
@@ -94,6 +94,8 @@
 +    }
 +
 +bail:
++    if(user)
++        g_object_unref(user);
 +    if(proxy)
 +        g_object_unref(proxy);
 +    if(variant)
@@ -104,7 +106,7 @@
  backdrop_changed_cb(XfceBackdrop *backdrop, gpointer user_data)
  {
      XfceDesktop *desktop = XFCE_DESKTOP(user_data);
-@@ -386,6 +467,10 @@ backdrop_changed_cb(XfceBackdrop *backdr
+@@ -386,6 +469,10 @@ backdrop_changed_cb(XfceBackdrop *backdr
      }
      if(monitor == -1)
          return;

=== modified file 'src/xfce-desktop.c'
--- src/xfce-desktop.c	2014-03-19 16:33:54 +0000
+++ src/xfce-desktop.c	2014-03-28 19:37:23 +0000
@@ -425,6 +425,8 @@
     }
 
 bail:
+    if(user)
+        g_object_unref(user);
     if(proxy)
         g_object_unref(proxy);
     if(variant)