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

[Arthur Borsboom]

Fixed bug #307669 - Theme colour doesn't hold.

Fixed bug "Theme colour doesn't hold."
https://bugs.launchpad.net/xpad/+bug/307669

[Sachin Raut (sachinr)]

Please free settings->priv->back before assigning NULL to it, as done in if block. This would cause memory leak.

review: Needs Fixing

[Arthur Borsboom (arthurborsboom)]

Good one! I will change this. I am a bit struggling with the version
managementto get it working easily from eclipse.

In the same time, I try to 'wake up' some of the Xpad developers, by
contacting them.

Whoohaaa! :)

On 7 October 2013 13:43, Sachin Raut <email address hidden> wrote:
> Review: Needs Fixing
>
> Please free settings->priv->back before assigning NULL to it, as done in if block. This would cause memory leak.
> --
> https://code.launchpad.net/~arthurborsboom/xpad/xpad/+merge/189512
> You are the owner of lp:~arthurborsboom/xpad/xpad.

--
Arthur Borsboom
Appartment 10-01 (level 10, app 1)
Avenida Arequipa 4130
Lima, Peru
Mob: [phone]
Email: <email address hidden>

[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

644. By Arthur Borsboom on 2013-10-08

Changelog update to v4.2

645. By Arthur Borsboom on 2013-10-08

Added feature for providing different Xpad tray icon

646. By Arthur Borsboom on 2013-10-08

Updated POT and PO (language) files lp:890212

647. By Arthur Borsboom on 2013-10-09

Fix compilation error against glib-2.34.1 lp:974011, Update changelog lp:890327

648. By Launchpad Translations on behalf of xpad-team on 2013-10-09

Launchpad automatic translations update.

649. By Arthur Borsboom on 2013-10-09

performance fix: busy harddisk while typing or moving pad

650. By Arthur Borsboom on 2013-10-09

Updated Makefile for new source files

651. By Launchpad Translations on behalf of xpad-team on 2013-10-10

Launchpad automatic translations update.

652. By Launchpad Translations on behalf of xpad-team on 2013-10-11

Launchpad automatic translations update.

653. By Arthur Borsboom on 2013-10-11

lp:385007: sticky setting is reset on start up. lp:890212: Update translations.

654. By Launchpad Translations on behalf of xpad-team on 2013-10-12

Launchpad automatic translations update.

655. By Launchpad Translations on behalf of xpad-team on 2013-10-13

Launchpad automatic translations update.

656. By Launchpad Translations on behalf of xpad-team on 2013-10-14

Launchpad automatic translations update.

657. By Arthur Borsboom on 2013-10-18

Fixed crash after deleting pad(s).\nFixed memory leaks.\nUpdated help.\nUpdated changelog.

658. By Arthur Borsboom on 2013-10-18

Updated language files

659. By Arthur Borsboom on 2013-10-18

Reverted deleted mandatory NEWS file

660. By Arthur Borsboom on 2013-10-18

New ability to configure the tray-icon left-click behaviour

661. By Arthur Borsboom on 2013-10-20

Fixed issue autohide toolbar, fixed issue dispose and finalize not called when quiting application

Unmerged revisions

661. By Arthur Borsboom on 2013-10-20

Fixed issue autohide toolbar, fixed issue dispose and finalize not called when quiting application

=== modified file 'po/fr.po'
--- po/fr.po	2011-11-14 16:42:43 +0000
+++ po/fr.po	2013-10-07 20:08:55 +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-07 20:08:55 +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)
 	{