aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChenthill Palanisamy <pchen@src.gnome.org>2006-06-16 16:59:49 +0800
committerChenthill Palanisamy <pchen@src.gnome.org>2006-06-16 16:59:49 +0800
commit32bffd275509124b75f409b190e571b6df2e9d32 (patch)
tree834c638dd92d9c67fc740ea81dac372ad2a2abd5
parentd219c9c769d8f53ebba08d3cc209f99dca0880bd (diff)
downloadgsoc2013-evolution-32bffd275509124b75f409b190e571b6df2e9d32.tar.gz
gsoc2013-evolution-32bffd275509124b75f409b190e571b6df2e9d32.tar.zst
gsoc2013-evolution-32bffd275509124b75f409b190e571b6df2e9d32.zip
Fixes #179774
svn path=/trunk/; revision=32159
-rw-r--r--plugins/itip-formatter/ChangeLog7
-rw-r--r--plugins/itip-formatter/itip-formatter.c12
2 files changed, 18 insertions, 1 deletions
diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog
index e968a282cd..cb8ccb93b3 100644
--- a/plugins/itip-formatter/ChangeLog
+++ b/plugins/itip-formatter/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-16 Chenthill Palanisamy <pchenthill@novell.com>
+
+ Fixes #179774 (b.n.c)
+ * itip-formatter.c: (cal_opened_cb), (find_cal_opened_cb):
+ Reset the current_ecal and disable the buttons if the calendar
+ is not opened properly.
+
2006-06-09 Chris Heath <chris@heathens.co.nz>
* itip-view.c (itip_view_destroy): Fix memory leak.
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index d51f54cb1b..6d5f532206 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -273,6 +273,12 @@ cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
ITIP_VIEW_INFO_ITEM_TYPE_WARNING,
_("Failed to load the calendar '%s'"),
e_source_peek_name (source));
+
+ if (pitip->current_ecal == ecal) {
+ pitip->current_ecal = NULL;
+ itip_view_set_buttons_sensitive (ITIP_VIEW (pitip->view), FALSE);
+ }
+
g_hash_table_remove (pitip->ecals[source_type], e_source_peek_uid (source));
return;
}
@@ -391,6 +397,11 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
ITIP_VIEW_INFO_ITEM_TYPE_WARNING,
_("Failed to load the calendar '%s'"),
e_source_peek_name (source));
+ if (pitip->current_ecal == ecal) {
+ pitip->current_ecal = NULL;
+ itip_view_set_buttons_sensitive (ITIP_VIEW (pitip->view), FALSE);
+ }
+
g_hash_table_remove (pitip->ecals[source_type], e_source_peek_uid (source));
goto cleanup;
}
@@ -444,7 +455,6 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
itip_view_set_show_recur_check (ITIP_VIEW (pitip->view), FALSE);
}
-
cleanup:
d(printf ("Decreasing itip formatter search count to %d\n", fd->count));