lists.geany.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
List overview
Plugins-Commits
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
plugins-commits@lists.geany.org
5468 discussions
Start a n
N
ew thread
[geany/geany-plugins] 2b897d: Merge pull request #1335 from xiota/pr-markdown-webkit2gtk-4.1
by Colomban Wendling
25 Apr '24
25 Apr '24
Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: GitHub <noreply(a)github.com> Date: Thu, 25 Apr 2024 17:04:20 UTC Commit: 2b897dc56c097551d2214aef9bfe2c9341585e52
https://github.com/geany/geany-plugins/commit/2b897dc56c097551d2214aef9bfe2…
Log Message: ----------- Merge pull request #1335 from xiota/pr-markdown-webkit2gtk-4.1 Markdown: Add support for webkit2gtk-4.1 Modified Paths: -------------- build/markdown.m4 markdown/README markdown/src/Makefile.am markdown/src/viewer.c markdown/src/viewer.h Modified: build/markdown.m4 16 lines changed, 11 insertions(+), 5 deletions(-) =================================================================== @@ -46,16 +46,22 @@ AC_DEFUN([GP_CHECK_MARKDOWN], [markdown_library=libmarkdown]) GP_STATUS_FEATURE_ADD([Markdown library], [$markdown_library]) - GTK_VERSION=2.16 - WEBKIT_VERSION=1.1.13 + GTK_VERSION=3.0 + WEBKIT_VERSION=2.30 + + dnl Support both webkit2gtk 4.0 and 4.1, as the only difference is the + dnl libsoup version in the API, which we don't use. + dnl Prefer the 4.1 version, but use the 4.0 version as fallback if + dnl available -- yet still ask for the 4.1 if neither are available + webkit_package=webkit2gtk-4.1 + PKG_CHECK_EXISTS([${webkit_package} >= ${WEBKIT_VERSION}],, + [PKG_CHECK_EXISTS([webkit2gtk-4.0 >= ${WEBKIT_VERSION}], + [webkit_package=webkit2gtk-4.0])]) - GP_CHECK_GTK3([webkit_package=webkit2gtk-4.0], - [webkit_package=webkit-1.0]) GP_CHECK_PLUGIN_DEPS([markdown], [MARKDOWN], [$GP_GTK_PACKAGE >= ${GTK_VERSION} $webkit_package >= ${WEBKIT_VERSION} gthread-2.0]) - AM_CONDITIONAL([MARKDOWN_WEBKIT2], [test "$webkit_package" = webkit2gtk-4.0]) GP_COMMIT_PLUGIN_STATUS([Markdown]) Modified: markdown/README 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -146,8 +146,8 @@ Requirements The plugin depends on the following libraries: -* `GTK+ <
http://www.gtk.org
>`_ 2.16 or greater -* `WebKitGTK+ <
http://webkitgtk.org
>`_ 1.1.18 or greater +* `GTK+ <
http://www.gtk.org
>`_ 3.0 or greater +* `WebKitGTK+ <
http://webkitgtk.org
>`_ API 4.0 or 4.1 License ------- Modified: markdown/src/Makefile.am 4 lines changed, 0 insertions(+), 4 deletions(-) =================================================================== @@ -35,8 +35,4 @@ markdown_la_CFLAGS += $(LIBMARKDOWN_CFLAGS) markdown_la_LIBADD += $(LIBMARKDOWN_LIBS) endif -if MARKDOWN_WEBKIT2 -markdown_la_CFLAGS += -DMARKDOWN_WEBKIT2 -endif - include $(top_srcdir)/build/cppcheck.mk Modified: markdown/src/viewer.c 33 lines changed, 1 insertions(+), 32 deletions(-) =================================================================== @@ -22,11 +22,7 @@ #include "config.h" #include <string.h> #include <gtk/gtk.h> -#ifdef MARKDOWN_WEBKIT2 -# include <webkit2/webkit2.h> -#else -# include <webkit/webkitwebview.h> -#endif +#include <webkit2/webkit2.h> #include <geanyplugin.h> #ifndef FULL_PRICE # include <mkdio.h> @@ -303,7 +299,6 @@ pop_scroll_pos(MarkdownViewer *self) return popped; } -#ifdef MARKDOWN_WEBKIT2 static void on_webview_load_changed(MarkdownViewer *self, WebKitLoadEvent load_event, @@ -314,21 +309,6 @@ on_webview_load_changed(MarkdownViewer *self, pop_scroll_pos(self); } } -#else -static void -on_webview_load_status_notify(WebKitWebView *view, GParamSpec *pspec, - MarkdownViewer *self) -{ - WebKitLoadStatus load_status; - - g_object_get(view, "load-status", &load_status, NULL); - - /* When the webkit is done loading, reset the scroll position. */ - if (load_status == WEBKIT_LOAD_FINISHED) { - pop_scroll_pos(self); - } -} -#endif gchar * markdown_viewer_get_html(MarkdownViewer *self) @@ -408,23 +388,12 @@ markdown_viewer_update_view(MarkdownViewer *self) /* Connect a signal handler (only needed once) to restore the scroll * position once the webview is reloaded. */ if (self->priv->load_handle == 0) { -#ifdef MARKDOWN_WEBKIT2 self->priv->load_handle = g_signal_connect_swapped(WEBKIT_WEB_VIEW(self), "load-changed", G_CALLBACK(on_webview_load_changed), self); -#else - self->priv->load_handle = - g_signal_connect_swapped(WEBKIT_WEB_VIEW(self), "notify::load-status", - G_CALLBACK(on_webview_load_status_notify), self); -#endif } -#ifdef MARKDOWN_WEBKIT2 webkit_web_view_load_html(WEBKIT_WEB_VIEW(self), html, base_uri); -#else - webkit_web_view_load_string(WEBKIT_WEB_VIEW(self), html, "text/html", - self->priv->enc, base_uri); -#endif g_free(base_uri); g_free(html); Modified: markdown/src/viewer.h 6 lines changed, 1 insertions(+), 5 deletions(-) =================================================================== @@ -23,11 +23,7 @@ #define MARKDOWN_VIEWER_H 1 #include <gtk/gtk.h> -#ifdef MARKDOWN_WEBKIT2 -# include <webkit2/webkit2.h> -#else -# include <webkit/webkitwebview.h> -#endif +#include <webkit2/webkit2.h> G_BEGIN_DECLS -------------- This E-Mail was brought to you by github_commit_mail.py (Source:
https://github.com/geany/infrastructure
).
1
0
0
0
[geany/geany-plugins] a9914c: Markdown: Modify replace_all to avoid infinite loop
by xiota
25 Apr '24
25 Apr '24
Branch: refs/heads/master Author: xiota <github(a)mentalfossa.com> Committer: xiota <github(a)mentalfossa.com> Date: Sat, 04 Mar 2023 20:21:32 UTC Commit: a9914c7df9729cf8db4c5e9f5f20082c68fd158c
https://github.com/geany/geany-plugins/commit/a9914c7df9729cf8db4c5e9f5f200…
Log Message: ----------- Markdown: Modify replace_all to avoid infinite loop Modified Paths: -------------- markdown/src/viewer.c Modified: markdown/src/viewer.c 7 lines changed, 5 insertions(+), 2 deletions(-) =================================================================== @@ -194,12 +194,15 @@ replace_all(MarkdownViewer *self, { gchar *ptr; gsize needle_len = strlen(needle); + gsize replacement_len = strlen(replacement); + goffset offset = 0; /* For each occurrence of needle in haystack */ - while ((ptr = strstr(haystack->str, needle)) != NULL) { - goffset offset = ptr - haystack->str; + while ((ptr = strstr(haystack->str + offset, needle)) != NULL) { + offset = ptr - haystack->str; g_string_erase(haystack, offset, needle_len); g_string_insert(haystack, offset, replacement); + offset += replacement_len; } } -------------- This E-Mail was brought to you by github_commit_mail.py (Source:
https://github.com/geany/infrastructure
).
1
0
0
0
[geany/geany-plugins] d851fa: Merge pull request #1232 from xiota/pr-markdown-replace-all
by Colomban Wendling
25 Apr '24
25 Apr '24
Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: GitHub <noreply(a)github.com> Date: Thu, 25 Apr 2024 12:24:32 UTC Commit: d851faca7a88e761c624b675549cebbaac21f5bd
https://github.com/geany/geany-plugins/commit/d851faca7a88e761c624b675549ce…
Log Message: ----------- Merge pull request #1232 from xiota/pr-markdown-replace-all Markdown: Modify replace_all to avoid infinite loop Fixes #936. Modified Paths: -------------- markdown/src/viewer.c Modified: markdown/src/viewer.c 7 lines changed, 5 insertions(+), 2 deletions(-) =================================================================== @@ -194,12 +194,15 @@ replace_all(MarkdownViewer *self, { gchar *ptr; gsize needle_len = strlen(needle); + gsize replacement_len = strlen(replacement); + goffset offset = 0; /* For each occurrence of needle in haystack */ - while ((ptr = strstr(haystack->str, needle)) != NULL) { - goffset offset = ptr - haystack->str; + while ((ptr = strstr(haystack->str + offset, needle)) != NULL) { + offset = ptr - haystack->str; g_string_erase(haystack, offset, needle_len); g_string_insert(haystack, offset, replacement); + offset += replacement_len; } } -------------- This E-Mail was brought to you by github_commit_mail.py (Source:
https://github.com/geany/infrastructure
).
1
0
0
0
[geany/geany-plugins] a0e819: Markdown: Allow building with webkit2gtk-4.1
by xiota
24 Apr '24
24 Apr '24
Branch: refs/heads/master Author: xiota <github(a)mentalfossa.com> Committer: xiota <github(a)mentalfossa.com> Date: Wed, 24 Apr 2024 21:50:37 UTC Commit: a0e81927312305dc0b8c0360a62db61c8584aa26
https://github.com/geany/geany-plugins/commit/a0e81927312305dc0b8c0360a62db…
Log Message: ----------- Markdown: Allow building with webkit2gtk-4.1 Modified Paths: -------------- build/markdown.m4 markdown/README markdown/src/Makefile.am markdown/src/viewer.c markdown/src/viewer.h Modified: build/markdown.m4 16 lines changed, 11 insertions(+), 5 deletions(-) =================================================================== @@ -46,16 +46,22 @@ AC_DEFUN([GP_CHECK_MARKDOWN], [markdown_library=libmarkdown]) GP_STATUS_FEATURE_ADD([Markdown library], [$markdown_library]) - GTK_VERSION=2.16 - WEBKIT_VERSION=1.1.13 + GTK_VERSION=3.0 + WEBKIT_VERSION=2.30 + + dnl Support both webkit2gtk 4.0 and 4.1, as the only difference is the + dnl libsoup version in the API, which we don't use. + dnl Prefer the 4.1 version, but use the 4.0 version as fallback if + dnl available -- yet still ask for the 4.1 if neither are available + webkit_package=webkit2gtk-4.1 + PKG_CHECK_EXISTS([${webkit_package} >= ${WEBKIT_VERSION}],, + [PKG_CHECK_EXISTS([webkit2gtk-4.0 >= ${WEBKIT_VERSION}], + [webkit_package=webkit2gtk-4.0])]) - GP_CHECK_GTK3([webkit_package=webkit2gtk-4.0], - [webkit_package=webkit-1.0]) GP_CHECK_PLUGIN_DEPS([markdown], [MARKDOWN], [$GP_GTK_PACKAGE >= ${GTK_VERSION} $webkit_package >= ${WEBKIT_VERSION} gthread-2.0]) - AM_CONDITIONAL([MARKDOWN_WEBKIT2], [test "$webkit_package" = webkit2gtk-4.0]) GP_COMMIT_PLUGIN_STATUS([Markdown]) Modified: markdown/README 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -146,8 +146,8 @@ Requirements The plugin depends on the following libraries: -* `GTK+ <
http://www.gtk.org
>`_ 2.16 or greater -* `WebKitGTK+ <
http://webkitgtk.org
>`_ 1.1.18 or greater +* `GTK+ <
http://www.gtk.org
>`_ 3.0 or greater +* `WebKitGTK+ <
http://webkitgtk.org
>`_ API 4.0 or 4.1 License ------- Modified: markdown/src/Makefile.am 4 lines changed, 0 insertions(+), 4 deletions(-) =================================================================== @@ -35,8 +35,4 @@ markdown_la_CFLAGS += $(LIBMARKDOWN_CFLAGS) markdown_la_LIBADD += $(LIBMARKDOWN_LIBS) endif -if MARKDOWN_WEBKIT2 -markdown_la_CFLAGS += -DMARKDOWN_WEBKIT2 -endif - include $(top_srcdir)/build/cppcheck.mk Modified: markdown/src/viewer.c 33 lines changed, 1 insertions(+), 32 deletions(-) =================================================================== @@ -22,11 +22,7 @@ #include "config.h" #include <string.h> #include <gtk/gtk.h> -#ifdef MARKDOWN_WEBKIT2 -# include <webkit2/webkit2.h> -#else -# include <webkit/webkitwebview.h> -#endif +#include <webkit2/webkit2.h> #include <geanyplugin.h> #ifndef FULL_PRICE # include <mkdio.h> @@ -300,7 +296,6 @@ pop_scroll_pos(MarkdownViewer *self) return popped; } -#ifdef MARKDOWN_WEBKIT2 static void on_webview_load_changed(MarkdownViewer *self, WebKitLoadEvent load_event, @@ -311,21 +306,6 @@ on_webview_load_changed(MarkdownViewer *self, pop_scroll_pos(self); } } -#else -static void -on_webview_load_status_notify(WebKitWebView *view, GParamSpec *pspec, - MarkdownViewer *self) -{ - WebKitLoadStatus load_status; - - g_object_get(view, "load-status", &load_status, NULL); - - /* When the webkit is done loading, reset the scroll position. */ - if (load_status == WEBKIT_LOAD_FINISHED) { - pop_scroll_pos(self); - } -} -#endif gchar * markdown_viewer_get_html(MarkdownViewer *self) @@ -405,23 +385,12 @@ markdown_viewer_update_view(MarkdownViewer *self) /* Connect a signal handler (only needed once) to restore the scroll * position once the webview is reloaded. */ if (self->priv->load_handle == 0) { -#ifdef MARKDOWN_WEBKIT2 self->priv->load_handle = g_signal_connect_swapped(WEBKIT_WEB_VIEW(self), "load-changed", G_CALLBACK(on_webview_load_changed), self); -#else - self->priv->load_handle = - g_signal_connect_swapped(WEBKIT_WEB_VIEW(self), "notify::load-status", - G_CALLBACK(on_webview_load_status_notify), self); -#endif } -#ifdef MARKDOWN_WEBKIT2 webkit_web_view_load_html(WEBKIT_WEB_VIEW(self), html, base_uri); -#else - webkit_web_view_load_string(WEBKIT_WEB_VIEW(self), html, "text/html", - self->priv->enc, base_uri); -#endif g_free(base_uri); g_free(html); Modified: markdown/src/viewer.h 6 lines changed, 1 insertions(+), 5 deletions(-) =================================================================== @@ -23,11 +23,7 @@ #define MARKDOWN_VIEWER_H 1 #include <gtk/gtk.h> -#ifdef MARKDOWN_WEBKIT2 -# include <webkit2/webkit2.h> -#else -# include <webkit/webkitwebview.h> -#endif +#include <webkit2/webkit2.h> G_BEGIN_DECLS -------------- This E-Mail was brought to you by github_commit_mail.py (Source:
https://github.com/geany/infrastructure
).
1
0
0
0
[geany/geany-plugins] 644550: Merge pull request #1334 from techee/prjorg_pattern
by Jiří Techet
23 Apr '24
23 Apr '24
Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Tue, 23 Apr 2024 16:57:21 UTC Commit: 644550babb52013d2625a3f8e789bbe94a335b6f
https://github.com/geany/geany-plugins/commit/644550babb52013d2625a3f8e789b…
Log Message: ----------- Merge pull request #1334 from techee/prjorg_pattern projectorganizer: Use g_pattern_spec_match_string() instead of g_pattern_match_string() Modified Paths: -------------- projectorganizer/src/prjorg-project.c projectorganizer/src/prjorg-sidebar.c projectorganizer/src/prjorg-utils.c projectorganizer/src/prjorg-utils.h Modified: projectorganizer/src/prjorg-project.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -216,7 +216,7 @@ static gboolean match_basename(gconstpointer pft, gconstpointer user_data) { GPatternSpec *pattern = g_pattern_spec_new(ft->pattern[j]); - if (g_pattern_match_string(pattern, utf8_base_filename)) + if (g_pattern_spec_match_string(pattern, utf8_base_filename)) { ret = TRUE; g_pattern_spec_free(pattern); Modified: projectorganizer/src/prjorg-sidebar.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -657,7 +657,7 @@ static void find_file_recursive(GtkTreeIter *iter, gboolean case_sensitive, gboo if (!case_sensitive) SETPTR(utf8_name, g_utf8_strdown(utf8_name, -1)); - if (g_pattern_match_string(pattern, utf8_name)) + if (g_pattern_spec_match_string(pattern, utf8_name)) { gchar *utf8_base_path = get_project_base_path(); gchar *utf8_path, *rel_path; @@ -840,7 +840,7 @@ static gboolean match(TMTag *tag, const gchar *name, gboolean declaration, gbool matches = g_strcmp0(name_case, name) == 0; break; case MATCH_PATTERN: - matches = g_pattern_match_string(pspec, name_case); + matches = g_pattern_spec_match_string(pspec, name_case); break; case MATCH_PREFIX: matches = g_str_has_prefix(name_case, name); Modified: projectorganizer/src/prjorg-utils.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -80,7 +80,7 @@ gboolean patterns_match(GSList *patterns, const gchar *str) foreach_slist (elem, patterns) { GPatternSpec *pattern = elem->data; - if (g_pattern_match_string(pattern, str)) + if (g_pattern_spec_match_string(pattern, str)) return TRUE; } return FALSE; @@ -269,7 +269,7 @@ gchar *try_find_header_source(gchar *utf8_file_name, gboolean is_header, GSList full_name = elem->data; gchar *base_name = g_path_get_basename(full_name); - if (g_pattern_match_string(pattern, base_name)) + if (g_pattern_spec_match_string(pattern, base_name)) { if ((is_header && patterns_match(source_patterns, base_name)) || (!is_header && patterns_match(header_patterns, base_name))) Modified: projectorganizer/src/prjorg-utils.h 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -22,6 +22,10 @@ #include <gtk/gtk.h> #include <geanyplugin.h> +#if ! GLIB_CHECK_VERSION(2, 70, 0) +# define g_pattern_spec_match_string g_pattern_match_string +#endif + gchar *get_relative_path(const gchar *utf8_parent, const gchar *utf8_descendant); gboolean patterns_match(GSList *patterns, const gchar *str); -------------- This E-Mail was brought to you by github_commit_mail.py (Source:
https://github.com/geany/infrastructure
).
1
0
0
0
[geany/geany-plugins] c5c45f: Merge pull request #1333 from techee/ctags_pattern
by Jiří Techet
23 Apr '24
23 Apr '24
Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Tue, 23 Apr 2024 16:56:44 UTC Commit: c5c45f2999803c818176217dc9df50652efe3f94
https://github.com/geany/geany-plugins/commit/c5c45f2999803c818176217dc9df5…
Log Message: ----------- Merge pull request #1333 from techee/ctags_pattern geanyctags: Use g_pattern_spec_match_string() instead of g_pattern_match_string() Modified Paths: -------------- geanyctags/src/geanyctags.c Modified: geanyctags/src/geanyctags.c 6 lines changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -395,6 +395,10 @@ static gboolean find_next(tagFile *tf, tagEntry *entry, MatchType match_type) return ret; } +#if ! GLIB_CHECK_VERSION(2, 70, 0) +# define g_pattern_spec_match_string g_pattern_match_string +#endif + static gboolean filter_tag(tagEntry *entry, GPatternSpec *name, gboolean declaration, gboolean case_sensitive) { gboolean filter = TRUE; @@ -415,7 +419,7 @@ static gboolean filter_tag(tagEntry *entry, GPatternSpec *name, gboolean declara else entry_name = g_utf8_strdown(entry->name, -1); - filter = !g_pattern_match_string(name, entry_name); + filter = !g_pattern_spec_match_string(name, entry_name); g_free(entry_name); -------------- This E-Mail was brought to you by github_commit_mail.py (Source:
https://github.com/geany/infrastructure
).
1
0
0
0
[geany/geany-plugins] 05752c: projectorganizer: Use g_pattern_spec_match_string() instead of g_pattern_match_string()
by Jiří Techet
23 Apr '24
23 Apr '24
Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Tue, 23 Apr 2024 16:43:51 UTC Commit: 05752c4c62dfbfa6f1038f2c280e02cbc6054f89
https://github.com/geany/geany-plugins/commit/05752c4c62dfbfa6f1038f2c280e0…
Log Message: ----------- projectorganizer: Use g_pattern_spec_match_string() instead of g_pattern_match_string() Eliminates a warning on newer glib versions. Adds a fallback on older versions. Modified Paths: -------------- projectorganizer/src/prjorg-project.c projectorganizer/src/prjorg-sidebar.c projectorganizer/src/prjorg-utils.c projectorganizer/src/prjorg-utils.h Modified: projectorganizer/src/prjorg-project.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -216,7 +216,7 @@ static gboolean match_basename(gconstpointer pft, gconstpointer user_data) { GPatternSpec *pattern = g_pattern_spec_new(ft->pattern[j]); - if (g_pattern_match_string(pattern, utf8_base_filename)) + if (g_pattern_spec_match_string(pattern, utf8_base_filename)) { ret = TRUE; g_pattern_spec_free(pattern); Modified: projectorganizer/src/prjorg-sidebar.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -657,7 +657,7 @@ static void find_file_recursive(GtkTreeIter *iter, gboolean case_sensitive, gboo if (!case_sensitive) SETPTR(utf8_name, g_utf8_strdown(utf8_name, -1)); - if (g_pattern_match_string(pattern, utf8_name)) + if (g_pattern_spec_match_string(pattern, utf8_name)) { gchar *utf8_base_path = get_project_base_path(); gchar *utf8_path, *rel_path; @@ -840,7 +840,7 @@ static gboolean match(TMTag *tag, const gchar *name, gboolean declaration, gbool matches = g_strcmp0(name_case, name) == 0; break; case MATCH_PATTERN: - matches = g_pattern_match_string(pspec, name_case); + matches = g_pattern_spec_match_string(pspec, name_case); break; case MATCH_PREFIX: matches = g_str_has_prefix(name_case, name); Modified: projectorganizer/src/prjorg-utils.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -80,7 +80,7 @@ gboolean patterns_match(GSList *patterns, const gchar *str) foreach_slist (elem, patterns) { GPatternSpec *pattern = elem->data; - if (g_pattern_match_string(pattern, str)) + if (g_pattern_spec_match_string(pattern, str)) return TRUE; } return FALSE; @@ -269,7 +269,7 @@ gchar *try_find_header_source(gchar *utf8_file_name, gboolean is_header, GSList full_name = elem->data; gchar *base_name = g_path_get_basename(full_name); - if (g_pattern_match_string(pattern, base_name)) + if (g_pattern_spec_match_string(pattern, base_name)) { if ((is_header && patterns_match(source_patterns, base_name)) || (!is_header && patterns_match(header_patterns, base_name))) Modified: projectorganizer/src/prjorg-utils.h 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -22,6 +22,10 @@ #include <gtk/gtk.h> #include <geanyplugin.h> +#if ! GLIB_CHECK_VERSION(2, 70, 0) +# define g_pattern_spec_match_string g_pattern_match_string +#endif + gchar *get_relative_path(const gchar *utf8_parent, const gchar *utf8_descendant); gboolean patterns_match(GSList *patterns, const gchar *str); -------------- This E-Mail was brought to you by github_commit_mail.py (Source:
https://github.com/geany/infrastructure
).
1
0
0
0
[geany/geany-plugins] e2f784: Merge pull request #1332 from techee/vimode_warning_fix
by Jiří Techet
23 Apr '24
23 Apr '24
Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Tue, 23 Apr 2024 16:41:02 UTC Commit: e2f78480f5a951a94a88ec7e92ee6006f2d99353
https://github.com/geany/geany-plugins/commit/e2f78480f5a951a94a88ec7e92ee6…
Log Message: ----------- Merge pull request #1332 from techee/vimode_warning_fix vimode: eliminate a warning Modified Paths: -------------- vimode/src/backends/backend-viw.c Modified: vimode/src/backends/backend-viw.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -90,8 +90,8 @@ static gboolean on_save(gboolean force) { GtkWidget *dialog = gtk_file_chooser_dialog_new ("Save File", GTK_WINDOW(window), GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); + "_Cancel", GTK_RESPONSE_CANCEL, + "_Save", GTK_RESPONSE_ACCEPT, NULL); gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog), TRUE); if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) fname = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); -------------- This E-Mail was brought to you by github_commit_mail.py (Source:
https://github.com/geany/infrastructure
).
1
0
0
0
[geany/geany-plugins] 046b01: geanyctags: Use g_pattern_spec_match_string() instead of g_pattern_match_string()
by Jiří Techet
23 Apr '24
23 Apr '24
Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Tue, 23 Apr 2024 16:39:58 UTC Commit: 046b01cef4ecb6dee63315db56580b4f09bb2206
https://github.com/geany/geany-plugins/commit/046b01cef4ecb6dee63315db56580…
Log Message: ----------- geanyctags: Use g_pattern_spec_match_string() instead of g_pattern_match_string() With a fallback on older glib versions. Modified Paths: -------------- geanyctags/src/geanyctags.c Modified: geanyctags/src/geanyctags.c 6 lines changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -395,6 +395,10 @@ static gboolean find_next(tagFile *tf, tagEntry *entry, MatchType match_type) return ret; } +#if ! GLIB_CHECK_VERSION(2, 70, 0) +# define g_pattern_spec_match_string g_pattern_match_string +#endif + static gboolean filter_tag(tagEntry *entry, GPatternSpec *name, gboolean declaration, gboolean case_sensitive) { gboolean filter = TRUE; @@ -415,7 +419,7 @@ static gboolean filter_tag(tagEntry *entry, GPatternSpec *name, gboolean declara else entry_name = g_utf8_strdown(entry->name, -1); - filter = !g_pattern_match_string(name, entry_name); + filter = !g_pattern_spec_match_string(name, entry_name); g_free(entry_name); -------------- This E-Mail was brought to you by github_commit_mail.py (Source:
https://github.com/geany/infrastructure
).
1
0
0
0
[geany/geany-plugins] 27f35d: vimode: eliminate a warning
by Jiří Techet
23 Apr '24
23 Apr '24
Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Tue, 23 Apr 2024 16:28:51 UTC Commit: 27f35ddd9c7f5107bf1db21fa6062e86eeea4e17
https://github.com/geany/geany-plugins/commit/27f35ddd9c7f5107bf1db21fa6062…
Log Message: ----------- vimode: eliminate a warning This is just a binary for testing and the missing icons don't matter. Modified Paths: -------------- vimode/src/backends/backend-viw.c Modified: vimode/src/backends/backend-viw.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -90,8 +90,8 @@ static gboolean on_save(gboolean force) { GtkWidget *dialog = gtk_file_chooser_dialog_new ("Save File", GTK_WINDOW(window), GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); + "_Cancel", GTK_RESPONSE_CANCEL, + "_Save", GTK_RESPONSE_ACCEPT, NULL); gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog), TRUE); if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) fname = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); -------------- This E-Mail was brought to you by github_commit_mail.py (Source:
https://github.com/geany/infrastructure
).
1
0
0
0
← Newer
1
...
8
9
10
11
12
13
14
...
547
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
Results per page:
10
25
50
100
200