From b2cda1d0c6d44f53f71bad9e256f41188677dfba Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 1 Oct 2008 20:56:04 +0000 Subject: Merge revisions 36016:36533 from trunk. svn path=/branches/kill-bonobo/; revision=36534 --- plugins/mail-notification/ChangeLog | 13 +++++++++ plugins/mail-notification/mail-notification.c | 41 ++++++++++++++------------- 2 files changed, 35 insertions(+), 19 deletions(-) (limited to 'plugins/mail-notification') diff --git a/plugins/mail-notification/ChangeLog b/plugins/mail-notification/ChangeLog index 81039caa5c..3e489aca96 100644 --- a/plugins/mail-notification/ChangeLog +++ b/plugins/mail-notification/ChangeLog @@ -1,3 +1,16 @@ +2008-09-16 Sankar P + +License Changes + + * mail-notification.c: + +2008-09-15 Milan Crha + + ** Fix for bug #514299 + + * mail-notification.c: (new_notify_status): + Connect to signals only once, when creating new status icon. + 2008-08-12 Bharath Acharya * Makefile.am: Have a check for OS_WIN32 and handle the schema data diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c index 9826f5a06d..f3da922a79 100644 --- a/plugins/mail-notification/mail-notification.c +++ b/plugins/mail-notification/mail-notification.c @@ -1,21 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Author: Miguel Angel Lopez Hernandez + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * Authors: + * Miguel Angel Lopez Hernandez + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ @@ -493,13 +494,15 @@ new_notify_status (EMEventTargetFolder *t) g_free (msg); - #ifdef HAVE_LIBNOTIFY - g_signal_connect (G_OBJECT (status_icon), "activate", G_CALLBACK (icon_activated), notify); - #else - g_signal_connect (G_OBJECT (status_icon), "activate", G_CALLBACK (icon_activated), NULL); - #endif + if (new_icon) { + #ifdef HAVE_LIBNOTIFY + g_signal_connect (G_OBJECT (status_icon), "activate", G_CALLBACK (icon_activated), notify); + #else + g_signal_connect (G_OBJECT (status_icon), "activate", G_CALLBACK (icon_activated), NULL); + #endif - g_signal_connect (G_OBJECT (status_icon), "popup-menu", G_CALLBACK (popup_menu_status), NULL); + g_signal_connect (G_OBJECT (status_icon), "popup-menu", G_CALLBACK (popup_menu_status), NULL); + } } static void -- cgit v1.2.3