evolution r34814 - in trunk/calendar: . gui gui/dialogs

[msuman svn gnome org]

Author: msuman
Date: Mon Jan 14 10:32:42 2008
New Revision: 34814
URL: http://svn.gnome.org/viewvc/evolution?rev=34814&view=rev

Log:
Patch from Milan Crha  <mcrha redhat com> Fix for bug #507359 (Free/Busy UI needs names and graphs widgets in a container)

Modified:
   trunk/calendar/ChangeLog
   trunk/calendar/gui/dialogs/memo-page.c
   trunk/calendar/gui/e-meeting-time-sel.c
   trunk/calendar/gui/e-meeting-time-sel.h

Modified: trunk/calendar/gui/dialogs/memo-page.c
==============================================================================
--- trunk/calendar/gui/dialogs/memo-page.c	(original)
+++ trunk/calendar/gui/dialogs/memo-page.c	Mon Jan 14 10:32:42 2008
@@ -355,7 +355,7 @@
 	     icalprop = icalcomponent_get_next_property (icalcomp, ICAL_X_PROPERTY)) {
 		const char *xname = icalproperty_get_x_name (icalprop);
 
-		if (xname && 0 == strcmp (xname, "X-EVOLUTION-RECIPIENTS"))
+		if (xname && strcmp (xname, "X-EVOLUTION-RECIPIENTS") == 0)
 			break;
 	}
 

Modified: trunk/calendar/gui/e-meeting-time-sel.c
==============================================================================
--- trunk/calendar/gui/e-meeting-time-sel.c	(original)
+++ trunk/calendar/gui/e-meeting-time-sel.c	Mon Jan 14 10:32:42 2008
@@ -263,6 +263,7 @@
 								     mts);
 
 	mts->fb_refresh_not = 0;
+	mts->style_change_idle_id = 0;
 }
 
 
@@ -842,6 +843,12 @@
 
 	if (mts->fb_refresh_not != 0) {
 		g_source_remove (mts->fb_refresh_not);
+		mts->fb_refresh_not = 0;
+	}
+
+	if (mts->style_change_idle_id != 0) {
+		g_source_remove (mts->style_change_idle_id);
+		mts->style_change_idle_id = 0;
 	}
 
 	if (GTK_OBJECT_CLASS (e_meeting_time_selector_parent_class)->destroy)
@@ -891,9 +898,8 @@
 	return height;
 }
 
-static void
-e_meeting_time_selector_style_set (GtkWidget *widget,
-				   GtkStyle  *previous_style)
+static gboolean
+style_change_idle_func (gpointer widget)
 {
 	EMeetingTimeSelector *mts;
 	EMeetingTime saved_time;
@@ -904,9 +910,6 @@
 	PangoFontMetrics *font_metrics;
 	PangoLayout *layout;
 
-	if (GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->style_set)
-		(*GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->style_set)(widget, previous_style);
-
 	mts = E_MEETING_TIME_SELECTOR (widget);
 
 	/* Set up Pango prerequisites */
@@ -928,7 +931,8 @@
 		max_hour_width = MAX (max_hour_width, mts->hour_widths[hour]);
 	}
 
-	mts->row_height = get_cell_height (GTK_TREE_VIEW (mts->list_view));
+	/* add also some padding for lines so it fits better */
+	mts->row_height = get_cell_height (GTK_TREE_VIEW (mts->list_view)) + 2;
 	mts->col_width = max_hour_width + 6;
 
 	e_meeting_time_selector_save_position (mts, &saved_time);
@@ -956,6 +960,23 @@
 
 	g_object_unref (layout);
 	pango_font_metrics_unref (font_metrics);
+
+	mts->style_change_idle_id = 0;
+
+	return FALSE;
+}
+
+static void
+e_meeting_time_selector_style_set (GtkWidget *widget,
+				   GtkStyle  *previous_style)
+{
+	EMeetingTimeSelector *mts = E_MEETING_TIME_SELECTOR (widget);
+
+	if (GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->style_set)
+		(*GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->style_set)(widget, previous_style);
+
+	if (!mts->style_change_idle_id)
+		mts->style_change_idle_id = g_idle_add (style_change_idle_func, widget);
 }
 
 /* This draws a shadow around the top display and main display. */

Modified: trunk/calendar/gui/e-meeting-time-sel.h
==============================================================================
--- trunk/calendar/gui/e-meeting-time-sel.h	(original)
+++ trunk/calendar/gui/e-meeting-time-sel.h	Mon Jan 14 10:32:42 2008
@@ -262,6 +262,8 @@
 	gboolean fb_refresh_not;
 
 	GdkCursorType last_cursor_set;
+
+	guint style_change_idle_id;
 };