From 7040b51739c376b9a7962371fe08a55a76c67326 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Mon, 27 May 2019 11:40:07 +0200 Subject: Revert back to using Gio::APPLICATION_NON_UNIQUE. See commit for reasons. --- src/inkscape-application.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'src/inkscape-application.cpp') diff --git a/src/inkscape-application.cpp b/src/inkscape-application.cpp index 77734ecd4..c5ea45ad9 100644 --- a/src/inkscape-application.cpp +++ b/src/inkscape-application.cpp @@ -434,15 +434,21 @@ ConcreteInkscapeApplication::get_instance() return instance; } +// Note: We tried using Gio::APPLICATION_CAN_OVERRIDE_APP_ID instead of +// Gio::APPLICATION_NON_UNIQUE. The advantages of this is that copy/paste between windows would be +// more reliable and that we wouldn't have multiple Inkscape instance writing to the preferences +// file at the same time (if started as separate processes). This caused problems with batch +// processing files and with extensions as they rely on having multiple instances of Inkscape +// running independently. In principle one can use --gapplication-app-id to run a new instance of +// Inkscape but this with our current structure fails with the error message: +// "g_application_set_application_id: assertion '!application->priv->is_registered' failed". +// It also require generating new id's for each separate Inkscape instance required. + template ConcreteInkscapeApplication::ConcreteInkscapeApplication() : T("org.inkscape.application.with_gui", Gio::APPLICATION_HANDLES_OPEN | // Use default file opening. - Gio::APPLICATION_CAN_OVERRIDE_APP_ID ) // Allows different instances of - // Inkscape to run at same time using - // --gapplication-app-id (useful for - // debugging different versions of - // Inkscape). + Gio::APPLICATION_NON_UNIQUE ) , InkscapeApplication() { -- cgit v1.2.3 From 2bc21f94d5f4370fb6a084cbe6a64d420faeeca2 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Mon, 27 May 2019 11:44:01 +0200 Subject: Improve xgettext process --- src/inkscape-application.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/inkscape-application.cpp') diff --git a/src/inkscape-application.cpp b/src/inkscape-application.cpp index cbdacf64d..d85d172aa 100644 --- a/src/inkscape-application.cpp +++ b/src/inkscape-application.cpp @@ -201,7 +201,7 @@ ConcreteInkscapeApplication::on_startup2() // removed after confirming this code isn't required. _builder = Gtk::Builder::create(); - Glib::ustring app_builder_file = get_filename(UIS, "inkscape-application.xml"); + Glib::ustring app_builder_file = get_filename(UIS, "inkscape-application.glade"); try { -- cgit v1.2.3