Merge lp:~rodrigo-moya/ubuntu/natty/gnome-settings-daemon/fix_685785 into lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu

[Rodrigo Moya]

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-10 21:27:56 +0000
+++ debian/changelog	2011-01-18 15:28:36 +0000
@@ -1,3 +1,10 @@
+gnome-settings-daemon (2.32.1-0ubuntu5) UNRELEASED; urgency=low
+
+  * debian/patches/06_use_application_indicator.patch:
+    - Initialize variable to avoid crashes on free (LP: #685785) 
+
+ -- Rodrigo Moya <[e-mail]>  Tue, 18 Jan 2011 16:23:55 +0100
+
 gnome-settings-daemon (2.32.1-0ubuntu4) natty; urgency=low
 
   * debian/control.in: build-depends on libpolkit-gobject-1-dev
 
=== modified file 'debian/patches/06_use_application_indicator.patch'
--- debian/patches/06_use_application_indicator.patch	2010-12-20 23:26:35 +0000
+++ debian/patches/06_use_application_indicator.patch	2011-01-18 15:28:36 +0000
@@ -794,7 +794,7 @@
 +                gchar * guide = "XXX";
 +	        gchar ** shortnames;
 +	        gchar ** longnames;
-+	        gchar * layout_name;
++	        gchar * layout_name = NULL;
 +	        gchar * lname = NULL;
 +	        GHashTable *ln2cnt_map = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify) g_free, NULL);
 +