File bnc-363070-evo-free-busy-rows-do-not-match.diff of Package evolution

Overview Repositories Revisions Requests Users Attributes Meta

File bnc-363070-evo-free-busy-rows-do-not-match.diff of Package evolution

--- /usr/src/packages/BUILD/evolution-2.6.0/calendar/gui/e-meeting-time-sel.c	2008-03-03 17:45:31.000000000 +0530
+++ calendar/gui/e-meeting-time-sel.c	2008-03-07 18:21:16.000000000 +0530
@@ -262,6 +262,7 @@ e_meeting_time_selector_init (EMeetingTi
 								     mts);
 
 	mts->fb_refresh_not = 0;
+	mts->style_change_idle_id = 0;
 }
 
 
@@ -839,7 +840,13 @@ e_meeting_time_selector_destroy (GtkObje
 
 	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)
 		(*GTK_OBJECT_CLASS (e_meeting_time_selector_parent_class)->destroy)(object);
@@ -888,9 +895,8 @@ get_cell_height (GtkTreeView *tree)
 	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;
@@ -901,9 +907,6 @@ e_meeting_time_selector_style_set (GtkWi
 	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 */
@@ -925,7 +928,8 @@ e_meeting_time_selector_style_set (GtkWi
 		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);
@@ -953,6 +957,23 @@ e_meeting_time_selector_style_set (GtkWi
 
 	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. */
--- /usr/src/packages/BUILD/evolution-2.6.0/calendar/gui/e-meeting-time-sel.h	2008-03-03 17:45:31.000000000 +0530
+++ calendar/gui/e-meeting-time-sel.h	2008-03-07 18:21:42.000000000 +0530
@@ -262,6 +262,7 @@ struct _EMeetingTimeSelector
 	gboolean fb_refresh_not;
 
 	GdkCursorType last_cursor_set;
+	guint style_change_idle_id;
 };

Places

File bnc-363070-evo-free-busy-rows-do-not-match.diff of Package evolution

Places