Plugins-Commits November 2013

plugins-commits@lists.geany.org

1 participants
21 discussions

[geany/geany-plugins] 495712: Geanyvc: fix leak
by Pavel Roschin 28 Nov '13

28 Nov '13

Branch: refs/heads/master Author: Pavel Roschin <roshin(a)scriptumplus.ru> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Thu, 28 Nov 2013 21:36:19 UTC Commit: 4957126bc954f3e13969ee169876a1b1b9d04818 https://github.com/geany/geany-plugins/commit/4957126bc954f3e13969ee169876a… Log Message: ----------- Geanyvc: fix leak Modified Paths: -------------- geanyvc/src/externdiff.c Modified: geanyvc/src/externdiff.c 4 files changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -50,8 +50,10 @@ enum for (i = 0; i < EXTERNAL_DIFF_COUNT; i++) { - if (g_find_program_in_path(viewers[i])) + gchar *path = g_find_program_in_path(viewers[i]); + if (path) { + g_free(path); extern_diff_viewer = (gchar *) viewers[i]; return viewers[i]; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 55d5f0: Geanysendmail: fix mismatching allocation/deallocation
by Pavel Roschin 28 Nov '13

28 Nov '13

Branch: refs/heads/master Author: Pavel Roschin <roshin(a)scriptumplus.ru> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Thu, 28 Nov 2013 21:33:26 UTC Commit: 55d5f08a835a1b4a730898399c5348aa2296dffb https://github.com/geany/geany-plugins/commit/55d5f08a835a1b4a730898399c534… Log Message: ----------- Geanysendmail: fix mismatching allocation/deallocation Modified Paths: -------------- geanysendmail/src/geanysendmail.c Modified: geanysendmail/src/geanysendmail.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -111,7 +111,7 @@ enum } else { - g_free(cmd_str); + g_string_free(cmd_str, TRUE); g_free(locale_filename); return; } @@ -173,7 +173,7 @@ enum ui_set_statusbar(FALSE, _("File has to be saved before sending.")); } - g_free(config); + g_key_file_free(config); } static void key_send_as_attachment(G_GNUC_UNUSED guint key_id) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] e327c7: Merge pull request #127 from vmkononenko/master
by Frank Lanitz 21 Nov '13

21 Nov '13

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Thu, 21 Nov 2013 12:18:06 UTC Commit: e327c76188a738f5c3d2bdaccb3fb06a99eccb39 https://github.com/geany/geany-plugins/commit/e327c76188a738f5c3d2bdaccb3fb… Log Message: ----------- Merge pull request #127 from vmkononenko/master Update PairTagHighlighter to version 1.1 Modified Paths: -------------- pairtaghighlighter/ChangeLog pairtaghighlighter/src/pair_tag_highlighter.c Modified: pairtaghighlighter/ChangeLog 9 files changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,12 @@ +Changes in v1.1 Nov 19, 2013 + + * Add HTML empty tags support according to HTML5 standard. + * Add red and yellow colors to define if pair is found or tag is + empty. + * Enable XML support. + * Improved brackets search by ignoring php tags (<? <?php ?>) and + object operators (->). Thanks Peter Donin for bugreport! + Changes in v1.0 Apr 5, 2013 * The first public version. Modified: pairtaghighlighter/src/pair_tag_highlighter.c 65 files changed, 44 insertions(+), 21 deletions(-) =================================================================== @@ -34,7 +34,7 @@ PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, _("Pair Tag Highlighter"), _("Finds and highlights matching opening/closing HTML tag"), - "1.0", "Volodymyr Kononenko <vm(a)kononenko.ws>") + "1.1", "Volodymyr Kononenko <vm(a)kononenko.ws>") /* Searches tag brackets. @@ -55,13 +55,26 @@ static gint findBracket(ScintillaObject *sci, gint position, gint endOfSearchPos for(pos=position; pos<=endOfSearchPos; pos++) { gchar charAtCurPosition = sci_get_char_at(sci, pos); - if(charAtCurPosition == searchedBracket) - { + gchar charAtPrevPosition = sci_get_char_at(sci, pos-1); + gchar charAtNextPosition = sci_get_char_at(sci, pos+1); + + if(charAtCurPosition == searchedBracket) { + if ('>' == searchedBracket) { + if (('-' == charAtPrevPosition) || ('?' == charAtPrevPosition)) + continue; + } else if ('<' == searchedBracket) { + if ('?' == charAtNextPosition) + continue; + } foundBracket = pos; break; - } - if(charAtCurPosition == breakBracket) + } else if(charAtCurPosition == breakBracket) { + if ('<' == breakBracket) { + if ('?' == charAtNextPosition) + continue; + } break; + } } } else @@ -70,13 +83,27 @@ static gint findBracket(ScintillaObject *sci, gint position, gint endOfSearchPos for(pos=position-1; pos>=endOfSearchPos; pos--) { gchar charAtCurPosition = sci_get_char_at(sci, pos); + gchar charAtPrevPosition = sci_get_char_at(sci, pos+1); + gchar charAtNextPosition = sci_get_char_at(sci, pos-1); + if(charAtCurPosition == searchedBracket) { + if ('<' == searchedBracket) { + if ('?' == charAtPrevPosition) + continue; + } else if ('>' == searchedBracket) { + if (('-' == charAtNextPosition) || ('?' == charAtNextPosition)) + continue; + } foundBracket = pos; break; - } - if(charAtCurPosition == breakBracket) + } else if(charAtCurPosition == breakBracket) { + if ('>' == breakBracket) { + if (('-' == charAtNextPosition) || ('?' == charAtNextPosition)) + continue; + } break; + } } } @@ -251,8 +278,8 @@ static void findMatchingClosingTag(ScintillaObject *sci, gchar *tagName, gint cl /* are we inside tag? */ gint lineNumber = sci_get_line_from_position(sci, pos); gint lineEnd = sci_get_line_end_position(sci, lineNumber); - gint matchingOpeningBracket = findBracket(sci, pos, endOfDocument, '<', '\0', TRUE); - gint matchingClosingBracket = findBracket(sci, pos, endOfDocument, '>', '\0', TRUE); + gint matchingOpeningBracket = findBracket(sci, pos, lineEnd, '<', '\0', TRUE); + gint matchingClosingBracket = findBracket(sci, pos, lineEnd, '>', '\0', TRUE); if(-1 != matchingOpeningBracket && -1 != matchingClosingBracket && (matchingClosingBracket > matchingOpeningBracket)) @@ -271,14 +298,7 @@ static void findMatchingClosingTag(ScintillaObject *sci, gchar *tagName, gint cl } pos = matchingClosingBracket; } - /* Speed up search: if findBracket returns -1, that means end of line - * is reached. There is no need to go through the same positions again. - * Jump to the end of line */ - else if(-1 == matchingOpeningBracket || -1 == matchingClosingBracket) - { - pos = lineEnd; - continue; - } + if(openingTagsCount == closingTagsCount) { /* matching tag is found */ @@ -339,10 +359,13 @@ static void run_tag_highlighter(ScintillaObject *sci) clear_previous_highlighting(sci, highlightedBrackets[2], highlightedBrackets[3]); } - highlightedBrackets[0] = openingBracket; - highlightedBrackets[1] = closingBracket; + /* Don't run search on empty brackets <> */ + if (closingBracket - openingBracket > 1) { + highlightedBrackets[0] = openingBracket; + highlightedBrackets[1] = closingBracket; - findMatchingTag(sci, openingBracket, closingBracket); + findMatchingTag(sci, openingBracket, closingBracket); + } } @@ -353,7 +376,7 @@ static gboolean on_editor_notify(GObject *obj, GeanyEditor *editor, gint lexer; lexer = sci_get_lexer(editor->sci); - if(lexer != SCLEX_HTML) + if((lexer != SCLEX_HTML) && (lexer != SCLEX_XML)) { return FALSE; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 0bf3f4: PairTagHighlighter: update version number to 1.1
by Volodymyr Kononenko 20 Nov '13

20 Nov '13

1 0

[geany/geany-plugins] b390b2: PairTagHighlighter: enable SCLEX_XML lexer support
by Volodymyr Kononenko 20 Nov '13

20 Nov '13

1 0

[geany/geany-plugins] e72ea2: PairTagHighlighter: improve brackets search
by Volodymyr Kononenko 20 Nov '13

20 Nov '13

Branch: refs/heads/master Author: Volodymyr Kononenko <vm(a)kononenko.ws> Committer: Volodymyr Kononenko <volodymyr.kononenko(a)globallogic.com> Date: Wed, 20 Nov 2013 08:59:15 UTC Commit: e72ea257154043f45bb3e7091eb170fb3dd984be https://github.com/geany/geany-plugins/commit/e72ea257154043f45bb3e7091eb17… Log Message: ----------- PairTagHighlighter: improve brackets search Ignore brackets corresponding to php tags (<? <?php ?>) and object operators (->). Thanks Peter Donin for bugreport! Modified Paths: -------------- pairtaghighlighter/src/pair_tag_highlighter.c Modified: pairtaghighlighter/src/pair_tag_highlighter.c 61 files changed, 42 insertions(+), 19 deletions(-) =================================================================== @@ -55,13 +55,26 @@ static gint findBracket(ScintillaObject *sci, gint position, gint endOfSearchPos for(pos=position; pos<=endOfSearchPos; pos++) { gchar charAtCurPosition = sci_get_char_at(sci, pos); - if(charAtCurPosition == searchedBracket) - { + gchar charAtPrevPosition = sci_get_char_at(sci, pos-1); + gchar charAtNextPosition = sci_get_char_at(sci, pos+1); + + if(charAtCurPosition == searchedBracket) { + if ('>' == searchedBracket) { + if (('-' == charAtPrevPosition) || ('?' == charAtPrevPosition)) + continue; + } else if ('<' == searchedBracket) { + if ('?' == charAtNextPosition) + continue; + } foundBracket = pos; break; - } - if(charAtCurPosition == breakBracket) + } else if(charAtCurPosition == breakBracket) { + if ('<' == breakBracket) { + if ('?' == charAtNextPosition) + continue; + } break; + } } } else @@ -70,13 +83,27 @@ static gint findBracket(ScintillaObject *sci, gint position, gint endOfSearchPos for(pos=position-1; pos>=endOfSearchPos; pos--) { gchar charAtCurPosition = sci_get_char_at(sci, pos); + gchar charAtPrevPosition = sci_get_char_at(sci, pos+1); + gchar charAtNextPosition = sci_get_char_at(sci, pos-1); + if(charAtCurPosition == searchedBracket) { + if ('<' == searchedBracket) { + if ('?' == charAtPrevPosition) + continue; + } else if ('>' == searchedBracket) { + if (('-' == charAtNextPosition) || ('?' == charAtNextPosition)) + continue; + } foundBracket = pos; break; - } - if(charAtCurPosition == breakBracket) + } else if(charAtCurPosition == breakBracket) { + if ('>' == breakBracket) { + if (('-' == charAtNextPosition) || ('?' == charAtNextPosition)) + continue; + } break; + } } } @@ -251,8 +278,8 @@ static void findMatchingClosingTag(ScintillaObject *sci, gchar *tagName, gint cl /* are we inside tag? */ gint lineNumber = sci_get_line_from_position(sci, pos); gint lineEnd = sci_get_line_end_position(sci, lineNumber); - gint matchingOpeningBracket = findBracket(sci, pos, endOfDocument, '<', '\0', TRUE); - gint matchingClosingBracket = findBracket(sci, pos, endOfDocument, '>', '\0', TRUE); + gint matchingOpeningBracket = findBracket(sci, pos, lineEnd, '<', '\0', TRUE); + gint matchingClosingBracket = findBracket(sci, pos, lineEnd, '>', '\0', TRUE); if(-1 != matchingOpeningBracket && -1 != matchingClosingBracket && (matchingClosingBracket > matchingOpeningBracket)) @@ -271,14 +298,7 @@ static void findMatchingClosingTag(ScintillaObject *sci, gchar *tagName, gint cl } pos = matchingClosingBracket; } - /* Speed up search: if findBracket returns -1, that means end of line - * is reached. There is no need to go through the same positions again. - * Jump to the end of line */ - else if(-1 == matchingOpeningBracket || -1 == matchingClosingBracket) - { - pos = lineEnd; - continue; - } + if(openingTagsCount == closingTagsCount) { /* matching tag is found */ @@ -339,10 +359,13 @@ static void run_tag_highlighter(ScintillaObject *sci) clear_previous_highlighting(sci, highlightedBrackets[2], highlightedBrackets[3]); } - highlightedBrackets[0] = openingBracket; - highlightedBrackets[1] = closingBracket; + /* Don't run search on empty brackets <> */ + if (closingBracket - openingBracket > 1) { + highlightedBrackets[0] = openingBracket; + highlightedBrackets[1] = closingBracket; - findMatchingTag(sci, openingBracket, closingBracket); + findMatchingTag(sci, openingBracket, closingBracket); + } } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 0232e4: Merge pull request #126 from scriptum/master
by Frank Lanitz 14 Nov '13

14 Nov '13

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Thu, 14 Nov 2013 10:16:26 UTC Commit: 0232e44d07f291f40256fad6b63114f573cab82f https://github.com/geany/geany-plugins/commit/0232e44d07f291f40256fad6b6311… Log Message: ----------- Merge pull request #126 from scriptum/master autoclose: Refactor so that "document-close" is not necessary Modified Paths: -------------- autoclose/src/autoclose.c Modified: autoclose/src/autoclose.c 23 files changed, 4 insertions(+), 19 deletions(-) =================================================================== @@ -780,9 +780,8 @@ struct_semicolon( if (!ac_info->jump_on_tab) return; g_return_if_fail(data); - g_return_if_fail(DOC_VALID(data->doc)); - ScintillaObject *sci = data->doc->editor->sci; + ScintillaObject *sci = SCINTILLA(obj); /* reset jump_on_tab state when user clicked away */ gboolean updated_sel = nt->updated & SC_UPDATE_SELECTION; gboolean updated_text = nt->updated & SC_UPDATE_CONTENT; @@ -801,8 +800,6 @@ struct_semicolon( data->last_line = new_line; } -#define AC_GOBJECT_KEY "autoclose-userdata" - static void on_document_open(GObject *obj, GeanyDocument *doc, gpointer user_data) { @@ -814,29 +811,17 @@ struct_semicolon( data = g_new0(AutocloseUserData, 1); data->doc = doc; plugin_signal_connect(geany_plugin, G_OBJECT(sci), "sci-notify", - FALSE, G_CALLBACK(on_sci_notify), data); + FALSE, G_CALLBACK(on_sci_notify), data); plugin_signal_connect(geany_plugin, G_OBJECT(sci), "key-press-event", FALSE, G_CALLBACK(on_key_press), data); - /* save data pointer via GObject too for on_document_close() */ - g_object_set_data(G_OBJECT(sci), AC_GOBJECT_KEY, data); -} - -static void -on_document_close(GObject *obj, GeanyDocument *doc, gpointer user_data) -{ - /* free the AutocloseUserData instance and disconnect the handler */ - ScintillaObject *sci = doc->editor->sci; - AutocloseUserData *data = g_object_steal_data(G_OBJECT(sci), AC_GOBJECT_KEY); - /* no plugin_signal_disconnect() ?? */ - g_signal_handlers_disconnect_by_func(G_OBJECT(sci), G_CALLBACK(on_sci_notify), data); - g_free(data); + /* This will free the data when the sci is destroyed */ + g_object_set_data_full(G_OBJECT(sci), "autoclose-userdata", data, g_free); } PluginCallback plugin_callbacks[] = { { "document-open", (GCallback) &on_document_open, FALSE, NULL }, { "document-new", (GCallback) &on_document_open, FALSE, NULL }, - { "document-close", (GCallback) &on_document_close, FALSE, NULL }, { NULL, NULL, FALSE, NULL } }; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 6f48da: Merge pull request #2 from kugel-/autoclose-v0.2
by RPG 14 Nov '13

14 Nov '13

Branch: refs/heads/master Author: RPG <rpg(a)scriptumplus.ru> Committer: RPG <rpg(a)scriptumplus.ru> Date: Thu, 14 Nov 2013 10:07:27 UTC Commit: 6f48dac8b2e9d83b3b0ec782458ebb3916ad0708 https://github.com/geany/geany-plugins/commit/6f48dac8b2e9d83b3b0ec782458eb… Log Message: ----------- Merge pull request #2 from kugel-/autoclose-v0.2 Autoclose v0.2 Modified Paths: -------------- addons/src/ao_xmltagging.c autoclose/src/autoclose.c geanylatex/src/geanylatex.c geanylatex/src/templates.c geanysendmail/src/geanysendmail.c updatechecker/src/updatechecker.c Modified: addons/src/ao_xmltagging.c 28 files changed, 14 insertions(+), 14 deletions(-) =================================================================== @@ -44,8 +44,6 @@ void ao_xmltagging(void) if (sci_has_selection(doc->editor->sci) == TRUE) { - gchar *selection = NULL; - gchar *replacement = NULL; GtkWidget *dialog = NULL; GtkWidget *vbox = NULL; GtkWidget *hbox = NULL; @@ -84,38 +82,40 @@ void ao_xmltagging(void) if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { - gchar *tag = NULL; + GString *tag = NULL; + gchar *selection = NULL; + gchar *replacement = NULL; + /* Getting the selection and setting the undo flag */ selection = sci_get_selection_contents(doc->editor->sci); sci_start_undo_action(doc->editor->sci); - tag = g_strdup(gtk_entry_get_text(GTK_ENTRY(textbox))); - if (NZV(tag)) + /* Getting the tag */ + tag = g_string_new(gtk_entry_get_text(GTK_ENTRY(textbox))); + + if (tag->len > 0) { gsize end = 0; - GString *tmp = NULL; gchar *end_tag; /* First we check for %s and replace it with selection*/ - tmp = g_string_new(tag); - utils_string_replace_all(tmp, "%s", selection); - tag = g_string_free(tmp, FALSE); + utils_string_replace_all(tag, "%s", selection); /* We try to find a space inside the inserted tag as we * only need to close the tag with part until first space. * */ - while (!g_ascii_isspace(tag[end]) && tag[end] != '\0') + while (end < tag->len && !g_ascii_isspace(tag->str[end]) ) end++; if (end > 0) { - end_tag = g_strndup(tag, end); + end_tag = g_strndup(tag->str, end); } else { - end_tag = tag; + end_tag = tag->str; } - replacement = g_strconcat("<", tag, ">", + replacement = g_strconcat("<", tag->str, ">", selection, "</", end_tag, ">", NULL); g_free(end_tag); } @@ -124,7 +124,7 @@ void ao_xmltagging(void) sci_end_undo_action(doc->editor->sci); g_free(selection); g_free(replacement); - g_free(tag); + g_string_free(tag, TRUE); } gtk_widget_destroy(dialog); } Modified: autoclose/src/autoclose.c 26 files changed, 6 insertions(+), 20 deletions(-) =================================================================== @@ -410,7 +410,7 @@ if (char_is_curly_bracket(ch)) { if (line_start == line_end) - return AC_CONTINUE_ACTION; + goto final; if (line_start > line_end) { line = line_end; @@ -433,6 +433,7 @@ unindent_line(sci, i, indent_width); } } +final: sci_end_undo_action(sci); return AC_STOP_ACTION; } @@ -779,9 +780,8 @@ struct_semicolon( if (!ac_info->jump_on_tab) return; g_return_if_fail(data); - g_return_if_fail(DOC_VALID(data->doc)); - ScintillaObject *sci = data->doc->editor->sci; + ScintillaObject *sci = SCINTILLA(obj); /* reset jump_on_tab state when user clicked away */ gboolean updated_sel = nt->updated & SC_UPDATE_SELECTION; gboolean updated_text = nt->updated & SC_UPDATE_CONTENT; @@ -800,8 +800,6 @@ struct_semicolon( data->last_line = new_line; } -#define AC_GOBJECT_KEY "autoclose-userdata" - static void on_document_open(GObject *obj, GeanyDocument *doc, gpointer user_data) { @@ -813,29 +811,17 @@ struct_semicolon( data = g_new0(AutocloseUserData, 1); data->doc = doc; plugin_signal_connect(geany_plugin, G_OBJECT(sci), "sci-notify", - FALSE, G_CALLBACK(on_sci_notify), data); + FALSE, G_CALLBACK(on_sci_notify), data); plugin_signal_connect(geany_plugin, G_OBJECT(sci), "key-press-event", FALSE, G_CALLBACK(on_key_press), data); - /* save data pointer via GObject too for on_document_close() */ - g_object_set_data(G_OBJECT(sci), AC_GOBJECT_KEY, data); -} - -static void -on_document_close(GObject *obj, GeanyDocument *doc, gpointer user_data) -{ - /* free the AutocloseUserData instance and disconnect the handler */ - ScintillaObject *sci = doc->editor->sci; - AutocloseUserData *data = g_object_steal_data(G_OBJECT(sci), AC_GOBJECT_KEY); - /* no plugin_signal_disconnect() ?? */ - g_signal_handlers_disconnect_by_func(G_OBJECT(sci), G_CALLBACK(on_sci_notify), data); - g_free(data); + /* This will free the data when the sci is destroyed */ + g_object_set_data_full(G_OBJECT(sci), "autoclose-userdata", data, g_free); } PluginCallback plugin_callbacks[] = { { "document-open", (GCallback) &on_document_open, FALSE, NULL }, { "document-new", (GCallback) &on_document_open, FALSE, NULL }, - { "document-close", (GCallback) &on_document_close, FALSE, NULL }, { NULL, NULL, FALSE, NULL } }; Modified: geanylatex/src/geanylatex.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1,7 +1,7 @@ /* * geanylatex.c - Plugin to let Geany better work together with LaTeX * - * Copyright 2007-2012 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + * Copyright 2007-2013 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * Copyright 2005-2009 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * Copyright 2006-2009 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * @@ -971,7 +971,7 @@ static void glatex_kblatex_toggle(G_GNUC_UNUSED guint key_id) if (ref_string != NULL) g_free(ref_string); if (template_string != NULL) - g_free(template_string); + g_string_free(template_string, TRUE); } } Modified: geanylatex/src/templates.c 4 files changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,7 @@ /* * templates.c * - * Copyright 2009-2012 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + * Copyright 2009-2013 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -81,6 +81,8 @@ GPtrArray* glatex_init_custom_templates(void) g_slist_foreach(file_list, (GFunc)glatex_init_cutom_template_item, templates); g_slist_foreach(file_list, (GFunc) g_free, NULL); g_slist_free(file_list); + + g_free(tmp_basedir); return templates; } Modified: geanysendmail/src/geanysendmail.c 6 files changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,7 @@ /* * geanysendmail.c * - * Copyright 2007-2011 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + * Copyright 2007-2011, 2013 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * Copyright 2007 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * Copyright 2007, 2008 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * Copyright 2008, 2009 Timothy Boronczyk <tboronczyk(at)gmail(dot)com> @@ -111,6 +111,8 @@ enum } else { + g_free(cmd_str); + g_free(locale_filename); return; } @@ -170,6 +172,8 @@ enum { ui_set_statusbar(FALSE, _("File has to be saved before sending.")); } + + g_free(config); } static void key_send_as_attachment(G_GNUC_UNUSED guint key_id) Modified: updatechecker/src/updatechecker.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -143,7 +143,7 @@ static void parse_version_string(const gchar *ver, gint *major, gint *minor, } else { - major = 0; + *major = 0; } g_strfreev(vers); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 4cb69f: autoclose: Refactor so that "document-close" is not necessary.
by Thomas Martitz 13 Nov '13

13 Nov '13

Branch: refs/heads/master Author: Thomas Martitz <thomas.martitz(a)student.htw-berlin.de> Committer: Thomas Martitz <thomas.martitz(a)student.htw-berlin.de> Date: Wed, 13 Nov 2013 22:57:18 UTC Commit: 4cb69f39e0c202c122f3c6aee36ad075fcd90aed https://github.com/geany/geany-plugins/commit/4cb69f39e0c202c122f3c6aee36ad… Log Message: ----------- autoclose: Refactor so that "document-close" is not necessary. The document-close handler was just to free data and disconnect handlers associated to the sci widget. The former can be simplified with g_object_set_data_full() and the signal handler will be disconnected anyway on widget destroy. Modified Paths: -------------- autoclose/src/autoclose.c Modified: autoclose/src/autoclose.c 23 files changed, 4 insertions(+), 19 deletions(-) =================================================================== @@ -780,9 +780,8 @@ struct_semicolon( if (!ac_info->jump_on_tab) return; g_return_if_fail(data); - g_return_if_fail(DOC_VALID(data->doc)); - ScintillaObject *sci = data->doc->editor->sci; + ScintillaObject *sci = SCINTILLA(obj); /* reset jump_on_tab state when user clicked away */ gboolean updated_sel = nt->updated & SC_UPDATE_SELECTION; gboolean updated_text = nt->updated & SC_UPDATE_CONTENT; @@ -801,8 +800,6 @@ struct_semicolon( data->last_line = new_line; } -#define AC_GOBJECT_KEY "autoclose-userdata" - static void on_document_open(GObject *obj, GeanyDocument *doc, gpointer user_data) { @@ -814,29 +811,17 @@ struct_semicolon( data = g_new0(AutocloseUserData, 1); data->doc = doc; plugin_signal_connect(geany_plugin, G_OBJECT(sci), "sci-notify", - FALSE, G_CALLBACK(on_sci_notify), data); + FALSE, G_CALLBACK(on_sci_notify), data); plugin_signal_connect(geany_plugin, G_OBJECT(sci), "key-press-event", FALSE, G_CALLBACK(on_key_press), data); - /* save data pointer via GObject too for on_document_close() */ - g_object_set_data(G_OBJECT(sci), AC_GOBJECT_KEY, data); -} - -static void -on_document_close(GObject *obj, GeanyDocument *doc, gpointer user_data) -{ - /* free the AutocloseUserData instance and disconnect the handler */ - ScintillaObject *sci = doc->editor->sci; - AutocloseUserData *data = g_object_steal_data(G_OBJECT(sci), AC_GOBJECT_KEY); - /* no plugin_signal_disconnect() ?? */ - g_signal_handlers_disconnect_by_func(G_OBJECT(sci), G_CALLBACK(on_sci_notify), data); - g_free(data); + /* This will free the data when the sci is destroyed */ + g_object_set_data_full(G_OBJECT(sci), "autoclose-userdata", data, g_free); } PluginCallback plugin_callbacks[] = { { "document-open", (GCallback) &on_document_open, FALSE, NULL }, { "document-new", (GCallback) &on_document_open, FALSE, NULL }, - { "document-close", (GCallback) &on_document_close, FALSE, NULL }, { NULL, NULL, FALSE, NULL } }; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] add447: GeanyPy: Fix build with -fno-common: use extern and NO_IMPORT_PYGOBJECT
by Enrico Tröger 13 Nov '13

13 Nov '13

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Matthew Brush <matt(a)geany.org> Date: Wed, 13 Nov 2013 03:02:35 UTC Commit: add44778fd12390b57b5f8741aa6e4ebd23c85d5 https://github.com/geany/geany-plugins/commit/add44778fd12390b57b5f8741aa6e… Log Message: ----------- GeanyPy: Fix build with -fno-common: use extern and NO_IMPORT_PYGOBJECT Define global variables as extern in the header files to fix build with the gcc option -fno-common. Also, define NO_IMPORT_PYGOBJECT and NO_IMPORT_PYGTK for PyGTK as this also fails to build with linker errors if the headers are included multiple times. Closes #120 Modified Paths: -------------- geanypy/src/geanypy-editor.h geanypy/src/geanypy-encoding.h geanypy/src/geanypy-plugin.c geanypy/src/geanypy-project.h geanypy/src/geanypy-scintilla.h geanypy/src/geanypy-uiutils.h geanypy/src/geanypy.h Modified: geanypy/src/geanypy-editor.h 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,7 @@ #ifndef GEANYPY_EDITOR_H__ #define GEANYPY_EDITOR_H__ -PyTypeObject IndentPrefsType; +extern PyTypeObject IndentPrefsType; typedef struct { Modified: geanypy/src/geanypy-encoding.h 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,7 @@ #ifndef GEANYPY_ENCODING_H__ #define GEANYPY_ENCODING_H__ -PyTypeObject EncodingType; +extern PyTypeObject EncodingType; typedef struct { Modified: geanypy/src/geanypy-plugin.c 2 files changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -19,6 +19,8 @@ * MA 02110-1301, USA. */ +#define INCLUDE_PYGOBJECT_ONCE_FULL + #include "geanypy.h" G_MODULE_EXPORT GeanyPlugin *geany_plugin; Modified: geanypy/src/geanypy-project.h 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,7 @@ #ifndef GEANYPY_PROJECT_H__ #define GEANYPY_PROJECT_H__ -PyTypeObject ProjectType; +extern PyTypeObject ProjectType; typedef struct { Modified: geanypy/src/geanypy-scintilla.h 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,8 @@ #ifndef GEANYPY_SCINTILLA_H__ #define GEANYPY_SCINTILLA_H__ -PyTypeObject NotificationType; -PyTypeObject NotifyHeaderType; +extern PyTypeObject NotificationType; +extern PyTypeObject NotifyHeaderType; typedef struct { Modified: geanypy/src/geanypy-uiutils.h 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,8 @@ #ifndef GEANYPY_UI_UTILS_H__ #define GEANYPY_UI_UTILS_H__ -PyTypeObject InterfacePrefsType; -PyTypeObject MainWidgetsType; +extern PyTypeObject InterfacePrefsType; +extern PyTypeObject MainWidgetsType; typedef struct { Modified: geanypy/src/geanypy.h 9 files changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -75,6 +75,15 @@ #include <string.h> #include <gtk/gtk.h> + +/* necessary for compilation with -fno-common, + * see https://bugzilla.gnome.org/show_bug.cgi?id=610657 for details, + * INCLUDE_PYGOBJECT_ONCE_FULL is set only once in geanypy-plugin.c */ +#ifndef INCLUDE_PYGOBJECT_ONCE_FULL +# define NO_IMPORT_PYGOBJECT +# define NO_IMPORT_PYGTK +#endif + #include <pygobject.h> #ifndef GEANYPY_WINDOWS -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits November 2013