diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-10-16 10:05:16 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2013-10-16 10:05:16 +0000 |
| commit | 098590935052a42027c47f8635ae6f11cf35503b (patch) | |
| tree | 141ba0f404001acb91e6b173360c4485c453a0c8 /src/display | |
| parent | fixing bend warnings (diff) | |
| parent | add (commented-out) flag for C++11 compilation. (note that on Windows we use ... (diff) | |
| download | inkscape-098590935052a42027c47f8635ae6f11cf35503b.tar.gz inkscape-098590935052a42027c47f8635ae6f11cf35503b.zip | |
Update to trunk
(bzr r12588.1.17)
Diffstat (limited to 'src/display')
| -rw-r--r-- | src/display/sp-canvas.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp index 9adb96642..455f628bc 100644 --- a/src/display/sp-canvas.cpp +++ b/src/display/sp-canvas.cpp @@ -2301,8 +2301,6 @@ int SPCanvasImpl::do_update(SPCanvas *canvas) gint SPCanvasImpl::idle_handler(gpointer data) { - GDK_THREADS_ENTER (); - SPCanvas *canvas = SP_CANVAS (data); int const ret = do_update (canvas); @@ -2312,15 +2310,13 @@ gint SPCanvasImpl::idle_handler(gpointer data) canvas->idle_id = 0; } - GDK_THREADS_LEAVE (); - return !ret; } void SPCanvasImpl::add_idle(SPCanvas *canvas) { if (canvas->idle_id == 0) { - canvas->idle_id = g_idle_add_full(UPDATE_PRIORITY, idle_handler, canvas, NULL); + canvas->idle_id = gdk_threads_add_idle_full(UPDATE_PRIORITY, idle_handler, canvas, NULL); } } |