[Pkg-xfce-commits] r596 - desktop/trunk/thunar/debian/patches

[Yves-Alexis Perez]

Author: corsac-guest
Date: 2006-05-01 14:42:22 +0000 (Mon, 01 May 2006)
New Revision: 596

Added:
   desktop/trunk/thunar/debian/patches/04_thunar-apr_launcher-closes-dialog.patch
Log:
patch to fix problem with properties on launchers


Added: desktop/trunk/thunar/debian/patches/04_thunar-apr_launcher-closes-dialog.patch
===================================================================
--- desktop/trunk/thunar/debian/patches/04_thunar-apr_launcher-closes-dialog.patch	2006-05-01 14:16:26 UTC (rev 595)
+++ desktop/trunk/thunar/debian/patches/04_thunar-apr_launcher-closes-dialog.patch	2006-05-01 14:42:22 UTC (rev 596)
@@ -0,0 +1,37 @@
+Index: plugins/thunar-apr/thunar-apr-desktop-page.c
+===================================================================
+--- plugins/thunar-apr/thunar-apr-desktop-page.c	(revision 21419)
++++ plugins/thunar-apr/thunar-apr-desktop-page.c	(working copy)
+@@ -496,9 +496,7 @@
+   gchar     *data;
+   gchar     *uri;
+   gsize      data_length;
+-#if !GLIB_CHECK_VERSION(2,8,0)
+   FILE      *fp;
+-#endif
+ 
+   /* verify that we still have a valid file */
+   if (THUNAR_APR_ABSTRACT_PAGE (desktop_page)->file == NULL)
+@@ -527,20 +525,17 @@
+       if (G_LIKELY (data != NULL))
+         {
+           /* try to save the key file content to disk */
+-#if GLIB_CHECK_VERSION(2,8,0)
+-          g_file_set_contents (filename, data, data_length, &error);
+-#else
+           fp = fopen (filename, "w");
+           if (G_LIKELY (fp != NULL))
+             {
+-              fwrite (data, data_length, 1, fp);
++              if (fwrite (data, data_length, 1, fp) != 1)
++                error = g_error_new_literal (G_FILE_ERROR, g_file_error_from_errno (errno), g_strerror (errno));
+               fclose (fp);
+             }
+           else
+             {
+               error = g_error_new_literal (G_FILE_ERROR, g_file_error_from_errno (errno), g_strerror (errno));
+             }
+-#endif
+ 
+           /* cleanup */
+           g_free (data);