[Xfce4-commits] r29834 - in thunar/trunk: . plugins/thunar-wallpaper

[Stephan Arts]

Author: stephan
Date: 2009-04-18 14:36:41 +0000 (Sat, 18 Apr 2009)
New Revision: 29834

Modified:
   thunar/trunk/ChangeLog
   thunar/trunk/plugins/thunar-wallpaper/twp-provider.c
Log:
Applied patch by mike massonnet (bug #5056)



Modified: thunar/trunk/ChangeLog
===================================================================
--- thunar/trunk/ChangeLog	2009-04-18 14:21:06 UTC (rev 29833)
+++ thunar/trunk/ChangeLog	2009-04-18 14:36:41 UTC (rev 29834)
@@ -2,6 +2,15 @@
 
 	* configure.in.in, docs/manual/gl/images/: Fix broken build due
 	  to incomplete integration of the Galician manual translations.
+
+2009-04-07  Mike Massonnet <mmassonnet at xfce.org>
+
+	* plugins/thunar-wallpaper/twp-provider.c(twp_action_set_wallpaper):
+	  Escape spaces in filename (bug #5056) and set style auto (bug #5057)
+	* plugins/thunar-wallpaper/twp-provider.c(twp_action_set_wallpaper),
+	  plugins/thunar-wallpaper/twp-provider.c(check_cli_tools):
+	  Don't pretend gconftool exists (if it exists it is just a symlink),
+	  instead look for gconftool-2
 	
 2009-03-12  Jannis Pohlmann <jannis at xfce.org>
 

Modified: thunar/trunk/plugins/thunar-wallpaper/twp-provider.c
===================================================================
--- thunar/trunk/plugins/thunar-wallpaper/twp-provider.c	2009-04-18 14:21:06 UTC (rev 29833)
+++ thunar/trunk/plugins/thunar-wallpaper/twp-provider.c	2009-04-18 14:36:41 UTC (rev 29834)
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2008 Stephan Arts <stephan at xfce.org>
- * Copyright (c) 2008 Mike Massonnet <mmassonnet at xfce.org>
+ * Copyright (c) 2008-2009 Mike Massonnet <mmassonnet at xfce.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -243,7 +243,7 @@
             image_show_prop = g_strdup_printf("/backdrop/screen%d/monitor%d/image-show", screen_nr, monitor_nr);
             image_style_prop = g_strdup_printf("/backdrop/screen%d/monitor%d/image-style", screen_nr, monitor_nr);
 
-            command = g_strdup_printf ("xfconf-query -c xfce4-desktop -p %s --create -t string -s %s", image_path_prop, file_name);
+            command = g_strdup_printf ("xfconf-query -c xfce4-desktop -p %s --create -t string -s \"%s\"", image_path_prop, file_name);
             g_spawn_command_line_async (command, NULL);
             g_free (command);
 
@@ -251,7 +251,7 @@
             g_spawn_command_line_async (command, NULL);
             g_free (command);
 
-            command = g_strdup_printf ("xfconf-query -c xfce4-desktop -p %s --create -t int -s 4", image_style_prop);
+            command = g_strdup_printf ("xfconf-query -c xfce4-desktop -p %s --create -t int -s 0", image_style_prop);
             g_spawn_command_line_async (command, NULL);
             g_free (command);
 
@@ -264,12 +264,12 @@
             image_path_prop = g_strdup_printf("/desktop/gnome/background/picture_filename");
             image_show_prop = g_strdup_printf("/desktop/gnome/background/draw_background");
 
-            command = g_strdup_printf ("gconftool %s --set %s--type string", image_path_prop, file_name);
+            command = g_strdup_printf ("gconftool-2 %s --set %s--type string", image_path_prop, file_name);
             g_spawn_command_line_async (command, NULL);
             g_free (command);
 
 
-            command = g_strdup_printf ("gconftool %s --set true --type boolean", image_show_prop);
+            command = g_strdup_printf ("gconftool-2 %s --set true --type boolean", image_show_prop);
             g_spawn_command_line_async (command, NULL);
             g_free (command);
 
@@ -298,7 +298,7 @@
     g_free (program);
   }
 
-  program = g_find_program_in_path ("gconftool");
+  program = g_find_program_in_path ("gconftool-2");
   if (G_LIKELY (program != NULL))
   {
     _has_gconftool = TRUE;