[Xfce4-commits] [apps/xfce4-terminal] 01/01: Eliminate GDK_THREADS warnings

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

f2404 pushed a commit to branch master
in repository apps/xfce4-terminal.

commit eaec59f33c923290b941960b3b07e707af8b2941
Author: Igor <f2404 at yandex.ru>
Date:   Mon Jul 18 12:36:31 2016 +0300

    Eliminate GDK_THREADS warnings
---
 terminal/terminal-screen.c | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
index 205a0b7..9671012 100644
--- a/terminal/terminal-screen.c
+++ b/terminal/terminal-screen.c
@@ -751,8 +751,9 @@ terminal_screen_update_background_fast (TerminalScreen *screen)
 {
   if (G_UNLIKELY (screen->background_timer_id == 0))
     {
-      screen->background_timer_id = g_idle_add_full (G_PRIORITY_LOW, terminal_screen_timer_background,
-                                                     screen, terminal_screen_timer_background_destroy);
+      screen->background_timer_id =
+          gdk_threads_add_idle_full (G_PRIORITY_LOW, terminal_screen_timer_background,
+                                     screen, terminal_screen_timer_background_destroy);
     }
 }
 
@@ -764,8 +765,9 @@ terminal_screen_update_background (TerminalScreen *screen)
   if (G_UNLIKELY (screen->background_timer_id != 0))
     g_source_remove (screen->background_timer_id);
 
-  screen->background_timer_id = g_timeout_add_full (G_PRIORITY_LOW, 250, terminal_screen_timer_background,
-                                                    screen, terminal_screen_timer_background_destroy);
+  screen->background_timer_id =
+      gdk_threads_add_timeout_full (G_PRIORITY_LOW, 250, terminal_screen_timer_background,
+                                    screen, terminal_screen_timer_background_destroy);
 }
 
 
@@ -1291,8 +1293,6 @@ terminal_screen_reset_activity_timeout (gpointer user_data)
   if (G_UNLIKELY (screen->tab_label == NULL))
     return FALSE;
 
-  GDK_THREADS_ENTER ();
-
   /* unset */
   gtk_widget_override_color (screen->tab_label, GTK_STATE_FLAG_ACTIVE, NULL);
 
@@ -1308,8 +1308,6 @@ terminal_screen_reset_activity_timeout (gpointer user_data)
       gtk_widget_override_color (screen->tab_label, GTK_STATE_FLAG_ACTIVE, &color);
     }
 
-  GDK_THREADS_LEAVE ();
-
   return FALSE;
 }
 
@@ -1356,9 +1354,9 @@ terminal_screen_vte_window_contents_changed (TerminalScreen *screen)
 
   /* start new timeout to unset the activity */
   screen->activity_timeout_id =
-      g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, timeout,
-                                  terminal_screen_reset_activity_timeout,
-                                  screen, terminal_screen_reset_activity_destroyed);
+      gdk_threads_add_timeout_seconds_full (G_PRIORITY_DEFAULT, timeout,
+                                            terminal_screen_reset_activity_timeout,
+                                            screen, terminal_screen_reset_activity_destroyed);
 }
 
 
@@ -1384,8 +1382,6 @@ terminal_screen_timer_background (gpointer user_data)
   terminal_return_val_if_fail (TERMINAL_IS_SCREEN (screen), FALSE);
   terminal_return_val_if_fail (VTE_IS_TERMINAL (screen->terminal), FALSE);
 
-  GDK_THREADS_ENTER ();
-
   g_object_get (G_OBJECT (screen->preferences), "background-mode", &background_mode, NULL);
 
   if (G_UNLIKELY (background_mode == TERMINAL_BACKGROUND_IMAGE))
@@ -1436,8 +1432,6 @@ terminal_screen_timer_background (gpointer user_data)
   screen->background_color.alpha = background_darkness;
   vte_terminal_set_color_background (VTE_TERMINAL (screen->terminal), &screen->background_color);
 
-  GDK_THREADS_LEAVE ();
-
   return FALSE;
 }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.