Branch: refs/heads/master Author: Frank Lanitz frank@frank.uvena.de Committer: Frank Lanitz frank@frank.uvena.de Date: Sat, 18 Apr 2015 07:43:07 UTC Commit: b8684a00f0b9bccbe739f797ffea92bb6b33613a https://github.com/geany/geany/commit/b8684a00f0b9bccbe739f797ffea92bb6b3361...
Log Message: ----------- Merge pull request #472 from huth/fixes
Fix typos in comments
Modified Paths: -------------- doc/pluginsignals.c doc/pluginsymbols.c src/build.c src/dialogs.c src/msgwindow.c src/tools.c src/utils.c
Modified: doc/pluginsignals.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -31,7 +31,7 @@ * To use plugin signals in Geany, you have two options: * * -# Create a PluginCallback array with the @ref plugin_callbacks symbol. List the signals - * you want to listen to and create the appropiate signal callbacks for each signal. + * you want to listen to and create the appropriate signal callbacks for each signal. * The callback array is read @a after plugin_init() has been called. * -# Use plugin_signal_connect(), which can be called at any time and can also connect * to non-Geany signals (such as GTK widget signals).
Modified: doc/pluginsymbols.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -79,7 +79,7 @@ KeyBindingGroup *plugin_key_group; * The dialog will show all plugins that support this symbol together. * @param dialog The plugin preferences dialog widget - this should only be used to * connect the @c "response" signal. If settings should be read from the dialog, the - * reponse will be either @c GTK_RESPONSE_OK or @c GTK_RESPONSE_APPLY. + * response will be either @c GTK_RESPONSE_OK or @c GTK_RESPONSE_APPLY. * @return A container widget holding preference widgets. * @note Using @link stash.h Stash @endlink can make implementing preferences easier. * @see plugin_configure_single(). */
Modified: src/build.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -716,7 +716,7 @@ static void parse_build_output(const gchar **output, gint status) #endif
-/* Replaces occurences of %e and %p with the appropriate filenames and +/* Replaces occurrences of %e and %p with the appropriate filenames and * %l with current line number. %d and %p replacements should be in UTF8 */ static gchar *build_replace_placeholder(const GeanyDocument *doc, const gchar *src) { @@ -1224,7 +1224,7 @@ static void build_exit_cb(GPid child_pid, gint status, gpointer user_data) failure = TRUE; } else - { /* any other failure occured */ + { /* any other failure occurred */ failure = TRUE; } #endif
Modified: src/dialogs.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -430,7 +430,7 @@ static void open_file_dialog_apply_settings(GtkWidget *dialog) GtkWidget *encoding_combo = ui_lookup_widget(dialog, "encoding_combo"); GtkWidget *expander = ui_lookup_widget(dialog, "more_options_expander");
- /* we can't know the initial position of combo boxes, so retreive it the first time */ + /* we can't know the initial position of combo boxes, so retrieve it the first time */ if (! initialized) { filesel_state.open.filter_idx = file_chooser_get_filter_idx(GTK_FILE_CHOOSER(dialog)); @@ -457,7 +457,7 @@ void dialogs_show_open_file(void) initdir = utils_get_current_file_dir_utf8();
/* use project or default startup directory (if set) if no files are open */ - /** TODO should it only be used when initally open the dialog and not on every show? */ + /** TODO should it only be used when initially open the dialog and not on every show? */ if (! initdir) initdir = g_strdup(utils_get_default_dir_utf8());
Modified: src/msgwindow.c 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -774,7 +774,7 @@ static void make_absolute(gchar **filename, const gchar *dir) }
-/* try to parse the file and line number where the error occured described in line +/* try to parse the file and line number where the error occurred described in line * and when something useful is found, it stores the line number in *line and the * relevant file with the error in *filename. * *line will be -1 if no error was found in string. @@ -983,7 +983,7 @@ static void parse_compiler_error_line(const gchar *string, data.file_idx = 1; break; } - /* don't accidently find libtool versions x:y:x and think it is a file name */ + /* don't accidentally find libtool versions x:y:x and think it is a file name */ if (strstr(string, "libtool --mode=link") == NULL) { data.pattern = ":"; @@ -1000,7 +1000,7 @@ static void parse_compiler_error_line(const gchar *string, }
-/* try to parse the file and line number where the error occured described in string +/* try to parse the file and line number where the error occurred described in string * and when something useful is found, it stores the line number in *line and the * relevant file with the error in *filename. * *line will be -1 if no error was found in string.
Modified: src/tools.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -325,7 +325,7 @@ static gboolean cc_replace_sel_cb(gpointer user_data)
/* check whether the executed command failed and if so do nothing. - * If it returned with a sucessful exit code, replace the selection. */ + * If it returned with a successful exit code, replace the selection. */ static void cc_exit_cb(GPid child_pid, gint status, gpointer user_data) { struct cc_data *data = user_data; @@ -344,7 +344,7 @@ static void cc_exit_cb(GPid child_pid, gint status, gpointer user_data) data->error = TRUE; } else - { /* any other failure occured */ + { /* any other failure occurred */ data->error = TRUE; } #else
Modified: src/utils.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -564,7 +564,7 @@ gchar *utils_str_middle_truncate(const gchar *string, guint truncate_length)
g_return_val_if_fail(g_utf8_validate(string, length, NULL), NULL);
- /* It doesnt make sense to truncate strings to less than the size of the delimiter plus 2 + /* It doesn't make sense to truncate strings to less than the size of the delimiter plus 2 * characters (one on each side) */ delimiter_length = g_utf8_strlen(delimiter, -1); if (truncate_length < (delimiter_length + 2))
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).