Revert "Fix all remaining GTK3 issues."

This reverts commit fd8b55edaa88906b588aa07d9eadcacd34a7a774.

Something in this commit seriously hosed ETable, making Evolution pretty
much unusable.  Reverting this until I can track down the problem.

3 files changed, 15 insertions, 27 deletions

diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index de4b9b3b68..010f5bdb32 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -1931,11 +1931,7 @@ e_day_view_focus_in (GtkWidget *widget, GdkEventFocus *event)
 
 	day_view = E_DAY_VIEW (widget);
 
-	/* XXX Can't access flags directly anymore, but is it really needed?
-	 *     If so, could we call gtk_widget_send_focus_change() instead? */
-#if 0
 	GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
-#endif
 
 	gtk_widget_queue_draw (day_view->top_canvas);
 	gtk_widget_queue_draw (day_view->main_canvas);
@@ -1954,11 +1950,7 @@ e_day_view_focus_out (GtkWidget *widget, GdkEventFocus *event)
 
 	day_view = E_DAY_VIEW (widget);
 
-	/* XXX Can't access flags directly anymore, but is it really needed?
-	 *     If so, could we call gtk_widget_send_focus_change() instead? */
-#if 0
 	GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
-#endif
 
 	gtk_widget_queue_draw (day_view->top_canvas);
 	gtk_widget_queue_draw (day_view->main_canvas);
@@ -7108,8 +7100,10 @@ e_day_view_auto_scroll_handler (gpointer data)
 			e_day_view_update_selection (day_view, day, row);
 		} else if (day_view->resize_drag_pos != E_CALENDAR_VIEW_POS_NONE) {
 			e_day_view_update_resize (day_view, row);
-		} else if (day_view->drag_item->flags & GNOME_CANVAS_ITEM_VISIBLE) {
-			e_day_view_update_main_canvas_drag (day_view, row, day);
+		} else if (day_view->drag_item->object.flags
+			   & GNOME_CANVAS_ITEM_VISIBLE) {
+			e_day_view_update_main_canvas_drag (day_view, row,
+							    day);
 		}
 	}
 
@@ -7517,7 +7511,8 @@ e_day_view_update_top_canvas_drag (EDayView *day_view,
 
 	/* If the position hasn't changed, just return. */
 	if (day_view->drag_last_day == day
-	    && (day_view->drag_long_event_item->flags & GNOME_CANVAS_ITEM_VISIBLE))
+	    && (day_view->drag_long_event_item->object.flags
+		& GNOME_CANVAS_ITEM_VISIBLE))
 		return;
 
 	day_view->drag_last_day = day;
@@ -7544,7 +7539,7 @@ e_day_view_update_top_canvas_drag (EDayView *day_view,
 				     item_x + E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH + E_DAY_VIEW_LONG_EVENT_X_PAD,
 				     item_y + E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT + E_DAY_VIEW_LONG_EVENT_Y_PAD);
 
-	if (!(day_view->drag_long_event_rect_item->flags & GNOME_CANVAS_ITEM_VISIBLE)) {
+	if (!(day_view->drag_long_event_rect_item->object.flags & GNOME_CANVAS_ITEM_VISIBLE)) {
 		gnome_canvas_item_raise_to_top (day_view->drag_long_event_rect_item);
 		gnome_canvas_item_show (day_view->drag_long_event_rect_item);
 	}
@@ -7552,7 +7547,8 @@ e_day_view_update_top_canvas_drag (EDayView *day_view,
 	/* Set the text, if necessary. We don't want to set the text every
 	   time it moves, so we check if it is currently invisible and only
 	   set the text then. */
-	if (!(day_view->drag_long_event_item->flags & GNOME_CANVAS_ITEM_VISIBLE)) {
+	if (!(day_view->drag_long_event_item->object.flags
+	      & GNOME_CANVAS_ITEM_VISIBLE)) {
 		const gchar *summary;
 
 		if (event && is_comp_data_valid (event)) {
@@ -7633,7 +7629,7 @@ e_day_view_update_main_canvas_drag (EDayView *day_view,
 	/* If the position hasn't changed, just return. */
 	if (day_view->drag_last_day == day
 	    && day_view->drag_last_row == row
-	    && (day_view->drag_item->flags & GNOME_CANVAS_ITEM_VISIBLE))
+	    && (day_view->drag_item->object.flags & GNOME_CANVAS_ITEM_VISIBLE))
 		return;
 
 	day_view->drag_last_day = day;
@@ -7704,12 +7700,12 @@ e_day_view_update_main_canvas_drag (EDayView *day_view,
 				     item_x + E_DAY_VIEW_BAR_WIDTH + E_DAY_VIEW_EVENT_X_PAD,
 				     item_y + E_DAY_VIEW_EVENT_BORDER_HEIGHT + E_DAY_VIEW_EVENT_Y_PAD);
 
-	if (!(day_view->drag_bar_item->flags & GNOME_CANVAS_ITEM_VISIBLE)) {
+	if (!(day_view->drag_bar_item->object.flags & GNOME_CANVAS_ITEM_VISIBLE)) {
 		gnome_canvas_item_raise_to_top (day_view->drag_bar_item);
 		gnome_canvas_item_show (day_view->drag_bar_item);
 	}
 
-	if (!(day_view->drag_rect_item->flags & GNOME_CANVAS_ITEM_VISIBLE)) {
+	if (!(day_view->drag_rect_item->object.flags & GNOME_CANVAS_ITEM_VISIBLE)) {
 		gnome_canvas_item_raise_to_top (day_view->drag_rect_item);
 		gnome_canvas_item_show (day_view->drag_rect_item);
 	}
@@ -7717,7 +7713,7 @@ e_day_view_update_main_canvas_drag (EDayView *day_view,
 	/* Set the text, if necessary. We don't want to set the text every
 	   time it moves, so we check if it is currently invisible and only
 	   set the text then. */
-	if (!(day_view->drag_item->flags & GNOME_CANVAS_ITEM_VISIBLE)) {
+	if (!(day_view->drag_item->object.flags & GNOME_CANVAS_ITEM_VISIBLE)) {
 		const gchar *summary;
 
 		if (event && is_comp_data_valid (event)) {
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index db6d861c28..accafd9ac2 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -1363,11 +1363,7 @@ e_week_view_focus_in (GtkWidget *widget, GdkEventFocus *event)
 
 	week_view = E_WEEK_VIEW (widget);
 
-	/* XXX Can't access flags directly anymore, but is it really needed?
-	 *     If so, could we call gtk_widget_send_focus_change() instead? */
-#if 0
 	GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
-#endif
 
 	gtk_widget_queue_draw (week_view->main_canvas);
 
@@ -1385,11 +1381,7 @@ e_week_view_focus_out (GtkWidget *widget, GdkEventFocus *event)
 
 	week_view = E_WEEK_VIEW (widget);
 
-	/* XXX Can't access flags directly anymore, but is it really needed?
-	 *     If so, could we call gtk_widget_send_focus_change() instead? */
-#if 0
 	GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
-#endif
 
 	gtk_widget_queue_draw (week_view->main_canvas);
 
@@ -4684,7 +4676,7 @@ e_week_view_is_jump_button_visible (EWeekView *week_view, gint day)
 	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);
 
 	if ((day >= 0) && (day < E_WEEK_VIEW_MAX_WEEKS * 7))
-		return week_view->jump_buttons[day]->flags & GNOME_CANVAS_ITEM_VISIBLE;
+		return week_view->jump_buttons[day]->object.flags & GNOME_CANVAS_ITEM_VISIBLE;
 	return FALSE;
 }
 
diff --git a/calendar/gui/ea-week-view.c b/calendar/gui/ea-week-view.c
index 19028cf189..fcbae83cb7 100644
--- a/calendar/gui/ea-week-view.c
+++ b/calendar/gui/ea-week-view.c
@@ -242,7 +242,7 @@ ea_week_view_get_n_children (AtkObject *accessible)
 
 	/* add the number of visible jump buttons */
 	for (i = 0; i < E_WEEK_VIEW_MAX_WEEKS * 7; i++) {
-		if (week_view->jump_buttons[i]->flags & GNOME_CANVAS_ITEM_VISIBLE)
+		if (week_view->jump_buttons[i]->object.flags & GNOME_CANVAS_ITEM_VISIBLE)
 			++count;
 	}