Commits December 2023

commits@lists.geany.org

1 participants
17 discussions

[geany/geany] c09069: Remove deprecated Doxygen settings
by Enrico Tröger 20 Dec '23

20 Dec '23

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Tue, 12 Dec 2023 21:58:25 UTC Commit: c090698fafaf238e8a9b450c2cc4f2aaaaca3780 https://github.com/geany/geany/commit/c090698fafaf238e8a9b450c2cc4f2aaaaca3… Log Message: ----------- Remove deprecated Doxygen settings This removes the followings warnings when generating the docs: warning: Tag 'LATEX_SOURCE_CODE' at line 1758 of file 'Doxyfile.tmp' has become obsolete. To avoid this warning please remove this line from your configuration file or upgrade it using "doxygen -u" warning: Tag 'CLASS_DIAGRAMS' at line 2113 of file 'Doxyfile.tmp' has become obsolete. To avoid this warning please remove this line from your configuration file or upgrade it using "doxygen -u" warning: Changing CLASS_GRAPH option to TEXT because obsolete option CLASS_DIAGRAM was found and set to NO. Modified Paths: -------------- doc/Doxyfile.in Modified: doc/Doxyfile.in 19 lines changed, 0 insertions(+), 19 deletions(-) =================================================================== @@ -1747,16 +1747,6 @@ LATEX_BATCHMODE = NO LATEX_HIDE_INDICES = NO -# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source -# code with syntax highlighting in the LaTeX output. -# -# Note that which sources are shown also depends on other settings such as -# SOURCE_BROWSER. -# The default value is: NO. -# This tag requires that the tag GENERATE_LATEX is set to YES. - -LATEX_SOURCE_CODE = NO - # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See # http://en.wikipedia.org/wiki/BibTeX and \cite for more info. @@ -2103,15 +2093,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = NO - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 06b8e6: Merge pull request #3719 from eht16/remove_deprecated_doxygen_settings
by Colomban Wendling 20 Dec '23

20 Dec '23

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 20 Dec 2023 11:02:05 UTC Commit: 06b8e6b1c9c73636906d23d2c272d85dabc0ff56 https://github.com/geany/geany/commit/06b8e6b1c9c73636906d23d2c272d85dabc0f… Log Message: ----------- Merge pull request #3719 from eht16/remove_deprecated_doxygen_settings Remove deprecated Doxygen settings Modified Paths: -------------- doc/Doxyfile.in Modified: doc/Doxyfile.in 19 lines changed, 0 insertions(+), 19 deletions(-) =================================================================== @@ -1747,16 +1747,6 @@ LATEX_BATCHMODE = NO LATEX_HIDE_INDICES = NO -# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source -# code with syntax highlighting in the LaTeX output. -# -# Note that which sources are shown also depends on other settings such as -# SOURCE_BROWSER. -# The default value is: NO. -# This tag requires that the tag GENERATE_LATEX is set to YES. - -LATEX_SOURCE_CODE = NO - # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See # http://en.wikipedia.org/wiki/BibTeX and \cite for more info. @@ -2103,15 +2093,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = NO - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/infrastructure] 61598c: Add new --quiet flag to github-backup
by Enrico Tröger 13 Dec '23

13 Dec '23

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Tue, 12 Dec 2023 22:07:57 UTC Commit: 61598c96a3f7247621ffaf9dc42dfdf986f43e46 https://github.com/geany/infrastructure/commit/61598c96a3f7247621ffaf9dc42d… Log Message: ----------- Add new --quiet flag to github-backup Suppress informational messages and show only warnings and errors. Modified Paths: -------------- github-backup/backup.sh Modified: github-backup/backup.sh 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -8,6 +8,7 @@ # start the backup /home/geany/github-backup/venv/bin/github-backup \ + --quiet \ --token file:///home/geany/.github-token \ --issues \ --issue-comments \ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 17523e: Do not show charset "None" in the list of encodings
by Enrico Tröger 10 Dec '23

10 Dec '23

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 22 Oct 2023 11:31:44 UTC Commit: 17523e5f8ba6ac0c93290fac4ad64f23d005b3b1 https://github.com/geany/geany/commit/17523e5f8ba6ac0c93290fac4ad64f23d005b… Log Message: ----------- Do not show charset "None" in the list of encodings The charset "None" would be shown for the encoding name "Without encoding" and so it would be rather redundant and the special value "None" should be translatable but isn't. Closes #3624. Modified Paths: -------------- src/encodings.c Modified: src/encodings.c 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -278,7 +278,10 @@ gchar *encodings_to_string(const GeanyEncoding* enc) g_return_val_if_fail(enc->name != NULL, NULL); g_return_val_if_fail(enc->charset != NULL, NULL); - return g_strdup_printf("%s (%s)", enc->name, enc->charset); + if (enc->idx == GEANY_ENCODING_NONE) + return g_strdup(enc->name); // enc->charset is "None" and would be useless to display + else + return g_strdup_printf("%s (%s)", enc->name, enc->charset); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 512e88: Merge pull request #3640 from eht16/issue3624_do_not_none_charset
by Colomban Wendling 10 Dec '23

10 Dec '23

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 09 Dec 2023 23:34:06 UTC Commit: 512e88df8d97284c191459450bce4dd7877b9c2b https://github.com/geany/geany/commit/512e88df8d97284c191459450bce4dd7877b9… Log Message: ----------- Merge pull request #3640 from eht16/issue3624_do_not_none_charset Do not show charset "None" in the list of encodings Modified Paths: -------------- src/encodings.c Modified: src/encodings.c 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -278,7 +278,10 @@ gchar *encodings_to_string(const GeanyEncoding* enc) g_return_val_if_fail(enc->name != NULL, NULL); g_return_val_if_fail(enc->charset != NULL, NULL); - return g_strdup_printf("%s (%s)", enc->name, enc->charset); + if (enc->idx == GEANY_ENCODING_NONE) + return g_strdup(enc->name); // enc->charset is "None" and would be useless to display + else + return g_strdup_printf("%s (%s)", enc->name, enc->charset); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] ffaa38: Merge pull request #3681 from BayashiPascal/master
by Colomban Wendling 10 Dec '23

10 Dec '23

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 09 Dec 2023 23:18:54 UTC Commit: ffaa38365b229f370d2085ed560575b7dbc2fd70 https://github.com/geany/geany/commit/ffaa38365b229f370d2085ed560575b7dbc2f… Log Message: ----------- Merge pull request #3681 from BayashiPascal/master Fix focusing the symbol list through key binding Modified Paths: -------------- src/sidebar.c Modified: src/sidebar.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1649,7 +1649,7 @@ void sidebar_focus_symbols_tab(void) if (ui_prefs.sidebar_visible && interface_prefs.sidebar_symbol_visible) { GtkNotebook *notebook = GTK_NOTEBOOK(main_widgets.sidebar_notebook); - GtkWidget *symbol_list_scrollwin = gtk_notebook_get_nth_page(notebook, TREEVIEW_SYMBOL); + GtkWidget *symbol_list_scrollwin = ui_lookup_widget(main_widgets.window, "scrolledwindow2"); gtk_notebook_set_current_page(notebook, TREEVIEW_SYMBOL); gtk_widget_grab_focus(gtk_bin_get_child(GTK_BIN(symbol_list_scrollwin))); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] ea2458: Fix focusing the symbol list through key binding
by Baillehache Pascal 10 Dec '23

10 Dec '23

Branch: refs/heads/master Author: Baillehache Pascal <baillehache.pascal(a)gmail.com> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 09 Dec 2023 23:13:43 UTC Commit: ea2458e4472fe0d42d4e8ae460596b561b1d37c7 https://github.com/geany/geany/commit/ea2458e4472fe0d42d4e8ae460596b561b1d3… Log Message: ----------- Fix focusing the symbol list through key binding Fixes #3678 Co-authored-by: Colomban Wendling <lists.ban(a)herbesfolles.org> Modified Paths: -------------- src/sidebar.c Modified: src/sidebar.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1649,7 +1649,7 @@ void sidebar_focus_symbols_tab(void) if (ui_prefs.sidebar_visible && interface_prefs.sidebar_symbol_visible) { GtkNotebook *notebook = GTK_NOTEBOOK(main_widgets.sidebar_notebook); - GtkWidget *symbol_list_scrollwin = gtk_notebook_get_nth_page(notebook, TREEVIEW_SYMBOL); + GtkWidget *symbol_list_scrollwin = ui_lookup_widget(main_widgets.window, "scrolledwindow2"); gtk_notebook_set_current_page(notebook, TREEVIEW_SYMBOL); gtk_widget_grab_focus(gtk_bin_get_child(GTK_BIN(symbol_list_scrollwin))); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 0629be: Add `.mjs` extension for JavaScript
by Damon Harris 10 Dec '23

10 Dec '23

Branch: refs/heads/master Author: Damon Harris <TheDcoder(a)protonmail.com> Committer: GitHub <noreply(a)github.com> Date: Wed, 22 Nov 2023 12:08:16 UTC Commit: 0629be7ac2b97dc254fc51f1beda8dfe83c952a8 https://github.com/geany/geany/commit/0629be7ac2b97dc254fc51f1beda8dfe83c95… Log Message: ----------- Add `.mjs` extension for JavaScript The `.mjs` extension is used by Node.js and others to denote JavaScript module files, unlike normal `.js` files these files are treated like ES6 modules by default. Modified Paths: -------------- data/filetype_extensions.conf Modified: data/filetype_extensions.conf 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -42,7 +42,7 @@ Haskell=*.hs;*.lhs;*.hs-boot;*.lhs-boot; Haxe=*.hx; HTML=*.htm;*.html;*.shtml;*.hta;*.htd;*.htt;*.cfm;*.tpl; Java=*.java;*.jsp; -Javascript=*.js; +Javascript=*.js;*.mjs; JSON=*.json; Julia=*.jl; Kotlin=*.kt;*.kts; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] aaaf1e: Merge pull request #3698 from TheDcoder/patch-1
by Colomban Wendling 10 Dec '23

10 Dec '23

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 09 Dec 2023 22:59:45 UTC Commit: aaaf1ed59b56aecb5fb8d76b93a177b3652f3a17 https://github.com/geany/geany/commit/aaaf1ed59b56aecb5fb8d76b93a177b3652f3… Log Message: ----------- Merge pull request #3698 from TheDcoder/patch-1 Add `.mjs` extension for JavaScript Modified Paths: -------------- data/filetype_extensions.conf Modified: data/filetype_extensions.conf 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -42,7 +42,7 @@ Haskell=*.hs;*.lhs;*.hs-boot;*.lhs-boot; Haxe=*.hx; HTML=*.htm;*.html;*.shtml;*.hta;*.htd;*.htt;*.cfm;*.tpl; Java=*.java;*.jsp; -Javascript=*.js; +Javascript=*.js;*.mjs; JSON=*.json; Julia=*.jl; Kotlin=*.kt;*.kts; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] cb68cd: Refactor to remove duplication, lower assumptions and improve safety
by Colomban Wendling 09 Dec '23

09 Dec '23

Branch: refs/heads/encodings-fixes Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 08 Dec 2023 20:58:01 UTC Commit: cb68cdb2f1b5c544b3235edde3bb12f149360fe7 https://github.com/geany/geany/commit/cb68cdb2f1b5c544b3235edde3bb12f149360… Log Message: ----------- Refactor to remove duplication, lower assumptions and improve safety * Do not have repeated code paths having to manually update `buffer->size` with `strlen(buffer->data)`; * This also reduces how many code paths assume `buffer->data` is NUL-free at this stage -- we still have some, but they are a little less critical, and it's a step in the right direction anyway; * Perform the NUL-freeness check unconditionally, only assuming `buffer->size` is correct, which it ought to be anyway. Modified Paths: -------------- src/encodings.c Modified: src/encodings.c 71 lines changed, 38 insertions(+), 33 deletions(-) =================================================================== @@ -619,21 +619,9 @@ void encodings_encoding_store_cell_data_func(GtkCellLayout *cell_layout, } -/** - * Tries to convert @a buffer into UTF-8 encoding from the encoding specified with @a charset. - * If @a fast is not set, additional checks to validate the converted string are performed. - * - * @param buffer The input string to convert. - * @param size The length of the string, or -1 if the string is nul-terminated. - * @param charset The charset to be used for conversion. - * @param fast @c TRUE to only convert the input and skip extended checks on the converted string. - * - * @return If the conversion was successful, a newly allocated nul-terminated string, - * which must be freed with @c g_free(). Otherwise @c NULL. - **/ -GEANY_API_SYMBOL -gchar *encodings_convert_to_utf8_from_charset(const gchar *buffer, gssize size, - const gchar *charset, gboolean fast) +static gchar *convert_to_utf8_from_charset(const gchar *buffer, gssize size, + const gchar *charset, gboolean fast, + gsize *utf8_size) { gchar *utf8_content = NULL; GError *conv_error = NULL; @@ -671,10 +659,35 @@ gchar *encodings_convert_to_utf8_from_charset(const gchar *buffer, gssize size, utf8_content = converted_contents; } + if (utf8_content && utf8_size) + *utf8_size = bytes_written; + return utf8_content; } +/** + * Tries to convert @a buffer into UTF-8 encoding from the encoding specified with @a charset. + * If @a fast is not set, additional checks to validate the converted string are performed. + * + * @param buffer The input string to convert. + * @param size The length of the string, or -1 if the string is nul-terminated. + * @param charset The charset to be used for conversion. + * @param fast @c TRUE to only convert the input and skip extended checks on the converted string. + * + * @return If the conversion was successful, a newly allocated nul-terminated string, + * which must be freed with @c g_free(). Otherwise @c NULL. + **/ +GEANY_API_SYMBOL +gchar *encodings_convert_to_utf8_from_charset(const gchar *buffer, gssize size, + const gchar *charset, gboolean fast) +{ + /* If fast=FALSE, we can safely ignore the size as the output cannot contain NULs. + * Otherwise, the caller already agrees on partial data anyway. */ + return convert_to_utf8_from_charset(buffer, size, charset, fast, NULL); +} + + static gchar *encodings_check_regexes(const gchar *buffer, gsize size) { guint i; @@ -691,7 +704,7 @@ static gchar *encodings_check_regexes(const gchar *buffer, gsize size) static gchar *encodings_convert_to_utf8_with_suggestion(const gchar *buffer, gssize size, - const gchar *suggested_charset, gchar **used_encoding) + const gchar *suggested_charset, gchar **used_encoding, gsize *utf8_size) { const gchar *locale_charset = NULL; const gchar *charset; @@ -758,7 +771,7 @@ static gchar *encodings_convert_to_utf8_with_suggestion(const gchar *buffer, gss geany_debug("Trying to convert %" G_GSIZE_FORMAT " bytes of data from %s into UTF-8.", size, charset); - utf8_content = encodings_convert_to_utf8_from_charset(buffer, size, charset, FALSE); + utf8_content = convert_to_utf8_from_charset(buffer, size, charset, FALSE, utf8_size); if (G_LIKELY(utf8_content != NULL)) { @@ -798,7 +811,8 @@ gchar *encodings_convert_to_utf8(const gchar *buffer, gssize size, gchar **used_ /* first try to read the encoding from the file content */ regex_charset = encodings_check_regexes(buffer, size); - utf8 = encodings_convert_to_utf8_with_suggestion(buffer, size, regex_charset, used_encoding); + /* we know this cannot succeed if there are NULs in the output, so ignoring the size is OK */ + utf8 = encodings_convert_to_utf8_with_suggestion(buffer, size, regex_charset, used_encoding, NULL); g_free(regex_charset); return utf8; @@ -879,7 +893,6 @@ typedef struct gsize size; /* actual data size */ gchar *enc; gboolean bom; - gboolean has_nuls; } BufferData; @@ -898,17 +911,15 @@ handle_forced_encoding(BufferData *buffer, const gchar *forced_enc) } else { - gchar *converted_text = encodings_convert_to_utf8_from_charset( - buffer->data, buffer->size, forced_enc, FALSE); + gchar *converted_text = convert_to_utf8_from_charset( + buffer->data, buffer->size, forced_enc, FALSE, &buffer->size); if (converted_text == NULL) { return FALSE; } else { SETPTR(buffer->data, converted_text); - /* we can't succeed with NULs, so this is OK */ - buffer->size = strlen(converted_text); } } enc_idx = encodings_scan_unicode_bom(buffer->data, buffer->size, NULL); @@ -949,13 +960,11 @@ handle_encoding(BufferData *buffer, GeanyEncodingIndex enc_idx) } else /* the BOM indicated something else than UTF-8 */ { - gchar *converted_text = encodings_convert_to_utf8_from_charset( - buffer->data, buffer->size, buffer->enc, FALSE); + gchar *converted_text = convert_to_utf8_from_charset( + buffer->data, buffer->size, buffer->enc, FALSE, &buffer->size); if (converted_text != NULL) { SETPTR(buffer->data, converted_text); - /* we can't succeed with NULs, so this is OK */ - buffer->size = strlen(converted_text); } else { @@ -981,16 +990,14 @@ handle_encoding(BufferData *buffer, GeanyEncodingIndex enc_idx) { /* detect the encoding */ gchar *converted_text = encodings_convert_to_utf8_with_suggestion(buffer->data, - buffer->size, regex_charset, &buffer->enc); + buffer->size, regex_charset, &buffer->enc, &buffer->size); if (converted_text == NULL) { g_free(regex_charset); return FALSE; } SETPTR(buffer->data, converted_text); - /* we can't succeed with NULs, so this is OK */ - buffer->size = strlen(converted_text); } g_free(regex_charset); } @@ -1032,7 +1039,6 @@ static gboolean handle_buffer(BufferData *buffer, const gchar *forced_enc) { buffer->bom = FALSE; buffer->enc = g_strdup(encodings[GEANY_ENCODING_NONE].charset); - buffer->has_nuls = strlen(buffer->data) != buffer->size; } else if (! handle_forced_encoding(buffer, forced_enc)) { @@ -1075,7 +1081,6 @@ gboolean encodings_convert_to_utf8_auto(gchar **buf, gsize *size, const gchar *f buffer.size = *size; buffer.enc = NULL; buffer.bom = FALSE; - buffer.has_nuls = FALSE; if (! handle_buffer(&buffer, forced_enc)) return FALSE; @@ -1088,7 +1093,7 @@ gboolean encodings_convert_to_utf8_auto(gchar **buf, gsize *size, const gchar *f if (has_bom) *has_bom = buffer.bom; if (has_nuls) - *has_nuls = buffer.has_nuls; + *has_nuls = strlen(buffer.data) != buffer.size; *buf = buffer.data; return TRUE; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits December 2023