aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/gui/e-day-view.c4
-rw-r--r--calendar/gui/e-meeting-time-sel.c11
2 files changed, 2 insertions, 13 deletions
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 620b664f11..c2b7fc78fd 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -7131,11 +7131,8 @@ e_day_view_auto_scroll_handler (gpointer data)
day_view = E_DAY_VIEW (data);
- GDK_THREADS_ENTER ();
-
if (day_view->auto_scroll_delay > 0) {
day_view->auto_scroll_delay--;
- GDK_THREADS_LEAVE ();
return TRUE;
}
@@ -7189,7 +7186,6 @@ e_day_view_auto_scroll_handler (gpointer data)
}
}
- GDK_THREADS_LEAVE ();
return TRUE;
}
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index 79acc1887a..eb7a1fc67e 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -2794,13 +2794,9 @@ e_meeting_time_selector_timeout_handler (gpointer data)
mts = E_MEETING_TIME_SELECTOR (data);
- GDK_THREADS_ENTER ();
-
/* Return if we don't need to scroll yet. */
- if (mts->scroll_count-- > 0) {
- GDK_THREADS_LEAVE ();
+ if (mts->scroll_count-- > 0)
return TRUE;
- }
/* Get the x coords of visible part of the canvas. */
gnome_canvas_get_scroll_offsets (GNOME_CANVAS (mts->display_main),
@@ -2871,10 +2867,8 @@ e_meeting_time_selector_timeout_handler (gpointer data)
time_to_set = &mts->meeting_end_time;
/* If the time is unchanged, just return. */
- if (e_meeting_time_compare_times (time_to_set, &drag_time) == 0) {
- GDK_THREADS_LEAVE ();
+ if (e_meeting_time_compare_times (time_to_set, &drag_time) == 0)
goto scroll;
- }
/* Don't let an empty occur for all day events */
if (mts->all_day
@@ -2929,7 +2923,6 @@ e_meeting_time_selector_timeout_handler (gpointer data)
gnome_canvas_scroll_to (GNOME_CANVAS (mts->display_top),
scroll_x, scroll_y);
- GDK_THREADS_LEAVE ();
return TRUE;
}