From 2252f488aec993855c44d884747394ff15810fac Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Tue, 15 Sep 2015 15:05:51 +0200
Subject: [PATCH 134/398] gtktiledviewer: factor out setupDocView() from main()

Change-Id: Iac803f03267859c11f0f9090346b09b90c115b76
(cherry picked from commit 8d8a8e1a2ea26df6d676495af7f017baa071153d)
---
 .../qa/gtktiledviewer/gtktiledviewer.cxx           | 30 ++++++++++++----------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index b43f785a300a..53bc5ea39615 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -716,6 +716,21 @@ static GtkWidget* createWindow(TiledWindow& rWindow)
     return pWindow;
 }
 
+/// Common setup for DocView (regardless if it's just a new view or a document to be loaded).
+static void setupDocView(GtkWidget* pDocView)
+{
+#if GLIB_CHECK_VERSION(2,40,0)
+    g_assert_nonnull(pDocView);
+#endif
+    g_signal_connect(pDocView, "edit-changed", G_CALLBACK(signalEdit), NULL);
+    g_signal_connect(pDocView, "command-changed", G_CALLBACK(signalCommand), NULL);
+    g_signal_connect(pDocView, "search-not-found", G_CALLBACK(signalSearch), NULL);
+    g_signal_connect(pDocView, "part-changed", G_CALLBACK(signalPart), NULL);
+    g_signal_connect(pDocView, "size-changed", G_CALLBACK(signalSize), NULL);
+    g_signal_connect(pDocView, "hyperlink-clicked", G_CALLBACK(signalHyperlink), NULL);
+    g_signal_connect(pDocView, "cursor-changed", G_CALLBACK(cursorChanged), NULL);
+}
+
 int main( int argc, char* argv[] )
 {
     if( argc < 3 ||
@@ -730,19 +745,8 @@ int main( int argc, char* argv[] )
 
     gtk_init( &argc, &argv );
 
-    // Docview
-    GtkWidget* pDocView = lok_doc_view_new (argv[1], NULL, NULL);
-#if GLIB_CHECK_VERSION(2,40,0)
-    g_assert_nonnull(pDocView);
-#endif
-    g_signal_connect(pDocView, "edit-changed", G_CALLBACK(signalEdit), NULL);
-    g_signal_connect(pDocView, "command-changed", G_CALLBACK(signalCommand), NULL);
-    g_signal_connect(pDocView, "search-not-found", G_CALLBACK(signalSearch), NULL);
-    g_signal_connect(pDocView, "part-changed", G_CALLBACK(signalPart), NULL);
-    g_signal_connect(pDocView, "size-changed", G_CALLBACK(signalSize), NULL);
-    g_signal_connect(pDocView, "hyperlink-clicked", G_CALLBACK(signalHyperlink), NULL);
-    g_signal_connect(pDocView, "cursor-changed", G_CALLBACK(cursorChanged), NULL);
-
+    GtkWidget* pDocView = lok_doc_view_new(argv[1], NULL, NULL);
+    setupDocView(pDocView);
     TiledWindow aWindow;
     aWindow.m_pDocView = pDocView;
     createWindow(aWindow);
-- 
2.12.0