aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorRodrigo Moya <rodrigo@novell.com>2004-08-25 00:08:14 +0800
committerRodrigo Moya <rodrigo@src.gnome.org>2004-08-25 00:08:14 +0800
commitd3d69b8838ff0d10e33809e2552731821875cf02 (patch)
tree58d400dbb976d8d06bf936365a101f75dc8909cf /calendar
parentca56f39c8f41075870dde30e446349d7155854c1 (diff)
downloadgsoc2013-evolution-d3d69b8838ff0d10e33809e2552731821875cf02.tar
gsoc2013-evolution-d3d69b8838ff0d10e33809e2552731821875cf02.tar.gz
gsoc2013-evolution-d3d69b8838ff0d10e33809e2552731821875cf02.tar.bz2
gsoc2013-evolution-d3d69b8838ff0d10e33809e2552731821875cf02.tar.lz
gsoc2013-evolution-d3d69b8838ff0d10e33809e2552731821875cf02.tar.xz
gsoc2013-evolution-d3d69b8838ff0d10e33809e2552731821875cf02.tar.zst
gsoc2013-evolution-d3d69b8838ff0d10e33809e2552731821875cf02.zip
Fixes #58824
2004-08-24 Rodrigo Moya <rodrigo@novell.com> Fixes #58824 * gui/gnome-cal.c (open_ecal): Only try to open the calendar if not loaded yet. (update_query, client_cal_opened_cb, default_client_cal_opened_cb, backend_died_cb): use always the same view for status messages. (gnome_calendar_set_activity_handler): set the activity handlers on all views, not just the current one. (display_view): no need to set the activity handler here. svn path=/trunk/; revision=27007
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog15
-rw-r--r--calendar/gui/gnome-cal.c24
2 files changed, 24 insertions, 15 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 4986cf933e..f6f479e087 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,15 @@
+2004-08-24 Rodrigo Moya <rodrigo@novell.com>
+
+ Fixes #58824
+
+ * gui/gnome-cal.c (open_ecal): Only try to open the calendar if not
+ loaded yet.
+ (update_query, client_cal_opened_cb, default_client_cal_opened_cb,
+ backend_died_cb): use always the same view for status messages.
+ (gnome_calendar_set_activity_handler): set the activity handlers on
+ all views, not just the current one.
+ (display_view): no need to set the activity handler here.
+
2004-08-13 Jeffrey Stedfast <fejj@novell.com>
* gui/dialogs/event-page.glade: Make the description scrolled
@@ -15,8 +27,7 @@
one minute
(alarm_notify_add_calendar) : lock ad unlock the new mutex
before and after accessing uri_clients_hash
-
-
+
2004-08-16 JP Rosevear <jpr@ximian.com>
Fixes #62706
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 6de6326f7a..e6bed3e695 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -702,7 +702,7 @@ update_query (GnomeCalendar *gcal)
priv = gcal->priv;
- e_calendar_view_set_status_message (priv->views[priv->current_view_type], _("Updating query"));
+ e_calendar_view_set_status_message (priv->week_view, _("Updating query"));
e_calendar_item_clear_marks (priv->date_navigator->calitem);
/* free the previous queries */
@@ -723,7 +723,7 @@ update_query (GnomeCalendar *gcal)
real_sexp = adjust_e_cal_view_sexp (gcal, priv->sexp);
if (!real_sexp) {
- e_calendar_view_set_status_message (priv->views[priv->current_view_type], NULL);
+ e_calendar_view_set_status_message (priv->week_view, NULL);
return; /* No time range is set, so don't start a query */
}
@@ -755,7 +755,7 @@ update_query (GnomeCalendar *gcal)
}
g_free (real_sexp);
- e_calendar_view_set_status_message (priv->views[priv->current_view_type], NULL);
+ e_calendar_view_set_status_message (priv->week_view, NULL);
update_todo_view (gcal);
}
@@ -1778,7 +1778,6 @@ display_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type, gboolean gra
if (grab_focus)
focus_current_view (gcal);
- gnome_calendar_set_activity_handler (gcal, priv->activity_handler);
gnome_calendar_set_pane_positions (gcal);
/* For the week & month views we want the selection in the date
@@ -2011,7 +2010,7 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal)
source = e_cal_get_source (ecal);
if (source_type == E_CAL_SOURCE_TYPE_EVENT)
- e_calendar_view_set_status_message (priv->views[priv->current_view_type], NULL);
+ e_calendar_view_set_status_message (priv->week_view, NULL);
else
e_calendar_table_set_status_message (E_CALENDAR_TABLE (priv->todo), NULL);
@@ -2038,7 +2037,7 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal)
switch (source_type) {
case E_CAL_SOURCE_TYPE_EVENT :
msg = g_strdup_printf (_("Loading appointments at %s"), e_cal_get_uri (ecal));
- e_calendar_view_set_status_message (priv->views[priv->current_view_type], msg);
+ e_calendar_view_set_status_message (priv->week_view, msg);
g_free (msg);
/* add client to the views */
@@ -2052,7 +2051,7 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal)
/* update date navigator query */
update_query (gcal);
- e_calendar_view_set_status_message (priv->views[priv->current_view_type], NULL);
+ e_calendar_view_set_status_message (priv->week_view, NULL);
break;
case E_CAL_SOURCE_TYPE_TODO :
@@ -2086,7 +2085,7 @@ default_client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar
switch (source_type) {
case E_CAL_SOURCE_TYPE_EVENT:
- e_calendar_view_set_status_message (priv->views[priv->current_view_type], NULL);
+ e_calendar_view_set_status_message (priv->week_view, NULL);
break;
case E_CAL_SOURCE_TYPE_TODO:
e_calendar_table_set_status_message (E_CALENDAR_TABLE (priv->todo), NULL);
@@ -2148,11 +2147,11 @@ open_ecal (GnomeCalendar *gcal, ECal *cal, gboolean only_if_exists, open_func of
char *msg;
priv = gcal->priv;
-
+
msg = g_strdup_printf (_("Opening %s"), e_cal_get_uri (cal));
switch (e_cal_get_source_type (cal)) {
case E_CAL_SOURCE_TYPE_EVENT :
- e_calendar_view_set_status_message (priv->views[priv->current_view_type], msg);
+ e_calendar_view_set_status_message (priv->week_view, msg);
break;
case E_CAL_SOURCE_TYPE_TODO :
e_calendar_table_set_status_message (E_CALENDAR_TABLE (priv->todo), msg);
@@ -2293,8 +2292,7 @@ backend_died_cb (ECal *ecal, gpointer data)
case E_CAL_SOURCE_TYPE_EVENT:
id = "calendar:calendar-crashed";
- for (i = 0; i < GNOME_CAL_LAST_VIEW; i++)
- e_calendar_view_set_status_message (priv->views[i], NULL);
+ e_calendar_view_set_status_message (priv->week_view, NULL);
gtk_signal_emit (GTK_OBJECT (gcal), gnome_calendar_signals[SOURCE_REMOVED], source_type, source);
break;
@@ -2360,7 +2358,7 @@ gnome_calendar_set_activity_handler (GnomeCalendar *cal, EActivityHandler *activ
priv->activity_handler = activity_handler;
for (i = 0; i < GNOME_CAL_LAST_VIEW; i++)
- e_calendar_view_set_activity_handler (priv->views[i], i == priv->current_view_type ? activity_handler : NULL);
+ e_calendar_view_set_activity_handler (priv->views[i], activity_handler);
e_calendar_table_set_activity_handler (E_CALENDAR_TABLE (priv->todo), activity_handler);
}