From 181829f14206127361b0766ac22299fd0f4b8be0 Mon Sep 17 00:00:00 2001
From: JP Rosevear <jpr@novell.com>
Date: Wed, 23 Jun 2004 15:38:29 +0000
Subject: Fixes #57862

2004-06-23 JP Rosevear  <jpr@novell.com>

	Fixes #57862

	* gui/gnome-cal.c (connect_day_view_focus): connect after the
	focus events happen so the day view knows what is selected

svn path=/trunk/; revision=26477
---
 calendar/ChangeLog       |  7 +++++++
 calendar/gui/gnome-cal.c | 12 ++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'calendar')

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 7bc3dd1b56..f48ea19dbc 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2004-06-23 JP Rosevear  <jpr@novell.com>
+
+	Fixes #57862
+	
+	* gui/gnome-cal.c (connect_day_view_focus): connect after the
+	focus events happen so the day view knows what is selected
+
 2004-06-23  JP Rosevear  <jpr@novell.com>
 
 	* gui/e-itip-control.c (update_attendee_status): tidy up to work
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index b58e6d2133..b65437a045 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -879,15 +879,15 @@ calendar_focus_change_cb (GtkWidget *widget, GdkEventFocus *event, gpointer data
 static void
 connect_day_view_focus (GnomeCalendar *gcal, EDayView *dv)
 {
-	g_signal_connect (dv->top_canvas, "focus_in_event",
+	g_signal_connect_after (dv->top_canvas, "focus_in_event",
 			  G_CALLBACK (calendar_focus_change_cb), gcal);
-	g_signal_connect (dv->top_canvas, "focus_out_event",
+	g_signal_connect_after (dv->top_canvas, "focus_out_event",
 			  G_CALLBACK (calendar_focus_change_cb), gcal);
 
-	g_signal_connect (dv->main_canvas, "focus_in_event",
-			  G_CALLBACK (calendar_focus_change_cb), gcal);
-	g_signal_connect (dv->main_canvas, "focus_out_event",
+	g_signal_connect_after (dv->main_canvas, "focus_in_event",
 			  G_CALLBACK (calendar_focus_change_cb), gcal);
+	g_signal_connect_after (dv->main_canvas, "focus_out_event",
+				G_CALLBACK (calendar_focus_change_cb), gcal);
 }
 
 /* Connects to the focus change signals of a week view widget */
@@ -2464,7 +2464,7 @@ gnome_calendar_set_default_source (GnomeCalendar *gcal, ECalSourceType source_ty
 	priv = gcal->priv;
 
 	client = g_hash_table_lookup (priv->clients[source_type], e_source_peek_uid (source));
-	if (!client)
+	if (!client) 
 		return FALSE;
 	
 	switch (source_type) {
-- 
cgit v1.2.3