Plugins-Commits July 2024

plugins-commits@lists.geany.org

1 participants
13 discussions

[geany/plugins.geany.org] 990ab8: Remove the GitHub Link as the image doesn't load anymore
by Dominic Hopf 21 Jul '24

21 Jul '24

Branch: refs/heads/master Author: Dominic Hopf <dmaphy(a)googlemail.com> Committer: Dominic Hopf <dmaphy(a)googlemail.com> Date: Sun, 21 Jul 2024 13:49:01 UTC Commit: 990ab83d0146b492036e4de05073587748fe3269 https://github.com/geany/plugins.geany.org/commit/990ab83d0146b492036e4de05… Log Message: ----------- Remove the GitHub Link as the image doesn't load anymore Modified Paths: -------------- index.php Modified: index.php 5 lines changed, 0 insertions(+), 5 deletions(-) =================================================================== @@ -45,11 +45,6 @@ <link rel="stylesheet" type="text/css" href="./stylesheets/mainstyle.css" /> </head> <body> - <a href="https://github.com/geany/geany-plugins"> - <img style="position: absolute; top: 0; left: 0; border: 0;" - src="https://camo.githubusercontent.com/8b6b8ccc6da3aa5722903da7b58eb5ab1081adee…" - alt="Fork me on GitHub" - data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_left_orange_ff7600.png"></a> <div id="header"> <a href="./"> <img src="./images/geany.png" alt="Geany Logo" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/plugins.geany.org] 03ac6a: Switch Git URLs from git:// to https://
by Dominic Hopf 21 Jul '24

21 Jul '24

Branch: refs/heads/master Author: Dominic Hopf <dmaphy(a)googlemail.com> Committer: Dominic Hopf <dmaphy(a)googlemail.com> Date: Sun, 21 Jul 2024 13:44:11 UTC Commit: 03ac6aa746dd1704894f2918c1851c2c30fb8d4b https://github.com/geany/plugins.geany.org/commit/03ac6aa746dd1704894f2918c… Log Message: ----------- Switch Git URLs from git:// to https:// Modified Paths: -------------- content/about.html content/downloads.html gencontent.sh Modified: content/about.html 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -17,7 +17,7 @@ <h2>Contributing to this website</h2> own copy by running following command:</p> <code> -git clone git://github.com/geany/plugins.geany.org.git +git clone https://github.com/geany/plugins.geany.org.git </code> <p>Feel free to send patches to Dominic or open pull requests on GitHub to Modified: content/downloads.html 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -169,7 +169,7 @@ <h2>Download directly from version control</h2> "https://github.com/geany/geany-plugins">Git repository</a> like this:</p> <code> -git clone git://github.com/geany/geany-plugins.git geany-plugins +git clone https://github.com/geany/geany-plugins.git geany-plugins </code> <p>Build and install all plugins:</p> Modified: gencontent.sh 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -114,7 +114,7 @@ function prepare_source_dir() { if [ ! -d "${SOURCESDIR}" ]; then echo -e "Directory containing sources $SOURCESDIR could not be found.\nTrying to clone from git...\n" - git clone git://github.com/geany/geany-plugins.git ${SOURCESDIR} + git clone https://github.com/geany/geany-plugins.git ${SOURCESDIR} fi if [ $? -ne 0 ]; then -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] c30ab9: updatechecker: Don't leak the libsoup session
by Colomban Wendling 14 Jul '24

14 Jul '24

1 0

[geany/geany-plugins] ce1e69: updatechecker: Avoid a deprecated call
by Colomban Wendling 14 Jul '24

14 Jul '24

1 0

[geany/geany-plugins] e1c9ac: updatechecker: Remove weird German quotes
by Colomban Wendling 14 Jul '24

14 Jul '24

1 0

[geany/geany-plugins] c33ef2: updatechecker: Port to libsoup3
by Colomban Wendling 14 Jul '24

14 Jul '24

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 16 Jun 2024 09:42:30 UTC Commit: c33ef2e6940770b4e191d587eac305c1fe99dd4a https://github.com/geany/geany-plugins/commit/c33ef2e6940770b4e191d587eac30… Log Message: ----------- updatechecker: Port to libsoup3 libsoup2 is phasing out, and using it in a plugin causes conflicts with other plugins using a newer version, including ones using a current webkit2gtk. Modified Paths: -------------- build/updatechecker.m4 updatechecker/README updatechecker/src/updatechecker.c Modified: build/updatechecker.m4 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -3,7 +3,7 @@ AC_DEFUN([GP_CHECK_UPDATECHECKER], GP_ARG_DISABLE([Updatechecker], [auto]) GP_CHECK_PLUGIN_DEPS([Updatechecker], UPDATECHECKER, - [libsoup-2.4 >= 2.42]) + [libsoup-3.0]) GP_COMMIT_PLUGIN_STATUS([Updatechecker]) Modified: updatechecker/README 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -41,8 +41,8 @@ Requirements Updatechecker depends on a recent version of Geany (0.20 or above) as well as on: -* GTK >= 2.12 -* libsoup 2.4 >= 2.42 +* GTK >= 3.0 +* libsoup 3 To compile it on your own you will need the devel packages for these. Modified: updatechecker/src/updatechecker.c 51 lines changed, 39 insertions(+), 12 deletions(-) =================================================================== @@ -49,9 +49,11 @@ enum { #define UPDATE_CHECK_URL "https://geany.org/service/version/" +#define UPDATECHECKER_TYPE_KEY "updatechecker-type" + static GtkWidget *main_menu_item = NULL; -static void update_check_result_cb(SoupSession *session, - SoupMessage *msg, gpointer user_data); +static void update_check_result_cb(GObject *session, + GAsyncResult *result, gpointer user_data); static gboolean check_on_startup = FALSE; @@ -84,15 +86,17 @@ static void update_check(gint type) g_message("Checking for updates (querying URL \"%s\")", UPDATE_CHECK_URL); soup = soup_session_new_with_options( - SOUP_SESSION_USER_AGENT, user_agent, - SOUP_SESSION_TIMEOUT, 10, + "user-agent", user_agent, + "timeout", 10, NULL); g_free(user_agent); msg = soup_message_new ("GET", UPDATE_CHECK_URL); + g_object_set_data(G_OBJECT(msg), UPDATECHECKER_TYPE_KEY, GINT_TO_POINTER(type)); - soup_session_queue_message (soup, msg, update_check_result_cb, GINT_TO_POINTER(type)); + soup_session_send_and_read_async(soup, msg, G_PRIORITY_DEFAULT, NULL, + update_check_result_cb, msg); } @@ -185,15 +189,30 @@ version_compare(const gchar *current_version) } -static void update_check_result_cb(SoupSession *session, - SoupMessage *msg, gpointer user_data) +static gchar *bytes_to_string(GBytes *bytes) { - gint type = GPOINTER_TO_INT(user_data); + gsize bytes_size = g_bytes_get_size(bytes); + gchar *str = g_malloc(bytes_size + 1); + memcpy(str, g_bytes_get_data(bytes, NULL), bytes_size); + str[bytes_size] = 0; + return str; +} + + +static void update_check_result_cb(GObject *session, + GAsyncResult *result, gpointer user_data) +{ + SoupMessage *msg = user_data; + gpointer type_ptr = g_object_get_data(G_OBJECT(msg), UPDATECHECKER_TYPE_KEY); + gint type = GPOINTER_TO_INT(type_ptr); + GError *err = NULL; + + GBytes *bytes = soup_session_send_and_read_finish(SOUP_SESSION(session), result, &err); /* Checking whether we did get a valid (200) result */ - if (msg->status_code == 200) + if (bytes && soup_message_get_status(msg) == 200) { - const gchar *remote_version = msg->response_body->data; + gchar *remote_version = bytes_to_string(bytes); if (version_compare(remote_version) == TRUE) { gchar *update_msg = g_strdup_printf( @@ -216,12 +235,14 @@ static void update_check_result_cb(SoupSession *session, } g_message("%s", no_update_msg); } + g_free(remote_version); } else { gchar *error_message = g_strdup_printf( _("Unable to perform version check.\nError code: %d \nError message: »%s«"), - msg->status_code, msg->reason_phrase); + soup_message_get_status(msg), + err ? err->message : soup_message_get_reason_phrase(msg)); if (type == UPDATECHECK_MANUAL) { dialogs_show_msgbox(GTK_MESSAGE_ERROR, "%s", error_message); @@ -230,9 +251,15 @@ static void update_check_result_cb(SoupSession *session, { msgwin_status_add("%s", error_message); } - g_warning("Connection error: Code: %d; Message: %s", msg->status_code, msg->reason_phrase); + g_warning( + "Connection error: Code: %d; Message: %s", + soup_message_get_status(msg), + err ? err->message : soup_message_get_reason_phrase(msg)); g_free(error_message); } + + g_clear_error(&err); + g_bytes_unref(bytes); } static void manual_check_activated_cb(GtkMenuItem *menuitem, gpointer gdata) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] c53695: Merge pull request #1336 from b4n/updatechecker-libsoup3
by Frank Lanitz 14 Jul '24

14 Jul '24

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sun, 14 Jul 2024 09:56:47 UTC Commit: c53695dfcebcdb8a61f82e6dd4d8c9bbfdf9c541 https://github.com/geany/geany-plugins/commit/c53695dfcebcdb8a61f82e6dd4d8c… Log Message: ----------- Merge pull request #1336 from b4n/updatechecker-libsoup3 updatechecker: Port to libsoup3 and small other fixes Modified Paths: -------------- build/updatechecker.m4 updatechecker/README updatechecker/src/updatechecker.c Modified: build/updatechecker.m4 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -3,7 +3,7 @@ AC_DEFUN([GP_CHECK_UPDATECHECKER], GP_ARG_DISABLE([Updatechecker], [auto]) GP_CHECK_PLUGIN_DEPS([Updatechecker], UPDATECHECKER, - [libsoup-2.4 >= 2.42]) + [libsoup-3.0]) GP_COMMIT_PLUGIN_STATUS([Updatechecker]) Modified: updatechecker/README 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -41,8 +41,8 @@ Requirements Updatechecker depends on a recent version of Geany (0.20 or above) as well as on: -* GTK >= 2.12 -* libsoup 2.4 >= 2.42 +* GTK >= 3.0 +* libsoup 3 To compile it on your own you will need the devel packages for these. Modified: updatechecker/src/updatechecker.c 70 lines changed, 53 insertions(+), 17 deletions(-) =================================================================== @@ -49,15 +49,19 @@ enum { #define UPDATE_CHECK_URL "https://geany.org/service/version/" +#define UPDATECHECKER_TYPE_KEY "updatechecker-type" + static GtkWidget *main_menu_item = NULL; -static void update_check_result_cb(SoupSession *session, - SoupMessage *msg, gpointer user_data); +static void update_check_result_cb(GObject *session, + GAsyncResult *result, gpointer user_data); static gboolean check_on_startup = FALSE; /* Configuration file */ static gchar *config_file = NULL; +static SoupSession *soup_session = NULL; + static struct { @@ -77,22 +81,24 @@ version_struct; static void update_check(gint type) { - SoupSession *soup; SoupMessage *msg; gchar *user_agent = g_strconcat("Updatechecker ", VERSION, " at Geany ", GEANY_VERSION, NULL); g_message("Checking for updates (querying URL \"%s\")", UPDATE_CHECK_URL); - soup = soup_session_new_with_options( - SOUP_SESSION_USER_AGENT, user_agent, - SOUP_SESSION_TIMEOUT, 10, - NULL); + if (! soup_session) + soup_session = soup_session_new_with_options( + "user-agent", user_agent, + "timeout", 10, + NULL); g_free(user_agent); msg = soup_message_new ("GET", UPDATE_CHECK_URL); + g_object_set_data(G_OBJECT(msg), UPDATECHECKER_TYPE_KEY, GINT_TO_POINTER(type)); - soup_session_queue_message (soup, msg, update_check_result_cb, GINT_TO_POINTER(type)); + soup_session_send_and_read_async(soup_session, msg, G_PRIORITY_DEFAULT, NULL, + update_check_result_cb, msg); } @@ -185,15 +191,30 @@ version_compare(const gchar *current_version) } -static void update_check_result_cb(SoupSession *session, - SoupMessage *msg, gpointer user_data) +static gchar *bytes_to_string(GBytes *bytes) +{ + gsize bytes_size = g_bytes_get_size(bytes); + gchar *str = g_malloc(bytes_size + 1); + memcpy(str, g_bytes_get_data(bytes, NULL), bytes_size); + str[bytes_size] = 0; + return str; +} + + +static void update_check_result_cb(GObject *session, + GAsyncResult *result, gpointer user_data) { - gint type = GPOINTER_TO_INT(user_data); + SoupMessage *msg = user_data; + gpointer type_ptr = g_object_get_data(G_OBJECT(msg), UPDATECHECKER_TYPE_KEY); + gint type = GPOINTER_TO_INT(type_ptr); + GError *err = NULL; + + GBytes *bytes = soup_session_send_and_read_finish(SOUP_SESSION(session), result, &err); /* Checking whether we did get a valid (200) result */ - if (msg->status_code == 200) + if (bytes && soup_message_get_status(msg) == 200) { - const gchar *remote_version = msg->response_body->data; + gchar *remote_version = bytes_to_string(bytes); if (version_compare(remote_version) == TRUE) { gchar *update_msg = g_strdup_printf( @@ -216,12 +237,16 @@ static void update_check_result_cb(SoupSession *session, } g_message("%s", no_update_msg); } + g_free(remote_version); } + else if (g_error_matches(err, G_IO_ERROR, G_IO_ERROR_CANCELLED)) + ; /* nothing to do */ else { gchar *error_message = g_strdup_printf( - _("Unable to perform version check.\nError code: %d \nError message: »%s«"), - msg->status_code, msg->reason_phrase); + _("Unable to perform version check.\nError code: %d \nError message: %s"), + soup_message_get_status(msg), + err ? err->message : soup_message_get_reason_phrase(msg)); if (type == UPDATECHECK_MANUAL) { dialogs_show_msgbox(GTK_MESSAGE_ERROR, "%s", error_message); @@ -230,9 +255,15 @@ static void update_check_result_cb(SoupSession *session, { msgwin_status_add("%s", error_message); } - g_warning("Connection error: Code: %d; Message: %s", msg->status_code, msg->reason_phrase); + g_warning( + "Connection error: Code: %d; Message: %s", + soup_message_get_status(msg), + err ? err->message : soup_message_get_reason_phrase(msg)); g_free(error_message); } + + g_clear_error(&err); + g_bytes_unref(bytes); } static void manual_check_activated_cb(GtkMenuItem *menuitem, gpointer gdata) @@ -285,7 +316,7 @@ GtkWidget * plugin_configure(GtkDialog * dialog) { GtkWidget *vbox; - vbox = gtk_vbox_new(FALSE, 6); + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6); config_widgets.run_on_startup = gtk_check_button_new_with_label( _("Run updatecheck on startup")); @@ -341,6 +372,11 @@ void plugin_init(GeanyData *data) void plugin_cleanup(void) { + if (soup_session) + { + soup_session_abort(soup_session); + g_clear_object(&soup_session); + } gtk_widget_destroy(main_menu_item); g_free(config_file); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 3a9071: Merge pull request #1365 from b4n/geanygendoc/unknown-type-crash
by Colomban Wendling 06 Jul '24

06 Jul '24

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 06 Jul 2024 17:30:51 UTC Commit: 3a907109681ea93d2d394a94b8bea48a4d0ed1f5 https://github.com/geany/geany-plugins/commit/3a907109681ea93d2d394a94b8bea… Log Message: ----------- Merge pull request #1365 from b4n/geanygendoc/unknown-type-crash geanygendoc: Fix crash if trying to document an unknown type Modified Paths: -------------- geanygendoc/data/filetypes/c.conf geanygendoc/docs/manual.rst geanygendoc/src/ggd-doc-type.c geanygendoc/src/ggd-tag-utils.c geanygendoc/src/ggd.c Modified: geanygendoc/data/filetypes/c.conf 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -43,6 +43,9 @@ doctypes = { enumval.policy = FORWARD; # usually, locals are just not documented and get in the way local.policy = FORWARD; + # usually nothing useful to document + include.policy = PASS; + other.policy = PASS; function = { template = "/**\n * {symbol}:\n{for arg in argument_list} * @{arg}: {cursor}\n{end} * \n * {cursor}\n{if returns} * \n * Returns: \n{end}{if write_since}{if returns} * \n{end} * Since: \n{end} */\n"; @@ -77,6 +80,9 @@ doctypes = { doxygen = { # usually, locals are just not documented and get in the way local.policy = FORWARD; + # usually nothing useful to document + include.policy = PASS; + other.policy = PASS; function.template = "/**\n * {doxygen_prefix}brief {cursor}\n{for a in argument_list} * {doxygen_prefix}param {a} \n{end}{if returns} * {doxygen_prefix}returns \n{end}{if write_since} * {doxygen_prefix}since \n{end} * \n * \n */\n"; macro.template = "/**\n * {doxygen_prefix}brief {cursor}\n{for a in argument_list} * {doxygen_prefix}param {a} \n{end}{if returns} * {doxygen_prefix}returns \n{end}{if write_since} * {doxygen_prefix}since \n{end} * \n * \n */\n"; Modified: geanygendoc/docs/manual.rst 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -346,6 +346,8 @@ Known types A field (of a class for example). ``function`` A function. +``include`` + An include directive. ``interface`` An interface. ``local`` @@ -356,6 +358,8 @@ Known types A method. ``namespace`` A namespace. +``other`` + A non-specific type that highly depend on the language. ``package`` A package. ``prototype`` Modified: geanygendoc/src/ggd-doc-type.c 6 lines changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -128,9 +128,12 @@ ggd_doc_type_get_setting (const GgdDocType *doctype, { GgdDocSetting *setting = NULL; GList *tmp; - gssize match_len = strlen (match); + gssize match_len; g_return_val_if_fail (doctype != NULL, NULL); + g_return_val_if_fail (match != NULL, NULL); + + match_len = (gssize) strlen (match); for (tmp = doctype->settings; tmp && ! setting; tmp = g_list_next (tmp)) { if (ggd_doc_setting_matches (tmp->data, match, match_len)) { @@ -177,6 +180,7 @@ ggd_doc_type_resolve_setting (const GgdDocType *doctype, gchar *child_match = NULL; g_return_val_if_fail (doctype != NULL, NULL); + g_return_val_if_fail (match != NULL, NULL); /*g_debug ("Resolving match \"%s\"...", child_match);*/ if (nth_child) (*nth_child) = 0; Modified: geanygendoc/src/ggd-tag-utils.c 10 lines changed, 6 insertions(+), 4 deletions(-) =================================================================== @@ -252,22 +252,24 @@ static const struct { { tm_tag_class_t, "class" }, { tm_tag_enum_t, "enum" }, { tm_tag_enumerator_t, "enumval" }, + { tm_tag_externvar_t, "extern" }, { tm_tag_field_t, "field" }, { tm_tag_function_t, "function" }, { tm_tag_interface_t, "interface" }, + { tm_tag_include_t, "include" }, { tm_tag_local_var_t, "local" }, + { tm_tag_macro_t, "define" }, + { tm_tag_macro_with_arg_t, "macro" }, { tm_tag_member_t, "member" }, { tm_tag_method_t, "method" }, { tm_tag_namespace_t, "namespace" }, + { tm_tag_other_t, "other" }, { tm_tag_package_t, "package" }, { tm_tag_prototype_t, "prototype" }, { tm_tag_struct_t, "struct" }, { tm_tag_typedef_t, "typedef" }, { tm_tag_union_t, "union" }, - { tm_tag_variable_t, "variable" }, - { tm_tag_externvar_t, "extern" }, - { tm_tag_macro_t, "define" }, - { tm_tag_macro_with_arg_t, "macro" } + { tm_tag_variable_t, "variable" } }; /** Modified: geanygendoc/src/ggd.c 17 lines changed, 10 insertions(+), 7 deletions(-) =================================================================== @@ -383,22 +383,25 @@ get_setting_from_tag (GgdDocType *doctype, const TMTag *tag, const TMTag **real_tag) { - GgdDocSetting *setting; + GgdDocSetting *setting = NULL; gchar *hierarchy; - gint nth_child; GPtrArray *tag_array = doc->tm_file->tags_array; GeanyFiletypeID geany_ft = FILETYPE_ID (doc->file_type); hierarchy = ggd_tag_resolve_type_hierarchy (tag_array, geany_ft, tag); /*g_debug ("type hierarchy for tag %s is: %s", tag->name, hierarchy);*/ - setting = ggd_doc_type_resolve_setting (doctype, hierarchy, &nth_child); *real_tag = tag; - if (setting) { - for (; nth_child > 0; nth_child--) { - *real_tag = ggd_tag_find_parent (tag_array, geany_ft, *real_tag); + if (hierarchy) { + gint nth_child; + + setting = ggd_doc_type_resolve_setting (doctype, hierarchy, &nth_child); + if (setting) { + for (; nth_child > 0; nth_child--) { + *real_tag = ggd_tag_find_parent (tag_array, geany_ft, *real_tag); + } } + g_free (hierarchy); } - g_free (hierarchy); return setting; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 63cd68: geanygendoc: Fix crash if trying to document an unknown type
by Colomban Wendling 06 Jul '24

06 Jul '24

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 06 Jul 2024 15:15:16 UTC Commit: 63cd681d4e3cdb9d79b5eacd8aebf20d09500419 https://github.com/geany/geany-plugins/commit/63cd681d4e3cdb9d79b5eacd8aebf… Log Message: ----------- geanygendoc: Fix crash if trying to document an unknown type Fix crash if the tag to generate documentation for is of an unknown type. Also consolidate some code around this to validate parameters just to be more defensive in case it sill actually happens. Fixes #1362. Modified Paths: -------------- geanygendoc/src/ggd-doc-type.c geanygendoc/src/ggd.c Modified: geanygendoc/src/ggd-doc-type.c 6 lines changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -128,9 +128,12 @@ ggd_doc_type_get_setting (const GgdDocType *doctype, { GgdDocSetting *setting = NULL; GList *tmp; - gssize match_len = strlen (match); + gssize match_len; g_return_val_if_fail (doctype != NULL, NULL); + g_return_val_if_fail (match != NULL, NULL); + + match_len = (gssize) strlen (match); for (tmp = doctype->settings; tmp && ! setting; tmp = g_list_next (tmp)) { if (ggd_doc_setting_matches (tmp->data, match, match_len)) { @@ -177,6 +180,7 @@ ggd_doc_type_resolve_setting (const GgdDocType *doctype, gchar *child_match = NULL; g_return_val_if_fail (doctype != NULL, NULL); + g_return_val_if_fail (match != NULL, NULL); /*g_debug ("Resolving match \"%s\"...", child_match);*/ if (nth_child) (*nth_child) = 0; Modified: geanygendoc/src/ggd.c 17 lines changed, 10 insertions(+), 7 deletions(-) =================================================================== @@ -383,22 +383,25 @@ get_setting_from_tag (GgdDocType *doctype, const TMTag *tag, const TMTag **real_tag) { - GgdDocSetting *setting; + GgdDocSetting *setting = NULL; gchar *hierarchy; - gint nth_child; GPtrArray *tag_array = doc->tm_file->tags_array; GeanyFiletypeID geany_ft = FILETYPE_ID (doc->file_type); hierarchy = ggd_tag_resolve_type_hierarchy (tag_array, geany_ft, tag); /*g_debug ("type hierarchy for tag %s is: %s", tag->name, hierarchy);*/ - setting = ggd_doc_type_resolve_setting (doctype, hierarchy, &nth_child); *real_tag = tag; - if (setting) { - for (; nth_child > 0; nth_child--) { - *real_tag = ggd_tag_find_parent (tag_array, geany_ft, *real_tag); + if (hierarchy) { + gint nth_child; + + setting = ggd_doc_type_resolve_setting (doctype, hierarchy, &nth_child); + if (setting) { + for (; nth_child > 0; nth_child--) { + *real_tag = ggd_tag_find_parent (tag_array, geany_ft, *real_tag); + } } + g_free (hierarchy); } - g_free (hierarchy); return setting; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 7a2f1d: geanygendoc: Sort tag types alphabetically
by Colomban Wendling 06 Jul '24

06 Jul '24

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits July 2024