[Xfce4-commits] <thunar:master> Add some missing gdk thread protection.

Nick Schermer noreply at xfce.org
Sun Nov 11 18:54:02 CET 2012


Updating branch refs/heads/master
         to b9cf2d21b85856b84f6964a375b200a4144a203f (commit)
       from 9b02a15007ac21a45e5784cde4741602bacb6cff (commit)

commit b9cf2d21b85856b84f6964a375b200a4144a203f
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Nov 11 18:44:35 2012 +0100

    Add some missing gdk thread protection.

 thunar/thunar-launcher.c      |    4 ++++
 thunar/thunar-standard-view.c |    4 ++++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/thunar/thunar-launcher.c b/thunar/thunar-launcher.c
index 820c986..f4f192a 100644
--- a/thunar/thunar-launcher.c
+++ b/thunar/thunar-launcher.c
@@ -776,6 +776,8 @@ thunar_launcher_update_idle (gpointer data)
   if (G_UNLIKELY (launcher->ui_manager == NULL))
     return FALSE;
 
+  GDK_THREADS_ENTER ();
+
   /* drop the previous addons ui controls from the UI manager */
   if (G_LIKELY (launcher->ui_addons_merge_id != 0))
     {
@@ -1057,6 +1059,8 @@ thunar_launcher_update_idle (gpointer data)
         }
     }
 
+  GDK_THREADS_LEAVE ();
+
   return FALSE;
 }
 
diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
index 1e4fea9..ac82415 100644
--- a/thunar/thunar-standard-view.c
+++ b/thunar/thunar-standard-view.c
@@ -2085,6 +2085,8 @@ thunar_standard_view_update_statusbar_text_idle (gpointer data)
 
   _thunar_return_val_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view), FALSE);
 
+  GDK_THREADS_ENTER ();
+
   /* clear the current status text (will be recalculated on-demand) */
   g_free (standard_view->priv->statusbar_text);
   standard_view->priv->statusbar_text = NULL;
@@ -2094,6 +2096,8 @@ thunar_standard_view_update_statusbar_text_idle (gpointer data)
   /* tell everybody that the statusbar text may have changed */
   g_object_notify_by_pspec (G_OBJECT (standard_view), standard_view_props[PROP_STATUSBAR_TEXT]);
 
+  GDK_THREADS_LEAVE ();
+
   return FALSE;
 }
 


More information about the Xfce4-commits mailing list