aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKjartan Maraas <kmaraas@gnome.org>2005-07-13 18:36:15 +0800
committerKjartan Maraas <kmaraas@src.gnome.org>2005-07-13 18:36:15 +0800
commit4afc6e2f2a877441d36c670ef58fe31360a83e63 (patch)
tree9b737cf33428ae159d14bf9b7afa159d09d725f5
parentf0f3975fa81631502c2dbba2a37368faef4493da (diff)
downloadgsoc2013-evolution-4afc6e2f2a877441d36c670ef58fe31360a83e63.tar
gsoc2013-evolution-4afc6e2f2a877441d36c670ef58fe31360a83e63.tar.gz
gsoc2013-evolution-4afc6e2f2a877441d36c670ef58fe31360a83e63.tar.bz2
gsoc2013-evolution-4afc6e2f2a877441d36c670ef58fe31360a83e63.tar.lz
gsoc2013-evolution-4afc6e2f2a877441d36c670ef58fe31360a83e63.tar.xz
gsoc2013-evolution-4afc6e2f2a877441d36c670ef58fe31360a83e63.tar.zst
gsoc2013-evolution-4afc6e2f2a877441d36c670ef58fe31360a83e63.zip
Free the uri to the source in a few cases. Free the timezone location.
2005-07-08 Kjartan Maraas <kmaraas@gnome.org> * gui/alarm-notify/alarm-notify.c: (alarm_notify_add_calendar): Free the uri to the source in a few cases. * gui/calendar-config.c: (calendar_config_get_icaltimezone): Free the timezone location. svn path=/trunk/; revision=29756
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/alarm-notify/alarm-notify.c3
-rw-r--r--calendar/gui/calendar-config.c5
3 files changed, 13 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index fd6ecd9ea1..956a4ce947 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-08 Kjartan Maraas <kmaraas@gnome.org>
+
+ * gui/alarm-notify/alarm-notify.c: (alarm_notify_add_calendar):
+ Free the uri to the source in a few cases.
+ * gui/calendar-config.c: (calendar_config_get_icaltimezone):
+ Free the timezone location.
+
2005-07-12 Chenthill Palanisamy <pchenthill@novell.com>
* gui/e-meeting-list-view.c:
diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c
index 51aac05cdd..5fa9117370 100644
--- a/calendar/gui/alarm-notify/alarm-notify.c
+++ b/calendar/gui/alarm-notify/alarm-notify.c
@@ -338,6 +338,7 @@ alarm_notify_add_calendar (AlarmNotify *an, ECalSourceType source_type, ESource
/* See if we already know about this uri */
if (g_hash_table_lookup (priv->uri_client_hash[source_type], str_uri)) {
g_mutex_unlock (an->priv->mutex);
+ g_free (str_uri);
return;
}
/* if loading of this requires password and password is not currently availble in e-password
@@ -346,6 +347,7 @@ alarm_notify_add_calendar (AlarmNotify *an, ECalSourceType source_type, ESource
if ((e_source_get_property (source, "auth") &&
(!e_passwords_get_password (e_source_get_property(source, "auth-domain"), str_uri)))) {
g_mutex_unlock (an->priv->mutex);
+ g_free (str_uri);
return;
}
client = auth_new_cal_from_source (source, source_type);
@@ -355,6 +357,7 @@ alarm_notify_add_calendar (AlarmNotify *an, ECalSourceType source_type, ESource
g_signal_connect (G_OBJECT (client), "cal_opened", G_CALLBACK (cal_opened_cb), an);
e_cal_open_async (client, FALSE);
}
+ g_free (str_uri);
g_mutex_unlock (an->priv->mutex);
}
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
index d8d21b0f5b..aa2b565b52 100644
--- a/calendar/gui/calendar-config.c
+++ b/calendar/gui/calendar-config.c
@@ -195,9 +195,10 @@ calendar_config_get_icaltimezone (void)
calendar_config_init ();
location = calendar_config_get_timezone ();
- if (location)
+ if (location) {
zone = icaltimezone_get_builtin_timezone (location);
-
+ g_free (location);
+ }
if (!zone)
zone = icaltimezone_get_utc_timezone ();