Plugins-Commits January 2013

plugins-commits@lists.geany.org

1 participants
33 discussions

[geany/geany-plugins] b97337: Rework TableConvert-plugin to be a little more generic.
by Frank Lanitz 01 Feb '13

01 Feb '13

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Thu, 31 Jan 2013 22:27:42 UTC Commit: b973375af88f3baf08d03deaec176a521f41862f https://github.com/geany/geany-plugins/commit/b973375af88f3baf08d03deaec176… Log Message: ----------- Rework TableConvert-plugin to be a little more generic. Modified Paths: -------------- tableconvert/src/tableconvert.c Modified: tableconvert/src/tableconvert.c 161 files changed, 121 insertions(+), 40 deletions(-) =================================================================== @@ -1,7 +1,7 @@ /* * tableconvert.c * - * Copyright 2011-2012 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + * Copyright 2011-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 @@ -41,9 +41,126 @@ enum COUNT_KB }; +typedef struct { + const gchar *start; + const gchar *header_start; + const gchar *header_stop; + const gchar *body_start; + const gchar *body_end; + const gchar *columnsplit; + const gchar *linestart; + const gchar *lineend; + const gchar *linesplit; + const gchar *end; +} TableConvertRule; + +enum { + TC_LATEX = 0, + TC_HTML, + TC_SQL +}; + +TableConvertRule tablerules[] = { + /* LaTeX */ + { + "\\begin{table}[h]\n\\begin{tabular}{}\n", + "", + "", + "", + "", + " & ", + "\t", + "\\\\", + "\n", + "\\end{tabular}\n\\end{table}" + }, + /* HTML */ + { + "<table>\n", + "<thead>\n", + "</thead>\n", + "<tbody\n\t<tr>\n\t\t<td>", + "</td>\n</tr>\n</tbody>", + "</td>\n\t<td>", + "<tr>\n\t<td>", + "</td>\n</tr>", + "\n", + "\n</table>" + }, + /* SQL */ + { + "", + "", + "", + "", + "", + ",", + "\t(", + ")", + ",\n", + ";" + } +}; static GtkWidget *main_menu_item = NULL; +static GString* convert_to_table_worker(gchar **rows, gboolean header, gint type) +{ + guint i; + guint j; + GString *replacement_str = NULL; + + g_return_val_if_fail(rows != NULL, NULL); + + /* Adding start of table to replacement */ + replacement_str = g_string_new(tablerules[type].start); + + /* Adding special header if requested + * e.g. <thead> */ + if (header == TRUE) + { + g_string_append(replacement_str, tablerules[type].header_start); + } + + /* Iteration onto rows and building up lines of table for + * replacement */ + for (i = 0; rows[i] != NULL ; i++) + { + gchar **columns = NULL; + columns = g_strsplit_set(rows[i], "\t", -1); + + if (i == 0 && + header == TRUE) + { + g_string_append(replacement_str, tablerules[type].header_stop); + } + + g_string_append(replacement_str, tablerules[type].linestart); + + for (j = 0; columns[j] != NULL; j++) + { + if (j > 0) + { + g_string_append(replacement_str, tablerules[type].columnsplit); + } + g_string_append(replacement_str, columns[j]); + } + + g_string_append(replacement_str, tablerules[type].lineend); + + if (rows[i+1] != NULL) + { + g_string_append(replacement_str, tablerules[type].linesplit); + } + g_free(columns); + } + + /* Adding the footer of table */ + + g_string_append(replacement_str, tablerules[type].end); + return replacement_str; +} + static GString* convert_to_table_html(gchar **rows, gboolean header) { @@ -108,42 +225,6 @@ static GString* convert_to_table_html(gchar **rows, gboolean header) return replacement_str; } -static GString* convert_to_table_latex(gchar** rows, gboolean header) -{ - guint i; - guint j; - GString *replacement_str = NULL; - - g_return_val_if_fail(rows != NULL, NULL); - - /* Adding header to replacement */ - replacement_str = g_string_new("\\begin{table}[h]\n\\begin{tabular}{}\n"); - - /* Iteration onto rows and building up lines of table for - * replacement */ - for (i = 0; rows[i] != NULL ; i++) - { - gchar **columns = NULL; - columns = g_strsplit_set(rows[i], "\t", -1); - - for (j = 0; columns[j] != NULL; j++) - { - if (j > 0) - { - g_string_append(replacement_str, " & "); - } - g_string_append(replacement_str, columns[j]); - } - - g_string_append(replacement_str, "\\\\\n"); - - g_free(columns); - } - /* Adding the footer of table */ - - g_string_append(replacement_str, "\\end{tabular}\n\\end{table}"); - return replacement_str; -} static GString* convert_to_table_sql(gchar** rows) { @@ -220,17 +301,17 @@ static void convert_to_table(gboolean header) } case GEANY_FILETYPES_HTML: { - replacement_str = convert_to_table_html(rows, header); + replacement_str = convert_to_table_worker(rows, header, TC_HTML); break; } case GEANY_FILETYPES_LATEX: { - replacement_str = convert_to_table_latex(rows, header); + replacement_str = convert_to_table_worker(rows, header, TC_LATEX); break; } case GEANY_FILETYPES_SQL: { - replacement_str = convert_to_table_sql(rows); + replacement_str = convert_to_table_worker(rows, header, TC_SQL); break; } default: -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] c9dfcb: Fix possible memory leaks
by Frank Lanitz 01 Feb '13

01 Feb '13

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Thu, 31 Jan 2013 22:27:42 UTC Commit: c9dfcb54a2147ca0593b1c8a599748f6483a6c2b https://github.com/geany/geany-plugins/commit/c9dfcb54a2147ca0593b1c8a59974… Log Message: ----------- Fix possible memory leaks Modified Paths: -------------- tableconvert/src/tableconvert.c Modified: tableconvert/src/tableconvert.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -152,7 +152,7 @@ static GString* convert_to_table_worker(gchar **rows, gboolean header, gint type { g_string_append(replacement_str, tablerules[type].linesplit); } - g_free(columns); + g_strfreev(columns); } /* Adding the footer of table */ @@ -229,7 +229,7 @@ static void convert_to_table(gboolean header) replacement = g_string_free(replacement_str, FALSE); sci_replace_sel(doc->editor->sci, replacement); } - g_free(rows); + g_strfreev(rows); g_free(replacement); } /* in case of there was no selection we are just doing nothing */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 82cbec: Purge unneeded code
by Frank Lanitz 01 Feb '13

01 Feb '13

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Thu, 31 Jan 2013 22:27:42 UTC Commit: 82cbec5920f47bab96a3cd0df86619ba4b180ea8 https://github.com/geany/geany-plugins/commit/82cbec5920f47bab96a3cd0df8661… Log Message: ----------- Purge unneeded code Modified Paths: -------------- tableconvert/src/tableconvert.c Modified: tableconvert/src/tableconvert.c 107 files changed, 0 insertions(+), 107 deletions(-) =================================================================== @@ -161,113 +161,6 @@ static GString* convert_to_table_worker(gchar **rows, gboolean header, gint type return replacement_str; } - -static GString* convert_to_table_html(gchar **rows, gboolean header) -{ - guint i; - guint j; - GString *replacement_str = NULL; - - g_return_val_if_fail(rows != NULL, NULL); - - /* Adding header to replacement */ - replacement_str = g_string_new("<table>\n"); - - /* Adding <thead> if requested */ - if (header == TRUE) - { - g_string_append(replacement_str, "<thead>\n"); - } - - /* Iteration onto rows and building up lines of table for - * replacement */ - for (i = 0; rows[i] != NULL ; i++) - { - gchar **columns = NULL; - columns = g_strsplit_set(rows[i], "\t", -1); - - /* Adding <tbody> after first line if header and body - * is requested */ - if (i == 1 && - header == TRUE) - { - g_string_append(replacement_str, "<tbody>\n"); - } - - g_string_append(replacement_str, "\t<tr>\n"); - for (j = 0; columns[j] != NULL; j++) - { - g_string_append(replacement_str, "\t\t<td>"); - g_string_append(replacement_str, columns[j]); - g_string_append(replacement_str, "</td>\n"); - } - - g_string_append(replacement_str, "\t</tr>\n"); - - /* Adding closing </thead> after first row if header - * is requested */ - if (i == 0 && - header == TRUE) - { - g_string_append(replacement_str, "</thead>\n"); - } - g_free(columns); - } - - /* Adding the footer of table */ - /* Closing </tbody> if requested */ - if (header == TRUE) - { - g_string_append(replacement_str, "</tbody>\n"); - } - - g_string_append(replacement_str, "</table>\n"); - return replacement_str; -} - - -static GString* convert_to_table_sql(gchar** rows) -{ - guint i; - guint j; - GString *replacement_str = NULL; - - g_return_val_if_fail(rows != NULL, NULL); - - /* Adding start */ - replacement_str = g_string_new(""); - - /* Iteration onto rows and building up lines for replacement */ - for (i = 0; rows[i] != NULL ; i++) - { - gchar **columns = NULL; - - g_string_append(replacement_str, "\t('"); - columns = g_strsplit_set(rows[i], "\t", -1); - - for (j = 0; columns[j] != NULL; j++) - { - if (j > 0) - { - g_string_append(replacement_str, "','"); - } - g_string_append(replacement_str, columns[j]); - } - - if (rows[i+1] != NULL) - { - g_string_append(replacement_str, "'),\n"); - } - else - { - g_string_append(replacement_str, "')\n"); - } - - g_free(columns); - } - return replacement_str; -} - static void convert_to_table(gboolean header) { GeanyDocument *doc = NULL; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] ba57da: Added testfiles
by Frank Lanitz 01 Feb '13

01 Feb '13

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Thu, 31 Jan 2013 22:27:42 UTC Commit: ba57dad437a8481ceaafc66812a2d3fb0e2fe5c7 https://github.com/geany/geany-plugins/commit/ba57dad437a8481ceaafc66812a2d… Log Message: ----------- Added testfiles Modified Paths: -------------- tableconvert/testfiles/test.html tableconvert/testfiles/test.sql tableconvert/testfiles/test.tex Modified: tableconvert/testfiles/test.html 10 files changed, 10 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,10 @@ +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff Modified: tableconvert/testfiles/test.sql 10 files changed, 10 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,10 @@ +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff Modified: tableconvert/testfiles/test.tex 10 files changed, 10 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,10 @@ +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 09dc49: Use correct callback function
by Frank Lanitz 01 Feb '13

01 Feb '13

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Thu, 31 Jan 2013 22:27:42 UTC Commit: 09dc4907d6ee09698e8f59a03fe5f8b664a55da4 https://github.com/geany/geany-plugins/commit/09dc4907d6ee09698e8f59a03fe5f… Log Message: ----------- Use correct callback function Modified Paths: -------------- tableconvert/src/tableconvert.c Modified: tableconvert/src/tableconvert.c 54 files changed, 27 insertions(+), 27 deletions(-) =================================================================== @@ -63,12 +63,12 @@ enum { TableConvertRule tablerules[] = { /* LaTeX */ { - "\\begin{table}[h]\n\\begin{tabular}{}\n", - "", - "", - "", - "", - " & ", + "\\begin{table}[h]\n\\begin{tabular}{}\n", + "", + "", + "", + "", + " & ", "\t", "\\\\", "\n", @@ -76,11 +76,11 @@ enum { }, /* HTML */ { - "<table>\n", - "<thead>\n", - "</thead>\n", - "<tbody\n\t<tr>\n\t\t<td>", - "</td>\n</tr>\n</tbody>", + "<table>\n", + "<thead>\n", + "</thead>\n", + "<tbody\n\t<tr>\n\t\t<td>", + "</td>\n</tr>\n</tbody>", "</td>\n\t<td>", "<tr>\n\t<td>", "</td>\n</tr>", @@ -89,15 +89,15 @@ enum { }, /* SQL */ { - "", - "", - "", - "", - "", - ",", + "", + "", + "", + "", + "", + ",", "\t(", - ")", - ",\n", + ")", + ",\n", ";" } }; @@ -111,11 +111,11 @@ static GString* convert_to_table_worker(gchar **rows, gboolean header, gint type GString *replacement_str = NULL; g_return_val_if_fail(rows != NULL, NULL); - + /* Adding start of table to replacement */ replacement_str = g_string_new(tablerules[type].start); - /* Adding special header if requested + /* Adding special header if requested * e.g. <thead> */ if (header == TRUE) { @@ -128,7 +128,7 @@ static GString* convert_to_table_worker(gchar **rows, gboolean header, gint type { gchar **columns = NULL; columns = g_strsplit_set(rows[i], "\t", -1); - + if (i == 0 && header == TRUE) { @@ -136,7 +136,7 @@ static GString* convert_to_table_worker(gchar **rows, gboolean header, gint type } g_string_append(replacement_str, tablerules[type].linestart); - + for (j = 0; columns[j] != NULL; j++) { if (j > 0) @@ -147,16 +147,16 @@ static GString* convert_to_table_worker(gchar **rows, gboolean header, gint type } g_string_append(replacement_str, tablerules[type].lineend); - + if (rows[i+1] != NULL) { g_string_append(replacement_str, tablerules[type].linesplit); } g_strfreev(columns); } - + /* Adding the footer of table */ - + g_string_append(replacement_str, tablerules[type].end); return replacement_str; } @@ -266,7 +266,7 @@ void plugin_init(GeanyData *data) gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu), main_menu_item); ui_widget_set_tooltip_text(main_menu_item, _("Converts current marked list to a table.")); - g_signal_connect(G_OBJECT(main_menu_item), "activate", G_CALLBACK(convert_to_table), NULL); + g_signal_connect(G_OBJECT(main_menu_item), "activate", G_CALLBACK(cb_table_convert), NULL); gtk_widget_show_all(main_menu_item); ui_add_document_sensitive(main_menu_item); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 9e8b05: Improve way how worker is being called. Thanks to b4n and elextr.
by Frank Lanitz 01 Feb '13

01 Feb '13

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Thu, 31 Jan 2013 22:27:42 UTC Commit: 9e8b050c51e4ca8001c51d97fe17ee878fef8a70 https://github.com/geany/geany-plugins/commit/9e8b050c51e4ca8001c51d97fe17e… Log Message: ----------- Improve way how worker is being called. Thanks to b4n and elextr. Modified Paths: -------------- tableconvert/src/tableconvert.c Modified: tableconvert/src/tableconvert.c 67 files changed, 41 insertions(+), 26 deletions(-) =================================================================== @@ -79,8 +79,8 @@ enum { "<table>\n", "<thead>\n", "</thead>\n", - "<tbody\n\t<tr>\n\t\t<td>", - "</td>\n</tr>\n</tbody>", + "<tbody>\n", + "\n</tbody>", "</td>\n\t<td>", "<tr>\n\t<td>", "</td>\n</tr>", @@ -102,9 +102,10 @@ enum { } }; + static GtkWidget *main_menu_item = NULL; -static GString* convert_to_table_worker(gchar **rows, gboolean header, gint type) +static gchar* convert_to_table_worker(gchar **rows, gboolean header, TableConvertRule *rule) { guint i; guint j; @@ -113,52 +114,61 @@ static GString* convert_to_table_worker(gchar **rows, gboolean header, gint type g_return_val_if_fail(rows != NULL, NULL); /* Adding start of table to replacement */ - replacement_str = g_string_new(tablerules[type].start); + replacement_str = g_string_new(rule->start); /* Adding special header if requested * e.g. <thead> */ if (header == TRUE) { - g_string_append(replacement_str, tablerules[type].header_start); + g_string_append(replacement_str, rule->header_start); } /* Iteration onto rows and building up lines of table for * replacement */ - for (i = 0; rows[i] != NULL ; i++) + for (i = 0; rows[i] != NULL; i++) { gchar **columns = NULL; columns = g_strsplit_set(rows[i], "\t", -1); - if (i == 0 && + if (i == 1 && header == TRUE) { - g_string_append(replacement_str, tablerules[type].header_stop); + g_string_append(replacement_str, rule->header_stop); + /* We are assuming, that if someone inserts a head, + * only in this case we will insert some special body. + * Might needs to be discussed further */ + g_string_append(replacement_str, rule->body_start); } - g_string_append(replacement_str, tablerules[type].linestart); + g_string_append(replacement_str, rule->linestart); for (j = 0; columns[j] != NULL; j++) { if (j > 0) { - g_string_append(replacement_str, tablerules[type].columnsplit); + g_string_append(replacement_str, rule->columnsplit); } g_string_append(replacement_str, columns[j]); } - g_string_append(replacement_str, tablerules[type].lineend); + g_string_append(replacement_str, rule->lineend); if (rows[i+1] != NULL) { - g_string_append(replacement_str, tablerules[type].linesplit); + g_string_append(replacement_str, rule->linesplit); } g_strfreev(columns); } + if (header == TRUE) + { + g_string_append(replacement_str, rule->body_end); + } + /* Adding the footer of table */ + g_string_append(replacement_str, rule->end); - g_string_append(replacement_str, tablerules[type].end); - return replacement_str; + return g_string_free(replacement_str, FALSE); } static void convert_to_table(gboolean header) @@ -172,7 +182,6 @@ static void convert_to_table(gboolean header) { gchar *selection = NULL; gchar **rows = NULL; - GString *replacement_str = NULL; gchar *replacement = NULL; /* Actually grabbing selection and splitting it into single @@ -188,45 +197,49 @@ static void convert_to_table(gboolean header) { case GEANY_FILETYPES_NONE: { - g_free(rows); - g_free(replacement); + g_strfreev(rows); return; } case GEANY_FILETYPES_HTML: { - replacement_str = convert_to_table_worker(rows, header, TC_HTML); + replacement = convert_to_table_worker(rows, + header, + &tablerules[TC_HTML]); break; } case GEANY_FILETYPES_LATEX: { - replacement_str = convert_to_table_worker(rows, header, TC_LATEX); + replacement = convert_to_table_worker(rows, + header, + &tablerules[TC_LATEX]); break; } case GEANY_FILETYPES_SQL: { - replacement_str = convert_to_table_worker(rows, header, TC_SQL); + replacement = convert_to_table_worker(rows, + header, + &tablerules[TC_SQL]); break; } default: { - replacement_str = NULL; + /* We just don't do anything */ } } /* filetype switch */ } else { /* OK. Something went not as expected. - * We did have a selection but cannot parse it into rows. - * Aborting */ + * We did have a selection but cannot parse it into rows. + * Aborting */ g_warning(_("Something went wrong on parsing selection. Aborting")); return; } /* The replacement should have been prepared at this point. Let's go - * on and put it into document and replace selection with it. */ - if (replacement_str != NULL) + * on and put it into document and replace selection with it. */ + if (replacement != NULL) { - replacement = g_string_free(replacement_str, FALSE); sci_replace_sel(doc->editor->sci, replacement); } g_strfreev(rows); @@ -236,9 +249,11 @@ static void convert_to_table(gboolean header) return; } + static void kb_convert_to_table(G_GNUC_UNUSED guint key_id) { g_return_if_fail(document_get_current() != NULL); + convert_to_table(TRUE); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 364529: Small fix at German translatation which caused a segfault on GeanySendMail if no mailer and/or filename placeholder has been configured
by Frank Lanitz 01 Feb '13

01 Feb '13

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Thu, 31 Jan 2013 22:27:03 UTC Commit: 364529a3468d2765d28bb9855f0006fb0130fe9b https://github.com/geany/geany-plugins/commit/364529a3468d2765d28bb9855f000… Log Message: ----------- Small fix at German translatation which caused a segfault on GeanySendMail if no mailer and/or filename placeholder has been configured Modified Paths: -------------- po/de.po Modified: po/de.po 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4018,7 +4018,7 @@ msgstr "E-Mail-Adresse des Empfängers:" #: ../geanysendmail/src/geanysendmail.c:136 msgid "Filename placeholder not found. The executed command might have failed." -msgstr "Konnte den Platzhalter für den Dateinamen (\\%s) nicht finden. Der angegebene Befehl könnte nicht korrekt ausgeführt worden sein." +msgstr "Konnte den Platzhalter für den Dateinamen nicht finden. Der angegebene Befehl könnte nicht korrekt ausgeführt worden sein." #: ../geanysendmail/src/geanysendmail.c:142 msgid "Recipient address placeholder not found. The executed command might have failed." -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 7294a4: Merge pull request #79 from vkochan/debugger_waf_defines_fix
by Enrico Tröger 31 Jan '13

31 Jan '13

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Thu, 31 Jan 2013 18:13:53 UTC Commit: 7294a45489464db3adf62f18f84357a34b452940 https://github.com/geany/geany-plugins/commit/7294a45489464db3adf62f18f8435… Log Message: ----------- Merge pull request #79 from vkochan/debugger_waf_defines_fix [Debugger:WAF] Fixed unevaluated ${#vars} in defines dict. Modified Paths: -------------- debugger/wscript_build Modified: debugger/wscript_build 9 files changed, 5 insertions(+), 4 deletions(-) =================================================================== @@ -21,6 +21,7 @@ # $Id: wscript_build 1735 2010-11-09 17:03:40Z eht16 $ from build.wafutils import build_plugin +from waflib.Utils import subst_vars name = 'Debugger' @@ -29,13 +30,13 @@ includes = ['debugger/src', 'debugger/src/cell_renderers', libraries = ['VTE', 'UTIL'] -pludin_datadir = '${PKGDATADIR}/debugger' +plugin_datadir = '${PKGDATADIR}/debugger' -defines=[ 'DBGPLUG_DATA_DIR="' + pludin_datadir + '"'] +defines=[ subst_vars('DBGPLUG_DATA_DIR="' + plugin_datadir + '"', bld.env) ] build_plugin(bld, name, includes=includes, libraries=libraries, defines=defines) # Icons start_dir = bld.path.find_dir('img') -bld.install_files(pludin_datadir, start_dir.ant_glob('*.png'), cwd=start_dir) -bld.install_files(pludin_datadir, start_dir.ant_glob('*.gif'), cwd=start_dir) +bld.install_files(plugin_datadir, start_dir.ant_glob('*.png'), cwd=start_dir) +bld.install_files(plugin_datadir, start_dir.ant_glob('*.gif'), cwd=start_dir) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 6e8cf9: Fix typo to unbreak compilation on older GLib versions
by Enrico Tröger 31 Jan '13

31 Jan '13

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Thu, 31 Jan 2013 17:57:34 UTC Commit: 6e8cf90c7b0e4c9edb10214b29da834d37d4e773 https://github.com/geany/geany-plugins/commit/6e8cf90c7b0e4c9edb10214b29da8… Log Message: ----------- Fix typo to unbreak compilation on older GLib versions Modified Paths: -------------- scope/src/gtk216.c Modified: scope/src/gtk216.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -31,7 +31,7 @@ static ArraySize *find_array_size(GArray *array) { - gchar *end = array_sizes->data + sizeof(ArraySize) * array>len; + gchar *end = array_sizes->data + sizeof(ArraySize) * array->len; gchar *data; for (data = array_sizes->data; data < end; data += sizeof(ArraySize)) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 1143cc: GeanyPG: Get rid of long-deprecated gtk_menu_append()
by Colomban Wendling 31 Jan '13

31 Jan '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 30 Jan 2013 21:21:58 UTC Commit: 1143cc99ed4aa68be025eec827f18c87eec9d562 https://github.com/geany/geany-plugins/commit/1143cc99ed4aa68be025eec827f18… Log Message: ----------- GeanyPG: Get rid of long-deprecated gtk_menu_append() gtk_menu_append() is deprecated in favor of gtk_menu_shell_append() since GTK 1.3.7, I think it's safe to get rid of it. Modified Paths: -------------- geanypg/src/geanypg.c Modified: geanypg/src/geanypg.c 8 files changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -93,10 +93,10 @@ void plugin_init(GeanyData *data) gtk_widget_show(decrypt); gtk_widget_show(verify); - gtk_menu_append(GTK_MENU(submenu), encrypt); - gtk_menu_append(GTK_MENU(submenu), sign); - gtk_menu_append(GTK_MENU(submenu), decrypt); - gtk_menu_append(GTK_MENU(submenu), verify); + gtk_menu_shell_append(GTK_MENU_SHELL(submenu), encrypt); + gtk_menu_shell_append(GTK_MENU_SHELL(submenu), sign); + gtk_menu_shell_append(GTK_MENU_SHELL(submenu), decrypt); + gtk_menu_shell_append(GTK_MENU_SHELL(submenu), verify); gtk_menu_item_set_submenu(GTK_MENU_ITEM(main_menu_item), submenu); -------------- 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 January 2013