Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Mon, 04 Mar 2013 16:52:30 UTC
Commit: 8b56073e9503c0dd1fb474dcf1654a3820d9164b
https://github.com/geany/geany-plugins/commit/8b56073e9503c0dd1fb474dcf1654…
Log Message:
-----------
TreeBrowser: Fix the row to which the popup menu pops for
When right-clocking, the clicked row got selected but the name and URI
were still fetched from the previously selected row. Fix this so if
the user right clicks on an unselected row the popup works for the
corrected item.
Modified Paths:
--------------
treebrowser/src/treebrowser.c
Modified: treebrowser/src/treebrowser.c
13 files changed, 7 insertions(+), 6 deletions(-)
===================================================================
@@ -1402,12 +1402,6 @@ enum
GtkWidget *menu;
gchar *name = NULL, *uri = NULL;
- if (gtk_tree_selection_get_selected(selection, &model, &iter))
- gtk_tree_model_get(GTK_TREE_MODEL(treestore), &iter,
- TREEBROWSER_COLUMN_NAME, &name,
- TREEBROWSER_COLUMN_URI, &uri,
- -1);
-
/* Get tree path for row that was clicked */
if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(treeview),
(gint) event->x,
@@ -1419,6 +1413,13 @@ enum
gtk_tree_selection_select_path(selection, path);
gtk_tree_path_free(path);
}
+
+ if (gtk_tree_selection_get_selected(selection, &model, &iter))
+ gtk_tree_model_get(GTK_TREE_MODEL(treestore), &iter,
+ TREEBROWSER_COLUMN_NAME, &name,
+ TREEBROWSER_COLUMN_URI, &uri,
+ -1);
+
menu = create_popup_menu(name != NULL ? name : "", uri != NULL ? uri : "");
gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, event->button, event->time);
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Matthew Brush <mbrush(a)codebrainz.ca>
Committer: Matthew Brush <matt(a)geany.org>
Date: Mon, 04 Mar 2013 01:27:50 UTC
Commit: e244ea510efa17846636d53a24f3893741e3380d
https://github.com/geany/geany-plugins/commit/e244ea510efa17846636d53a24f38…
Log Message:
-----------
Markdown: Allow choosing between Discount and peg-markdown at compile time
Modified Paths:
--------------
markdown/src/viewer.c
Modified: markdown/src/viewer.c
36 files changed, 30 insertions(+), 6 deletions(-)
===================================================================
@@ -22,7 +22,11 @@
#include <string.h>
#include <gtk/gtk.h>
#include <webkit/webkitwebview.h>
-#include "markdown_lib.h"
+#ifndef FULL_PRICE
+# include <mkdio.h>
+#else
+# include "markdown_lib.h"
+#endif
#include "viewer.h"
#include "conf.h"
@@ -305,11 +309,31 @@ struct _MarkdownViewerPrivate
if (!self->priv->text) {
update_internal_text(self, "");
}
-
- md_as_html = markdown_to_string(self->priv->text->str, 0, HTML_FORMAT);
- if (md_as_html) {
- html = template_replace(self, md_as_html);
- g_free(md_as_html);
+
+ {
+#ifndef FULL_PRICE /* this version using Discount markdown library
+ * is faster but may invoke endless discussions
+ * about the GPL and licenses similar to (but the
+ * same as) the old BSD 4-clause license being
+ * incompatible */
+ MMIOT *doc;
+ doc = mkd_string(self->priv->text->str, self->priv->text->len, 0);
+ mkd_compile(doc, 0);
+ if (mkd_document(doc, &md_as_html) != EOF) {
+ html = template_replace(self, md_as_html);
+ }
+ mkd_cleanup(doc);
+#else /* this version is slower but is unquestionably GPL-friendly
+ * and the lib also has much more readable/maintainable code */
+
+ md_as_html = markdown_to_string(self->priv->text->str, 0, HTML_FORMAT);
+ if (md_as_html) {
+ html = template_replace(self, md_as_html);
+ g_free(md_as_html); /* TODO: become 100% convinced this wasn't
+ * malloc()'d outside of GLIB functions with
+ * libc allocator (probably same anyway). */
+ }
+#endif
}
return html;
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Dominic Hopf <dmaphy(a)googlemail.com>
Committer: Dominic Hopf <dmaphy(a)googlemail.com>
Date: Sun, 03 Mar 2013 13:44:31 UTC
Commit: 2e69d880ffa39db1c20fd0e4bb8c031447761317
https://github.com/geany/plugins.geany.org/commit/2e69d880ffa39db1c20fd0e4b…
Log Message:
-----------
improve heading for Djynn plugin
Modified Paths:
--------------
content/djynn.html
Modified: content/djynn.html
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,4 +1,4 @@
-<h2>Geany Plugin</h2>
+<h2>Djynn</h2>
<h3>Introduction</h3>
<p>Like everyone else, more or less I suppose, I tried using every other editor available for
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).