Commits

commits@lists.geany.org

1 participants
11838 discussions

[geany/geany-osx] 146596: Fix patch to apply against current geany master
by Jiří Techet 13 Feb '25

13 Feb '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 13 Feb 2025 21:21:02 UTC Commit: 1465968eaf13d035eac6bf2a5a6446108df28f20 https://github.com/geany/geany-osx/commit/1465968eaf13d035eac6bf2a5a6446108… Log Message: ----------- Fix patch to apply against current geany master Modified Paths: -------------- geany_patches/geany_config_shell.patch Modified: geany_patches/geany_config_shell.patch 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -223,9 +223,9 @@ index 5d1b5fc97..f43f83619 100644 "entry_browser", "entry_grep", + "entry_shell1", + "entry_keybinding_filter", "entry_contextaction", "entry_template_developer", - "entry_template_initial", @@ -1787,6 +1793,10 @@ void prefs_show_dialog(void) NULL, GTK_FILE_CHOOSER_ACTION_OPEN, -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] a48d0a: Add upstream gtk-mac-integration patches
by Jiří Techet 13 Feb '25

13 Feb '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 13 Feb 2025 20:36:23 UTC Commit: a48d0a2c90e8963414c29c9c211f1a9687bdae8c https://github.com/geany/geany-osx/commit/a48d0a2c90e8963414c29c9c211f1a968… Log Message: ----------- Add upstream gtk-mac-integration patches Modified Paths: -------------- geany.modules geany_patches/gtk_mac_integration_typo.patch geany_patches/gtk_mac_integration_url_signal.patch Modified: geany.modules 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -81,6 +81,8 @@ checkoutdir="gtk-mac-integration-fixed" version="3.0.2"> <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/gtk_mac_integra…" strip="1" /> + <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/gtk_mac_integra…" strip="1" /> + <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/gtk_mac_integra…" strip="1" /> </branch> </autotools> Modified: geany_patches/gtk_mac_integration_typo.patch 25 lines changed, 25 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,25 @@ +From 7519ef0c14b662c5f1841ec34ae8700a34f70142 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jir=CC=8Ci=CC=81=20Techet?= <techet(a)gmail.com> +Date: Thu, 13 Feb 2025 21:16:53 +0100 +Subject: [PATCH] Fix typo + +--- + src/GtkApplicationDelegate.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/GtkApplicationDelegate.c b/src/GtkApplicationDelegate.c +index daddeb0..0d2aad6 100644 +--- a/src/GtkApplicationDelegate.c ++++ b/src/GtkApplicationDelegate.c +@@ -73,7 +73,7 @@ + return result; + } + +--(void) application: (NSApplication*)theApplication openFiless: (NSArray<NSString *> *) files ++-(void) application: (NSApplication*)theApplication openFiles: (NSArray<NSString *> *) files + { + gboolean overall_result = TRUE; + guint sig = g_signal_lookup ("NSApplicationOpenFile", +-- +2.45.2 + Modified: geany_patches/gtk_mac_integration_url_signal.patch 99 lines changed, 99 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,99 @@ +From 07d4a8e99dba4338145f750b6f7a7a17ca2198ba Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jir=CC=8Ci=CC=81=20Techet?= <techet(a)gmail.com> +Date: Thu, 13 Feb 2025 21:18:34 +0100 +Subject: [PATCH] Add signal for opening URLs + +--- + src/GtkApplicationDelegate.c | 16 ++++++++++++---- + src/gtkosxapplication_quartz.c | 29 ++++++++++++++++++++++++++++- + 2 files changed, 40 insertions(+), 5 deletions(-) + +diff --git a/src/GtkApplicationDelegate.c b/src/GtkApplicationDelegate.c +index 0d2aad6..09a8a87 100644 +--- a/src/GtkApplicationDelegate.c ++++ b/src/GtkApplicationDelegate.c +@@ -35,15 +35,23 @@ + -(void) application: (NSApplication*)theApplication openURLs: (NSArray<NSURL *> *) urls + { + gboolean overall_result = TRUE; +- guint sig = g_signal_lookup ("NSApplicationOpenFile", +- GTKOSX_TYPE_APPLICATION); +- if (sig) ++ guint file_sig = g_signal_lookup ("NSApplicationOpenFile", ++ GTKOSX_TYPE_APPLICATION); ++ guint url_sig = g_signal_lookup ("NSApplicationOpenURL", ++ GTKOSX_TYPE_APPLICATION); ++ if (file_sig || url_sig) + { + GtkosxApplication *app = g_object_new (GTKOSX_TYPE_APPLICATION, NULL); + for (NSURL* url in urls) + { + gboolean result = TRUE; +- g_signal_emit (app, sig, 0, [[url absoluteString] UTF8String], &result); ++ ++ if (file_sig && url.path) ++ g_signal_emit (app, file_sig, 0, [url.path UTF8String], &result); ++ ++ if (url_sig) ++ g_signal_emit (app, url_sig, 0, [url.absoluteString UTF8String], &result); ++ + if (!result) + overall_result = FALSE; + } +diff --git a/src/gtkosxapplication_quartz.c b/src/gtkosxapplication_quartz.c +index fa2977e..284d34a 100644 +--- a/src/gtkosxapplication_quartz.c ++++ b/src/gtkosxapplication_quartz.c +@@ -582,6 +582,7 @@ enum + BlockTermination, + WillTerminate, + OpenFile, ++ OpenURL, + LastSignal + }; + +@@ -727,7 +728,8 @@ gtkosx_application_class_init (GtkosxApplicationClass *klass) + * @user_data: Data attached at connection + * + * Emitted when an OpenFile, OpenFiles, or (in macOS 10.13 or later) +- * OpenURLs event is received from the operating system. This signal ++ * OpenURLs event is received from the operating system and in the ++ * last case when the URL is a file type. This signal + * does not implement drops, but it does implement "open with" + * events from Finder. If more than one file or URL is supplied then + * the signal is emitted once for each file. +@@ -742,6 +744,31 @@ gtkosx_application_class_init (GtkosxApplicationClass *klass) + g_cclosure_marshal_BOOLEAN__STRING, + G_TYPE_BOOLEAN, 1, G_TYPE_STRING); + ++ /** ++ * GtkosxApplication::NSApplicationOpenURL: ++ * @app: The application object ++ * @url: A UTF8-encoded, URL-escaped URL to open. ++ * @user_data: Data attached at connection ++ * ++ * Emitted in macOS 10.13 or later when an OpenURLs event is ++ * received from the operating system, including file types, meaning ++ * that both NSApplicationOpenFile and NSApplicationOpenURL are ++ * emitted when file type URLs are received. A separate signal will ++ * be emitted for each URL if more than one is received. If the URLs ++ * array contains a mix of file and the application handles both ++ * signals then it will get a mix of NSApplicationOpenFile and ++ * NSApplicationOpenURL signals. ++ * ++ * Returns: Boolean indicating success at opening the file. ++ */ ++ gtkosx_application_signals[OpenURL] = ++ g_signal_new ("NSApplicationOpenURL", ++ GTKOSX_TYPE_APPLICATION, ++ G_SIGNAL_NO_RECURSE | G_SIGNAL_ACTION, ++ 0, NULL, NULL, ++ g_cclosure_marshal_BOOLEAN__STRING, ++ G_TYPE_BOOLEAN, 1, G_TYPE_STRING); ++ + } + + /** +-- +2.45.2 + -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 7904ee: Revert "Temporarily add the LSP plugin"
by Jiří Techet 13 Feb '25

13 Feb '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 13 Feb 2025 19:40:01 UTC Commit: 7904ee6fba99e9b71a66143677b71810ea97e1a1 https://github.com/geany/geany-osx/commit/7904ee6fba99e9b71a66143677b71810e… Log Message: ----------- Revert "Temporarily add the LSP plugin" This reverts commit 9a64c725eae0820275678b3fdc1967cf61b53f2f. Modified Paths: -------------- geany.modules Modified: geany.modules 8 lines changed, 0 insertions(+), 8 deletions(-) =================================================================== @@ -16,9 +16,6 @@ href="https://files.pythonhosted.org/"/> <repository type="tarball" name="lua.org" href="https://www.lua.org/ftp/"/> - <repository name="github" - href="https://github.com/" - type="git" /> <include href="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/modulesets-stable/gtk-osx…" /> @@ -195,11 +192,6 @@ </dependencies> </autotools> - <meson id="geany-lsp"> - <branch repo="github" - module="techee/geany-lsp"/> - </meson> -  <metamodule id="geany-bundle-git"> <dependencies> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] f7da52: Revert "Add patch disabling meson and forth regex parsers which are slow"
by Jiří Techet 13 Feb '25

13 Feb '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 13 Feb 2025 19:40:01 UTC Commit: f7da5225a5b14da363b35e0f06be2f0e9351d945 https://github.com/geany/geany-osx/commit/f7da5225a5b14da363b35e0f06be2f0e9… Log Message: ----------- Revert "Add patch disabling meson and forth regex parsers which are slow" This reverts commit 0bbb75a8c75426bb2b5576dd047a44bd9fefa782. Modified Paths: -------------- geany.modules geany_patches/geany_disable_meson_forth_parsers.patch Modified: geany.modules 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -120,8 +120,6 @@ <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/geany_scintilla…" strip="1" /> <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/geany_vte_login…" strip="1" /> <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/geany_scintilla…" strip="1" /> -  - <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/geany_disable_m…" strip="1" /> </branch> <dependencies> <dep package="geany-deps" /> Modified: geany_patches/geany_disable_meson_forth_parsers.patch 39 lines changed, 0 insertions(+), 39 deletions(-) =================================================================== @@ -1,39 +0,0 @@ -From 5fb1e5a7e821c263570eba0cbd3784b17789db47 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jir=CC=8Ci=CC=81=20Techet?= <techet(a)gmail.com> -Date: Mon, 30 Dec 2024 19:21:19 +0100 -Subject: [PATCH] Disable meson and forth regex parsers - -These are extremely slow on macOS and make any editing pretty much unusable ---- - data/filedefs/filetypes.Meson.conf | 2 +- - data/filedefs/filetypes.forth | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/data/filedefs/filetypes.Meson.conf b/data/filedefs/filetypes.Meson.conf -index c97f8d153..0752182d0 100644 ---- a/data/filedefs/filetypes.Meson.conf -+++ b/data/filedefs/filetypes.Meson.conf -@@ -8,7 +8,7 @@ identifiers=add_global_arguments add_global_link_arguments add_languages add_pro - - [settings] - lexer_filetype=Python --tag_parser=Meson -+tag_parser= - extension=build - comment_single=# - mime_type=text/x-meson -diff --git a/data/filedefs/filetypes.forth b/data/filedefs/filetypes.forth -index 20b556ab6..17475ff7d 100644 ---- a/data/filedefs/filetypes.forth -+++ b/data/filedefs/filetypes.forth -@@ -26,6 +26,7 @@ preword2=! c! @ c@ 2! 2@ and or xor invert negate / /mod mod rshift lshift - [settings] - # default extension used when saving files - extension=fs -+tag_parser= - - # these characters define word boundaries when making selections and searching - # using word matching options --- -2.45.2 - -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 0daa90: Add lz4 dependency to libvte
by Jiří Techet 13 Feb '25

13 Feb '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 13 Feb 2025 19:32:46 UTC Commit: 0daa90ebe1494f771879da766a5993d04f90a369 https://github.com/geany/geany-osx/commit/0daa90ebe1494f771879da766a5993d04… Log Message: ----------- Add lz4 dependency to libvte Modified Paths: -------------- geany.modules Modified: geany.modules 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -51,6 +51,7 @@ <dependencies> <dep package="libpcre2" /> <dep package="gnutls" /> + <dep package="lz4" /> </dependencies> </meson> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 528b1a: Fix Doxygen markup for a return value
by Colomban Wendling 12 Feb '25

12 Feb '25

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 12 Feb 2025 11:16:01 UTC Commit: 528b1a25263124dfc3021d6bb40c0f52179cc57e https://github.com/geany/geany/commit/528b1a25263124dfc3021d6bb40c0f52179cc… Log Message: ----------- Fix Doxygen markup for a return value Modified Paths: -------------- src/symbols.c Modified: src/symbols.c 3 lines changed, 1 insertions(+), 2 deletions(-) =================================================================== @@ -262,8 +262,7 @@ const gchar *symbols_get_context_separator(gint ft_id) /** Gets the icon data corresponding to the provided TMIcon. * @param icon TMIcon. - * - * Returns the GdkPixbuf corresponding to the provided TMIcon. + * @returns The GdkPixbuf corresponding to the provided TMIcon. * * @since 2.1 */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 909e88: Merge pull request #4231 from techee/meson_test
by Colomban Wendling 06 Feb '25

06 Feb '25

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 06 Feb 2025 22:11:42 UTC Commit: 909e88ea6bad60708e9048df8363faa453bcda28 https://github.com/geany/geany/commit/909e88ea6bad60708e9048df8363faa453bcd… Log Message: ----------- Merge pull request #4231 from techee/meson_test Add ctags unit test for meson Modified Paths: -------------- tests/ctags/Makefile.am tests/ctags/simple.Meson_unittest tests/ctags/simple.Meson_unittest.tags tests/meson.build Modified: tests/ctags/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -318,6 +318,7 @@ test_sources = \ simple.lisp \ simple.lua \ simple.mak \ + simple.Meson_unittest \ simple.md \ simple.ml \ simple.php \ Modified: tests/ctags/simple.Meson_unittest 48 lines changed, 48 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,48 @@ +project('c++ foolib', 'cpp', + version : '1.0.0', + license : 'MIT') +add_global_arguments('-DSOME_TOKEN=value', language : 'cpp') +glib_dep = dependency('glib-2.0') + +inc = include_directories('include') + +subdir('include') +subdir('src') +subdir('test') + +pkg_mod = import('pkgconfig') +pkg_mod.generate(libraries : foolib, + version : '1.0', + name : 'libfoobar', + filebase : 'foobar', + description : 'A Library to barnicate your foos.') + +foo_sources = ['source1.cpp', 'source2.cpp'] +foolib = shared_library('foo', + foo_sources, + include_directories : inc, + dependencies : glib_dep, + install : true) + +testexe = executable('testexe', 'footest.cpp', + include_directories : inc, + link_with : foolib) +test('foolib test', testexe) + +mytarget = custom_target('targetname', + output : outfile, + input : infile, + command : [comp, '@INPUT@', '@OUTPUT@'], + install : true, + install_dir : 'subdir') + +suites = [ + { 'suite': 'dbus-broker', 'env': ['DBUS_BROKER_TEST_BROKER=' + exe_dbus_broker.full_path()]}, +] +foreach suite : suites + benchmark('Connection', bench_connect, timeout: 60, kwargs: suite) + benchmark('Message passing', bench_message, timeout: 120, kwargs: suite) +endforeach + +run_target('inspector', + command : ['scripts/inspect.sh', '--exclude', 'tests']) Modified: tests/ctags/simple.Meson_unittest.tags 24 lines changed, 24 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,24 @@ +Connection�16�0 +function: Connection +Message passing�16�0 +function: Message passing +c++ foolib�256�0 +namespace: c++ foolib +foo�524288�0 +other: foo +foolib test�8�0 +field: foolib test +include�65536�0 +macro: include +inspector�64�0 +member: inspector +pkgconfig�512�0 +package: pkgconfig +src�65536�0 +macro: src +targetname�4�0 +enumerator: targetname +test�65536�0 +macro: test +testexe�524288�0 +other: testexe Modified: tests/meson.build 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -315,6 +315,7 @@ ctags_tests = [ 'ctags/simple.lisp.tags', 'ctags/simple.lua.tags', 'ctags/simple.mak.tags', + 'ctags/simple.Meson_unittest.tags', 'ctags/simple.md.tags', 'ctags/simple.ml.tags', 'ctags/simple.php.tags', -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 716c68: Merge pull request #4232 from techee/regex_unused
by Jiří Techet 06 Feb '25

06 Feb '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Thu, 06 Feb 2025 22:02:55 UTC Commit: 716c681c0c93506557cff478ae5483c3a53189d3 https://github.com/geany/geany/commit/716c681c0c93506557cff478ae5483c3a5318… Log Message: ----------- Merge pull request #4232 from techee/regex_unused regex: Remove unused variable Modified Paths: -------------- ctags/gnu_regex/regex_internal.c Modified: ctags/gnu_regex/regex_internal.c 4 lines changed, 1 insertions(+), 3 deletions(-) =================================================================== @@ -694,7 +694,7 @@ re_string_reconstruct (re_string_t *pstr, int idx, int eflags) if (pstr->is_utf8) { - const unsigned char *raw, *p, *q, *end; + const unsigned char *raw, *p, *end; /* Special case UTF-8. Multi-byte chars start with any byte other than 0x80 - 0xbf. */ @@ -723,13 +723,11 @@ re_string_reconstruct (re_string_t *pstr, int idx, int eflags) unsigned char buf[6]; size_t mbclen; - q = p; if (BE (pstr->trans != NULL, 0)) { int i = mlen < 6 ? mlen : 6; while (--i >= 0) buf[i] = pstr->trans[p[i]]; - q = buf; } /* XXX Don't use mbrtowc, we know which conversion to use (UTF-8 -> UCS4). */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] ff0ce0: Add unit test for meson
by Jiří Techet 06 Feb '25

06 Feb '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 06 Feb 2025 21:25:27 UTC Commit: ff0ce020f577d087fde3022d5cb719f0357e5074 https://github.com/geany/geany/commit/ff0ce020f577d087fde3022d5cb719f0357e5… Log Message: ----------- Add unit test for meson Modified Paths: -------------- tests/ctags/Makefile.am tests/ctags/simple.Meson_unittest tests/ctags/simple.Meson_unittest.tags tests/meson.build Modified: tests/ctags/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -318,6 +318,7 @@ test_sources = \ simple.lisp \ simple.lua \ simple.mak \ + simple.Meson_unittest \ simple.md \ simple.ml \ simple.php \ Modified: tests/ctags/simple.Meson_unittest 48 lines changed, 48 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,48 @@ +project('c++ foolib', 'cpp', + version : '1.0.0', + license : 'MIT') +add_global_arguments('-DSOME_TOKEN=value', language : 'cpp') +glib_dep = dependency('glib-2.0') + +inc = include_directories('include') + +subdir('include') +subdir('src') +subdir('test') + +pkg_mod = import('pkgconfig') +pkg_mod.generate(libraries : foolib, + version : '1.0', + name : 'libfoobar', + filebase : 'foobar', + description : 'A Library to barnicate your foos.') + +foo_sources = ['source1.cpp', 'source2.cpp'] +foolib = shared_library('foo', + foo_sources, + include_directories : inc, + dependencies : glib_dep, + install : true) + +testexe = executable('testexe', 'footest.cpp', + include_directories : inc, + link_with : foolib) +test('foolib test', testexe) + +mytarget = custom_target('targetname', + output : outfile, + input : infile, + command : [comp, '@INPUT@', '@OUTPUT@'], + install : true, + install_dir : 'subdir') + +suites = [ + { 'suite': 'dbus-broker', 'env': ['DBUS_BROKER_TEST_BROKER=' + exe_dbus_broker.full_path()]}, +] +foreach suite : suites + benchmark('Connection', bench_connect, timeout: 60, kwargs: suite) + benchmark('Message passing', bench_message, timeout: 120, kwargs: suite) +endforeach + +run_target('inspector', + command : ['scripts/inspect.sh', '--exclude', 'tests']) Modified: tests/ctags/simple.Meson_unittest.tags 24 lines changed, 24 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,24 @@ +Connection�16�0 +function: Connection +Message passing�16�0 +function: Message passing +c++ foolib�256�0 +namespace: c++ foolib +foo�524288�0 +other: foo +foolib test�8�0 +field: foolib test +include�65536�0 +macro: include +inspector�64�0 +member: inspector +pkgconfig�512�0 +package: pkgconfig +src�65536�0 +macro: src +targetname�4�0 +enumerator: targetname +test�65536�0 +macro: test +testexe�524288�0 +other: testexe Modified: tests/meson.build 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -315,6 +315,7 @@ ctags_tests = [ 'ctags/simple.lisp.tags', 'ctags/simple.lua.tags', 'ctags/simple.mak.tags', + 'ctags/simple.Meson_unittest.tags', 'ctags/simple.md.tags', 'ctags/simple.ml.tags', 'ctags/simple.php.tags', -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] b43827: prefs: Fix crash changing a keybinding
by Colomban Wendling 06 Feb '25

06 Feb '25

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 04 Feb 2025 23:33:29 UTC Commit: b43827e346a62e6bb1c9eaa02a7bf2f143a01dbc https://github.com/geany/geany/commit/b43827e346a62e6bb1c9eaa02a7bf2f143a01… Log Message: ----------- prefs: Fix crash changing a keybinding Fix crash when changing a keybinding using the key input dialog. Related-to: #4192 Modified Paths: -------------- src/prefs.c Modified: src/prefs.c 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -203,9 +203,11 @@ static void kb_tree_view_change_button_clicked_cb(GtkWidget *button, KbData *kbd gtk_widget_show_all(dialog); if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { + GtkTreeIter child_iter; const gchar *new_text = gtk_label_get_text(GTK_LABEL(accel_label)); - kb_change_iter_shortcut(kbdata, &iter, new_text); + gtk_tree_model_filter_convert_iter_to_child_iter(GTK_TREE_MODEL_FILTER(model), &child_iter, &iter); + kb_change_iter_shortcut(kbdata, &child_iter, new_text); } gtk_widget_destroy(dialog); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits