428c5d
From 9363553a3087c7dbfa93e1d342283600ceb5993b Mon Sep 17 00:00:00 2001
428c5d
From: Marek Kasik <mkasik@redhat.com>
428c5d
Date: Fri, 22 Jun 2018 17:00:20 +0200
428c5d
Subject: shell: Set application-id
428c5d
428c5d
Set "application-id" property for evince's GApplication
428c5d
to "org.gnome.evince.Application".
428c5d
An assertion warning is shown in shell if it is not set.
428c5d
428c5d
Even though we use G_APPLICATION_NON_UNIQUE, the application
428c5d
ID is still required. See:
428c5d
https://bugzilla.gnome.org/show_bug.cgi?id=646985#c2
428c5d
428c5d
Closes: https://gitlab.gnome.org/GNOME/evince/issues/918
428c5d
428c5d
diff --git a/shell/ev-application.c b/shell/ev-application.c
428c5d
index 7d546933..f173d7a4 100644
428c5d
--- a/shell/ev-application.c
428c5d
+++ b/shell/ev-application.c
428c5d
@@ -65,6 +65,7 @@ struct _EvApplicationClass {
428c5d
 G_DEFINE_TYPE (EvApplication, ev_application, GTK_TYPE_APPLICATION)
428c5d
 
428c5d
 #ifdef ENABLE_DBUS
428c5d
+#define APPLICATION_DBUS_NAME        "org.gnome.evince.Application"
428c5d
 #define APPLICATION_DBUS_OBJECT_PATH "/org/gnome/evince/Evince"
428c5d
 #define APPLICATION_DBUS_INTERFACE   "org.gnome.evince.Application"
428c5d
 
428c5d
@@ -102,7 +103,7 @@ ev_application_new (void)
428c5d
   const GApplicationFlags flags = G_APPLICATION_NON_UNIQUE;
428c5d
 
428c5d
   return g_object_new (EV_TYPE_APPLICATION,
428c5d
-                       "application-id", NULL,
428c5d
+                       "application-id", APPLICATION_DBUS_NAME,
428c5d
                        "flags", flags,
428c5d
                        NULL);
428c5d
 }