luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-03 22:33:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'typos' into 'main'

Browse Source 
Fix typos

See merge request GNOME/glib!3520
This commit is contained in:
Michael Catanzaro 2023-08-01 21:29:05 +00:00
commit dc4a191587
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/gappinfo.c
View File

@ -1595,7 +1595,7 @@ g_app_launch_context_get_display (GAppLaunchContext *context,
* g_app_launch_context_get_startup_notify_id: * g_app_launch_context_get_startup_notify_id:
* @context: a #GAppLaunchContext * @context: a #GAppLaunchContext
* @info: a #GAppInfo * @info: a #GAppInfo
* @files: (element-type GFile): a #GList of of #GFile objects * @files: (element-type GFile): a #GList of #GFile objects
* *
* Initiates startup notification for the application and returns the * Initiates startup notification for the application and returns the
* `XDG_ACTIVATION_TOKEN` or `DESKTOP_STARTUP_ID` for the launched operation, * `XDG_ACTIVATION_TOKEN` or `DESKTOP_STARTUP_ID` for the launched operation,

4
gio/gapplication.c
View File

@ -88,8 +88,8 @@
* instance and g_application_run() promptly returns. See the code * instance and g_application_run() promptly returns. See the code
* examples below. * examples below.
* *
* If used, the expected form of an application identifier is the same as * If used, the expected form of an application identifier is the
* that of of a * same as that of a
* [D-Bus well-known bus name](https://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-names-bus). * [D-Bus well-known bus name](https://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-names-bus).
* Examples include: `com.example.MyApp`, `org.example.internal_apps.Calculator`, * Examples include: `com.example.MyApp`, `org.example.internal_apps.Calculator`,
* `org._7_zip.Archiver`. * `org._7_zip.Archiver`.

6
gio/gdbusintrospection.c
View File

@ -1613,7 +1613,7 @@ parser_end_element (GMarkupParseContext *context,
nodes = parse_data_steal_nodes (data, &num_nodes); nodes = parse_data_steal_nodes (data, &num_nodes);
interfaces = parse_data_steal_interfaces (data, &num_interfaces); interfaces = parse_data_steal_interfaces (data, &num_interfaces);
/* destroy the nodes, interfaces for scope we're exiting and and pop the nodes, interfaces from the /* destroy the nodes, interfaces for scope we're exiting and pop the nodes, interfaces from the
* scope we're reentering * scope we're reentering
*/ */
parse_data_free_interfaces (data); parse_data_free_interfaces (data);
@ -1707,7 +1707,7 @@ parser_end_element (GMarkupParseContext *context,
embedded_annotations = steal_annotations (data); embedded_annotations = steal_annotations (data);
/* destroy the annotations for scope we're exiting and and pop the annotations from the scope we're reentering */ /* destroy the annotations for scope we're exiting and pop the annotations from the scope we're reentering */
parse_data_free_annotations (data); parse_data_free_annotations (data);
data->annotations = (GPtrArray *) data->annotations_stack->data; data->annotations = (GPtrArray *) data->annotations_stack->data;
data->annotations_stack = g_slist_remove (data->annotations_stack, data->annotations_stack->data); data->annotations_stack = g_slist_remove (data->annotations_stack, data->annotations_stack->data);
@ -1727,7 +1727,7 @@ parser_end_element (GMarkupParseContext *context,
if (!have_popped_annotations) if (!have_popped_annotations)
{ {
/* destroy the annotations for scope we're exiting and and pop the annotations from the scope we're reentering */ /* destroy the annotations for scope we're exiting and pop the annotations from the scope we're reentering */
parse_data_free_annotations (data); parse_data_free_annotations (data);
data->annotations = (GPtrArray *) data->annotations_stack->data; data->annotations = (GPtrArray *) data->annotations_stack->data;
data->annotations_stack = g_slist_remove (data->annotations_stack, data->annotations_stack->data); data->annotations_stack = g_slist_remove (data->annotations_stack, data->annotations_stack->data);

2
gio/gschema.dtd
View File

@ -33,7 +33,7 @@
enum CDATA #IMPLIED enum CDATA #IMPLIED
flags CDATA #IMPLIED > flags CDATA #IMPLIED >
<!-- the default value is specified a a serialized GVariant, <!-- the default value is specified as a serialized GVariant,
i.e. you have to include the quotes when specifying a string --> i.e. you have to include the quotes when specifying a string -->
<!ELEMENT default (#PCDATA) > <!ELEMENT default (#PCDATA) >
<!-- the presence of the l10n attribute marks a default value for <!-- the presence of the l10n attribute marks a default value for

2
gio/gtlsdatabase.c
View File

@ -978,7 +978,7 @@ g_tls_database_lookup_certificates_issued_by (GTlsDatabase *self,
* g_tls_database_lookup_certificates_issued_by() for more information. * g_tls_database_lookup_certificates_issued_by() for more information.
* *
* The database may choose to hold a reference to the issuer byte array for the duration * The database may choose to hold a reference to the issuer byte array for the duration
* of of this asynchronous operation. The byte array should not be modified during * of this asynchronous operation. The byte array should not be modified during
* this time. * this time.
* *
* Since: 2.30 * Since: 2.30

2
glib/tests/gvariant.c
View File

@ -3807,7 +3807,7 @@ test_gv_byteswap (void)
# define native16(x) 0, x # define native16(x) 0, x
# define swapped16(x) x, 0 # define swapped16(x) x, 0
#endif #endif
/* all kinds of of crazy randomised testing already performed on the /* all kinds of crazy randomised testing already performed on the
* byteswapper in the /gvariant/serializer/byteswap test and all kinds * byteswapper in the /gvariant/serializer/byteswap test and all kinds
* of crazy randomised testing performed against the serializer * of crazy randomised testing performed against the serializer
* normalisation functions in the /gvariant/serializer/fuzz/ tests. * normalisation functions in the /gvariant/serializer/fuzz/ tests.

2
glib/win_iconv.c
View File

@ -1087,7 +1087,7 @@ ucs4_to_utf16(uint wc, ushort *wbuf, int *wbufsize)
/* /*
* Check if codepage is one of those for which the dwFlags parameter * Check if codepage is one of those for which the dwFlags parameter
* to MultiByteToWideChar() must be zero. Return zero or * to MultiByteToWideChar() must be zero. Return zero or
* MB_ERR_INVALID_CHARS. The docs in Platform SDK for for Windows * MB_ERR_INVALID_CHARS. The docs in Platform SDK for Windows
* Server 2003 R2 claims that also codepage 65001 is one of these, but * Server 2003 R2 claims that also codepage 65001 is one of these, but
* that doesn't seem to be the case. The MSDN docs for MSVS2008 leave * that doesn't seem to be the case. The MSDN docs for MSVS2008 leave
* out 65001 (UTF-8), and that indeed seems to be the case on XP, it * out 65001 (UTF-8), and that indeed seems to be the case on XP, it