Plugins-Commits June 2016

plugins-commits@lists.geany.org

1 participants
67 discussions

[geany/geany-plugins] c005a9: Windows: update version numbers of used components in the installer
by Enrico Troeger 17 Jun '16

17 Jun '16

Branch: refs/heads/master Author: Enrico Troeger <enrico.troeger(a)uvena.de> Committer: Enrico Troeger <enrico.troeger(a)uvena.de> Date: Fri, 17 Jun 2016 18:31:34 UTC Commit: c005a9a22cf8a34e302b4d21dbbd8966cbd07592 https://github.com/geany/geany-plugins/commit/c005a9a22cf8a34e302b4d21dbbd8… Log Message: ----------- Windows: update version numbers of used components in the installer Modified Paths: -------------- build/geany-plugins.nsi Modified: build/geany-plugins.nsi 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -38,7 +38,7 @@ RequestExecutionLevel highest ; set execution level for Windows Vista !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_DIR_REGKEY "Software\Geany-Plugins" !define GEANY_DIR_REGKEY "Software\Geany" -!define REQUIRED_GEANY_VERSION "1.27.0" +!define REQUIRED_GEANY_VERSION "1.28.0" !define RESOURCEDIR "geany-plugins-${PRODUCT_VERSION}" ;;;;;;;;;;;;;;;;;;;;; @@ -51,7 +51,7 @@ VIAddVersionKey "ProductVersion" "${PRODUCT_VERSION}" VIAddVersionKey "LegalCopyright" "Copyright 2009-2016 by the Geany developer team" VIAddVersionKey "FileDescription" "${PRODUCT_NAME} Installer" -BrandingText "$(^NAME) installer (NSIS 2.46)" +BrandingText "$(^NAME) installer (NSIS 2.51)" Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" SetCompressor /SOLID lzma ShowInstDetails hide -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 4c4a95: Windows: cleanup files of new dependencies
by Enrico Troeger 17 Jun '16

17 Jun '16

Branch: refs/heads/master Author: Enrico Troeger <enrico.troeger(a)uvena.de> Committer: Enrico Troeger <enrico.troeger(a)uvena.de> Date: Fri, 17 Jun 2016 18:30:52 UTC Commit: 4c4a959917ca97db59e634ef3d9d9d7479b54f1c https://github.com/geany/geany-plugins/commit/4c4a959917ca97db59e634ef3d9d9… Log Message: ----------- Windows: cleanup files of new dependencies Modified Paths: -------------- build/geany-plugins.nsi Modified: build/geany-plugins.nsi 7 lines changed, 6 insertions(+), 1 deletions(-) =================================================================== @@ -235,6 +235,7 @@ Section Uninstall Delete "$INSTDIR\bin\libgsttag-1.0-0.dll" Delete "$INSTDIR\bin\libgstvideo-1.0-0.dll" Delete "$INSTDIR\bin\libgtkspell-0.dll" + Delete "$INSTDIR\bin\libgtkspell3-*.dll" Delete "$INSTDIR\bin\libhistory6.dll" Delete "$INSTDIR\bin\libhogweed-4-1.dll" Delete "$INSTDIR\bin\libhttp_parser-2.dll" @@ -249,9 +250,11 @@ Section Uninstall Delete "$INSTDIR\bin\libicuuc56.dll" Delete "$INSTDIR\bin\libidn-11.dll" Delete "$INSTDIR\bin\libjavascriptcoregtk-1.0-0.dll" + Delete "$INSTDIR\bin\libjavascriptcoregtk-3.0-0.dll" Delete "$INSTDIR\bin\libjpeg-8.dll" Delete "$INSTDIR\bin\liblzma-5.dll" - Delete "$INSTDIR\bin\libnettle-6-1.dll" + Delete "$INSTDIR\bin\libnettle-6-2.dll" + Delete "$INSTDIR\bin\libnghttp2-14" Delete "$INSTDIR\bin\libogg-0.dll" Delete "$INSTDIR\bin\liborc-0.4-0.dll" Delete "$INSTDIR\bin\liborc-test-0.4-0.dll" @@ -277,6 +280,7 @@ Section Uninstall Delete "$INSTDIR\bin\libvorbisfile-3.dll" Delete "$INSTDIR\bin\libvorbisidec-1.dll" Delete "$INSTDIR\bin\libwebkitgtk-1.0-0.dll" + Delete "$INSTDIR\bin\libwebkitgtk-3.0-0.dll" Delete "$INSTDIR\bin\libwebp-6.dll" Delete "$INSTDIR\bin\libwebpdecoder-2.dll" Delete "$INSTDIR\bin\libwebpdemux-2.dll" @@ -300,6 +304,7 @@ Section Uninstall RMDir /r "$INSTDIR\share\p11-kit" RMDir /r "$INSTDIR\share\vala" RMDir /r "$INSTDIR\share\webkitgtk-1.0" + RMDir /r "$INSTDIR\share\webkitgtk-3.0" FindFirst $0 $1 "$INSTDIR\share\locale\*" loop: -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] d3b09b: Windows: Add new indirect dependencies to the bundle
by Enrico Troeger 17 Jun '16

17 Jun '16

Branch: refs/heads/master Author: Enrico Troeger <enrico.troeger(a)uvena.de> Committer: Enrico Troeger <enrico.troeger(a)uvena.de> Date: Fri, 17 Jun 2016 18:12:58 UTC Commit: d3b09b30c9d83770a8ab3b8d0cfdca68d5027f52 https://github.com/geany/geany-plugins/commit/d3b09b30c9d83770a8ab3b8d0cfdc… Log Message: ----------- Windows: Add new indirect dependencies to the bundle Modified Paths: -------------- build/gtk-bundle-from-msys2.sh Modified: build/gtk-bundle-from-msys2.sh 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -38,7 +38,6 @@ gnutls gpgme gstreamer gst-plugins-base -gtkspell http-parser hunspell icu @@ -63,6 +62,7 @@ libxml2 libxslt lua51 nettle +nghttp2 openssl orc p11-kit @@ -74,9 +74,11 @@ xz " gtk2_dependency_pkgs=" +gtkspell webkitgtk2 " gtk3_dependency_pkgs=" +gtkspell3 webkitgtk3 " @@ -240,6 +242,7 @@ cleanup_unnecessary_files() { rm -rf share/info rm -rf share/lua rm -rf share/man + rm -rf share/nghttp2 rm -rf share/readline rm -rf share/zsh # ssl: cleanup ssl files -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] eb9b14: Merge pull request #449 from sardemff7/wip/addons-tasks
by Frank Lanitz 17 Jun '16

17 Jun '16

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Fri, 17 Jun 2016 17:38:02 UTC Commit: eb9b14366da1beb42b6a5febe0ab9823486e2fb6 https://github.com/geany/geany-plugins/commit/eb9b14366da1beb42b6a5febe0ab9… Log Message: ----------- Merge pull request #449 from sardemff7/wip/addons-tasks addons/tasks: Small improvments Modified Paths: -------------- addons/src/ao_tasks.c Modified: addons/src/ao_tasks.c 50 lines changed, 30 insertions(+), 20 deletions(-) =================================================================== @@ -558,38 +558,48 @@ static void create_task(AoTasks *t, GeanyDocument *doc, gint line, const gchar * static void update_tasks_for_doc(AoTasks *t, GeanyDocument *doc) { - gint lines, line; - gchar *line_buf, *display_name, *task_start; + gint lexer, lines, line, last_pos = 0, style; + gchar *line_buf, *display_name, *task_start, *closing_comment; gchar **token; AoTasksPrivate *priv = AO_TASKS_GET_PRIVATE(t); if (doc->is_valid) { display_name = document_get_basename_for_display(doc, -1); + lexer = sci_get_lexer(doc->editor->sci); lines = sci_get_line_count(doc->editor->sci); for (line = 0; line < lines; line++) { - line_buf = g_strstrip(sci_get_line(doc->editor->sci, line)); - token = priv->tokens; - while (*token != NULL) + line_buf = sci_get_line(doc->editor->sci, line); + for (token = priv->tokens; *token != NULL; ++token) { - if (!EMPTY(*token) && (task_start = strstr(line_buf, *token)) != NULL) - { - /* skip the token and additional whitespace */ - task_start += strlen(*token); - while (*task_start == ' ' || *task_start == ':') - task_start++; - /* reset task_start in case there is no text following */ - if (EMPTY(task_start)) - task_start = line_buf; - /* create the task */ - create_task(t, doc, line, *token, line_buf, task_start, display_name); - /* if we found a token, continue on next line */ - break; - } - token++; + if (EMPTY(*token)) + continue; + if ((task_start = strstr(line_buf, *token)) == NULL) + continue; + style = sci_get_style_at(doc->editor->sci, last_pos + (task_start - line_buf)); + if (!highlighting_is_comment_style(lexer, style)) + continue; + + /* skip the token and additional whitespace */ + task_start = strstr(g_strstrip(line_buf), *token) + strlen(*token); + while (*task_start == ' ' || *task_start == ':') + task_start++; + /* reset task_start in case there is no text following */ + if (EMPTY(task_start)) + task_start = line_buf; + else if ((EMPTY(doc->file_type->comment_single) || + strstr(line_buf, doc->file_type->comment_single) == NULL) && + !EMPTY(doc->file_type->comment_close) && + (closing_comment = strstr(task_start, doc->file_type->comment_close)) != NULL) + *closing_comment = '\0'; + /* create the task */ + create_task(t, doc, line, *token, line_buf, task_start, display_name); + /* if we found a token, continue on next line */ + break; } g_free(line_buf); + last_pos = sci_get_line_end_position(doc->editor->sci, line) + 1; } g_free(display_name); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] d0a27c: Merge pull request #448 from techee/tab_fix
by Jiří Techet 17 Jun '16

17 Jun '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Fri, 17 Jun 2016 13:40:32 UTC Commit: d0a27c644193c1931240b2971bf570d9034a855f https://github.com/geany/geany-plugins/commit/d0a27c644193c1931240b2971bf57… Log Message: ----------- Merge pull request #448 from techee/tab_fix projectorganizer: Fix multiple tabs in Project Properties Modified Paths: -------------- projectorganizer/src/prjorg-main.c projectorganizer/src/prjorg-project.c projectorganizer/src/prjorg-project.h Modified: projectorganizer/src/prjorg-main.c 12 lines changed, 6 insertions(+), 6 deletions(-) =================================================================== @@ -42,7 +42,7 @@ PLUGIN_SET_TRANSLATABLE_INFO( VERSION, "Jiri Techet <techet(a)gmail.com>") -static gint page_index = -1; +static GtkWidget *properties_tab = NULL; static void on_doc_open(G_GNUC_UNUSED GObject * obj, G_GNUC_UNUSED GeanyDocument * doc, @@ -96,8 +96,8 @@ static void on_build_start(GObject *obj, gpointer user_data) static void on_project_dialog_open(G_GNUC_UNUSED GObject * obj, GtkWidget * notebook, G_GNUC_UNUSED gpointer user_data) { - if (prj_org && page_index == -1) - page_index = prjorg_project_add_properties_tab(notebook); + if (prj_org && !properties_tab) + properties_tab = prjorg_project_add_properties_tab(notebook); } @@ -115,10 +115,10 @@ static void on_project_dialog_confirmed(G_GNUC_UNUSED GObject * obj, GtkWidget * static void on_project_dialog_close(G_GNUC_UNUSED GObject * obj, GtkWidget * notebook, G_GNUC_UNUSED gpointer user_data) { - if (page_index != -1) + if (properties_tab) { - gtk_notebook_remove_page(GTK_NOTEBOOK(notebook), page_index); - page_index = -1; + gtk_widget_destroy(properties_tab); + properties_tab = NULL; } } Modified: projectorganizer/src/prjorg-project.c 7 lines changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -555,13 +555,12 @@ void prjorg_project_read_properties_tab(void) } -gint prjorg_project_add_properties_tab(GtkWidget *notebook) +GtkWidget *prjorg_project_add_properties_tab(GtkWidget *notebook) { GtkWidget *vbox, *hbox, *hbox1; GtkWidget *table; GtkWidget *label; gchar *str; - gint page_index; e = g_new0(PropertyDialogElements, 1); @@ -645,10 +644,10 @@ gint prjorg_project_add_properties_tab(GtkWidget *notebook) hbox = gtk_hbox_new(FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 6); - page_index = gtk_notebook_append_page(GTK_NOTEBOOK(notebook), hbox, label); + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), hbox, label); gtk_widget_show_all(notebook); - return page_index; + return hbox; } Modified: projectorganizer/src/prjorg-project.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -47,7 +47,7 @@ extern PrjOrg *prj_org; void prjorg_project_open(GKeyFile * key_file); -gint prjorg_project_add_properties_tab(GtkWidget *notebook); +GtkWidget *prjorg_project_add_properties_tab(GtkWidget *notebook); void prjorg_project_close(void); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] c7ee5e: projectorganizer: Fix multiple tabs in Project Properties
by Jiří Techet 17 Jun '16

17 Jun '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Fri, 17 Jun 2016 13:33:12 UTC Commit: c7ee5ea50be681aec15f10d97993e927b7c2c769 https://github.com/geany/geany-plugins/commit/c7ee5ea50be681aec15f10d97993e… Log Message: ----------- projectorganizer: Fix multiple tabs in Project Properties There is a problem when there are multiple tabs added by plugins: if on_project_dialog_open() is called and Project Organizer stores the index of the tab and then another plugin adds a tab before the Project Organizer's tab, then the stored index becomes invalid which can lead to not correctly removing the tab from the dialog. Instead store a pointer of the added tab widget and remove the widget when the properties dialog is closed. Modified Paths: -------------- projectorganizer/src/prjorg-main.c projectorganizer/src/prjorg-project.c projectorganizer/src/prjorg-project.h Modified: projectorganizer/src/prjorg-main.c 12 lines changed, 6 insertions(+), 6 deletions(-) =================================================================== @@ -42,7 +42,7 @@ PLUGIN_SET_TRANSLATABLE_INFO( VERSION, "Jiri Techet <techet(a)gmail.com>") -static gint page_index = -1; +static GtkWidget *properties_tab = NULL; static void on_doc_open(G_GNUC_UNUSED GObject * obj, G_GNUC_UNUSED GeanyDocument * doc, @@ -96,8 +96,8 @@ static void on_build_start(GObject *obj, gpointer user_data) static void on_project_dialog_open(G_GNUC_UNUSED GObject * obj, GtkWidget * notebook, G_GNUC_UNUSED gpointer user_data) { - if (prj_org && page_index == -1) - page_index = prjorg_project_add_properties_tab(notebook); + if (prj_org && !properties_tab) + properties_tab = prjorg_project_add_properties_tab(notebook); } @@ -115,10 +115,10 @@ static void on_project_dialog_confirmed(G_GNUC_UNUSED GObject * obj, GtkWidget * static void on_project_dialog_close(G_GNUC_UNUSED GObject * obj, GtkWidget * notebook, G_GNUC_UNUSED gpointer user_data) { - if (page_index != -1) + if (properties_tab) { - gtk_notebook_remove_page(GTK_NOTEBOOK(notebook), page_index); - page_index = -1; + gtk_widget_destroy(properties_tab); + properties_tab = NULL; } } Modified: projectorganizer/src/prjorg-project.c 7 lines changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -555,13 +555,12 @@ void prjorg_project_read_properties_tab(void) } -gint prjorg_project_add_properties_tab(GtkWidget *notebook) +GtkWidget *prjorg_project_add_properties_tab(GtkWidget *notebook) { GtkWidget *vbox, *hbox, *hbox1; GtkWidget *table; GtkWidget *label; gchar *str; - gint page_index; e = g_new0(PropertyDialogElements, 1); @@ -645,10 +644,10 @@ gint prjorg_project_add_properties_tab(GtkWidget *notebook) hbox = gtk_hbox_new(FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 6); - page_index = gtk_notebook_append_page(GTK_NOTEBOOK(notebook), hbox, label); + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), hbox, label); gtk_widget_show_all(notebook); - return page_index; + return hbox; } Modified: projectorganizer/src/prjorg-project.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -47,7 +47,7 @@ extern PrjOrg *prj_org; void prjorg_project_open(GKeyFile * key_file); -gint prjorg_project_add_properties_tab(GtkWidget *notebook); +GtkWidget *prjorg_project_add_properties_tab(GtkWidget *notebook); void prjorg_project_close(void); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 45d9ba: addons/tasks: Stript comment-closing sequence from task text
by Quentin Glidic 17 Jun '16

17 Jun '16

Branch: refs/heads/master Author: Quentin Glidic <sardemff7+git(a)sardemff7.net> Committer: Quentin Glidic <sardemff7+git(a)sardemff7.net> Date: Fri, 17 Jun 2016 12:55:14 UTC Commit: 45d9badc60c2f00a2f1abce57f9be8fdbb936033 https://github.com/geany/geany-plugins/commit/45d9badc60c2f00a2f1abce57f9be… Log Message: ----------- addons/tasks: Stript comment-closing sequence from task text Signed-off-by: Quentin Glidic <sardemff7+git(a)sardemff7.net> Modified Paths: -------------- addons/src/ao_tasks.c Modified: addons/src/ao_tasks.c 7 lines changed, 6 insertions(+), 1 deletions(-) =================================================================== @@ -559,7 +559,7 @@ static void create_task(AoTasks *t, GeanyDocument *doc, gint line, const gchar * static void update_tasks_for_doc(AoTasks *t, GeanyDocument *doc) { gint lexer, lines, line, last_pos = 0, style; - gchar *line_buf, *display_name, *task_start; + gchar *line_buf, *display_name, *task_start, *closing_comment; gchar **token; AoTasksPrivate *priv = AO_TASKS_GET_PRIVATE(t); @@ -588,6 +588,11 @@ static void update_tasks_for_doc(AoTasks *t, GeanyDocument *doc) /* reset task_start in case there is no text following */ if (EMPTY(task_start)) task_start = line_buf; + else if ((EMPTY(doc->file_type->comment_single) || + strstr(line_buf, doc->file_type->comment_single) == NULL) && + !EMPTY(doc->file_type->comment_close) && + (closing_comment = strstr(task_start, doc->file_type->comment_close)) != NULL) + *closing_comment = '\0'; /* create the task */ create_task(t, doc, line, *token, line_buf, task_start, display_name); /* if we found a token, continue on next line */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 236363: addons/tasks: Do not extract tokens from non-comments
by Quentin Glidic 17 Jun '16

17 Jun '16

Branch: refs/heads/master Author: Quentin Glidic <sardemff7+git(a)sardemff7.net> Committer: Quentin Glidic <sardemff7+git(a)sardemff7.net> Date: Fri, 17 Jun 2016 12:50:07 UTC Commit: 236363f0e7dfab7db8690cc051a53417da6ece06 https://github.com/geany/geany-plugins/commit/236363f0e7dfab7db8690cc051a53… Log Message: ----------- addons/tasks: Do not extract tokens from non-comments Signed-off-by: Quentin Glidic <sardemff7+git(a)sardemff7.net> Modified Paths: -------------- addons/src/ao_tasks.c Modified: addons/src/ao_tasks.c 11 lines changed, 8 insertions(+), 3 deletions(-) =================================================================== @@ -558,27 +558,31 @@ static void create_task(AoTasks *t, GeanyDocument *doc, gint line, const gchar * static void update_tasks_for_doc(AoTasks *t, GeanyDocument *doc) { - gint lines, line; + gint lexer, lines, line, last_pos = 0, style; gchar *line_buf, *display_name, *task_start; gchar **token; AoTasksPrivate *priv = AO_TASKS_GET_PRIVATE(t); if (doc->is_valid) { display_name = document_get_basename_for_display(doc, -1); + lexer = sci_get_lexer(doc->editor->sci); lines = sci_get_line_count(doc->editor->sci); for (line = 0; line < lines; line++) { - line_buf = g_strstrip(sci_get_line(doc->editor->sci, line)); + line_buf = sci_get_line(doc->editor->sci, line); for (token = priv->tokens; *token != NULL; ++token) { if (EMPTY(*token)) continue; if ((task_start = strstr(line_buf, *token)) == NULL) continue; + style = sci_get_style_at(doc->editor->sci, last_pos + (task_start - line_buf)); + if (!highlighting_is_comment_style(lexer, style)) + continue; /* skip the token and additional whitespace */ - task_start += strlen(*token); + task_start = strstr(g_strstrip(line_buf), *token) + strlen(*token); while (*task_start == ' ' || *task_start == ':') task_start++; /* reset task_start in case there is no text following */ @@ -590,6 +594,7 @@ static void update_tasks_for_doc(AoTasks *t, GeanyDocument *doc) break; } g_free(line_buf); + last_pos = sci_get_line_end_position(doc->editor->sci, line) + 1; } g_free(display_name); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 213b24: addons/tasks: Rework the detection loop
by Quentin Glidic 17 Jun '16

17 Jun '16

Branch: refs/heads/master Author: Quentin Glidic <sardemff7+git(a)sardemff7.net> Committer: Quentin Glidic <sardemff7+git(a)sardemff7.net> Date: Fri, 17 Jun 2016 12:49:10 UTC Commit: 213b24a2f0a0522f7db07a6b67a526b5ff6a346c https://github.com/geany/geany-plugins/commit/213b24a2f0a0522f7db07a6b67a52… Log Message: ----------- addons/tasks: Rework the detection loop Signed-off-by: Quentin Glidic <sardemff7+git(a)sardemff7.net> Modified Paths: -------------- addons/src/ao_tasks.c Modified: addons/src/ao_tasks.c 34 lines changed, 17 insertions(+), 17 deletions(-) =================================================================== @@ -570,24 +570,24 @@ static void update_tasks_for_doc(AoTasks *t, GeanyDocument *doc) for (line = 0; line < lines; line++) { line_buf = g_strstrip(sci_get_line(doc->editor->sci, line)); - token = priv->tokens; - while (*token != NULL) + for (token = priv->tokens; *token != NULL; ++token) { - if (!EMPTY(*token) && (task_start = strstr(line_buf, *token)) != NULL) - { - /* skip the token and additional whitespace */ - task_start += strlen(*token); - while (*task_start == ' ' || *task_start == ':') - task_start++; - /* reset task_start in case there is no text following */ - if (EMPTY(task_start)) - task_start = line_buf; - /* create the task */ - create_task(t, doc, line, *token, line_buf, task_start, display_name); - /* if we found a token, continue on next line */ - break; - } - token++; + if (EMPTY(*token)) + continue; + if ((task_start = strstr(line_buf, *token)) == NULL) + continue; + + /* skip the token and additional whitespace */ + task_start += strlen(*token); + while (*task_start == ' ' || *task_start == ':') + task_start++; + /* reset task_start in case there is no text following */ + if (EMPTY(task_start)) + task_start = line_buf; + /* create the task */ + create_task(t, doc, line, *token, line_buf, task_start, display_name); + /* if we found a token, continue on next line */ + break; } g_free(line_buf); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 5b461b: pairtaghighlighter: Fix crash if the tag name is missing
by Colomban Wendling 15 Jun '16

15 Jun '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 15 Jun 2016 13:15:57 UTC Commit: 5b461b3bdcf2c380e5f323e287be4ebd32f07059 https://github.com/geany/geany-plugins/commit/5b461b3bdcf2c380e5f323e287be4… Log Message: ----------- pairtaghighlighter: Fix crash if the tag name is missing Fixes #446 and #442. Modified Paths: -------------- pairtaghighlighter/src/pair_tag_highlighter.c Modified: pairtaghighlighter/src/pair_tag_highlighter.c 13 lines changed, 9 insertions(+), 4 deletions(-) =================================================================== @@ -169,8 +169,10 @@ static gboolean is_tag_empty(gchar *tagName) const char *emptyTags[] = {"area", "base", "br", "col", "embed", "hr", "img", "input", "keygen", "link", "meta", "param", "source", "track", "wbr", "!DOCTYPE"}; - unsigned int i; + + g_return_val_if_fail(tagName != NULL, FALSE); + for(i=0; i<(sizeof(emptyTags)/sizeof(emptyTags[0])); i++) { if(strcmp(tagName, emptyTags[i]) == 0) @@ -207,7 +209,7 @@ static gchar *get_tag_name(ScintillaObject *sci, gint openingBracket, gint closi if(nameEnd-nameStart > MAX_TAG_NAME) break; } - return sci_get_contents_range(sci, nameStart, nameEnd-1); + return nameEnd > nameStart ? sci_get_contents_range(sci, nameStart, nameEnd-1) : NULL; } @@ -233,7 +235,7 @@ static void findMatchingOpeningTag(ScintillaObject *sci, gchar *tagName, gint op gchar *matchingTagName = get_tag_name(sci, matchingOpeningBracket, matchingClosingBracket, isMatchingTagOpening); - if(strcmp(tagName, matchingTagName) == 0) + if(matchingTagName && strcmp(tagName, matchingTagName) == 0) { if(TRUE == isMatchingTagOpening) openingTagsCount++; @@ -289,7 +291,7 @@ static void findMatchingClosingTag(ScintillaObject *sci, gchar *tagName, gint cl gchar *matchingTagName = get_tag_name(sci, matchingOpeningBracket, matchingClosingBracket, isMatchingTagOpening); - if(strcmp(tagName, matchingTagName) == 0) + if(matchingTagName && strcmp(tagName, matchingTagName) == 0) { if(TRUE == isMatchingTagOpening) openingTagsCount++; @@ -319,6 +321,9 @@ static void findMatchingTag(ScintillaObject *sci, gint openingBracket, gint clos gboolean isTagOpening = is_tag_opening(sci, openingBracket); gchar *tagName = get_tag_name(sci, openingBracket, closingBracket, isTagOpening); + if (!tagName) + return; + if(is_tag_self_closing(sci, closingBracket) || is_tag_empty(tagName)) { highlight_tag(sci, openingBracket, closingBracket, EMPTY_TAG_COLOR); } else { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits June 2016