[vte] widget: Move some methods to VteTerminalPrivate

[Christian Persch <chpe src gnome org>]

commit fa5b4adc5db80150ffe087a25fbe67e2dfabc058
Author: Christian Persch <chpe gnome org>
Date:   Wed Nov 18 21:15:41 2015 +0100

    widget: Move some methods to VteTerminalPrivate

 src/vte.cc         |   34 ++++++++++++++++++++--------------
 src/vteinternal.hh |    1 +
 2 files changed, 21 insertions(+), 14 deletions(-)
---
diff --git a/src/vte.cc b/src/vte.cc
index 92d7b61..fc77cea 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -9501,33 +9501,39 @@ vte_terminal_screen_changed (GtkWidget *widget,
                              GdkScreen *previous_screen)
 {
         VteTerminal *terminal = VTE_TERMINAL (widget);
-        GdkScreen *screen;
+
+        if (GTK_WIDGET_CLASS (vte_terminal_parent_class)->screen_changed) {
+                GTK_WIDGET_CLASS (vte_terminal_parent_class)->screen_changed (widget, previous_screen);
+        }
+
+        terminal->pvt->widget_screen_changed(previous_screen);
+}
+
+void
+VteTerminalPrivate::widget_screen_changed (GdkScreen *previous_screen)
+{
         GtkSettings *settings;
 
-        screen = gtk_widget_get_screen (widget);
+        auto gdk_screen = gtk_widget_get_screen (m_widget);
         if (previous_screen != NULL &&
-            (screen != previous_screen || screen == NULL)) {
+            (gdk_screen != previous_screen || gdk_screen == NULL)) {
                 settings = gtk_settings_get_for_screen (previous_screen);
                 g_signal_handlers_disconnect_matched (settings, G_SIGNAL_MATCH_DATA,
                                                       0, 0, NULL, NULL,
-                                                      widget);
+                                                      m_widget);
         }
 
-        if (GTK_WIDGET_CLASS (vte_terminal_parent_class)->screen_changed) {
-                GTK_WIDGET_CLASS (vte_terminal_parent_class)->screen_changed (widget, previous_screen);
-        }
-
-        if (screen == previous_screen || screen == NULL)
+        if (gdk_screen == previous_screen || gdk_screen == nullptr)
                 return;
 
-        settings = gtk_widget_get_settings (widget);
-        vte_terminal_sync_settings (settings, NULL, terminal);
+        settings = gtk_widget_get_settings(m_widget);
+        vte_terminal_sync_settings(settings, NULL, m_terminal);
         g_signal_connect (settings, "notify::gtk-cursor-blink",
-                          G_CALLBACK (vte_terminal_sync_settings), widget);
+                          G_CALLBACK (vte_terminal_sync_settings), m_widget);
         g_signal_connect (settings, "notify::gtk-cursor-blink-time",
-                          G_CALLBACK (vte_terminal_sync_settings), widget);
+                          G_CALLBACK (vte_terminal_sync_settings), m_widget);
         g_signal_connect (settings, "notify::gtk-cursor-blink-timeout",
-                          G_CALLBACK (vte_terminal_sync_settings), widget);
+                          G_CALLBACK (vte_terminal_sync_settings), m_widget);
 }
 
 /* Perform final cleanups for the widget before it's freed. */
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index eee9d75..ad27c8a 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -467,6 +467,7 @@ public:
         void widget_scroll(GdkEventScroll *event);
         bool widget_motion_notify(GdkEventMotion *event);
         void widget_draw(cairo_t *cr);
+        void widget_screen_changed (GdkScreen *previous_screen);
 
         void read_modifiers(GdkEvent *event);
         guint translate_ctrlkey(GdkEventKey *event);