Merge branch 'typo_fix' into 'master'

Fix minor typos

See merge request GNOME/gtk!2108
This commit is contained in:
Matthias Clasen 2020-06-18 15:22:53 +00:00
commit bd5fcf2998
37 changed files with 43 additions and 43 deletions

View File

@ -249,7 +249,7 @@ gtk_clock_tick (gpointer unused)
{
GtkClock *clock = l->data;
/* We will now return a different value for the time porperty,
/* We will now return a different value for the time property,
* so notify about that.
*/
g_object_notify_by_pspec (G_OBJECT (clock), properties[PROP_TIME]);

View File

@ -1290,7 +1290,7 @@ gdk_clipboard_set_valist (GdkClipboard *clipboard,
g_warning ("%s: %s", G_STRLOC, error);
g_free (error);
/* we purposely leak the value here, it might not be
* in a sane state if an error condition occoured
* in a sane state if an error condition occurred
*/
return;
}

View File

@ -156,7 +156,7 @@ gdk_content_provider_new_typed (GType type,
g_warning ("%s: %s", G_STRLOC, error);
g_free (error);
/* we purposely leak the value here, it might not be
* in a sane state if an error condition occoured
* in a sane state if an error condition occurred
*/
}
va_end (args);

View File

@ -452,7 +452,7 @@ gdk_keymap_have_bidi_layouts (GdkKeymap *keymap)
* gdk_keymap_get_caps_lock_state:
* @keymap: a #GdkKeymap
*
* Returns whether the Caps Lock modifer is locked.
* Returns whether the Caps Lock modifier is locked.
*
* Returns: %TRUE if Caps Lock is on
*/
@ -468,7 +468,7 @@ gdk_keymap_get_caps_lock_state (GdkKeymap *keymap)
* gdk_keymap_get_num_lock_state:
* @keymap: a #GdkKeymap
*
* Returns whether the Num Lock modifer is locked.
* Returns whether the Num Lock modifier is locked.
*
* Returns: %TRUE if Num Lock is on
*/
@ -484,7 +484,7 @@ gdk_keymap_get_num_lock_state (GdkKeymap *keymap)
* gdk_keymap_get_scroll_lock_state:
* @keymap: a #GdkKeymap
*
* Returns whether the Scroll Lock modifer is locked.
* Returns whether the Scroll Lock modifier is locked.
*
* Returns: %TRUE if Scroll Lock is on
*/

View File

@ -375,7 +375,7 @@ gdk_texture_new_from_resource (const char *resource_path)
* Creates a new texture by loading an image from a file. The file format is
* detected automatically. If %NULL is returned, then @error will be set.
*
* Return value: A newly-created #GdkTexture or %NULL if an error occured.
* Return value: A newly-created #GdkTexture or %NULL if an error occurred.
**/
GdkTexture *
gdk_texture_new_from_file (GFile *file,

View File

@ -64,7 +64,7 @@ static int acquired_loop_level = -1;
static gboolean run_loop_polling_async = FALSE;
/* Between run_loop_before_waiting() and run_loop_after_waiting();
* max_prioritiy to pass to g_main_loop_check()
* max_priority to pass to g_main_loop_check()
*/
static gint run_loop_max_priority;

View File

@ -1317,7 +1317,7 @@ idataobject_querygetdata (LPDATAOBJECT This,
GDK_NOTE (DND,
g_print ("idataobject_querygetdata %p 0x%08x fmt, %p ptd, %lu aspect, %ld lindex, %0lx tymed - %s, return %#lx (%s)\n",
This, pFormatEtc->cfFormat, pFormatEtc->ptd, pFormatEtc->dwAspect, pFormatEtc->lindex, pFormatEtc->tymed, _gdk_win32_cf_to_string (pFormatEtc->cfFormat),
hr, (hr == S_OK) ? "S_OK" : (hr == DV_E_FORMATETC) ? "DV_E_FORMATETC" : (hr == DV_E_LINDEX) ? "DV_E_LINDEX" : (hr == DV_E_TYMED) ? "DV_E_TYMED" : (hr == DV_E_DVASPECT) ? "DV_E_DVASPECT" : "uknown meaning"));
hr, (hr == S_OK) ? "S_OK" : (hr == DV_E_FORMATETC) ? "DV_E_FORMATETC" : (hr == DV_E_LINDEX) ? "DV_E_LINDEX" : (hr == DV_E_TYMED) ? "DV_E_TYMED" : (hr == DV_E_DVASPECT) ? "DV_E_DVASPECT" : "unknown meaning"));
return hr;
}

View File

@ -135,7 +135,7 @@ struct _GdkW32DragMoveResizeContext
guint32 timestamp;
/* TRUE if during the next redraw we should call SetWindowPos() to push
* the window size and poistion to the native window.
* the window size and position to the native window.
*/
gboolean native_move_resize_pending;

View File

@ -200,7 +200,7 @@ _gdk_x11_surface_grab_check_destroy (GdkSurface *surface)
* The X I/O error handling routine.
*
* Arguments:
* "display" is the X display the error orignated from.
* "display" is the X display the error originated from.
*
* Results:
* An X I/O error basically means we lost our connection

View File

@ -145,7 +145,7 @@ _gdk_x11_precache_atoms (GdkDisplay *display,
* be freed.
*
* Returns: name of the X atom; this string is owned by GDK,
* so it shouldnt be modifed or freed.
* so it shouldnt be modified or freed.
**/
const gchar *
gdk_x11_get_xatom_name_for_display (GdkDisplay *display,

View File

@ -158,7 +158,7 @@ gsk_rounded_rect_init_from_rect (GskRoundedRect *self,
*
* Normalizes the passed rectangle.
*
* this function will ensure that the bounds of the rectanlge are normalized
* this function will ensure that the bounds of the rectangle are normalized
* and ensure that the corner values are positive and the corners do not overlap.
*
* Returns: (transfer none): the normalized rectangle

View File

@ -53,7 +53,7 @@ G_BEGIN_DECLS
* A rectangular region with rounded corners.
*
* Application code should normalize rectangles using gsk_rounded_rect_normalize();
* this function will ensure that the bounds of the rectanlge are normalized
* this function will ensure that the bounds of the rectangle are normalized
* and ensure that the corner values are positive and the corners do not overlap.
* All functions taking a #GskRoundedRect as an argument will internally operate on
* a normalized copy; all functions returning a #GskRoundedRect will always return

View File

@ -326,7 +326,7 @@ static void
gtk_action_muxer_action_added (GtkActionMuxer *muxer,
const gchar *action_name,
GActionGroup *original_group,
const gchar *orignal_action_name)
const gchar *original_action_name)
{
const GVariantType *parameter_type;
gboolean enabled;
@ -336,7 +336,7 @@ gtk_action_muxer_action_added (GtkActionMuxer *muxer,
action = g_hash_table_lookup (muxer->observed_actions, action_name);
if (action && action->watchers &&
g_action_group_query_action (original_group, orignal_action_name,
g_action_group_query_action (original_group, original_action_name,
&enabled, &parameter_type, NULL, NULL, &state))
{
GSList *node;

View File

@ -585,7 +585,7 @@ sysprof_profiler_method_call (GDBusConnection *connection,
static gboolean
gtk_application_dbus_register (GApplication *application,
GDBusConnection *connection,
const char *obect_path,
const char *object_path,
GError **error)
{
GtkApplicationPrivate *priv = gtk_application_get_instance_private (GTK_APPLICATION (application));
@ -622,7 +622,7 @@ gtk_application_dbus_register (GApplication *application,
static void
gtk_application_dbus_unregister (GApplication *application,
GDBusConnection *connection,
const char *obect_path)
const char *object_path)
{
GtkApplicationPrivate *priv = gtk_application_get_instance_private (GTK_APPLICATION (application));
@ -634,7 +634,7 @@ gtk_application_dbus_unregister (GApplication *application,
static gboolean
gtk_application_dbus_register (GApplication *application,
GDBusConnection *connection,
const char *obect_path,
const char *object_path,
GError **error)
{
return TRUE;
@ -643,7 +643,7 @@ gtk_application_dbus_register (GApplication *application,
static void
gtk_application_dbus_unregister (GApplication *application,
GDBusConnection *connection,
const char *obect_path)
const char *object_path)
{
}

View File

@ -186,7 +186,7 @@ GClosure * gtk_builder_create_closure (GtkBuilder *builder,
/**
* GTK_BUILDER_WARN_INVALID_CHILD_TYPE:
* @object: the #GtkBuildable on which the warning ocurred
* @object: the #GtkBuildable on which the warning occurred
* @type: the unexpected type value
*
* This macro should be used to emit a warning about and unexpected @type value

View File

@ -2614,7 +2614,7 @@ gtk_cell_area_cell_set_valist (GtkCellArea *area,
g_free (error);
/* we purposely leak the value here, it might not be
* in a sane state if an error condition occoured
* in a sane state if an error condition occurred
*/
break;
}

View File

@ -1,4 +1,4 @@
/* Color utilties
/* Color utilities
*
* Copyright (C) 1999 The Free Software Foundation
*

View File

@ -1270,7 +1270,7 @@ gtk_dialog_buildable_custom_finished (GtkBuildable *buildable,
if (!object)
continue;
/* If the widget already has reponse data at this point, it
/* If the widget already has response data at this point, it
* was either added by gtk_dialog_add_action_widget(), or via
* <child type="action"> or by moving an action area child
* to the header bar. In these cases, apply placement heuristics

View File

@ -978,7 +978,7 @@ gtk_drop_target_get_drop (GtkDropTarget *self)
* gtk_drop_target_get_value:
* @self: a #GtkDropTarget
*
* Gets the value of the GtkDropTarget:value porperty.
* Gets the value of the GtkDropTarget:value property.
*
* Returns: (nullable) (transfer none): The current drop data
**/

View File

@ -420,7 +420,7 @@ gtk_drop_target_async_class_init (GtkDropTargetAsyncClass *class)
* based on the formats provided by the @drop.
*
* If the decision whether the drop will be accepted or rejected needs
* further procesing, such as inspecting the data, this function should
* further processing, such as inspecting the data, this function should
* return %TRUE and proceed as is @drop was accepted and if it decides to
* reject the drop later, it should call gtk_drop_target_reject_drop().
*

View File

@ -146,7 +146,7 @@ static void show_variations (GtkEmojiChooser *chooser,
static void
gtk_emoji_chooser_child_popup_menu (GtkWidget *widget,
const char *action_name,
GVariant *paramters)
GVariant *parameters)
{
GtkWidget *chooser;

View File

@ -6705,7 +6705,7 @@ search_start_query (GtkFileChooserWidget *impl,
gtk_widget_show (impl->remote_warning_bar);
/* We're not showing the file list here already and instead rely on the
* GtkSearchEntry timout and the ::hits-added signal from above to
* GtkSearchEntry timeout and the ::hits-added signal from above to
* switch. */
}

View File

@ -3765,7 +3765,7 @@ gtk_flow_box_class_init (GtkFlowBoxClass *class)
*
* The default bindings for this signal come in two variants,
* the variant with the Shift modifier extends the selection,
* the variant without the Shift modifer does not.
* the variant without the Shift modifier does not.
* There are too many key combinations to list them all here.
* - Arrow keys move by individual children
* - Home/End keys move to the ends of the box

View File

@ -3907,7 +3907,7 @@ icon_paintable_snapshot (GdkPaintable *paintable,
* of the icon or %NULL to use the default color (allow-none)
*
* This is similar to the implementation of gdk_paintable_snapshot(), but if the icon is
* symbolic it will be recolored with the specified colors (which ususally comes from the theme).
* symbolic it will be recolored with the specified colors (which usually comes from the theme).
*/
void
gtk_icon_paintable_snapshot_with_colors (GtkIconPaintable *icon,

View File

@ -293,7 +293,7 @@ clear_response_data (GtkWidget *widget)
data = get_response_data (widget, FALSE);
g_signal_handler_disconnect (widget, data->handler_id);
g_object_set_data (G_OBJECT (widget), "gtk-info-bar-reponse-data", NULL);
g_object_set_data (G_OBJECT (widget), "gtk-info-bar-response-data", NULL);
}
static GtkWidget *

View File

@ -642,7 +642,7 @@ gtk_label_class_init (GtkLabelClass *class)
*
* The default bindings for this signal come in two variants,
* the variant with the Shift modifier extends the selection,
* the variant without the Shift modifer does not.
* the variant without the Shift modifier does not.
* There are too many key combinations to list them all here.
* - Arrow keys move by individual characters/lines
* - Ctrl-arrow key combinations move by words/paragraphs

View File

@ -1038,7 +1038,7 @@ gtk_list_store_set_valist_internal (GtkListStore *list_store,
g_free (error);
/* we purposely leak the value here, it might not be
* in a sane state if an error condition occoured
* in a sane state if an error condition occurred
*/
break;
}

View File

@ -560,7 +560,7 @@ gtk_range_init (GtkRange *range)
/* Note: Order is important here.
* The ::drag-begin handler relies on the state set up by the
* click ::pressed handler. Gestures are handling events
* in the oppposite order in which they are added to their
* in the opposite order in which they are added to their
* widget.
*/
priv->drag_gesture = gtk_gesture_drag_new ();

View File

@ -83,7 +83,7 @@ gtk_scrollable_default_init (GtkScrollableInterface *iface)
/**
* GtkScrollable:vadjustment:
*
* Verical #GtkAdjustment of the scrollable widget. This adjustment is shared
* Vertical #GtkAdjustment of the scrollable widget. This adjustment is shared
* between the scrollable widget and its parent.
*/
pspec = g_param_spec_object ("vadjustment",

View File

@ -523,7 +523,7 @@ gtk_shortcut_controller_class_init (GtkShortcutControllerClass *klass)
*/
properties[PROP_MNEMONICS_MODIFIERS] =
g_param_spec_flags ("mnemonic-modifiers",
P_("Mnemonic modifers"),
P_("Mnemonic modifiers"),
P_("The modifiers to be pressed to allow mnemonics activation"),
GDK_TYPE_MODIFIER_TYPE,
GDK_ALT_MASK,

View File

@ -981,7 +981,7 @@ gtk_text_class_init (GtkTextClass *class)
*
* The default bindings for this signal come in two variants,
* the variant with the Shift modifier extends the selection,
* the variant without the Shift modifer does not.
* the variant without the Shift modifier does not.
* There are too many key combinations to list them all here.
* - Arrow keys move by individual characters/lines
* - Ctrl-arrow key combinations move by words/paragraphs

View File

@ -2846,7 +2846,7 @@ get_line_at_y (GtkTextLayout *layout,
* gtk_text_layout_get_line_at_y:
* @layout: a #GtkLayout
* @target_iter: the iterator in which the result is stored
* @y: the y positition
* @y: the y position
* @line_top: location to store the y coordinate of the
* top of the line. (Can by %NULL)
*

View File

@ -655,7 +655,7 @@ gtk_tooltip_position (GtkTooltip *tooltip,
* If the anchor rectangle is too tall (meaning if we'd be constrained
* and flip, it'd flip too far away), rely only on the pointer position
* to position the tooltip. The approximate pointer cursorrectangle is
* used as an anchor rectantgle.
* used as an anchor rectangle.
*
* If the anchor rectangle isn't to tall, make sure the tooltip isn't too
* far away from the pointer position.

View File

@ -904,7 +904,7 @@ gtk_tree_rbtree_reorder (GtkTreeRBTree *tree,
* Checks if @potential_child is a child (direct or via intermediate
* trees) of @tree.
*
* Returns: %TRUE if @potentitial_child is a child of @tree.
* Returns: %TRUE if @potential_child is a child of @tree.
**/
gboolean
gtk_tree_rbtree_contains (GtkTreeRBTree *tree,

View File

@ -1055,7 +1055,7 @@ gtk_tree_store_set_valist_internal (GtkTreeStore *tree_store,
g_free (error);
/* we purposely leak the value here, it might not be
* in a sane state if an error condition occoured
* in a sane state if an error condition occurred
*/
break;
}

View File

@ -6245,7 +6245,7 @@ do_validate_rows (GtkTreeView *tree_view, gboolean queue_resize)
* GtkWidget:adjust_size_request() is called).
*
* Currently bypassing this but the real solution is to not update the scroll adjustments
* untill we've recieved an allocation (never update scroll adjustments from size-requests).
* until we've received an allocation (never update scroll adjustments from size-requests).
*/
prevent_recursion_hack = TRUE;
gtk_tree_view_measure (GTK_WIDGET (tree_view),

View File

@ -2424,7 +2424,7 @@ cups_create_printer (GtkPrintBackendCups *cups_backend,
if (info->member_uris)
{
cups_printer->printer_uri = g_strdup (info->member_uris);
/* TODO if member_uris is a class we need to recursivly find a printer */
/* TODO if member_uris is a class we need to recursively find a printer */
GTK_NOTE (PRINTING,
g_print ("CUPS Backend: Found class with printer %s\n",
info->member_uris));