Blame SOURCES/0001-Make-the-Don-t-ask-again-checkbox-work-properly.patch

73be80
From 9c19d7fedadf38cc4fec21efdb3908572448f658 Mon Sep 17 00:00:00 2001
73be80
From: Matthias Clasen <mclasen@redhat.com>
73be80
Date: Thu, 30 May 2013 19:21:11 -0400
73be80
Subject: [PATCH] Make the 'Don't ask again' checkbox work properly
73be80
73be80
We used to remove the user-dirs.locale file when this is checked,
73be80
but that prevents xdg-user-dirs-gtk-update from ever running again.
73be80
Instead, update it with the current locale. This has the effect
73be80
of keeping xdg-user-dirs-gtk-update from running until the locale
73be80
changes again, which is probably closer to the intended effect.
73be80
73be80
https://bugzilla.redhat.com/show_bug.cgi?id=968955
73be80
---
73be80
 update.c | 40 +++++++++++++++++++++++++++++++---------
73be80
 1 file changed, 31 insertions(+), 9 deletions(-)
73be80
73be80
diff --git a/update.c b/update.c
73be80
index 4697913..8710c79 100644
73be80
--- a/update.c
73be80
+++ b/update.c
73be80
@@ -48,12 +48,40 @@ has_xdg_translation (void)
73be80
   if (strncmp (locale, "en_US", 5) == 0 ||
73be80
       strcmp (locale, "C") == 0)
73be80
     return TRUE;
73be80
-  
73be80
+
73be80
   str = "Desktop";
73be80
   return dgettext ("xdg-user-dirs", str) != str;
73be80
 }
73be80
 
73be80
 static void
73be80
+save_locale (void)
73be80
+{
73be80
+  FILE *file;
73be80
+  char *user_locale_file;
73be80
+  char *locale, *dot;
73be80
+
73be80
+  user_locale_file = g_build_filename (g_get_user_config_dir (),
73be80
+                                       "user-dirs.locale", NULL);
73be80
+  file = fopen (user_locale_file, "w");
73be80
+  g_free (user_locale_file);
73be80
+
73be80
+  if (file == NULL)
73be80
+    {
73be80
+      fprintf (stderr, "Can't save user-dirs.locale\n");
73be80
+      return;
73be80
+    }
73be80
+
73be80
+  locale = g_strdup (setlocale (LC_MESSAGES, NULL));
73be80
+  /* Skip encoding part */
73be80
+  dot = strchr (locale, '.');
73be80
+  if (dot)
73be80
+    *dot = 0;
73be80
+  fprintf (file, "%s", locale);
73be80
+  g_free (locale);
73be80
+  fclose (file);
73be80
+}
73be80
+
73be80
+static void
73be80
 update_locale (XdgDirEntry *old_entries)
73be80
 {
73be80
   XdgDirEntry *new_entries, *entry;
73be80
@@ -91,10 +119,9 @@ update_locale (XdgDirEntry *old_entries)
73be80
   g_free (std_out);
73be80
   g_free (std_err);
73be80
   g_free (cmdline);
73be80
-
73be80
   if (!WIFEXITED(exit_status) || WEXITSTATUS(exit_status) != 0)
73be80
     return;
73be80
-  
73be80
+
73be80
   new_entries = parse_xdg_dirs (filename);
73be80
   g_unlink (filename);
73be80
   g_free (filename);
73be80
@@ -254,12 +281,7 @@ update_locale (XdgDirEntry *old_entries)
73be80
 
73be80
   if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check)))
73be80
     {
73be80
-      char *file;
73be80
-      
73be80
-      file = g_build_filename (g_get_user_config_dir (),
73be80
-			       "user-dirs.locale", NULL);
73be80
-      g_unlink (file);
73be80
-      g_free (file);
73be80
+      save_locale ();
73be80
     }
73be80
 
73be80
   g_free (new_entries);
73be80
-- 
73be80
1.8.2.1
73be80