From 2fc6384bca0645317a6ee4242ff08d0281254849 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Daase?= Date: Wed, 19 Aug 2020 11:26:11 +0200 Subject: [PATCH] *: Fix spelling mistakes found by codespell https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1416 --- HACKING.md | 2 +- NEWS | 18 ++-- data/cldr2json/cldr2json.py | 2 +- data/theme/gnome-shell-sass/_drawing.scss | 2 +- .../gnome-shell-sass/widgets/_dialogs.scss | 2 +- .../widgets/_notifications.scss | 2 +- .../gnome-shell-sass/widgets/_slider.scss | 2 +- js/ui/altTab.js | 2 +- js/ui/components/telepathyClient.js | 2 +- js/ui/dialog.js | 4 +- js/ui/overviewControls.js | 2 +- js/ui/popupMenu.js | 2 +- src/gnome-shell-perf-tool.in | 2 +- src/gnome-shell-plugin.c | 2 +- src/shell-action-modes.h | 2 +- src/shell-app.c | 2 +- src/shell-blur-effect.c | 2 +- src/shell-embedded-window.c | 2 +- src/shell-global.c | 4 +- src/shell-glsl-effect.c | 2 +- src/shell-mount-operation.c | 2 +- src/shell-perf-log.c | 2 +- src/st/croco/cr-additional-sel.c | 2 +- src/st/croco/cr-attr-sel.c | 4 +- src/st/croco/cr-cascade.c | 4 +- src/st/croco/cr-declaration.c | 2 +- src/st/croco/cr-doc-handler.c | 14 +-- src/st/croco/cr-enc-handler.c | 4 +- src/st/croco/cr-fonts.c | 12 +-- src/st/croco/cr-input.c | 6 +- src/st/croco/cr-num.c | 2 +- src/st/croco/cr-om-parser.c | 14 +-- src/st/croco/cr-parser.c | 90 +++++++++---------- src/st/croco/cr-parsing-location.c | 8 +- src/st/croco/cr-prop-list.c | 2 +- src/st/croco/cr-simple-sel.c | 8 +- src/st/croco/cr-simple-sel.h | 2 +- src/st/croco/cr-statement.c | 10 +-- src/st/croco/cr-statement.h | 2 +- src/st/croco/cr-string.c | 14 +-- src/st/croco/cr-stylesheet.h | 2 +- src/st/croco/cr-term.c | 4 +- src/st/croco/cr-tknzr.c | 54 +++++------ src/st/croco/cr-token.c | 10 +-- src/st/croco/cr-utils.c | 36 ++++---- src/st/st-adjustment.c | 6 +- src/st/st-clipboard.c | 4 +- src/st/st-drawing-area.c | 4 +- src/st/st-icon.c | 2 +- src/st/st-scroll-view.c | 6 +- src/st/st-scrollable.c | 4 +- src/st/st-shadow.c | 2 +- src/st/st-texture-cache.c | 4 +- src/st/st-theme-context.c | 4 +- src/st/st-theme-node-drawing.c | 2 +- src/st/st-theme-node.c | 6 +- src/st/st-theme.c | 4 +- src/st/test-theme.c | 2 +- src/tray/na-tray-child.c | 2 +- tools/build/jhbuildrc-gnome-shell | 2 +- 60 files changed, 212 insertions(+), 212 deletions(-) diff --git a/HACKING.md b/HACKING.md index be26c8508..bdcb9ba93 100644 --- a/HACKING.md +++ b/HACKING.md @@ -131,7 +131,7 @@ whenever possible, that is when not inheriting from GObjects. }; ``` -For GObject inheritence, we use the GObject.registerClass() function provided +For GObject inheritance, we use the GObject.registerClass() function provided by gjs. ```javascript var MyActor = GObject.registerClass( diff --git a/NEWS b/NEWS index 28a468b62..e203bd89e 100644 --- a/NEWS +++ b/NEWS @@ -262,7 +262,7 @@ Translators: * Handle extension updates [Florian; !945] * Animate showing and hiding caps-lock warning [Jonas; !952] * Support "auto" lengths in CSS [Florian; !971] -* Turn extension-prefs into the offical Extensions app [Florian; #1968] +* Turn extension-prefs into the official Extensions app [Florian; #1968] * Sandbox the portal helper [Michael; !983] * Misc. bug fixes and cleanups [Florian, Björn, Jakub, Alexander, Daniel V., Jonas, nana-4, Carlos, Sebastian, Daniel G., Georges, Piotr; !918, !917, @@ -551,7 +551,7 @@ Translators: ====== * Fix keeping actors visible in scrollviews [Marco; #1061] * Move some chrome above popup windows [Jonas D.; !358] -* Include 'sandboxed-app-id' in winodw introspection info [Florian; #1289] +* Include 'sandboxed-app-id' in window introspection info [Florian; #1289] * Port to libecal-2.0 [Milan; !501] * Support TCRYPT in mount password dialog [segfault; !126] * Misc. bug fixes and cleanups [Florian, Marco, Veerasamy; !517, #745, !499, @@ -1100,7 +1100,7 @@ Translations: * gdm: Fix "Not listed" focus indication [Florian; #784040] * Fix missing icons in freedesktop notifications [Florian; #784245] * gdm: Disable user list when empty [Xiaoguang; #731320] -* gdm: Allow empty reponse to PAM messages [Ray; #784360] +* gdm: Allow empty response to PAM messages [Ray; #784360] * Fix blocked clicks in shutdown dialog [Florian; #781738] * Show OSD popup when changing volume via scroll wheel [Florian; #781028] * Refine list search results [Rares; #749957] @@ -2560,7 +2560,7 @@ Translations: * Merge the wayland branch [Giovanni, Neil; #707467] * Make search entry behave better in RTL locales [Matthias, Florian; #705779] * Allow to change app pages with pageUp/pageDown keys [Carlos; #707979] -* Set approriate a11y states on expandable menu items [Alejandro; #708038] +* Set appropriate a11y states on expandable menu items [Alejandro; #708038] * Improve page indicator animation [Carlos; #707565] * Misc bug fixes and cleanups [Florian, Olivier, Jasper, Giovanni, Magdalen, Adel, Carlos, Rico, Joanmarie; #707308, #707430, #707508, #707557, #707600, @@ -3844,7 +3844,7 @@ Translations: * Update the calendar code to use ECalClient [Giovanni; #671177] * Update jhbuild script to use the main moduleset [Owen, Will; #668440] * StTextureCache: code cleanup, evict unused icons, merge together - simulataneous requests for the same icon [Jasper; #670771, #671656, #672273] + simultaneous requests for the same icon [Jasper; #670771, #671656, #672273] * Clean up St for recent Clutter changes and fix bugs. StContainer and StGroup are removed [Jasper, Florian; #670034, #670640, #670904] * Code cleanup [Adel, Jasper, Rui; #613194, #671086, #671103] @@ -3979,7 +3979,7 @@ Translations: [Stefano; #664201] - Delay rearranging windows in the overview as long as the pointer is over a window [Vit; #645325] -* Add a GConf => DConf migration file for overriden Mutter settings +* Add a GConf => DConf migration file for overridden Mutter settings [Florian; #667636] * When a VPN connection is active, show that as the network icon [Giovanni; #665115] @@ -4226,7 +4226,7 @@ Translations: - Add fingerprint reader support [Ray; #657823] - Add a power button offering the choice of Suspend/Restart/Power off [Ray; #657822] - - Remove the option to view the current keyboad layout [Matthias; #659164] + - Remove the option to view the current keyboard layout [Matthias; #659164] - Make Control-Alt-Tab work for full keyboard access [Ray; #659177] * Frequently initiate a full garbage collection; Spidermonkey isn't very good at tracking the amount of resources we have allocated so this hopefully will @@ -4443,7 +4443,7 @@ Translations: * Fix selection highlighting for light-on-dark entries [Jasper; #643768] * Make control-Return in the overview open a new window [Maxim] * Delay showing the alt-Tab switcher to reduce visual noise when - flipping betweeen windows [Dan; #652346] + flipping between windows [Dan; #652346] * When we have vertically stacked monitors, put the message tray on the bottom one [Dan; #636963] * Fix various problems with keynav and the Activities button @@ -4594,7 +4594,7 @@ Translations: - Fix missing device descriptions with multiple devices of the same type [Giovanni] https://bugzilla.gnome.org/show_bug.cgi?id=646074 - - Label ad-hoc neworks with an appropriate icon [Dan] + - Label ad-hoc networks with an appropriate icon [Dan] https://bugzilla.gnome.org/show_bug.cgi?id=646141 - Fix displaying some devices states as "invalid" [Dan] https://bugzilla.gnome.org/show_bug.cgi?id=646946 diff --git a/data/cldr2json/cldr2json.py b/data/cldr2json/cldr2json.py index 49a3809cd..c8258007f 100755 --- a/data/cldr2json/cldr2json.py +++ b/data/cldr2json/cldr2json.py @@ -123,7 +123,7 @@ def locale_to_xkb(locale, name): if xkb: return xkb else: - raise KeyError("layout %s explicitely disabled in overrides" + raise KeyError("layout %s explicitly disabled in overrides" % locale) xkb_names = sorted(name_to_xkb.keys()) if name in xkb_names: diff --git a/data/theme/gnome-shell-sass/_drawing.scss b/data/theme/gnome-shell-sass/_drawing.scss index 4ca723bcc..54ff9d4a0 100644 --- a/data/theme/gnome-shell-sass/_drawing.scss +++ b/data/theme/gnome-shell-sass/_drawing.scss @@ -79,7 +79,7 @@ @function draw_button_hilight_color($c) { // -// calculate the right top hilight color for buttons +// calculate the right top highlight color for buttons // // $c: base color; // diff --git a/data/theme/gnome-shell-sass/widgets/_dialogs.scss b/data/theme/gnome-shell-sass/widgets/_dialogs.scss index 5ad99f87e..fc7792023 100644 --- a/data/theme/gnome-shell-sass/widgets/_dialogs.scss +++ b/data/theme/gnome-shell-sass/widgets/_dialogs.scss @@ -38,7 +38,7 @@ font-size: 18pt; font-weight: 800; - &.leightweight { + &.lightweight { font-size: 13pt; font-weight: 800; } diff --git a/data/theme/gnome-shell-sass/widgets/_notifications.scss b/data/theme/gnome-shell-sass/widgets/_notifications.scss index 7d0cda2ba..5ff46a058 100644 --- a/data/theme/gnome-shell-sass/widgets/_notifications.scss +++ b/data/theme/gnome-shell-sass/widgets/_notifications.scss @@ -1,4 +1,4 @@ -/* Notifications & Mesage Tray */ +/* Notifications & Message Tray */ $notification_banner_height: 64px; $notification_banner_width: 34em; diff --git a/data/theme/gnome-shell-sass/widgets/_slider.scss b/data/theme/gnome-shell-sass/widgets/_slider.scss index c0fdbb08e..f21d62e68 100644 --- a/data/theme/gnome-shell-sass/widgets/_slider.scss +++ b/data/theme/gnome-shell-sass/widgets/_slider.scss @@ -16,7 +16,7 @@ $slider_size: 15px; -barlevel-overdrive-color: $destructive_color; -barlevel-overdrive-border-color: if($variant == 'light', darken($destructive_color, 4%), lighten($destructive_color, 2%)); //trough border when red; -barlevel-overdrive-separator-width:1px; - // slider hander + // slider handler -slider-handle-radius: $slider_size * 0.5; // half the size of the size -slider-handle-border-width: 1px; -slider-handle-border-color: if($variant == 'light', $borders_color, $fg_color); diff --git a/js/ui/altTab.js b/js/ui/altTab.js index d637e2fbf..3937469b7 100644 --- a/js/ui/altTab.js +++ b/js/ui/altTab.js @@ -716,7 +716,7 @@ class AppSwitcher extends SwitcherPopup.SwitcherList { let iconSpacing = labelNaturalHeight + iconPadding + iconBorder; let totalSpacing = this._list.spacing * (this._items.length - 1); - // We just assume the whole screen here due to weirdness happing with the passed width + // We just assume the whole screen here due to weirdness happening with the passed width let primary = Main.layoutManager.primaryMonitor; let parentPadding = this.get_parent().get_theme_node().get_horizontal_padding(); let availWidth = primary.width - parentPadding - this.get_theme_node().get_horizontal_padding(); diff --git a/js/ui/components/telepathyClient.js b/js/ui/components/telepathyClient.js index 2e0669ac6..b51bedc4c 100644 --- a/js/ui/components/telepathyClient.js +++ b/js/ui/components/telepathyClient.js @@ -171,7 +171,7 @@ class TelepathyClient extends Tp.BaseClient { this.add_approver_filter(filter); this.add_handler_filter(filter); - // Allow other clients (such as Empathy) to pre-empt our channels if + // Allow other clients (such as Empathy) to preempt our channels if // needed this.set_delegated_channels_callback( this._delegatedChannelsCb.bind(this)); diff --git a/js/ui/dialog.js b/js/ui/dialog.js index e7d462f45..bb54ac029 100644 --- a/js/ui/dialog.js +++ b/js/ui/dialog.js @@ -220,7 +220,7 @@ var MessageDialogContent = GObject.registerClass({ this._updateTitleStyleLater = Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => { this._updateTitleStyleLater = 0; - this._title.add_style_class_name('leightweight'); + this._title.add_style_class_name('lightweight'); return GLib.SOURCE_REMOVE; }); } @@ -233,7 +233,7 @@ var MessageDialogContent = GObject.registerClass({ _setLabel(this._title, title); - this._title.remove_style_class_name('leightweight'); + this._title.remove_style_class_name('lightweight'); this._updateTitleStyle(); this.notify('title'); diff --git a/js/ui/overviewControls.js b/js/ui/overviewControls.js index 8fac5fc3d..b5e89bb16 100644 --- a/js/ui/overviewControls.js +++ b/js/ui/overviewControls.js @@ -233,7 +233,7 @@ class SlidingControl extends St.Widget { // When pageEmpty is received, there's no visible view in the // selector; this means we can now safely set the full slide for // the next page, since slideIn or slideOut might have been called, - // changing the visiblity + // changing the visibility this.remove_transition('@layout.slide-x'); this.layout.slide_x = this._getSlide(); this._updateTranslation(); diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js index 6d15261fd..a618f8fb4 100644 --- a/js/ui/popupMenu.js +++ b/js/ui/popupMenu.js @@ -208,7 +208,7 @@ var PopupBaseMenuItem = GObject.registerClass({ // Remove the CSS active state if the user press the button and // while holding moves to another menu item, so we don't paint all items. // The correct behaviour would be to set the new item with the CSS - // active state as well, but button-press-event is not trigered, + // active state as well, but button-press-event is not triggered, // so we should track it in our own, which would involve some work // in the container this.remove_style_pseudo_class('active'); diff --git a/src/gnome-shell-perf-tool.in b/src/gnome-shell-perf-tool.in index 658cafc1d..a1b5d5994 100755 --- a/src/gnome-shell-perf-tool.in +++ b/src/gnome-shell-perf-tool.in @@ -60,7 +60,7 @@ def run_shell(perf_output=None): # we do no additional supervision of gnome-shell, # beyond that of wait # in particular, we don't kill the shell upon - # receving a KeyboardInterrupt, as we expect to be + # receiving a KeyboardInterrupt, as we expect to be # in the same process group shell = start_shell(perf_output=perf_output) shell.wait() diff --git a/src/gnome-shell-plugin.c b/src/gnome-shell-plugin.c index 2e491646c..41641948b 100644 --- a/src/gnome-shell-plugin.c +++ b/src/gnome-shell-plugin.c @@ -27,7 +27,7 @@ * meta_plugin_manager_set_plugin_type(), Mutter will call the vfuncs of the * plugin at the appropriate time. * - * The funcions in in GnomeShellPlugin are all just stubs, which just call the + * The functions in in GnomeShellPlugin are all just stubs, which just call the * similar methods in GnomeShellWm. */ diff --git a/src/shell-action-modes.h b/src/shell-action-modes.h index a6f4718b1..edbdd16c6 100644 --- a/src/shell-action-modes.h +++ b/src/shell-action-modes.h @@ -11,7 +11,7 @@ * dialog * @SHELL_ACTION_MODE_LOGIN_SCREEN: allow action in the login screen * @SHELL_ACTION_MODE_SYSTEM_MODAL: allow action when a system modal - * dialog (e.g. authentification or session dialogs) is open + * dialog (e.g. authentication or session dialogs) is open * @SHELL_ACTION_MODE_LOOKING_GLASS: allow action in looking glass * @SHELL_ACTION_MODE_POPUP: allow action while a shell menu is open * @SHELL_ACTION_MODE_ALL: always allow action diff --git a/src/shell-app.c b/src/shell-app.c index 044f28030..6cf4cbaf6 100644 --- a/src/shell-app.c +++ b/src/shell-app.c @@ -283,7 +283,7 @@ shell_app_get_description (ShellApp *app) * shell_app_is_window_backed: * * A window backed application is one which represents just an open - * window, i.e. there's no .desktop file assocation, so we don't know + * window, i.e. there's no .desktop file association, so we don't know * how to launch it again. */ gboolean diff --git a/src/shell-blur-effect.c b/src/shell-blur-effect.c index 5e50ab886..1bdb4caa1 100644 --- a/src/shell-blur-effect.c +++ b/src/shell-blur-effect.c @@ -27,7 +27,7 @@ * @short_description: Blur effect for actors * * #ShellBlurEffect is a moderately fast gaussian blur implementation. It also has - * an optional brighness property. + * an optional brightness property. * * # Modes * diff --git a/src/shell-embedded-window.c b/src/shell-embedded-window.c index 3719577d1..31e350657 100644 --- a/src/shell-embedded-window.c +++ b/src/shell-embedded-window.c @@ -126,7 +126,7 @@ shell_embedded_window_constructor (GType gtype, object = parent_class->constructor (gtype, n_properties, properties); /* Setting the resize mode to immediate means that calling queue_resize() - * on a widget within the window will immmediately call check_resize() + * on a widget within the window will immediately call check_resize() * to be called, instead of having it queued to an idle. From our perspective, * this is ideal since we just are going to queue a resize to Clutter's * idle resize anyways. diff --git a/src/shell-global.c b/src/shell-global.c index 416651905..38b714806 100644 --- a/src/shell-global.c +++ b/src/shell-global.c @@ -1078,11 +1078,11 @@ _shell_global_get_gjs_context (ShellGlobal *global) * overview mode or the "looking glass" debug overlay, that block * application and normal key shortcuts. * - * Returns: %TRUE if we succesfully entered the mode. %FALSE if we couldn't + * Returns: %TRUE if we successfully entered the mode. %FALSE if we couldn't * enter the mode. Failure may occur because an application has the pointer * or keyboard grabbed, because Mutter is in a mode itself like moving a * window or alt-Tab window selection, or because shell_global_begin_modal() - * was previouly called. + * was previously called. */ gboolean shell_global_begin_modal (ShellGlobal *global, diff --git a/src/shell-glsl-effect.c b/src/shell-glsl-effect.c index 8f4bd2aaf..1f62380fc 100644 --- a/src/shell-glsl-effect.c +++ b/src/shell-glsl-effect.c @@ -101,7 +101,7 @@ shell_glsl_effect_paint_target (ClutterOffscreenEffect *effect, * @hook: where to insert the code * @declarations: GLSL declarations * @code: GLSL code - * @is_replace: wheter Cogl code should be replaced by the custom shader + * @is_replace: whether Cogl code should be replaced by the custom shader * * Adds a GLSL snippet to the pipeline used for drawing the effect texture. * See #CoglSnippet for details. diff --git a/src/shell-mount-operation.c b/src/shell-mount-operation.c index 4579aaf90..8d4336866 100644 --- a/src/shell-mount-operation.c +++ b/src/shell-mount-operation.c @@ -24,7 +24,7 @@ /* This is a dummy class; we would like to be able to subclass the * object from JS but we can't yet; the default GMountOperation impl * automatically calls g_mount_operation_reply(UNHANDLED) after an idle, - * in interactive methods. We want to handle the reply outselves + * in interactive methods. We want to handle the reply ourselves * instead, so we just override the default methods with empty ones, * except for ask-password, as we don't want to handle that. * diff --git a/src/shell-perf-log.c b/src/shell-perf-log.c index e6fbb3615..e108a268a 100644 --- a/src/shell-perf-log.c +++ b/src/shell-perf-log.c @@ -805,7 +805,7 @@ write_string (GOutputStream *out, * with each element being a dictionary of the form: * * { name: , - * description: start_document = start_document; sac_handler->end_document = end_document; @@ -667,7 +667,7 @@ property (CRDocHandler * a_this, g_return_if_fail (str); } - /*instanciates a new declaration */ + /*instantiates a new declaration */ decl = cr_declaration_new (ctxt->cur_stmt, str, a_expression); g_return_if_fail (decl); str = NULL; @@ -846,7 +846,7 @@ cr_om_parser_new (CRInput * a_input) * *Parses the content of an in memory buffer. * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_om_parser_parse_buf (CROMParser * a_this, @@ -895,7 +895,7 @@ cr_om_parser_parse_buf (CROMParser * a_this, * *The simpler way to parse an in memory css2 buffer. * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_om_parser_simply_parse_buf (const guchar * a_buf, @@ -928,7 +928,7 @@ cr_om_parser_simply_parse_buf (const guchar * a_buf, * cr_om_parser_parse_file: *@a_this: the current instance of the cssom parser. *@a_file_uri: the uri of the file. - *(only local file paths are suppported so far) + *(only local file paths are supported so far) *@a_enc: the encoding of the file. *@a_result: out parameter. A pointer *the build css object model. @@ -936,7 +936,7 @@ cr_om_parser_simply_parse_buf (const guchar * a_buf, *Parses a css2 stylesheet contained *in a file. * - * Returns CR_OK upon succesful completion, an error code otherwise. + * Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_om_parser_parse_file (CROMParser * a_this, @@ -984,7 +984,7 @@ cr_om_parser_parse_file (CROMParser * a_this, * *The simpler method to parse a css2 file. * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. *Note that this method uses cr_om_parser_parse_file() so both methods *have the same return values. */ diff --git a/src/st/croco/cr-parser.c b/src/st/croco/cr-parser.c index 8304b7561..d4f40cf1d 100644 --- a/src/st/croco/cr-parser.c +++ b/src/st/croco/cr-parser.c @@ -45,7 +45,7 @@ *that css UA must comply with two syntaxes. * *1/the specific syntax that defines the css language - *for a given level of specificatin (e.g css2 syntax + *for a given level of specification (e.g css2 syntax *defined in appendix D.1 of the css2 spec) * *2/the core (general) syntax that is there to allow @@ -171,7 +171,7 @@ if ((status) != CR_OK) \ *@a_is_exception: in case of error, if is TRUE, the status *is set to CR_PARSING_ERROR before goto error. If is false, the *real low level status is kept and will be returned by the - *upper level function that called this macro. Usally,this must + *upper level function that called this macro. Usually,this must *be set to FALSE. * *same as CHECK_PARSING_STATUS() but this one pushes an error @@ -207,7 +207,7 @@ CHECK_PARSING_STATUS (status, TRUE) \ *Reads the next char from the input stream of the current parser. *In case of error, jumps to the "error:" label located in the *function where this macro is called. - *@param a_this the curent instance of #CRParser + *@param a_this the current instance of #CRParser *@param to_char a pointer to the guint32 char where to store *the character read. */ @@ -514,7 +514,7 @@ cr_parser_error_destroy (CRParserError * a_this) *@param a_this the current instance of #CRParser. *@param a_msg the error message. *@param a_status the error status. - *@return CR_OK upon successfull completion, an error code otherwise. + *@return CR_OK upon successful completion, an error code otherwise. */ static enum CRStatus cr_parser_push_error (CRParser * a_this, @@ -560,7 +560,7 @@ cr_parser_push_error (CRParser * a_this, *@param a_this the current instance of #CRParser. *@param a_clear_errs whether to clear the error stack *after the dump or not. - *@return CR_OK upon successfull completion, an error code + *@return CR_OK upon successful completion, an error code *otherwise. */ static enum CRStatus @@ -618,7 +618,7 @@ cr_parser_clear_errors (CRParser * a_this) *Same as cr_parser_try_to_skip_spaces() but this one skips *spaces and comments. * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_parser_try_to_skip_spaces_and_comments (CRParser * a_this) @@ -755,7 +755,7 @@ cr_parser_parse_stylesheet_core (CRParser * a_this) *in chapter 4.1 in the css2 spec. *at-rule : ATKEYWORD S* any* [ block | ';' S* ]; *@param a_this the current instance of #CRParser. - *@return CR_OK upon successfull completion, an error code + *@return CR_OK upon successful completion, an error code *otherwise. */ static enum CRStatus @@ -831,7 +831,7 @@ cr_parser_parse_atrule_core (CRParser * a_this) *4.1 of the css2 spec. *ruleset ::= selector? '{' S* declaration? [ ';' S* declaration? ]* '}' S*; *@param a_this the current instance of #CRParser. - *@return CR_OK upon successfull completion, an error code otherwise. + *@return CR_OK upon successful completion, an error code otherwise. */ static enum CRStatus cr_parser_parse_ruleset_core (CRParser * a_this) @@ -919,7 +919,7 @@ cr_parser_parse_ruleset_core (CRParser * a_this) *grammar. *selector : any+; *@param a_this the current instance of #CRParser. - *@return CR_OK upon successfull completion, an error code + *@return CR_OK upon successful completion, an error code *otherwise. */ static enum CRStatus @@ -1089,7 +1089,7 @@ cr_parser_parse_declaration_core (CRParser * a_this) *in chapter 4.1. *value ::= [ any | block | ATKEYWORD S* ]+; *@param a_this the current instance of #CRParser. - *@return CR_OK upon successfull completion, an error code otherwise. + *@return CR_OK upon successful completion, an error code otherwise. */ static enum CRStatus cr_parser_parse_value_core (CRParser * a_this) @@ -1171,7 +1171,7 @@ cr_parser_parse_value_core (CRParser * a_this) * *@param a_this the current instance of #CRParser. *@param n_calls used to limit recursion depth - *@return CR_OK upon successfull completion, an error code otherwise. + *@return CR_OK upon successful completion, an error code otherwise. */ static enum CRStatus cr_parser_parse_any_core (CRParser * a_this, @@ -1332,7 +1332,7 @@ cr_parser_parse_any_core (CRParser * a_this, *@param a_this the "this pointer" of the current instance of *#CRParser . *@param a_sel out parameter. The successfully parsed attribute selector. - *@return CR_OK upon successfull completion, an error code otherwise. + *@return CR_OK upon successful completion, an error code otherwise. */ static enum CRStatus cr_parser_parse_attribute_selector (CRParser * a_this, @@ -1471,7 +1471,7 @@ cr_parser_parse_attribute_selector (CRParser * a_this, *new instance of GString and set it content to the parsed property. *If not, the property is just appended to a_property's previous content. *In both cases, it is up to the caller to free a_property. - *@return CR_OK upon successfull completion, CR_PARSING_ERROR if the + *@return CR_OK upon successful completion, CR_PARSING_ERROR if the *next construction was not a "property", or an error code. */ static enum CRStatus @@ -1514,7 +1514,7 @@ cr_parser_parse_property (CRParser * a_this, * *TODO: handle parsing of 'RGB' * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_parser_parse_term (CRParser * a_this, CRTerm ** a_term) @@ -1669,7 +1669,7 @@ cr_parser_parse_term (CRParser * a_this, CRTerm ** a_term) *and where pseudo is: *pseudo ::= ':' [ IDENT | FUNCTION S* IDENT S* ')' ] * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ static enum CRStatus cr_parser_parse_simple_selector (CRParser * a_this, CRSimpleSel ** a_sel) @@ -1928,7 +1928,7 @@ cr_parser_parse_simple_selector (CRParser * a_this, CRSimpleSel ** a_sel) * cr_parser_parse_simple_sels: *@a_this: the this pointer of the current instance of #CRParser. *@a_start: a pointer to the - *first chararcter of the successfully parsed + *first character of the successfully parsed *string. *@a_end: a pointer to the last character of the successfully parsed *string. @@ -1936,7 +1936,7 @@ cr_parser_parse_simple_selector (CRParser * a_this, CRSimpleSel ** a_sel) *Parses a "selector" as defined by the css2 spec in appendix D.1: *selector ::= simple_selector [ combinator simple_selector ]* * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ static enum CRStatus cr_parser_parse_simple_sels (CRParser * a_this, @@ -2134,7 +2134,7 @@ cr_parser_parse_selector (CRParser * a_this, *function ::= FUNCTION S* expr ')' S* *FUNCTION ::= ident'(' * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ static enum CRStatus cr_parser_parse_function (CRParser * a_this, @@ -2220,7 +2220,7 @@ cr_parser_parse_function (CRParser * a_this, * URI ::= url\({w}{string}{w}\) * |url\({w}([!#$%&*-~]|{nonascii}|{escape})*{w}\) * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ static enum CRStatus cr_parser_parse_uri (CRParser * a_this, CRString ** a_str) @@ -2239,10 +2239,10 @@ cr_parser_parse_uri (CRParser * a_this, CRString ** a_str) /** * cr_parser_parse_string: *@a_this: the current instance of #CRParser. - *@a_start: out parameter. Upon successfull completion, + *@a_start: out parameter. Upon successful completion, *points to the beginning of the string, points to an undefined value *otherwise. - *@a_end: out parameter. Upon successfull completion, points to + *@a_end: out parameter. Upon successful completion, points to *the beginning of the string, points to an undefined value otherwise. * *Parses a string type as defined in css spec [4.1.1]: @@ -2251,7 +2251,7 @@ cr_parser_parse_uri (CRParser * a_this, CRString ** a_str) *string1 ::= \"([\t !#$%&(-~]|\\{nl}|\'|{nonascii}|{escape})*\" *string2 ::= \'([\t !#$%&(-~]|\\{nl}|\"|{nonascii}|{escape})*\' * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ static enum CRStatus cr_parser_parse_string (CRParser * a_this, CRString ** a_str) @@ -2278,7 +2278,7 @@ cr_parser_parse_string (CRParser * a_this, CRString ** a_str) *the function just appends the parsed string to the one passed. *In both cases it is up to the caller to free *a_str. * - *@return CR_OK upon successfull completion, an error code + *@return CR_OK upon successful completion, an error code *otherwise. */ static enum CRStatus @@ -2311,7 +2311,7 @@ cr_parser_parse_ident (CRParser * a_this, CRString ** a_str) *@param a_end out parameter. A pointer to the first character of *the successfully parsed string. * - *@return CR_OK upon successfull completion, an error code otherwise. + *@return CR_OK upon successful completion, an error code otherwise. */ static enum CRStatus cr_parser_parse_stylesheet (CRParser * a_this) @@ -2789,7 +2789,7 @@ cr_parser_new (CRTknzr * a_tknzr) *of #CRParser. If set to FALSE, it is up to the caller to *eventually free it. * - *Instanciates a new parser from a memory buffer. + *Instantiates a new parser from a memory buffer. * *Returns the newly built parser, or NULL if an error arises. */ @@ -2870,7 +2870,7 @@ cr_parser_new_from_file (const guchar * a_file_uri, enum CREncoding a_enc) * *Sets a SAC document handler to the parser. * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_parser_set_sac_handler (CRParser * a_this, CRDocHandler * a_handler) @@ -2895,7 +2895,7 @@ cr_parser_set_sac_handler (CRParser * a_this, CRDocHandler * a_handler) * *Gets the SAC document handler. * - *Returns CR_OK upon successfull completion, an error code + *Returns CR_OK upon successful completion, an error code *otherwise. */ enum CRStatus @@ -2915,7 +2915,7 @@ cr_parser_get_sac_handler (CRParser * a_this, CRDocHandler ** a_handler) *Sets the SAC handler associated to the current instance *of #CRParser to the default SAC handler. * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_parser_set_default_sac_handler (CRParser * a_this) @@ -2944,7 +2944,7 @@ cr_parser_set_default_sac_handler (CRParser * a_this) * @a_this: the current instance of #CRParser. * @a_use_core_grammar: where to parse against the css core grammar. * - * Returns CR_OK upon succesful completion, an error code otherwise. + * Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_parser_set_use_core_grammar (CRParser * a_this, @@ -2960,9 +2960,9 @@ cr_parser_set_use_core_grammar (CRParser * a_this, /** * cr_parser_get_use_core_grammar: * @a_this: the current instance of #CRParser. - * @a_use_core_grammar: wether to use the core grammar or not. + * @a_use_core_grammar: whether to use the core grammar or not. * - * Returns CR_OK upon succesful completion, an error code otherwise. + * Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_parser_get_use_core_grammar (CRParser const * a_this, @@ -2984,7 +2984,7 @@ cr_parser_get_use_core_grammar (CRParser const * a_this, * *Parses a the given in parameter. * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_parser_parse_file (CRParser * a_this, @@ -3176,7 +3176,7 @@ cr_parser_parse_prio (CRParser * a_this, CRString ** a_prio) *Parses a "declaration" as defined by the css2 spec in appendix D.1: *declaration ::= [property ':' S* expr prio?]? * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_parser_parse_declaration (CRParser * a_this, @@ -3270,7 +3270,7 @@ cr_parser_parse_declaration (CRParser * a_this, *chapter 4.1 of the css2 spec. *statement : ruleset | at-rule; * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_parser_parse_statement_core (CRParser * a_this) @@ -3334,7 +3334,7 @@ cr_parser_parse_statement_core (CRParser * a_this) *See the documentation of #CRDocHandler (the SAC handler) to know *when which SAC handler is called. * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_parser_parse_ruleset (CRParser * a_this) @@ -3550,7 +3550,7 @@ cr_parser_parse_ruleset (CRParser * a_this) *import ::= *\@import [STRING|URI] S* [ medium [ ',' S* medium]* ]? ';' S* * - *Returns CR_OK upon sucessfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_parser_parse_import (CRParser * a_this, @@ -3670,7 +3670,7 @@ cr_parser_parse_import (CRParser * a_this, *will corrupt the memory and lead to hard to debug *random crashes. *This is where C++ and its compile time - *type checking mecanism (through STL containers) would + *type checking mechanism (through STL containers) would *have prevented us to go through this hassle. */ for (cur = *a_media_list; cur; cur = cur->next) { @@ -3711,7 +3711,7 @@ cr_parser_parse_import (CRParser * a_this, *to notify media productions. See #CRDocHandler to know the callback called *during \@media parsing. * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_parser_parse_media (CRParser * a_this) @@ -3881,7 +3881,7 @@ cr_parser_parse_media (CRParser * a_this) *encounters a construction that must *be reported to the calling application. * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_parser_parse_page (CRParser * a_this) @@ -4128,11 +4128,11 @@ cr_parser_parse_page (CRParser * a_this) *set to NULL. *@a_charset_sym_location: the parsing location of the charset rule * - *Parses a charset declaration as defined implictly by the css2 spec in + *Parses a charset declaration as defined implicitly by the css2 spec in *appendix D.1: *charset ::= CHARSET_SYM S* STRING S* ';' * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_parser_parse_charset (CRParser * a_this, CRString ** a_value, @@ -4223,7 +4223,7 @@ cr_parser_parse_charset (CRParser * a_this, CRString ** a_value, * *This function will call SAC handlers whenever it is necessary. * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_parser_parse_font_face (CRParser * a_this) @@ -4380,7 +4380,7 @@ cr_parser_parse_font_face (CRParser * a_this) *input previously associated to the current instance of *#CRParser. * - *Returns CR_OK upon succesful completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_parser_parse (CRParser * a_this) @@ -4430,7 +4430,7 @@ cr_parser_set_tknzr (CRParser * a_this, CRTknzr * a_tknzr) * *Getter of the parser's underlying tokenizer * - *Returns CR_OK upon succesful completion, an error code + *Returns CR_OK upon successful completion, an error code *otherwise */ enum CRStatus @@ -4450,7 +4450,7 @@ cr_parser_get_tknzr (CRParser * a_this, CRTknzr ** a_tknzr) * *Gets the current parsing location. * - *Returns CR_OK upon succesful completion, an error code + *Returns CR_OK upon successful completion, an error code *otherwise. */ enum CRStatus diff --git a/src/st/croco/cr-parsing-location.c b/src/st/croco/cr-parsing-location.c index 4fe4acc30..0aa0a45b3 100644 --- a/src/st/croco/cr-parsing-location.c +++ b/src/st/croco/cr-parsing-location.c @@ -33,9 +33,9 @@ /** * cr_parsing_location_new: - *Instanciates a new parsing location. + *Instantiates a new parsing location. * - *Returns the newly instanciated #CRParsingLocation. + *Returns the newly instantiated #CRParsingLocation. *Must be freed by cr_parsing_location_destroy() */ CRParsingLocation * @@ -58,7 +58,7 @@ cr_parsing_location_new (void) * *Initializes the an instance of #CRparsingLocation. * - *Returns CR_OK upon succesful completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_parsing_location_init (CRParsingLocation *a_this) @@ -77,7 +77,7 @@ cr_parsing_location_init (CRParsingLocation *a_this) * *Copies an instance of CRParsingLocation into another one. * - *Returns CR_OK upon succesful completion, an error code + *Returns CR_OK upon successful completion, an error code *otherwise. */ enum CRStatus diff --git a/src/st/croco/cr-prop-list.c b/src/st/croco/cr-prop-list.c index 70a04f337..03c447822 100644 --- a/src/st/croco/cr-prop-list.c +++ b/src/st/croco/cr-prop-list.c @@ -156,7 +156,7 @@ cr_prop_list_prepend (CRPropList * a_this, CRPropList * a_to_prepend) *@a_prop_name: property name to append *@a_decl: the property value to append. * - *Prepends a propertie to a list of properties + *Prepends a property to a list of properties * *Returns the new property list. */ diff --git a/src/st/croco/cr-simple-sel.c b/src/st/croco/cr-simple-sel.c index ac906858d..7d7c42230 100644 --- a/src/st/croco/cr-simple-sel.c +++ b/src/st/croco/cr-simple-sel.c @@ -55,7 +55,7 @@ cr_simple_sel_new (void) *@a_this: the this pointer of the current instance of #CRSimpleSel. *@a_sel: the simple selector to append. * - *Returns: the new list upon successfull completion, an error code otherwise. + *Returns: the new list upon successful completion, an error code otherwise. */ CRSimpleSel * cr_simple_sel_append_simple_sel (CRSimpleSel * a_this, CRSimpleSel * a_sel) @@ -83,7 +83,7 @@ cr_simple_sel_append_simple_sel (CRSimpleSel * a_this, CRSimpleSel * a_sel) * *Prepends a simple selector to the current list of simple selectors. * - *Returns the new list upon successfull completion, an error code otherwise. + *Returns the new list upon successful completion, an error code otherwise. */ CRSimpleSel * cr_simple_sel_prepend_simple_sel (CRSimpleSel * a_this, CRSimpleSel * a_sel) @@ -210,7 +210,7 @@ cr_simple_sel_one_to_string (CRSimpleSel const * a_this) *Dumps the selector to a file. *TODO: add the support of unicode in the dump. * - *Returns CR_OK upon successfull completion, an error code + *Returns CR_OK upon successful completion, an error code *otherwise. */ enum CRStatus @@ -240,7 +240,7 @@ cr_simple_sel_dump (CRSimpleSel const * a_this, FILE * a_fp) *Computes the selector (combinator separated list of simple selectors) *as defined in the css2 spec in chapter 6.4.3 * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_simple_sel_compute_specificity (CRSimpleSel * a_this) diff --git a/src/st/croco/cr-simple-sel.h b/src/st/croco/cr-simple-sel.h index d8edc0025..72b15fd1f 100644 --- a/src/st/croco/cr-simple-sel.h +++ b/src/st/croco/cr-simple-sel.h @@ -68,7 +68,7 @@ typedef struct _CRSimpleSel CRSimpleSel ; *then been called 'universal selector') * *2/An additional selector that "specializes" the preceding type or - *universal selector. The additionnal selector can be either + *universal selector. The additional selector can be either *an id selector, or a class selector, or an attribute selector. */ struct _CRSimpleSel diff --git a/src/st/croco/cr-statement.c b/src/st/croco/cr-statement.c index 241fa5f3b..376617c60 100644 --- a/src/st/croco/cr-statement.c +++ b/src/st/croco/cr-statement.c @@ -1037,7 +1037,7 @@ cr_statement_parse_from_buf (const guchar * a_buf, enum CREncoding a_encoding) *@a_buf: the buffer to parse. *@a_enc: the character encoding of a_buf. * - *Parses a buffer that contains a ruleset statement an instanciates + *Parses a buffer that contains a ruleset statement an instantiates *a #CRStatement of type RULESET_STMT. * *Returns the newly built instance of #CRStatement in case of successful parsing, @@ -1254,7 +1254,7 @@ cr_statement_at_media_rule_parse_from_buf (const guchar * a_buf, *in the \@media rule. *@a_media: the media string list. A list of GString pointers. * - *Instanciates an instance of #CRStatement of type + *Instantiates an instance of #CRStatement of type *AT_MEDIA_RULE_STMT (\@media ruleset). * */ @@ -1362,7 +1362,7 @@ cr_statement_new_at_import_rule (CRStyleSheet * a_container_sheet, *@a_encoding: the encoding of a_buf. * *Parses a buffer that contains an "\@import" rule and - *instanciate a #CRStatement of type AT_IMPORT_RULE_STMT + *instantiate a #CRStatement of type AT_IMPORT_RULE_STMT * *Returns the newly built instance of #CRStatement in case of *a successful parsing, NULL otherwise. @@ -2116,7 +2116,7 @@ cr_statement_ruleset_append_decl2 (CRStatement * a_this, *@a_this: the current statement. *@a_declaration: the declaration to append. * - *Returns CR_OK upon sucessful completion, an error code + *Returns CR_OK upon successful completion, an error code *otherwise. */ enum CRStatus @@ -2170,7 +2170,7 @@ cr_statement_at_import_rule_set_imported_sheet (CRStatement * a_this, *only if the function returns CR_OK. * *Gets the stylesheet contained by the \@import rule statement. - *Returns CR_OK upon sucessful completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_statement_at_import_rule_get_imported_sheet (CRStatement * a_this, diff --git a/src/st/croco/cr-statement.h b/src/st/croco/cr-statement.h index 74a233055..c5bec977f 100644 --- a/src/st/croco/cr-statement.h +++ b/src/st/croco/cr-statement.h @@ -129,7 +129,7 @@ struct _CRAtCharsetRule CRString * charset ; }; -/**The abstaction of the \@font-face rule.*/ +/**The abstraction of the \@font-face rule.*/ typedef struct _CRAtFontFaceRule CRAtFontFaceRule ; struct _CRAtFontFaceRule { diff --git a/src/st/croco/cr-string.c b/src/st/croco/cr-string.c index 1b10bb2ab..6a1667627 100644 --- a/src/st/croco/cr-string.c +++ b/src/st/croco/cr-string.c @@ -25,8 +25,8 @@ #include "cr-string.h" /** - *Instanciates a #CRString - *@return the newly instanciated #CRString + *Instantiates a #CRString + *@return the newly instantiated #CRString *Must be freed with cr_string_destroy(). */ CRString * @@ -45,10 +45,10 @@ cr_string_new (void) } /** - *Instanciate a string and initialise it to + *Instantiate a string and initialise it to *a_string. *@param a_string the initial string - *@return the newly instanciated string. + *@return the newly instantiated string. */ CRString * cr_string_new_from_string (const gchar * a_string) @@ -66,10 +66,10 @@ cr_string_new_from_string (const gchar * a_string) } /** - *Instanciates a #CRString from an instance of GString. + *Instantiates a #CRString from an instance of GString. *@param a_string the input string that will be copied into - *the newly instanciated #CRString - *@return the newly instanciated #CRString. + *the newly instantiated #CRString + *@return the newly instantiated #CRString. */ CRString * cr_string_new_from_gstring (GString const *a_string) diff --git a/src/st/croco/cr-stylesheet.h b/src/st/croco/cr-stylesheet.h index f35c94e37..2d6b4fa0f 100644 --- a/src/st/croco/cr-stylesheet.h +++ b/src/st/croco/cr-stylesheet.h @@ -74,7 +74,7 @@ struct _CRStyleSheet gpointer app_data ; /** - *the reference count of this insance + *the reference count of this instance *Please, don't never ever modify it *directly. Use cr_stylesheet_ref() *and cr_stylesheet_unref() instead. diff --git a/src/st/croco/cr-term.c b/src/st/croco/cr-term.c index 766ad8282..423524193 100644 --- a/src/st/croco/cr-term.c +++ b/src/st/croco/cr-term.c @@ -77,7 +77,7 @@ cr_term_clear (CRTerm * a_this) } /** - *Instanciate a #CRTerm. + *Instantiate a #CRTerm. *@return the newly build instance *of #CRTerm. */ @@ -96,7 +96,7 @@ cr_term_new (void) } /** - *Parses an expresion as defined by the css2 spec + *Parses an expression as defined by the css2 spec *and builds the expression as a list of terms. *@param a_buf the buffer to parse. *@return a pointer to the first term of the expression or diff --git a/src/st/croco/cr-tknzr.c b/src/st/croco/cr-tknzr.c index 1548c35c6..54f18f270 100644 --- a/src/st/croco/cr-tknzr.c +++ b/src/st/croco/cr-tknzr.c @@ -106,7 +106,7 @@ CHECK_PARSING_STATUS (status, TRUE) \ *Reads the next char from the input stream of the current parser. *In case of error, jumps to the "error:" label located in the *function where this macro is called. - *@param parser the curent instance of #CRTknzr + *@param parser the current instance of #CRTknzr *@param to_char a pointer to the guint32 char where to store *the character read. */ @@ -250,10 +250,10 @@ static enum CRStatus cr_tknzr_parse_num (CRTknzr * a_this, * w ::= [ \t\r\n\f]* * *@param a_this the current instance of #CRTknzr. - *@param a_start out param. Upon successfull completion, points + *@param a_start out param. Upon successful completion, points *to the beginning of the parsed white space, points to NULL otherwise. *Can also point to NULL is there is no white space actually. - *@param a_end out param. Upon successfull completion, points + *@param a_end out param. Upon successful completion, points *to the end of the parsed white space, points to NULL otherwise. *Can also point to NULL is there is no white space actually. */ @@ -329,7 +329,7 @@ cr_tknzr_parse_w (CRTknzr * a_this, *parsed string. *@param a_end a pointer to the last character of the successfully parsed *string. - *@result CR_OK uppon successfull completion, an error code otherwise. + *@result CR_OK upon successful completion, an error code otherwise. */ static enum CRStatus cr_tknzr_parse_nl (CRTknzr * a_this, @@ -387,7 +387,7 @@ cr_tknzr_parse_nl (CRTknzr * a_this, *In any cases, it stops when it encounters a non white space character. * *@param a_this the current instance of #CRTknzr. - *@return CR_OK upon successfull completion, an error code otherwise. + *@return CR_OK upon successful completion, an error code otherwise. */ static enum CRStatus cr_tknzr_try_to_skip_spaces (CRTknzr * a_this) @@ -519,7 +519,7 @@ cr_tknzr_parse_comment (CRTknzr * a_this, *the caller. *@param a_end out parameter. A pointer to the last character *of the unicode escape sequence. Must *NOT* be deleted by the caller. - *@return CR_OK if parsing succeded, an error code otherwise. + *@return CR_OK if parsing succeeded, an error code otherwise. *Error code can be either CR_PARSING_ERROR if the string *parsed just doesn't *respect the production or another error if a @@ -658,12 +658,12 @@ cr_tknzr_parse_escape (CRTknzr * a_this, guint32 * a_esc_code, *string2 ::= \'([\t !#$%&(-~]|\\{nl}|\"|{nonascii}|{escape})*\' * *@param a_this the current instance of #CRTknzr. - *@param a_start out parameter. Upon successfull completion, + *@param a_start out parameter. Upon successful completion, *points to the beginning of the string, points to an undefined value *otherwise. - *@param a_end out parameter. Upon successfull completion, points to + *@param a_end out parameter. Upon successful completion, points to *the beginning of the string, points to an undefined value otherwise. - *@return CR_OK upon successfull completion, an error code otherwise. + *@return CR_OK upon successful completion, an error code otherwise. */ static enum CRStatus cr_tknzr_parse_string (CRTknzr * a_this, CRString ** a_str) @@ -788,7 +788,7 @@ cr_tknzr_parse_string (CRTknzr * a_this, CRString ** a_str) *@param a_end out param. A pointer to the ending point of the *token. *@param a_char out param. The actual parsed nmchar. - *@return CR_OK upon successfull completion, + *@return CR_OK upon successful completion, *an error code otherwise. */ static enum CRStatus @@ -855,7 +855,7 @@ cr_tknzr_parse_nmstart (CRTknzr * a_this, *@param a_end out param. A pointer to the ending point of the *token. *@param a_char out param. The actual parsed nmchar. - *@return CR_OK upon successfull completion, + *@return CR_OK upon successful completion, *an error code otherwise. */ static enum CRStatus @@ -922,7 +922,7 @@ cr_tknzr_parse_nmchar (CRTknzr * a_this, guint32 * a_char, *the function just appends the parsed string to the one passed. *In both cases it is up to the caller to free *a_str. * - *@return CR_OK upon successfull completion, an error code + *@return CR_OK upon successful completion, an error code *otherwise. */ static enum CRStatus @@ -1010,7 +1010,7 @@ cr_tknzr_parse_ident (CRTknzr * a_this, CRString ** a_str) *of CRString. If not, it just appends the parsed name to the passed *a_str. *In both cases, it is up to the caller to free *a_str. * - *@return CR_OK upon successfull completion, an error code otherwise. + *@return CR_OK upon successful completion, an error code otherwise. */ static enum CRStatus cr_tknzr_parse_name (CRTknzr * a_this, @@ -1116,7 +1116,7 @@ cr_tknzr_parse_hash (CRTknzr * a_this, CRString ** a_str) * *@param a_this the current instance of #CRTknzr. *@param a_str the successfully parsed url. - *@return CR_OK upon successfull completion, an error code otherwise. + *@return CR_OK upon successful completion, an error code otherwise. */ static enum CRStatus cr_tknzr_parse_uri (CRTknzr * a_this, @@ -1238,7 +1238,7 @@ cr_tknzr_parse_uri (CRTknzr * a_this, * *@param a_this the "this pointer" of the current instance of *@param a_rgb out parameter the parsed rgb. - *@return CR_OK upon successfull completion, an error code otherwise. + *@return CR_OK upon successful completion, an error code otherwise. */ static enum CRStatus cr_tknzr_parse_rgb (CRTknzr * a_this, CRRgb ** a_rgb) @@ -1378,7 +1378,7 @@ cr_tknzr_parse_rgb (CRTknzr * a_this, CRRgb ** a_rgb) *the parsed atkeyword to the end of *a_str. In both cases it is up to *the caller to free *a_str. * - *@return CR_OK upon successfull completion, an error code otherwise. + *@return CR_OK upon successful completion, an error code otherwise. */ static enum CRStatus cr_tknzr_parse_atkeyword (CRTknzr * a_this, @@ -1472,11 +1472,11 @@ cr_tknzr_parse_important (CRTknzr * a_this, *[0-9]+|[0-9]*\.[0-9]+ *@param a_this the current instance of #CRTknzr. *@param a_num out parameter. The parsed number. - *@return CR_OK upon successfull completion, + *@return CR_OK upon successful completion, *an error code otherwise. * *The CSS specification says that numbers may be - *preceeded by '+' or '-' to indicate the sign. + *preceded by '+' or '-' to indicate the sign. *Technically, the "num" construction as defined *by the tokenizer doesn't allow this, but we parse *it here for simplicity. @@ -1717,7 +1717,7 @@ cr_tknzr_get_input (CRTknzr * a_this, CRInput ** a_input) *#CRParser. *@param a_byte out parameter the place where to store the byte *read. - *@return CR_OK upon successfull completion, an error + *@return CR_OK upon successful completion, an error *code otherwise. */ enum CRStatus @@ -1733,7 +1733,7 @@ cr_tknzr_read_byte (CRTknzr * a_this, guchar * a_byte) *Reads the next char from the parser input stream. *@param a_this the current instance of #CRTknzr. *@param a_char out parameter. The read char. - *@return CR_OK upon successfull completion, an error code + *@return CR_OK upon successful completion, an error code *otherwise. */ enum CRStatus @@ -1758,8 +1758,8 @@ cr_tknzr_read_char (CRTknzr * a_this, guint32 * a_char) *To "peek a char" means reads the next char without consuming it. *Subsequent calls to this function return the same char. *@param a_this the current instance of #CRTknzr. - *@param a_char out parameter. The peeked char uppon successfull completion. - *@return CR_OK upon successfull completion, an error code otherwise. + *@param a_char out parameter. The peeked char upon successful completion. + *@return CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_tknzr_peek_char (CRTknzr * a_this, guint32 * a_char) @@ -1779,13 +1779,13 @@ cr_tknzr_peek_char (CRTknzr * a_this, guint32 * a_char) } /** - *Peeks a byte ahead at a given postion in the parser input stream. + *Peeks a byte ahead at a given position in the parser input stream. *@param a_this the current instance of #CRTknzr. *@param a_offset the offset of the peeked byte starting from the current *byte in the parser input stream. *@param a_byte out parameter. The peeked byte upon - *successfull completion. - *@return CR_OK upon successfull completion, an error code otherwise. + *successful completion. + *@return CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_tknzr_peek_byte (CRTknzr * a_this, gulong a_offset, guchar * a_byte) @@ -1962,7 +1962,7 @@ cr_tknzr_unget_token (CRTknzr * a_this, CRToken * a_token) *@param a_tk out parameter. The returned token. *for the sake of mem leak avoidance, *a_tk must *be NULL. - *@param CR_OK upon successfull completion, an error code + *@param CR_OK upon successful completion, an error code *otherwise. */ enum CRStatus @@ -2562,7 +2562,7 @@ cr_tknzr_get_next_token (CRTknzr * a_this, CRToken ** a_tk) status = cr_token_set_function (token, str); CHECK_PARSING_STATUS (status, TRUE); - /*ownership is transfered + /*ownership is transferred *to token by cr_token_set_function. */ if (str) { diff --git a/src/st/croco/cr-token.c b/src/st/croco/cr-token.c index e240ab8f1..91dd632b5 100644 --- a/src/st/croco/cr-token.c +++ b/src/st/croco/cr-token.c @@ -151,7 +151,7 @@ cr_token_new (void) *Sets the type of curren instance of *#CRToken to 'S_TK' (S in the css2 spec) *@param a_this the current instance of #CRToken. - *@return CR_OK upon successfull completion, an error + *@return CR_OK upon successful completion, an error *code otherwise. */ enum CRStatus @@ -170,7 +170,7 @@ cr_token_set_s (CRToken * a_this) *Sets the type of the current instance of *#CRToken to 'CDO_TK' (CDO as said by the css2 spec) *@param a_this the current instance of #CRToken. - *@return CR_OK upon successfull completion, an error + *@return CR_OK upon successful completion, an error *code otherwise. */ enum CRStatus @@ -189,7 +189,7 @@ cr_token_set_cdo (CRToken * a_this) *Sets the type of the current token to *CDC_TK (CDC as said by the css2 spec). *@param a_this the current instance of #CRToken. - *@return CR_OK upon successfull completion, an error + *@return CR_OK upon successful completion, an error *code otherwise. */ enum CRStatus @@ -208,7 +208,7 @@ cr_token_set_cdc (CRToken * a_this) *Sets the type of the current instance of *#CRToken to INCLUDES_TK (INCLUDES as said by the css2 spec). *@param a_this the current instance of #CRToken. - *@return CR_OK upon successfull completion, an error + *@return CR_OK upon successful completion, an error *code otherwise. */ enum CRStatus @@ -227,7 +227,7 @@ cr_token_set_includes (CRToken * a_this) *Sets the type of the current instance of *#CRToken to DASHMATCH_TK (DASHMATCH as said by the css2 spec). *@param a_this the current instance of #CRToken. - *@return CR_OK upon successfull completion, an error + *@return CR_OK upon successful completion, an error *code otherwise. */ enum CRStatus diff --git a/src/st/croco/cr-utils.c b/src/st/croco/cr-utils.c index 2420cec7c..5fafade2f 100644 --- a/src/st/croco/cr-utils.c +++ b/src/st/croco/cr-utils.c @@ -40,8 +40,8 @@ ****************************/ /* - *Here is the correspondance between the ucs-4 charactere codes - *and there matching utf-8 encoding pattern as dscribed by RFC 2279: + *Here is the correspondence between the ucs-4 charactere codes + *and there matching utf-8 encoding pattern as described by RFC 2279: * *UCS-4 range (hex.) UTF-8 octet sequence (binary) *------------------ ----------------------------- @@ -57,12 +57,12 @@ *Given an utf8 string buffer, calculates *the length of this string if it was encoded *in ucs4. - *@param a_in_start a pointer to the begining of + *@param a_in_start a pointer to the beginning of *the input utf8 string. *@param a_in_end a pointre to the end of the input *utf8 string (points to the last byte of the buffer) *@param a_len out parameter the calculated length. - *@return CR_OK upon succesfull completion, an error code + *@return CR_OK upon successful completion, an error code *otherwise. */ enum CRStatus @@ -181,7 +181,7 @@ cr_utils_utf8_str_len_as_ucs4 (const guchar * a_in_start, *buffer. *@param a_in_end a pointer to the end of the input buffer. *@param a_len out parameter. The computed length. - *@return CR_OK upon successfull completion, an error code otherwise. + *@return CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_utils_ucs4_str_len_as_utf8 (const guint32 * a_in_start, @@ -224,7 +224,7 @@ cr_utils_ucs4_str_len_as_utf8 (const guint32 * a_in_start, *buffer. *@param a_in_end a pointer to the end of the input buffer. *@param a_len out parameter. The computed length. - *@return CR_OK upon successfull completion, an error code otherwise. + *@return CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_utils_ucs1_str_len_as_utf8 (const guchar * a_in_start, @@ -264,7 +264,7 @@ cr_utils_ucs1_str_len_as_utf8 (const guchar * a_in_start, *If this size is actually smaller than the real needed size, the function *just converts what it can and returns a success status. After return, *this param points to the actual number of characters decoded. - *@return CR_OK upon successfull completion, an error code otherwise. + *@return CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_utils_utf8_to_ucs4 (const guchar * a_in, @@ -422,7 +422,7 @@ cr_utils_utf8_to_ucs4 (const guchar * a_in, *@param a_out output parameter. The resulting read char. *@param a_consumed the number of the bytes consumed to *decode the returned character code. - *@return CR_OK upon successfull completion, an error code otherwise. + *@return CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_utils_read_char_from_utf8_buf (const guchar * a_in, @@ -698,12 +698,12 @@ cr_utils_utf8_str_len_as_ucs1 (const guchar * a_in_start, *@param a_in the input string to convert. *@param a_in_len in/out parameter. The length of the input *string. After return, points to the actual number of bytes - *consumed. This can be usefull to debug the input stream in case + *consumed. This can be useful to debug the input stream in case *of encoding error. *@param a_out out parameter. Points to the output string. It is allocated *by this function and must be freed by the caller. *@param a_out_len out parameter. The length of the output string. - *@return CR_OK upon successfull completion, an error code otherwise. + *@return CR_OK upon successful completion, an error code otherwise. * */ enum CRStatus @@ -742,7 +742,7 @@ cr_utils_utf8_str_to_ucs4 (const guchar * a_in, *If this size is actually smaller than the real needed size, the function *just converts what it can and returns a success status. After return, *this param points to the actual number of bytes in the buffer. - *@return CR_OK upon successfull completion, an error code otherwise. + *@return CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_utils_ucs4_to_utf8 (const guint32 * a_in, @@ -834,12 +834,12 @@ cr_utils_ucs4_to_utf8 (const guint32 * a_in, *@param a_in the input string to convert. *@param a_in_len in/out parameter. The length of the input *string. After return, points to the actual number of characters - *consumed. This can be usefull to debug the input string in case + *consumed. This can be useful to debug the input string in case *of encoding error. *@param a_out out parameter. Points to the output string. It is allocated *by this function and must be freed by the caller. *@param a_out_len out parameter. The length (in bytes) of the output string. - *@return CR_OK upon successfull completion, an error code otherwise. + *@return CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_utils_ucs4_str_to_utf8 (const guint32 * a_in, @@ -879,7 +879,7 @@ cr_utils_ucs4_str_to_utf8 (const guint32 * a_in, *If the output buffer size is shorter than the actual needed size, *this function just convert what it can. * - *@return CR_OK upon successfull completion, an error code otherwise. + *@return CR_OK upon successful completion, an error code otherwise. * */ enum CRStatus @@ -934,7 +934,7 @@ cr_utils_ucs1_to_utf8 (const guchar * a_in, *@param a_in_end the end of the input string to convert. *@param a_out out parameter. The converted string. *@param a_out out parameter. The length of the converted string. - *@return CR_OK upon successfull completion, an error code otherwise. + *@return CR_OK upon successful completion, an error code otherwise. * */ enum CRStatus @@ -983,13 +983,13 @@ cr_utils_ucs1_str_to_utf8 (const guchar * a_in, *@param a_out out parameter. Points to the resulting buffer. *Must be allocated by the caller. If the size of a_out is shorter *than its required size, this function converts what it can and return - *a successfull status. + *a successful status. * *@param a_out_len in/out parameter. The size of the output buffer. *After return, points to the number of bytes consumed even in case of *encoding error. * - *@return CR_OK upon successfull completion, an error code otherwise. + *@return CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_utils_utf8_to_ucs1 (const guchar * a_in, @@ -1133,7 +1133,7 @@ cr_utils_utf8_to_ucs1 (const guchar * a_in, *@param a_out out parameter. The resulting converted ucs4 buffer. *Must be freed by the caller. *@param a_out_len out parameter. The length of the converted buffer. - *@return CR_OK upon successfull completion, an error code otherwise. + *@return CR_OK upon successful completion, an error code otherwise. *Note that out parameters are valid if and only if this function *returns CR_OK. */ diff --git a/src/st/st-adjustment.c b/src/st/st-adjustment.c index 1538c46a3..96b126c8d 100644 --- a/src/st/st-adjustment.c +++ b/src/st/st-adjustment.c @@ -689,7 +689,7 @@ st_adjustment_set_page_size (StAdjustment *adjustment, g_object_notify_by_pspec (G_OBJECT (adjustment), props[PROP_PAGE_SIZE]); - /* Well explicitely clamp after construction. */ + /* We'll explicitly clamp after construction. */ if (!priv->is_constructing) st_adjustment_clamp_page (adjustment, priv->lower, priv->upper); @@ -924,7 +924,7 @@ st_adjustment_get_transition (StAdjustment *adjustment, * @name: a unique name for the transition * @transition: a #ClutterTransition * - * Add a #ClutterTransition for the adjustment. If the transiton stops, it will + * Add a #ClutterTransition for the adjustment. If the transition stops, it will * be automatically removed if #ClutterTransition:remove-on-complete is %TRUE. */ void @@ -969,7 +969,7 @@ st_adjustment_add_transition (StAdjustment *adjustment, /** * st_adjusmtent_remove_transition: - * @adjusment: a #StAdjustment + * @adjustment: a #StAdjustment * @name: the name of the transition to remove * * Remove a #ClutterTransition previously added by st_adjustment_add_transtion() diff --git a/src/st/st-clipboard.c b/src/st/st-clipboard.c index 4673a7888..4b730c993 100644 --- a/src/st/st-clipboard.c +++ b/src/st/st-clipboard.c @@ -190,11 +190,11 @@ st_clipboard_get_mimetypes (StClipboard *clipboard, * st_clipboard_get_text: * @clipboard: A #StCliboard * @type: The type of clipboard data you want - * @callback: (scope async): function to be called when the text is retreived + * @callback: (scope async): function to be called when the text is retrieved * @user_data: data to be passed to the callback * * Request the data from the clipboard in text form. @callback is executed - * when the data is retreived. + * when the data is retrieved. */ void st_clipboard_get_text (StClipboard *clipboard, diff --git a/src/st/st-drawing-area.c b/src/st/st-drawing-area.c index 1ab48c878..38737fd6c 100644 --- a/src/st/st-drawing-area.c +++ b/src/st/st-drawing-area.c @@ -169,7 +169,7 @@ st_drawing_area_queue_repaint (StDrawingArea *area) * @area: the #StDrawingArea * * Gets the Cairo context to paint to. This function must only be called - * from a signal hander or virtual function for the #StDrawingArea::repaint + * from a signal handler or virtual function for the #StDrawingArea::repaint * signal. * * JavaScript code must call the special dispose function before returning from @@ -211,7 +211,7 @@ st_drawing_area_get_context (StDrawingArea *area) * * Gets the size of the cairo surface being painted to, which is equal * to the size of the content area of the widget. This function must - * only be called from a signal hander for the #StDrawingArea::repaint signal. + * only be called from a signal handler for the #StDrawingArea::repaint signal. */ void st_drawing_area_get_surface_size (StDrawingArea *area, diff --git a/src/st/st-icon.c b/src/st/st-icon.c index f35cb96bb..c9d7a85e5 100644 --- a/src/st/st-icon.c +++ b/src/st/st-icon.c @@ -294,7 +294,7 @@ st_icon_class_init (StIconClass *klass) /** * StIcon:icon-size: * - * The size of the icon, if greater than `0`. Other the icon sise is derived + * The size of the icon, if greater than `0`. Other the icon size is derived * from the current style. */ props[PROP_ICON_SIZE] = diff --git a/src/st/st-scroll-view.c b/src/st/st-scroll-view.c index 6af6a9519..0cf48adaf 100644 --- a/src/st/st-scroll-view.c +++ b/src/st/st-scroll-view.c @@ -49,7 +49,7 @@ * inside the #StAdjustment. * * The second simplification that we make that allows us to implement - * a straighforward height-for-width negotiation without multiple + * a straightforward height-for-width negotiation without multiple * allocate passes is that when the scrollbar policy is * AUTO, we always reserve space for the scrollbar in the * reported minimum and natural size. @@ -164,7 +164,7 @@ st_scroll_view_get_property (GObject *object, /** * st_scroll_view_update_fade_effect: * @scroll: a #StScrollView - * @vfade_offset: The length of the veritcal fade effect, in pixels. + * @vfade_offset: The length of the vertical fade effect, in pixels. * @hfade_offset: The length of the horizontal fade effect, in pixels. * * Sets the height of the fade area area in pixels. A value of 0 @@ -659,7 +659,7 @@ st_scroll_view_allocate (ClutterActor *actor, clutter_actor_allocate (priv->hscroll, &child_box); /* In case the scrollbar policy is NEVER or EXTERNAL or scrollbars - * should be overlayed, we don't trim the content box allocation by + * should be overlaid, we don't trim the content box allocation by * the scrollbar size. * Fold this into the scrollbar sizes to simplify the rest of the * computations. diff --git a/src/st/st-scrollable.c b/src/st/st-scrollable.c index 93f06c122..aa387b9fd 100644 --- a/src/st/st-scrollable.c +++ b/src/st/st-scrollable.c @@ -37,8 +37,8 @@ G_DEFINE_INTERFACE (StScrollable, st_scrollable, G_TYPE_OBJECT) * for setting the adjustments. The parent container then sets the adjustments * back to %NULL when the scrollable is removed. * - * For #StScrollable supporting height-for-width size negotation, size - * negotation works as follows: + * For #StScrollable supporting height-for-width size negotiation, size + * negotiation works as follows: * * In response to get_preferred_width(), the scrollable should report * the minimum width at which horizontal scrolling is needed for the diff --git a/src/st/st-shadow.c b/src/st/st-shadow.c index 96e654fda..070e7bf60 100644 --- a/src/st/st-shadow.c +++ b/src/st/st-shadow.c @@ -160,7 +160,7 @@ st_shadow_get_box (StShadow *shadow, /* Inset shadows are drawn below the border, so returning * the original box is not actually correct; still, it's - * good enough for the purpose of determing additional space + * good enough for the purpose of determining additional space * required outside the actor box. */ if (shadow->inset) diff --git a/src/st/st-texture-cache.c b/src/st/st-texture-cache.c index 947d8fc89..a9bf38889 100644 --- a/src/st/st-texture-cache.c +++ b/src/st/st-texture-cache.c @@ -361,7 +361,7 @@ texture_load_data_free (gpointer p) * @pixbuf_loader: #GdkPixbufLoader loading the image * @width: the original width of the image * @height: the original height of the image - * @data: pointer to the #Dimensions sructure containing available width and height for the image, + * @data: pointer to the #Dimensions structure containing available width and height for the image, * available width or height can be -1 if the dimension is not limited * * Private function. @@ -1023,7 +1023,7 @@ st_texture_cache_load_gicon (StTextureCache *cache, gicon_string = g_icon_to_string (icon); /* A return value of NULL indicates that the icon can not be serialized, * so don't have a unique identifier for it as a cache key, and thus can't - * be cached. If it is cachable, we hardcode a policy of FOREVER here for + * be cached. If it is cacheable, we hardcode a policy of FOREVER here for * now; we should actually blow this away on icon theme changes probably */ policy = gicon_string != NULL ? ST_TEXTURE_CACHE_POLICY_FOREVER : ST_TEXTURE_CACHE_POLICY_NONE; diff --git a/src/st/st-theme-context.c b/src/st/st-theme-context.c index 6d8c90d15..b363b8136 100644 --- a/src/st/st-theme-context.c +++ b/src/st/st-theme-context.c @@ -333,7 +333,7 @@ st_theme_context_get_for_stage (ClutterStage *stage) * * Sets the default set of theme stylesheets for the context. This theme will * be used for the root node and for nodes descending from it, unless some other - * style is explicitely specified. + * style is explicitly specified. */ void st_theme_context_set_theme (StThemeContext *context, @@ -385,7 +385,7 @@ st_theme_context_get_theme (StThemeContext *context) * * Sets the default font for the theme context. This is the font that * is inherited by the root node of the tree of theme nodes. If the - * font is not overriden, then this font will be used. If the font is + * font is not overridden, then this font will be used. If the font is * partially modified (for example, with 'font-size: 110%'), then that * modification is based on this font. */ diff --git a/src/st/st-theme-node-drawing.c b/src/st/st-theme-node-drawing.c index 5ec0e87af..c5df5fc62 100644 --- a/src/st/st-theme-node-drawing.c +++ b/src/st/st-theme-node-drawing.c @@ -2231,7 +2231,7 @@ st_theme_node_paint_sliced_shadow (StThemeNodePaintState *state, rectangles, idx / 8); #if 0 - /* Visual feedback on shadow's 9-slice and orignal offscreen buffer, + /* Visual feedback on shadow's 9-slice and original offscreen buffer, for debug purposes */ cogl_framebuffer_draw_rectangle (framebuffer, state->box_shadow_pipeline, xend, yoffset, xend + shadow_width, yoffset + shadow_height); diff --git a/src/st/st-theme-node.c b/src/st/st-theme-node.c index cbfc9d064..038be2f2e 100644 --- a/src/st/st-theme-node.c +++ b/src/st/st-theme-node.c @@ -276,7 +276,7 @@ st_theme_node_get_element_type (StThemeNode *node) * st_theme_node_get_element_id: * @node: a #StThemeNode * - * Get the unqiue element ID for @node. + * Get the unique element ID for @node. * * Returns: (transfer none): the element's ID */ @@ -3290,9 +3290,9 @@ st_theme_node_get_border_image (StThemeNode *node) * st_theme_node_get_horizontal_padding: * @node: a #StThemeNode * - * Gets the total horizonal padding (left + right padding), in physical pixels. + * Gets the total horizontal padding (left + right padding), in physical pixels. * - * Returns: the total horizonal padding in physical pixels + * Returns: the total horizontal padding in physical pixels */ double st_theme_node_get_horizontal_padding (StThemeNode *node) diff --git a/src/st/st-theme.c b/src/st/st-theme.c index d1bde3fc0..20d42fd33 100644 --- a/src/st/st-theme.c +++ b/src/st/st-theme.c @@ -866,7 +866,7 @@ add_matched_properties (StTheme *a_this, for (cur_stmt = a_nodesheet->statements; cur_stmt; cur_stmt = cur_stmt->next) { /* - *initialyze the selector list in which we will + *initialize the selector list in which we will *really perform the search. */ sel_list = NULL; @@ -960,7 +960,7 @@ add_matched_properties (StTheme *a_this, * thread-safety anyways.) * * Once we've sorted the properties, the specificity no longer - * matters and it can be safely overriden. + * matters and it can be safely overridden. */ cr_simple_sel_compute_specificity (cur_sel->simple_sel); diff --git a/src/st/test-theme.c b/src/st/test-theme.c index 4b6f5d4fe..d38b41f03 100644 --- a/src/st/test-theme.c +++ b/src/st/test-theme.c @@ -380,7 +380,7 @@ test_border (void) /* group2 is defined as having a thin black border along the top three * sides with rounded joins, then a square-joined green border at the - * botttom + * bottom */ assert_length ("group2", "border-top-width", 2., diff --git a/src/tray/na-tray-child.c b/src/tray/na-tray-child.c index 944c79944..175ac8a5a 100644 --- a/src/tray/na-tray-child.c +++ b/src/tray/na-tray-child.c @@ -103,7 +103,7 @@ na_tray_child_style_set (GtkWidget *widget, #if 0 /* This is adapted from code that was commented out in na-tray-manager.c; the * code in na-tray-manager.c wouldn't have worked reliably, this will. So maybe - * it can be reenabled. On other hand, things seem to be working fine without + * it can be re-enabled. On other hand, things seem to be working fine without * it. * * If reenabling, you need to hook it up in na_tray_child_class_init(). diff --git a/tools/build/jhbuildrc-gnome-shell b/tools/build/jhbuildrc-gnome-shell index b5c238995..aef75dbf0 100644 --- a/tools/build/jhbuildrc-gnome-shell +++ b/tools/build/jhbuildrc-gnome-shell @@ -1,6 +1,6 @@ # -*- mode: python -*- # -# jhbuildrc for building gnome-shell. Customizations shuld be done in +# jhbuildrc for building gnome-shell. Customizations should be done in # ~/.jhbuildrc-custom # # Copyright (C) 2008 Red Hat, Inc.