New upstream version 2.10.20

This commit is contained in:
Simon McVittie
2020-08-26 11:05:56 +01:00
794 changed files with 93349 additions and 84053 deletions

View File

@ -1,7 +1,7 @@
# Makefile.in generated by automake 1.16.1 from Makefile.am.
# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -90,8 +90,14 @@ build_triplet = @build@
host_triplet = @host@
subdir = app/gui
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/m4macros/alsa.m4 \
am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \
$(top_srcdir)/m4macros/intltool.m4 \
$(top_srcdir)/m4macros/libtool.m4 \
$(top_srcdir)/m4macros/ltoptions.m4 \
$(top_srcdir)/m4macros/ltsugar.m4 \
$(top_srcdir)/m4macros/ltversion.m4 \
$(top_srcdir)/m4macros/lt~obsolete.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \
$(top_srcdir)/m4macros/ax_compare_version.m4 \
$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
@ -324,8 +330,6 @@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
GLIB_LIBS = @GLIB_LIBS@
GLIB_MKENUMS = @GLIB_MKENUMS@
GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
GLIB_WIN_BUG_CFLAGS = @GLIB_WIN_BUG_CFLAGS@
GLIB_WIN_BUG_LIBS = @GLIB_WIN_BUG_LIBS@
GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
GMOFILES = @GMOFILES@

View File

@ -1,8 +1,9 @@
/*
* Generated by gdbus-codegen 2.62.0 from dbus-service.xml. DO NOT EDIT.
* This file is generated by gdbus-codegen, do not modify it.
*
* The license of this code is the same as for the D-Bus interface description
* it was derived from.
* it was derived from. Note that it links to GLib, so must comply with the
* LGPL linking clauses.
*/
#ifdef HAVE_CONFIG_H
@ -582,7 +583,7 @@ gimp_dbus_service_ui_emit_opened (
* @user_data: User data to pass to @callback.
*
* Asynchronously invokes the <link linkend="gdbus-method-org-gimp-GIMP-UI.Open">Open()</link> D-Bus method on @proxy.
* When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
* When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from (see g_main_context_push_thread_default()).
* You can then call gimp_dbus_service_ui_call_open_finish() to get the result of the operation.
*
* See gimp_dbus_service_ui_call_open_sync() for the synchronous, blocking version of this method.
@ -686,7 +687,7 @@ _out:
* @user_data: User data to pass to @callback.
*
* Asynchronously invokes the <link linkend="gdbus-method-org-gimp-GIMP-UI.OpenAsNew">OpenAsNew()</link> D-Bus method on @proxy.
* When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
* When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from (see g_main_context_push_thread_default()).
* You can then call gimp_dbus_service_ui_call_open_as_new_finish() to get the result of the operation.
*
* See gimp_dbus_service_ui_call_open_as_new_sync() for the synchronous, blocking version of this method.
@ -791,7 +792,7 @@ _out:
* @user_data: User data to pass to @callback.
*
* Asynchronously invokes the <link linkend="gdbus-method-org-gimp-GIMP-UI.BatchRun">BatchRun()</link> D-Bus method on @proxy.
* When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
* When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from (see g_main_context_push_thread_default()).
* You can then call gimp_dbus_service_ui_call_batch_run_finish() to get the result of the operation.
*
* See gimp_dbus_service_ui_call_batch_run_sync() for the synchronous, blocking version of this method.
@ -899,7 +900,7 @@ _out:
* @user_data: User data to pass to @callback.
*
* Asynchronously invokes the <link linkend="gdbus-method-org-gimp-GIMP-UI.Activate">Activate()</link> D-Bus method on @proxy.
* When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
* When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from (see g_main_context_push_thread_default()).
* You can then call gimp_dbus_service_ui_call_activate_finish() to get the result of the operation.
*
* See gimp_dbus_service_ui_call_activate_sync() for the synchronous, blocking version of this method.
@ -1239,7 +1240,7 @@ gimp_dbus_service_ui_proxy_iface_init (GimpDBusServiceUIIface *iface)
*
* Asynchronously creates a proxy for the D-Bus interface <link linkend="gdbus-interface-org-gimp-GIMP-UI.top_of_page">org.gimp.GIMP.UI</link>. See g_dbus_proxy_new() for more details.
*
* When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
* When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from (see g_main_context_push_thread_default()).
* You can then call gimp_dbus_service_ui_proxy_new_finish() to get the result of the operation.
*
* See gimp_dbus_service_ui_proxy_new_sync() for the synchronous, blocking version of this constructor.
@ -1329,7 +1330,7 @@ gimp_dbus_service_ui_proxy_new_sync (
*
* Like gimp_dbus_service_ui_proxy_new() but takes a #GBusType instead of a #GDBusConnection.
*
* When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
* When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from (see g_main_context_push_thread_default()).
* You can then call gimp_dbus_service_ui_proxy_new_for_bus_finish() to get the result of the operation.
*
* See gimp_dbus_service_ui_proxy_new_for_bus_sync() for the synchronous, blocking version of this constructor.

View File

@ -1,8 +1,9 @@
/*
* Generated by gdbus-codegen 2.62.0 from dbus-service.xml. DO NOT EDIT.
* This file is generated by gdbus-codegen, do not modify it.
*
* The license of this code is the same as for the D-Bus interface description
* it was derived from.
* it was derived from. Note that it links to GLib, so must comply with the
* LGPL linking clauses.
*/
#ifndef __GIMPDBUSSERVICE_GENERATED_H__

View File

@ -409,6 +409,12 @@ gui_dbus_name_lost (GDBusConnection *connection,
const gchar *name,
Gimp *gimp)
{
if (connection == NULL)
g_printerr ("%s: connection to the bus cannot be established.\n",
G_STRFUNC);
else
g_printerr ("%s: the name \"%s\" could not be acquired on the bus.\n",
G_STRFUNC, name);
}
static void
@ -430,7 +436,7 @@ static void
gui_dbus_service_exit (void)
{
g_bus_unown_name (dbus_name_id);
g_object_unref (dbus_manager);
g_clear_object (&dbus_manager);
}
#endif

View File

@ -540,7 +540,7 @@ gui_wait (Gimp *gimp,
{
/* listens for a cancellation request */
input_async = gimp_parallel_run_async_independent (
(GimpParallelRunAsyncFunc) gui_wait_input_async,
(GimpRunAsyncFunc) gui_wait_input_async,
input_pipe);
while (! gimp_waitable_wait_for (waitable, 0.1 * G_TIME_SPAN_SECOND))