[Commits] [SCM] claws branch, master, updated. 3.12.0-51-g206f559

[Holger Berndt]

Thanks, Andrej!

On Mo, 17.08.2015 20:47, ticho at claws-mail.org wrote:

>The branch, master has been updated
>       via  206f559c6f1065be9fa221f00bddaf4e0b669dd9 (commit)
>      from  31806c2352c74a2df322b3483b58123d9320e852 (commit)
>
>Summary of changes:
> AUTHORS                                       |    1 +
> src/gtk/authors.h                             |    1 +
> src/plugins/notification/notification_popup.c |    4 +++-
> 3 files changed, 5 insertions(+), 1 deletion(-)
>
>
>- Log -----------------------------------------------------------------
>commit 206f559c6f1065be9fa221f00bddaf4e0b669dd9
>Author: Andrej Kacian <ticho at claws-mail.org>
>Date:   Mon Aug 17 20:45:38 2015 +0200
>
>    Fix crash on double notification popup.
>    
>    Patch by Richard Hughes. Closes bug #3496.
>
>diff --git a/AUTHORS b/AUTHORS
>index 4bc665a..5accdbd 100644
>--- a/AUTHORS
>+++ b/AUTHORS
>@@ -307,3 +307,4 @@ contributors (in addition to the above; based on Changelog)
> 	Robert David
> 	Oliver Schneider
> 	Jean Diraison
>+	Richard Hughes
>diff --git a/src/gtk/authors.h b/src/gtk/authors.h
>index 9880919..70209db 100644
>--- a/src/gtk/authors.h
>+++ b/src/gtk/authors.h
>@@ -161,6 +161,7 @@ static char *CONTRIBS_LIST[] = {
> "Michihide Hotta",
> "Shawn Houston",
> "Michael Hughes",
>+"Richard Hughes",
> "Chideok Hwang",
> "John E.P. Hynes",
> "Hironori IWANE",
>diff --git a/src/plugins/notification/notification_popup.c b/src/plugins/notification/notification_popup.c
>index 7393af2..180f067 100644
>--- a/src/plugins/notification/notification_popup.c
>+++ b/src/plugins/notification/notification_popup.c
>@@ -566,8 +566,10 @@ static gboolean notification_popup_add_msg(MsgInfo *msginfo)
>     ppopup->msg_path = NULL;
>   }
> 
>-  if(ppopup->label2)
>+  if(ppopup->label2) {
>     gtk_widget_destroy(ppopup->label2);
>+		ppopup->label2 = NULL;
>+	}
> 
>   message = g_strdup_printf(ngettext("%d new message",
> 				     "%d new messages",
>
>-----------------------------------------------------------------------
>
>
>hooks/post-receive




Holger