diff options
| author | nobody <nobody@localhost> | 2002-06-04 08:04:04 +0800 |
|---|---|---|
| committer | nobody <nobody@localhost> | 2002-06-04 08:04:04 +0800 |
| commit | 7760ee15585aca92e42e860d9967ac4d70021c5a (patch) | |
| tree | de637e066d27368c7895eb176998ffe0218d787d /calendar/gui/alarm-notify | |
| parent | b0d3a768d1197ef3fdd2f5884d981a23c367d594 (diff) | |
| download | gsoc2013-evolution-EVOLUTION_1_0_6.tar.gz gsoc2013-evolution-EVOLUTION_1_0_6.tar.zst gsoc2013-evolution-EVOLUTION_1_0_6.zip | |
This commit was manufactured by cvs2svn to create tagEVOLUTION_1_0_6
'EVOLUTION_1_0_6'.
svn path=/tags/EVOLUTION_1_0_6/; revision=17093
Diffstat (limited to 'calendar/gui/alarm-notify')
| -rw-r--r-- | calendar/gui/alarm-notify/alarm-notify.c | 4 | ||||
| -rw-r--r-- | calendar/gui/alarm-notify/notify-main.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c index 2f7889b4db..88c3ee2bad 100644 --- a/calendar/gui/alarm-notify/alarm-notify.c +++ b/calendar/gui/alarm-notify/alarm-notify.c @@ -358,7 +358,7 @@ static gboolean retry_timeout_cb (gpointer data) { RetryData *retry_data = data; - + if (cal_client_get_load_state (retry_data->client) != CAL_CLIENT_LOAD_LOADED) { cal_client_open_calendar (retry_data->client, retry_data->str_uri, FALSE); } @@ -458,7 +458,9 @@ alarm_notify_add_calendar (AlarmNotify *an, const char *str_uri, gboolean load_a lc->refcount = 1; g_hash_table_insert (priv->uri_client_hash, g_strdup (str_uri), lc); + } else { + remove_uri_to_load (uri); gtk_object_unref (GTK_OBJECT (client)); client = NULL; } diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c index 06fe87b611..148dab6865 100644 --- a/calendar/gui/alarm-notify/notify-main.c +++ b/calendar/gui/alarm-notify/notify-main.c @@ -118,7 +118,7 @@ load_calendars (gpointer user_data) uris = get_calendars_to_load (); if (!uris) { g_message ("load_calendars(): Could not get the list of calendars to load"); - return TRUE; /* should we continue retrying? */; + return TRUE; /* should we continue retrying? */ } for (i = 0; i < uris->len; i++) { |