diff options
| author | Wolfgang Ulbrich <[email protected]> | 2015-12-10 20:32:24 +0100 |
|---|---|---|
| committer | Wolfgang Ulbrich <[email protected]> | 2015-12-10 20:32:24 +0100 |
| commit | b2cfa83c0cff0211ac63356fe16cd2ad2144bd91 (patch) | |
| tree | 2a870825c8a042a015be5351bb38405916f19b0c | |
| parent | b57cfccec02400b470670c988adda6e99fe7a18f (diff) | |
| download | mate-screensaver-b2cfa83c0cff0211ac63356fe16cd2ad2144bd91.tar.bz2 mate-screensaver-b2cfa83c0cff0211ac63356fe16cd2ad2144bd91.tar.xz | |
GTK3: don't use deprecated GDK_THREADS_ENTER/LEAVE
| -rw-r--r-- | savers/gste-slideshow.c | 8 | ||||
| -rw-r--r-- | src/gs-lock-plug.c | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/savers/gste-slideshow.c b/savers/gste-slideshow.c index 887ec87..4c0fb99 100644 --- a/savers/gste-slideshow.c +++ b/savers/gste-slideshow.c @@ -428,7 +428,9 @@ results_pull_func (GSTESlideshow *show) { OpResult *result; +#if !GTK_CHECK_VERSION (3, 0, 0) GDK_THREADS_ENTER (); +#endif g_async_queue_lock (show->priv->results_q); @@ -447,7 +449,9 @@ results_pull_func (GSTESlideshow *show) g_async_queue_unlock (show->priv->results_q); +#if !GTK_CHECK_VERSION (3, 0, 0) GDK_THREADS_LEAVE (); +#endif return FALSE; } @@ -685,7 +689,9 @@ op_load_image (GSTESlideshow *show, window_width, window_height); +#if !GTK_CHECK_VERSION (3, 0, 0) GDK_THREADS_ENTER (); +#endif g_async_queue_lock (show->priv->results_q); g_async_queue_push_unlocked (show->priv->results_q, op_result); @@ -697,7 +703,9 @@ op_load_image (GSTESlideshow *show, } g_async_queue_unlock (show->priv->results_q); +#if !GTK_CHECK_VERSION (3, 0, 0) GDK_THREADS_LEAVE (); +#endif } static gpointer diff --git a/src/gs-lock-plug.c b/src/gs-lock-plug.c index 3387f29..5fe6d60 100644 --- a/src/gs-lock-plug.c +++ b/src/gs-lock-plug.c @@ -628,9 +628,13 @@ gs_lock_plug_run (GSLockPlug *plug) ri.loop = g_main_loop_new (NULL, FALSE); +#if !GTK_CHECK_VERSION (3, 0, 0) GDK_THREADS_LEAVE (); +#endif g_main_loop_run (ri.loop); +#if !GTK_CHECK_VERSION (3, 0, 0) GDK_THREADS_ENTER (); +#endif g_main_loop_unref (ri.loop); |