luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-14 06:17:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-various-glib-2-64' into 'glib-2-64'

Browse Source 
Backport various patches to glib-2-64

See merge request GNOME/glib!1438
This commit is contained in:
Sebastian Dröge 2020-04-03 16:42:21 +00:00
commit 204b4dc285
7 changed files with 45 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/reference/gio/gio.xml
View File

@ -307,6 +307,10 @@
<term><option>-n</option>, <option>--nofollow-symlinks</option></term>
<listitem><para>Don’t follow symbolic links.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>-d</option>, <option>--print-display-names</option></term>
<listitem><para>Print display names.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>-u</option>, <option>--print-uris</option></term>
<listitem><para>Print full URIs.</para></listitem>
@ -425,8 +429,8 @@
<listitem><para>Mount as mountable.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>-d</option>, <option>--device=<replaceable>DEVICE</replaceable></option></term>
<listitem><para>Mount volume with device file.</para></listitem>
<term><option>-d</option>, <option>--device=<replaceable>ID</replaceable></option></term>
<listitem><para>Mount volume with device file, or other identifier.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>-u</option>, <option>--unmount</option></term>
@ -436,6 +440,10 @@
<term><option>-e</option>, <option>--eject</option></term>
<listitem><para>Eject the location.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>-t</option>, <option>--stop=<replaceable>DEVICE</replaceable></option></term>
<listitem><para>Stop drive with device file.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>-s</option>, <option>--unmount-scheme=<replaceable>SCHEME</replaceable></option></term>
<listitem><para>Unmount all mounts with the given scheme.</para></listitem>

47
docs/reference/gio/meson.build
View File

@ -1,5 +1,7 @@
if get_option('gtk_doc')
subdir('gdbus-object-manager-example')
if installed_tests_enabled
subdir('gdbus-object-manager-example')
endif
subdir('xml')
ignore_headers = [
@ -160,6 +162,30 @@ if get_option('gtk_doc')
copy : true,
)
content_files = [
'overview.xml',
'migrating-posix.xml',
'migrating-gnome-vfs.xml',
'migrating-gconf.xml',
'migrating-gdbus.xml',
'gio-querymodules.xml',
'glib-compile-schemas.xml',
'glib-compile-resources.xml',
'gapplication.xml',
'gsettings.xml',
'gresource.xml',
'gdbus.xml',
'gdbus-codegen.xml',
]
if installed_tests_enabled
content_files += [
gdbus_example_objectmanager_xml,
gdbus_example_objectmanager_sources,
gdbus_object_manager_example_doc
]
endif
gnome.gtkdoc('gio',
main_xml : 'gio-docs.xml',
namespace : 'g',
@ -173,24 +199,7 @@ if get_option('gtk_doc')
mkdb_args : [
'--ignore-files=' + ' '.join(ignore_sources),
],
content_files : [
'overview.xml',
'migrating-posix.xml',
'migrating-gnome-vfs.xml',
'migrating-gconf.xml',
'migrating-gdbus.xml',
'gio-querymodules.xml',
'glib-compile-schemas.xml',
'glib-compile-resources.xml',
'gapplication.xml',
'gsettings.xml',
'gresource.xml',
'gdbus.xml',
'gdbus-codegen.xml',
gdbus_example_objectmanager_xml,
gdbus_example_objectmanager_sources,
gdbus_object_manager_example_doc,
],
content_files : content_files,
expand_content_files : [
'overview.xml',
'migrating-posix.xml',

4
gio/gdbusmessage.c
View File

@ -2786,7 +2786,7 @@ g_dbus_message_to_blob (GDBusMessage *message,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Message body has signature “%s” but there is no signature header"),
signature_str);
g_variant_get_type_string (message->body));
goto out;
}
tupled_signature_str = g_strdup_printf ("(%s)", signature_str);
@ -2796,7 +2796,7 @@ g_dbus_message_to_blob (GDBusMessage *message,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Message body has type signature “%s” but signature in the header field is “%s”"),
tupled_signature_str, g_variant_get_type_string (message->body));
g_variant_get_type_string (message->body), tupled_signature_str);
g_free (tupled_signature_str);
goto out;
}

2
glib/glib-unix.c
View File

@ -485,7 +485,7 @@ g_unix_get_passwd_entry (const gchar *user_name,
* loop until it’s big enough). Add 6 extra bytes to work around a bug in
* macOS < 10.3. See #156446.
*/
buffer = g_malloc0 (sizeof (buffer) + string_buffer_size + 6);
buffer = g_malloc0 (sizeof (*buffer) + string_buffer_size + 6);
errno = 0;
retval = getpwnam_r (user_name, &buffer->pwd, buffer->string_buffer,

2
glib/gtypes.h
View File

@ -565,7 +565,7 @@ G_END_DECLS
# else /* !GLIB_STATIC_COMPILATION */
# ifdef GLIB_COMPILATION
# ifdef DLL_EXPORT
# define GLIB_VAR __declspec(dllexport)
# define GLIB_VAR extern __declspec(dllexport)
# else /* !DLL_EXPORT */
# define GLIB_VAR extern
# endif /* !DLL_EXPORT */

4
glib/valgrind.h
View File

@ -130,11 +130,11 @@
# define PLAT_x86_darwin 1
#elif defined(__APPLE__) && defined(__x86_64__)
# define PLAT_amd64_darwin 1
#elif (defined(__MINGW32__) && !defined(__MINGW64__)) \
#elif (defined(__MINGW32__) && defined(__i386__)) \
|| defined(__CYGWIN32__) \
|| (defined(_WIN32) && defined(_M_IX86))
# define PLAT_x86_win32 1
#elif defined(__MINGW64__) \
#elif (defined(__MINGW64__) && defined(__x86_64__)) \
|| (defined(_WIN64) && defined(_M_X64))
# define PLAT_amd64_win64 1
#elif defined(__linux__) && defined(__i386__)

2
gobject/gparamspecs.h
View File

@ -1150,7 +1150,7 @@ GParamSpec* g_param_spec_variant (const gchar *name,
# else /* !GOBJECT_STATIC_COMPILATION */
# ifdef GOBJECT_COMPILATION
# ifdef DLL_EXPORT
# define GOBJECT_VAR __declspec(dllexport)
# define GOBJECT_VAR extern __declspec(dllexport)
# else /* !DLL_EXPORT */
# define GOBJECT_VAR extern
# endif /* !DLL_EXPORT */