[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - libreofficekit/qa

[Ashod Nakashian (via logerrit)]

 libreofficekit/qa/gtktiledviewer/gtv-application.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 6ac2ce64ddd4e2fcdfc0f8f50fae36a78f87f9ab
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Mon Apr 29 22:21:39 2019 -0400
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Thu May 2 11:17:43 2019 +0200

    gtktiledviewer: provide activation function
    
    This fixes the gtktiledviewer on some distros/gtk
    versions that require an activation function to be
    provided.
    
    Change-Id: I95fb3ed4e92e27d9c725ca38b4cb5a4f8af51771
    Reviewed-on: https://gerrit.libreoffice.org/71588
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application.cxx b/libreofficekit/qa/gtktiledviewer/gtv-application.cxx
index 3d802ee325d4..cd0a88a85fe2 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-application.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-application.cxx
@@ -28,6 +28,12 @@ getPrivate(GtvApplication* app)
 }
 
 static void
+gtv_application_activate(GApplication*)
+{
+    // If this isn't provided, some GTK versions fail to run us at all.
+}
+
+static void
 gtv_application_open(GApplication* app, GFile** file, gint /*nFiles*/, const gchar* /*hint*/)
 {
     // TODO: add some option to create a new view for existing document
@@ -142,6 +148,7 @@ gtv_application_handle_local_options(GApplication* app, GVariantDict* options)
 static void
 gtv_application_class_init(GtvApplicationClass* klass)
 {
+    G_APPLICATION_CLASS(klass)->activate = gtv_application_activate;
     G_APPLICATION_CLASS(klass)->open = gtv_application_open;
     G_APPLICATION_CLASS(klass)->handle_local_options = gtv_application_handle_local_options;
     G_OBJECT_CLASS(klass)->dispose = gtv_application_dispose;