Merge lp:~arthurborsboom/xpad/xpad-4.2 into lp:xpad

[Arthur Borsboom]

Bug #307669: Theme colour doesn't hold.
Bug #1216388: error in french traduction

[Arthur Borsboom (arthurborsboom)]

After fixing the comment of Sachin to free the memory, and fighting with the merging mechanism, this merge can be executed.

review: Approve

[lp:~arthurborsboom/xpad/xpad-4.2]

643. By Arthur Borsboom on 2013-10-08

Bug #307669: Theme colour doesn't hold, Bug #1216388: error in french traduction

=== modified file 'po/fr.po'
--- po/fr.po	2011-11-14 16:42:43 +0000
+++ po/fr.po	2013-10-08 16:27:48 +0000
@@ -229,7 +229,7 @@
 
 #: ../src/xpad-pad-properties.c:161 ../src/xpad-preferences.c:150
 msgid "Use this font:"
-msgstr "Utiliser cette poilce de caractère :"
+msgstr "Utiliser cette police de caractère :"
 
 #: ../src/xpad-pad-properties.c:162
 msgid "Use colors from xpad preferences"

=== modified file 'src/xpad-settings.c'
--- src/xpad-settings.c	2011-11-16 20:16:17 +0000
+++ src/xpad-settings.c	2013-10-08 16:27:48 +0000
@@ -748,13 +748,13 @@
 		gdk_color_free (settings->priv->text);
 		settings->priv->text = gdk_color_copy (&text);
 	}
-	
+
+	gdk_color_free (settings->priv->back);
 	if (use_back)
-	{
-		gdk_color_free (settings->priv->back);
 		settings->priv->back = gdk_color_copy (&back);
-	}
-	
+	else
+		settings->priv->back = NULL;
+
 	if (settings->priv->fontname &&
 	    strcmp (settings->priv->fontname, "NULL") == 0)
 	{