From: Jeffrey Middleton Date: Thu, 5 Mar 2009 20:36:12 +0000 (-0600) Subject: Spelling corrections X-Git-Tag: release-0.14~74 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a00c1bb99e0706ef8a59f14baae76f194f27d7db;p=ncmpc.git Spelling corrections All in comments except the one in a displayed message that got me started! --- diff --git a/src/command.c b/src/command.c index 3c8a405..add5722 100644 --- a/src/command.c +++ b/src/command.c @@ -71,7 +71,7 @@ static command_definition_t cmds[] = { { { 'q', 'Q', 3 }, 0, CMD_QUIT, "quit", N_("Quit") }, - /* movment */ + /* movement */ { { UP, 'k', 0 }, 0, CMD_LIST_PREVIOUS, "up", N_("Move cursor up") }, { { DWN, 'j', 0 }, 0, CMD_LIST_NEXT, "down", diff --git a/src/libmpdclient.c b/src/libmpdclient.c index 9a6aeb6..6f68dda 100644 --- a/src/libmpdclient.c +++ b/src/libmpdclient.c @@ -1551,7 +1551,7 @@ char * mpd_getNextCommand(mpd_Connection * connection) { void mpd_startSearch(mpd_Connection * connection,int exact) { if(connection->request) { - /* search/find allready in progress */ + /* search/find already in progress */ /* TODO: set error here? */ return; } @@ -1566,7 +1566,7 @@ void mpd_startSearch(mpd_Connection * connection,int exact) { void mpd_startFieldSearch(mpd_Connection * connection,int field) { if(connection->request) { - /* search/find allready in progress */ + /* search/find already in progress */ /* TODO: set error here? */ return; } @@ -1614,7 +1614,7 @@ void mpd_addConstraintSearch(mpd_Connection *connection, 2+ /* length of search term */ strlen(arg)+ - /* closign " +\0 that is added sprintf */ + /* closing " +\0 that is added sprintf */ 2 )*sizeof(char)); /* and form the query */ diff --git a/src/libmpdclient.h b/src/libmpdclient.h index 0dcbeda..2e94f17 100644 --- a/src/libmpdclient.h +++ b/src/libmpdclient.h @@ -460,7 +460,7 @@ void mpd_sendRandomCommand(mpd_Connection * connection, int randomMode); void mpd_sendSetvolCommand(mpd_Connection * connection, int volumeChange); -/* WARNING: don't use volume command, its depreacted */ +/* WARNING: don't use volume command, its deprecated */ void mpd_sendVolumeCommand(mpd_Connection * connection, int volumeChange); void mpd_sendCrossfadeCommand(mpd_Connection * connection, int seconds); diff --git a/src/list_window.c b/src/list_window.c index 8abad27..40fd179 100644 --- a/src/list_window.c +++ b/src/list_window.c @@ -578,7 +578,7 @@ list_window_mouse(struct list_window *lw, unsigned rows, { assert(lw != NULL); - /* if the even occured above the list window move up */ + /* if the even occurred above the list window move up */ if (y < 0) { if (bstate & BUTTON3_CLICKED) list_window_first(lw); @@ -587,7 +587,7 @@ list_window_mouse(struct list_window *lw, unsigned rows, return true; } - /* if the even occured below the list window move down */ + /* if the even occurred below the list window move down */ if ((unsigned)y >= rows) { if (bstate & BUTTON3_CLICKED) list_window_last(lw, rows); diff --git a/src/main.c b/src/main.c index 2edf2d4..c80b7ea 100644 --- a/src/main.c +++ b/src/main.c @@ -310,7 +310,7 @@ int do_input_event(command_t cmd) screen_cmd(mpd, cmd); if (cmd == CMD_VOLUME_UP || cmd == CMD_VOLUME_DOWN) { - /* make sure we dont update the volume yet */ + /* make sure we don't update the volume yet */ g_source_remove(update_source_id); update_source_id = g_timeout_add(update_interval, timer_mpd_update, diff --git a/src/mpdclient.c b/src/mpdclient.c index af3057d..f8f5ba7 100644 --- a/src/mpdclient.c +++ b/src/mpdclient.c @@ -218,7 +218,7 @@ mpdclient_update(mpdclient_t *c) if (c->status) mpd_freeStatus(c->status); - /* retreive new status */ + /* retrieve new status */ mpd_sendStatusCommand(c->connection); c->status = mpd_getStatus(c->connection); if ((retval=mpdclient_finish_command(c))) @@ -422,7 +422,7 @@ mpdclient_cmd_add(mpdclient_t *c, struct mpd_song *song) /* add the song to playlist */ playlist_append(&c->playlist, song); - /* increment the playlist id, so we dont retrives a new playlist */ + /* increment the playlist id, so we don't retrieve a new playlist */ c->playlist.id++; /* call playlist updated callback */ @@ -455,7 +455,7 @@ mpdclient_cmd_delete(mpdclient_t *c, gint idx) return retval; #ifdef ENABLE_FANCY_PLAYLIST_MANAGMENT_CMD_DELETE - /* increment the playlist id, so we dont retrive a new playlist */ + /* increment the playlist id, so we don't retrieve a new playlist */ c->playlist.id++; /* remove the song from the playlist */ @@ -505,7 +505,7 @@ mpdclient_cmd_move(mpdclient_t *c, gint old_index, gint new_index) /* update the playlist */ playlist_swap(&c->playlist, old_index, new_index); - /* increment the playlist id, so we dont retrives a new playlist */ + /* increment the playlist id, so we don't retrieve a new playlist */ c->playlist.id++; #else @@ -550,7 +550,7 @@ mpdclient_cmd_delete_playlist(mpdclient_t *c, gchar *filename_utf8) /****************************************************************************/ -/*** Callback managment functions *******************************************/ +/*** Callback management functions ******************************************/ /****************************************************************************/ static void @@ -615,7 +615,7 @@ mpdclient_remove_error_callback(mpdclient_t *c, mpdc_error_cb_t cb) /****************************************************************************/ -/*** Playlist managment functions *******************************************/ +/*** Playlist management functions ******************************************/ /****************************************************************************/ /* update playlist */ diff --git a/src/options.c b/src/options.c index 83ae5ff..cc938c3 100644 --- a/src/options.c +++ b/src/options.c @@ -300,11 +300,11 @@ options_parse(int argc, const char *argv[]) if (g_str_has_prefix(arg, "--")) { char *name, *value; - /* make shure we got an argument for the previous option */ + /* make sure we got an argument for the previous option */ if( opt && opt->argument ) option_error(ERROR_MISSING_ARGUMENT, opt->longopt, opt->argument); - /* retreive a option argument */ + /* retrieve a option argument */ if ((value=g_strrstr(arg+2, "="))) { *value = '\0'; name = g_strdup(arg); @@ -318,7 +318,7 @@ options_parse(int argc, const char *argv[]) option_error(ERROR_UNKNOWN_OPTION, name, NULL); g_free(name); - /* abort if we got an argument to the option and dont want one */ + /* abort if we got an argument to the option and don't want one */ if( value && opt->argument==NULL ) option_error(ERROR_GOT_ARGUMENT, arg, value); @@ -333,7 +333,7 @@ options_parse(int argc, const char *argv[]) size_t j; for(j=1; jargument) option_error(ERROR_MISSING_ARGUMENT, opt->longopt, opt->argument); @@ -371,7 +371,7 @@ options_init(void) const char *value; char *tmp; - /* get initial values for host and password from MPD_HOST (enviroment) */ + /* get initial values for host and password from MPD_HOST (environment) */ if ((value = g_getenv(MPD_HOST_ENV))) options.host = g_strdup(value); else @@ -385,7 +385,7 @@ options_init(void) g_free(oldhost); } - /* get initial values for port from MPD_PORT (enviroment) */ + /* get initial values for port from MPD_PORT (environment) */ if ((value = g_getenv(MPD_PORT_ENV))) options.port = atoi(value); diff --git a/src/screen.c b/src/screen.c index b53fcf4..ea6c023 100644 --- a/src/screen.c +++ b/src/screen.c @@ -48,7 +48,7 @@ static const GTime SCREEN_WELCOME_TIME = 10; /** status message time [s] */ static const GTime SCREEN_STATUS_MESSAGE_TIME = 3; -/* minumum window size */ +/* minimum window size */ static const int SCREEN_MIN_COLS = 14; static const int SCREEN_MIN_ROWS = 5; @@ -676,7 +676,7 @@ screen_get_mouse_event(mpdclient_t *c, unsigned long *bstate, int *row) { MEVENT event; - /* retreive the mouse event from ncurses */ + /* retrieve the mouse event from ncurses */ getmouse(&event); /* calculate the selected row in the list window */ *row = event.y - screen.top_window.rows; diff --git a/src/screen_artist.c b/src/screen_artist.c index 0d81874..40a0ed7 100644 --- a/src/screen_artist.c +++ b/src/screen_artist.c @@ -111,7 +111,7 @@ artist_repaint_if_active(void) } #ifndef NCMPC_MINI -/* the playlist have been updated -> fix highlights */ +/* the playlist has been updated -> fix highlights */ static void playlist_changed_callback(mpdclient_t *c, int event, gpointer data) { diff --git a/src/screen_browser.c b/src/screen_browser.c index 50fb300..325b4f4 100644 --- a/src/screen_browser.c +++ b/src/screen_browser.c @@ -87,7 +87,7 @@ sync_highlights(mpdclient_t *c, mpdclient_filelist_t *fl) } } -/* the playlist have been updated -> fix highlights */ +/* the playlist has been updated -> fix highlights */ void browser_playlist_changed(struct screen_browser *browser, mpdclient_t *c, int event, gpointer data) diff --git a/src/screen_file.c b/src/screen_file.c index 09d8dee..fdb8a5a 100644 --- a/src/screen_file.c +++ b/src/screen_file.c @@ -51,7 +51,7 @@ file_repaint_if_active(void) file_repaint(); } -/* the db have changed -> update the filelist */ +/* the db has changed -> update the filelist */ static void file_changed_callback(mpdclient_t *c, G_GNUC_UNUSED int event, G_GNUC_UNUSED gpointer data) @@ -66,7 +66,7 @@ file_changed_callback(mpdclient_t *c, G_GNUC_UNUSED int event, } #ifndef NCMPC_MINI -/* the playlist have been updated -> fix highlights */ +/* the playlist has been updated -> fix highlights */ static void playlist_changed_callback(mpdclient_t *c, int event, gpointer data) { @@ -273,7 +273,7 @@ browse_cmd(mpdclient_t *c, command_t cmd) } else screen_status_printf(_("Database update started")); - /* set updatingDb to make shure the browse callback gets called + /* set updatingDb to make sure the browse callback gets called * even if the updated has finished before status is updated */ c->status->updatingDb = 1; } diff --git a/src/screen_keydef.c b/src/screen_keydef.c index d5f12f8..c37d3f1 100644 --- a/src/screen_keydef.c +++ b/src/screen_keydef.c @@ -79,7 +79,7 @@ save_keys(void) char *filename; if (check_user_conf_dir()) { - screen_status_printf(_("Error: Unable to create direcory ~/.ncmpc - %s"), + screen_status_printf(_("Error: Unable to create directory ~/.ncmpc - %s"), strerror(errno)); screen_bell(); return -1; diff --git a/src/screen_search.c b/src/screen_search.c index 9c06f5a..f9b5145 100644 --- a/src/screen_search.c +++ b/src/screen_search.c @@ -136,7 +136,7 @@ search_repaint_if_active(void) search_repaint(); } -/* the playlist have been updated -> fix highlights */ +/* the playlist has been updated -> fix highlights */ static void playlist_changed_callback(mpdclient_t *c, int event, gpointer data) { diff --git a/src/screen_utils.c b/src/screen_utils.c index b4bd971..53b6b0f 100644 --- a/src/screen_utils.c +++ b/src/screen_utils.c @@ -311,7 +311,7 @@ void set_xterm_title(const char *format, ...) { /* the current xterm title exists under the WM_NAME property */ - /* and can be retreived with xprop -id $WINDOWID */ + /* and can be retrieved with xprop -id $WINDOWID */ if (options.enable_xterm_title) { if (g_getenv("WINDOWID")) { diff --git a/src/screen_utils.h b/src/screen_utils.h index bfaf7c2..6aacd5d 100644 --- a/src/screen_utils.h +++ b/src/screen_utils.h @@ -35,7 +35,7 @@ struct mpdclient; /* sound an audible and/or visible bell */ void screen_bell(void); -/* read a characher from the status window */ +/* read a character from the status window */ int screen_getch(WINDOW *w, const char *prompt); /* read a string from the status window */ diff --git a/src/utils.c b/src/utils.c index 002ab46..cd12509 100644 --- a/src/utils.c +++ b/src/utils.c @@ -69,7 +69,7 @@ string_list_remove(GList *string_list, const gchar *str) return list; } -/* create a list suiteble for GCompletion from path */ +/* create a list suitable for GCompletion from path */ GList * gcmp_list_from_path(mpdclient_t *c, const gchar *path, GList *list, gint types) { diff --git a/src/wreadln.c b/src/wreadln.c index 7261bba..441e1ce 100644 --- a/src/wreadln.c +++ b/src/wreadln.c @@ -137,7 +137,7 @@ screen_to_bytes(const gchar *data, unsigned width) #endif } -/** returns the screen colum where the cursor is located */ +/** returns the screen column where the cursor is located */ static unsigned cursor_column(const struct wreadln *wr) { @@ -405,14 +405,14 @@ _wreadln(WINDOW *w, /* turn off echo */ noecho(); - /* make shure the cursor is visible */ + /* make sure the cursor is visible */ curs_set(1); /* print prompt string */ if (prompt) { waddstr(w, prompt); waddstr(w, ": "); } - /* retrive y and x0 position */ + /* retrieve y and x0 position */ getyx(w, wr.y, wr.x); /* check the x1 value */ if (x1 <= wr.x || x1 > (unsigned)COLS) @@ -463,7 +463,7 @@ _wreadln(WINDOW *w, #ifdef HAVE_GETMOUSE case KEY_MOUSE: /* ignore mouse events */ #endif - case ERR: /* ingnore errors */ + case ERR: /* ignore errors */ break; case TAB: