From 121db0ea48eff51577543816082fafcaef7c85a0 Mon Sep 17 00:00:00 2001 From: freddii Date: Thu, 14 Jan 2021 09:20:26 +0100 Subject: [PATCH] fixed spelling mistakes --- CODING | 4 ++-- README.lirc | 2 +- src/bar_gps.c | 2 +- src/bar_sort.c | 2 +- src/collect.c | 4 ++-- src/editors.h | 2 +- src/exif.c | 2 +- src/filedata.c | 4 ++-- src/image-load.c | 6 +++--- src/image.c | 2 +- src/layout_image.c | 4 ++-- src/lua.c | 2 +- src/md5-util.c | 6 +++--- src/metadata.c | 2 +- src/osd.c | 2 +- src/pan-view/pan-view.c | 2 +- src/pixbuf-renderer.h | 2 +- src/preferences.c | 2 +- src/rcfile.c | 2 +- src/search.c | 2 +- src/secure_save.c | 8 ++++---- src/thumb.c | 2 +- src/ui_fileops.c | 4 ++-- src/ui_tree_edit.h | 2 +- web/geeqie-install-debian.sh | 2 +- 25 files changed, 37 insertions(+), 37 deletions(-) diff --git a/CODING b/CODING index bf8592e5..51debffe 100644 --- a/CODING +++ b/CODING @@ -27,7 +27,7 @@ GPL header, in every file, like this: * \author Author1 * \author Author2 * - * Optionaly detailed description of this file + * Optionally detailed description of this file * on more lines. */ @@ -162,7 +162,7 @@ Use spaces around every operator (except ".", "->", "++" and "--"); As you can see above, parentheses are closed to inside, i.e. " (blah blah) " In "function()" there are no space before '('. You MAY use more tabs/spaces than you OUGHT TO (according to this CodingStyle), if - it makes your code nicer in being verticaly indented. + it makes your code nicer in being vertically indented. Variables declarations should be followed by a blank line and should always be at the start of the block. diff --git a/README.lirc b/README.lirc index fcb32e05..f9306cbb 100644 --- a/README.lirc +++ b/README.lirc @@ -19,7 +19,7 @@ PREV - Go to previous image RIGHT [int] - Move "camera" right by the specified amount. Default=1 ROTATE_90 - Rotate image 90 degrees clockwise. ROTATE_90_CC - Rotate image 90 degrees counter-clockwise. -SET_INV_ZOOM [int] - Zoom to 1/Nx. Deafult=1x +SET_INV_ZOOM [int] - Zoom to 1/Nx. Default=1x SET_ZOOM [int] - Zoom to Nx. Default=1x UP [int] - Move "camera" up by the specified amount. Default=1 ZOOM_IN [int] - Zoom in. Value specifies the amount of zoom. diff --git a/src/bar_gps.c b/src/bar_gps.c index 6c6191d8..c511afdb 100644 --- a/src/bar_gps.c +++ b/src/bar_gps.c @@ -1016,7 +1016,7 @@ GtkWidget *bar_pane_gps_new_from_config(const gchar **attribute_names, const gch gdouble latitude; gdouble longitude; /* Latitude and longitude are stored in the config file as an integer of - * (actual value * 1,000,000). There is no READ_DOUBLE utilty function. + * (actual value * 1,000,000). There is no READ_DOUBLE utility function. */ gint int_latitude = 54000000; gint int_longitude = -4000000; diff --git a/src/bar_sort.c b/src/bar_sort.c index e319fe08..95615afb 100644 --- a/src/bar_sort.c +++ b/src/bar_sort.c @@ -764,7 +764,7 @@ GtkWidget *bar_sort_new_from_config(LayoutWindow *lw, const gchar **attribute_na * @param attribute_values * * Called from rcfile when processing geeqierc.xml on start-up. - * It is neccesary to set the bar_sort_enabled flag because + * It is necessary to set the bar_sort_enabled flag because * the sort manager and desktop files are set up in the idle loop, and * setup is not yet completed during initialisation. * The flag is checked in layout_editors_reload_idle_cb. diff --git a/src/collect.c b/src/collect.c index 30e592f6..2d4ed65b 100644 --- a/src/collect.c +++ b/src/collect.c @@ -392,7 +392,7 @@ gboolean is_collection(const gchar *param) /** * @brief Creates a text list of the image paths of the contents of a Collection - * @param[in] name The name of the collection, with or wihout extension + * @param[in] name The name of the collection, with or without extension * @param[inout] contents A GString to which the image paths are appended * * @@ -427,7 +427,7 @@ void collection_contents(const gchar *name, GString **contents) /** * @brief Returns a list of filedatas of the contents of a Collection - * @param[in] name The name of the collection, with or wihout extension + * @param[in] name The name of the collection, with or without extension * * */ diff --git a/src/editors.h b/src/editors.h index 5c2811e2..6f0df218 100644 --- a/src/editors.h +++ b/src/editors.h @@ -102,7 +102,7 @@ It is a good place to call file_data_change_info_free(). ed - pointer that can be used for editor_resume/editor_skip or NULL if all files were already processed flags - flags above -list - list of procesed FileData structures, typically single file or whole list passed to start_editor_* +list - list of processed FileData structures, typically single file or whole list passed to start_editor_* data - generic pointer */ typedef gint (*EditorCallback) (gpointer ed, EditorFlags flags, GList *list, gpointer data); diff --git a/src/exif.c b/src/exif.c index 872b9ccd..2c88b668 100644 --- a/src/exif.c +++ b/src/exif.c @@ -29,7 +29,7 @@ * Additional tag formats should be added to the proper * location in ExifKnownMarkersList[]. * - * Human readable ouput (that needs additional processing of data to + * Human readable output (that needs additional processing of data to * be useable) can be defined by adding a key to ExifFormattedList[], * then handling that tag in the function exif_get_formatted_by_key(). * The human readable formatted keys must begin with the character 'f'. diff --git a/src/filedata.c b/src/filedata.c index 7711432f..d89ea3b5 100644 --- a/src/filedata.c +++ b/src/filedata.c @@ -2027,7 +2027,7 @@ gchar *file_data_sc_list_to_string(FileData *fd) COPY MOVE - path is changed, name may be changed too RENAME - path remains unchanged, name is changed - extension should remain (FIXME should we allow editing extension? it will make problems wth grouping) + extension should remain (FIXME should we allow editing extension? it will make problems with grouping) sidecar names are changed too, extensions are not changed DELETE UPDATE - file size, date or grouping has been changed @@ -3090,7 +3090,7 @@ GList *file_data_process_groups_in_selection(GList *list, gboolean ungroup, GLis } /* remove sidecars from the list, - they can be still acessed via main_fd->sidecar_files */ + they can be still accessed via main_fd->sidecar_files */ work = list; while (work) { diff --git a/src/image-load.c b/src/image-load.c index e867c219..2f0dc8b6 100644 --- a/src/image-load.c +++ b/src/image-load.c @@ -340,7 +340,7 @@ static gboolean image_loader_emit_size_cb(gpointer data) } -/* DONE and ERROR are emited only once, thus they can have normal priority +/* DONE and ERROR are emitted only once, thus they can have normal priority PERCENT and AREA_READY should be processed ASAP */ @@ -1158,7 +1158,7 @@ static void image_loader_thread_run(gpointer data, gpointer user_data) if (il->idle_priority > G_PRIORITY_DEFAULT_IDLE) { - /* low prio, wait untill high prio tasks finishes */ + /* low prio, wait until high prio tasks finishes */ image_loader_thread_wait_high(); } else @@ -1185,7 +1185,7 @@ static void image_loader_thread_run(gpointer data, gpointer user_data) { if (il->idle_priority > G_PRIORITY_DEFAULT_IDLE) { - /* low prio, wait untill high prio tasks finishes */ + /* low prio, wait until high prio tasks finishes */ image_loader_thread_wait_high(); } cont = image_loader_continue(il); diff --git a/src/image.c b/src/image.c index ec08f67c..079b7aec 100644 --- a/src/image.c +++ b/src/image.c @@ -1816,7 +1816,7 @@ static void image_notify_cb(FileData *fd, NotifyType type, gpointer data) if ((type & NOTIFY_REREAD) && fd == imd->image_fd) { /* there is no need to reload on NOTIFY_CHANGE, - modified files should be detacted anyway and NOTIFY_REREAD should be recieved + modified files should be detacted anyway and NOTIFY_REREAD should be received or they are removed from the filelist completely on "move" and "delete" */ DEBUG_1("Notify image: %s %04x", fd->path, type); diff --git a/src/layout_image.c b/src/layout_image.c index 8983091b..4f1e7697 100644 --- a/src/layout_image.c +++ b/src/layout_image.c @@ -2151,8 +2151,8 @@ void layout_image_activate(LayoutWindow *lw, gint i, gboolean force) image_attach_window(lw->image, lw->window, NULL, GQ_APPNAME, FALSE); - /* do not hilight selected image in SPLIT_NONE */ - /* maybe the image should be selected always and hilight should be controled by + /* do not highlight selected image in SPLIT_NONE */ + /* maybe the image should be selected always and highlight should be controlled by another image option */ if (lw->split_mode != SPLIT_NONE) image_select(lw->split_images[i], TRUE); diff --git a/src/lua.c b/src/lua.c index f8603d8f..582fcd72 100644 --- a/src/lua.c +++ b/src/lua.c @@ -212,7 +212,7 @@ static int lua_exif_get_datum(lua_State *L) void lua_init(void) { L = luaL_newstate(); - luaL_openlibs(L); /* Open all libraries for lua programms */ + luaL_openlibs(L); /* Open all libraries for lua programs */ /* Now create custom methodes to do something */ static const luaL_Reg meta_methods[] = { diff --git a/src/md5-util.c b/src/md5-util.c index 2bf3db46..dca25fb2 100644 --- a/src/md5-util.c +++ b/src/md5-util.c @@ -91,7 +91,7 @@ md5_init(MD5Context *ctx) /** * md5_update: add a buffer to md5 hash computation - * @ctx: context object used for md5 computaion + * @ctx: context object used for md5 computation * @buf: buffer to add * @len: buffer length * @@ -151,11 +151,11 @@ md5_update(MD5Context *ctx, const guchar *buf, guint32 len) * 1 0* (64-bit count of bits processed, MSB-first) */ /** - * md5_final: copy the final md5 hash to a bufer + * md5_final: copy the final md5 hash to a buffer * @digest: 16 bytes buffer * @ctx: context containing the calculated md5 * - * copy the final md5 hash to a bufer + * copy the final md5 hash to a buffer **/ void md5_final(MD5Context *ctx, guchar digest[16]) diff --git a/src/metadata.c b/src/metadata.c index 98232ff0..70638628 100644 --- a/src/metadata.c +++ b/src/metadata.c @@ -670,7 +670,7 @@ GList *metadata_read_list(FileData *fd, const gchar *key, MetadataFormat format) const GList *cache_entry; if (!fd) return NULL; - /* unwritten data overide everything */ + /* unwritten data override everything */ if (fd->modified_xmp && format == METADATA_PLAIN) { list = g_hash_table_lookup(fd->modified_xmp, key); diff --git a/src/osd.c b/src/osd.c index bcc38d72..6c39156d 100644 --- a/src/osd.c +++ b/src/osd.c @@ -273,7 +273,7 @@ gchar *image_osd_mkinfo(const gchar *str, FileData *fd, GHashTable *vars) if (!end) break; - /* Search for optionnal modifiers + /* Search for optional modifiers * %name:99:extra% -> name = "name", limit=99, extra = "extra" */ for (p = start + 1; p < end; p++) diff --git a/src/pan-view/pan-view.c b/src/pan-view/pan-view.c index f4e58c37..aee4019f 100644 --- a/src/pan-view/pan-view.c +++ b/src/pan-view/pan-view.c @@ -1967,7 +1967,7 @@ static void pan_window_new_real(FileData *dir_fd) /* *----------------------------------------------------------------------------- - * peformance warnings + * performance warnings *----------------------------------------------------------------------------- */ diff --git a/src/pixbuf-renderer.h b/src/pixbuf-renderer.h index 71534902..7e1ede34 100644 --- a/src/pixbuf-renderer.h +++ b/src/pixbuf-renderer.h @@ -132,7 +132,7 @@ struct _PixbufRenderer gdouble norm_center_x; /* coordinates of viewport center in the image, in range 0.0 - 1.0 */ gdouble norm_center_y; /* these coordinates are used for PR_SCROLL_RESET_NOCHANGE and should be preserved over periods with NULL pixbuf */ - gdouble subpixel_x_scroll; /* subpixel scroll alignment, used to prevent acumulation of rounding errors */ + gdouble subpixel_x_scroll; /* subpixel scroll alignment, used to prevent accumulation of rounding errors */ gdouble subpixel_y_scroll; gdouble zoom_min; diff --git a/src/preferences.c b/src/preferences.c index 28b122a7..83be44de 100644 --- a/src/preferences.c +++ b/src/preferences.c @@ -202,7 +202,7 @@ static void slideshow_delay_seconds_cb(GtkWidget *spin, gpointer data) /* *----------------------------------------------------------------------------- - * sync progam to config window routine (private) + * sync program to config window routine (private) *----------------------------------------------------------------------------- */ diff --git a/src/rcfile.c b/src/rcfile.c index 21984b5b..26029dbc 100644 --- a/src/rcfile.c +++ b/src/rcfile.c @@ -298,7 +298,7 @@ gboolean read_bool_option(const gchar *option, const gchar *label, const gchar * /* *----------------------------------------------------------------------------- - * write fuctions for elements (private) + * write functions for elements (private) *----------------------------------------------------------------------------- */ diff --git a/src/search.c b/src/search.c index cff5f27e..de37de19 100644 --- a/src/search.c +++ b/src/search.c @@ -1740,7 +1740,7 @@ static void search_file_load_process(SearchData *sd, CacheData *cd) pixbuf = image_loader_get_pixbuf(sd->img_loader); - /* Used to determnine if image is broken + /* Used to determine if image is broken */ if (cd && !pixbuf) { diff --git a/src/secure_save.c b/src/secure_save.c index 85eff68e..f2f4f531 100644 --- a/src/secure_save.c +++ b/src/secure_save.c @@ -321,7 +321,7 @@ free: /** fputs() wrapper, set ssi->err to errno on error. If ssi->err is set when - * called, it immediatly returns EOF. + * called, it immediately returns EOF. */ gint secure_fputs(SecureSaveInfo *ssi, const gchar *s) @@ -341,7 +341,7 @@ secure_fputs(SecureSaveInfo *ssi, const gchar *s) /** fputc() wrapper, set ssi->err to errno on error. If ssi->err is set when - * called, it immediatly returns EOF. + * called, it immediately returns EOF. */ gint secure_fputc(SecureSaveInfo *ssi, gint c) @@ -360,7 +360,7 @@ secure_fputc(SecureSaveInfo *ssi, gint c) } /** fprintf() wrapper, set ssi->err to errno on error and return a negative - * value. If ssi->err is set when called, it immediatly returns -1. + * value. If ssi->err is set when called, it immediately returns -1. */ gint secure_fprintf(SecureSaveInfo *ssi, const gchar *format, ...) @@ -378,7 +378,7 @@ secure_fprintf(SecureSaveInfo *ssi, const gchar *format, ...) } /** fwrite() wrapper, set ssi->err to errno on error and return a value less than - * the number of elements to write. If ssi->err is set when called, it immediatly returns 0. + * the number of elements to write. If ssi->err is set when called, it immediately returns 0. */ size_t secure_fwrite(gconstpointer ptr, size_t size, size_t nmemb, SecureSaveInfo *ssi) diff --git a/src/thumb.c b/src/thumb.c index 6d464bb7..3e2e9fe8 100644 --- a/src/thumb.c +++ b/src/thumb.c @@ -510,7 +510,7 @@ void thumb_notify_cb(FileData *fd, NotifyType type, gpointer data) * * Note: Code has been modified to fit the style of the other code, and to use * a few more glib-isms. - * 08-28-2000: Updated to return a gdk_pixbuf, Imlib is dieing a death here. + * 08-28-2000: Updated to return a gdk_pixbuf, Imlib is dying a death here. */ #define XV_BUFFER 2048 diff --git a/src/ui_fileops.c b/src/ui_fileops.c index a42f4b19..a721b21a 100644 --- a/src/ui_fileops.c +++ b/src/ui_fileops.c @@ -178,7 +178,7 @@ gchar *path_from_utf8(const gchar *utf8) } if (!path) { - /* if invalid UTF-8, text probaby still in original form, so just copy it */ + /* if invalid UTF-8, text probably still in original form, so just copy it */ path = g_strdup(utf8); } @@ -887,7 +887,7 @@ void parse_out_relatives(gchar *path) { if (path[s] == G_DIR_SEPARATOR && path[s+1] == '.') { - /* /. occurence, let's see more */ + /* /. occurrence, let's see more */ gint p = s + 2; if (path[p] == G_DIR_SEPARATOR || path[p] == '\0') diff --git a/src/ui_tree_edit.h b/src/ui_tree_edit.h index e9a3ce96..fc7ef712 100644 --- a/src/ui_tree_edit.h +++ b/src/ui_tree_edit.h @@ -57,7 +57,7 @@ void tree_view_get_cell_clamped(GtkTreeView *widget, GtkTreePath *tpath, gint co gint *x, gint *y, gint *width, gint *height); /* return 0 = row visible, -1 = row is above, 1 = row is below visible region - * if fully_visible is TRUE, the bahavior changes to return -1/1 if _any_ part of the cell is out of view */ + * if fully_visible is TRUE, the behavior changes to return -1/1 if _any_ part of the cell is out of view */ gint tree_view_row_get_visibility(GtkTreeView *widget, GtkTreeIter *iter, gboolean fully_visible); /* scrolls to make row visible, if necessary diff --git a/web/geeqie-install-debian.sh b/web/geeqie-install-debian.sh index 6fff72e4..a606422e 100755 --- a/web/geeqie-install-debian.sh +++ b/web/geeqie-install-debian.sh @@ -289,7 +289,7 @@ Machine: $MACH" 2>/dev/null exit fi -# Parse the comand line +# Parse the command line OPTS=$(getopt -o vhc:t:b:d: --long version,help,commit:,tag:,back:,debug: -- "$@") eval set -- "$OPTS" -- 2.20.1