eb0ee5f33a
When passing an application ID (which is necessary for application inhibition to work, i.e. logoff/reboot/shutdown inhibition), GApplication will try to ensure process uniqueness, which will trigger a new activation to an already running process. Since our current code assumes that the application can be activated a single time only, this was what was triggering a whole lot of errors (on the first running process) in #9598 because there was all the initialization code which ran again, whereas it was not supposed to. This doubly-running initialization code was also what completely messed up the session files, hence broke the GUI after a restart (#9599). Therefore passing G_APPLICATION_NON_UNIQUE advertizes we don't want GIO to handle process uniqueness for us. Note that this is actually a very interesting feature which we have had in GIMP codebase forever. It would be interesting to kill all our own uniqueness code in favor of GIO code (and let them handle/maintain passing command line arguments from one process to another, for all possible platforms). So I added a TODO for this (for now, we just ignore this feature as it doesn't work well with current codebase).
80 lines
2.2 KiB
C
80 lines
2.2 KiB
C
/* GIMP - The GNU Image Manipulation Program
|
|
* Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
|
|
*
|
|
* gimpapp.c
|
|
* Copyright (C) 2021 Niels De Graef <nielsdegraef@gmail.com>
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Library General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library. If not, see
|
|
* <https://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#include <gio/gio.h>
|
|
|
|
#include "libgimpbase/gimpbase.h"
|
|
|
|
#include "core/core-types.h"
|
|
|
|
#include "core/gimp.h"
|
|
|
|
#include "gimpconsoleapp.h"
|
|
#include "gimpcoreapp.h"
|
|
|
|
struct _GimpConsoleApp
|
|
{
|
|
GApplication parent_instance;
|
|
};
|
|
|
|
G_DEFINE_TYPE_WITH_CODE (GimpConsoleApp, gimp_console_app, G_TYPE_APPLICATION,
|
|
G_IMPLEMENT_INTERFACE (GIMP_TYPE_CORE_APP, NULL))
|
|
|
|
|
|
static void
|
|
gimp_console_app_class_init (GimpConsoleAppClass *klass)
|
|
{
|
|
GObjectClass *gobj_class = G_OBJECT_CLASS (klass);
|
|
|
|
gobj_class->get_property = gimp_core_app_get_property;
|
|
gobj_class->set_property = gimp_core_app_set_property;
|
|
|
|
gimp_core_app_install_properties (gobj_class);
|
|
}
|
|
|
|
static void
|
|
gimp_console_app_init (GimpConsoleApp *self)
|
|
{
|
|
}
|
|
|
|
/* public functions */
|
|
|
|
GApplication *
|
|
gimp_console_app_new (Gimp *gimp,
|
|
gboolean quit,
|
|
gboolean as_new,
|
|
const char **filenames,
|
|
const char *batch_interpreter,
|
|
const char **batch_commands)
|
|
{
|
|
GimpConsoleApp *app;
|
|
|
|
app = g_object_new (GIMP_TYPE_CONSOLE_APP,
|
|
"application-id", GIMP_APPLICATION_ID,
|
|
"flags", G_APPLICATION_DEFAULT_FLAGS | G_APPLICATION_NON_UNIQUE,
|
|
"gimp", gimp,
|
|
"filenames", filenames,
|
|
"as-new", as_new,
|
|
|
|
"quit", quit,
|
|
"batch-interpreter", batch_interpreter,
|
|
"batch-commands", batch_commands,
|
|
NULL);
|
|
|
|
return G_APPLICATION (app);
|
|
}
|