diff options
| author | Suman Manjunath <msuman@src.gnome.org> | 2008-08-18 13:14:43 +0800 |
|---|---|---|
| committer | Suman Manjunath <msuman@src.gnome.org> | 2008-08-18 13:14:43 +0800 |
| commit | 2e2cef24bc9275c29d013cdcee6517d921d26c15 (patch) | |
| tree | 1b2f4b3b5b3b0dbd029169924b836492f128b142 | |
| parent | a763c26876c7e56401452f76e1d372bb945aa8b7 (diff) | |
| download | gsoc2013-evolution-2e2cef24bc9275c29d013cdcee6517d921d26c15.tar.gz gsoc2013-evolution-2e2cef24bc9275c29d013cdcee6517d921d26c15.tar.zst gsoc2013-evolution-2e2cef24bc9275c29d013cdcee6517d921d26c15.zip | |
Milan Crha <mcrha@redhat.com> ** Part of fix for bug #462242 (Do not unref NULL pointers).
svn path=/trunk/; revision=36011
| -rw-r--r-- | calendar/ChangeLog | 11 | ||||
| -rw-r--r-- | calendar/gui/gnome-cal.c | 3 |
2 files changed, 11 insertions, 3 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index ce3f685dc9..f30818fdf2 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,10 @@ +2008-08-08 Milan Crha <mcrha@redhat.com> + + ** Part of fix for bug #462242 + + * gui/gnome-cal.c: (default_client_cal_opened_cb): + Do not unref NULL pointers. + 2008-08-18 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #508732 @@ -16,10 +23,10 @@ 2008-08-14 Sebastien Bacher <seb128@ubuntu.com> - ** Fix for bug #547805 + ** Fix for bug #547805 * gui/e-cal-popup.c: (ecalp_standard_menu_factory): - don't filter applications using g_app_info_should_show() + don't filter applications using g_app_info_should_show() 2008-08-14 Matthew Barnes <mbarnes@redhat.com> diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index d2fd8f551b..4d65f094b8 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -2870,7 +2870,8 @@ default_client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar g_hash_table_remove (priv->clients[source_type], e_source_peek_uid (source)); /* FIXME Is there a better way to handle this? */ - g_object_unref (priv->default_client[source_type]); + if (priv->default_client[source_type]) + g_object_unref (priv->default_client[source_type]); priv->default_client[source_type] = NULL; g_signal_emit (gcal, gnome_calendar_signals[SOURCE_REMOVED], 0, source_type, source); |