[geany/geany-plugins] a9d841: Merge pull request #70 from b4n/fixes/markdown - Plugins-Commits

27 Aug 2012


      Branch:      refs/heads/master
Author:      Frank Lanitz frank@frank.uvena.de
Committer:   Frank Lanitz frank@frank.uvena.de
Date:        Mon, 27 Aug 2012 15:09:56
Commit:      a9d8417f88719aec36503943c8a7f1792cd44353
             https://github.com/geany/geany-plugins/commit/a9d8417f88719aec36503943c8a7f1...
Log Message:
-----------
Merge pull request #70 from b4n/fixes/markdown
Fixes/markdown
Modified Paths:
--------------
    markdown/discount/Makefile.am
    markdown/docs/Makefile.am
    markdown/src/conf.c
    markdown/src/viewer.c
Modified: markdown/discount/Makefile.am
1 files changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -3,6 +3,7 @@ noinst_LTLIBRARIES = libdiscount.la
 libdiscount_la_SOURCES = \
    amalloc.c \
    amalloc.h \
+	blocktags \
    basename.c \
    config.h \
    Csio.c \
Modified: markdown/docs/Makefile.am
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,6 +1,6 @@
helpdir = $(docdir)/markdown/html
-help_DATA = \
+dist_help_DATA = \
    help.html \
    plugin.png \
    plugin_mgr.png \
Modified: markdown/src/conf.c
6 files changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -83,7 +83,7 @@ struct _MarkdownConfigPrivate
   gchar filename[PATH_MAX];
   GKeyFile *kf;
   guint handle;
-  guint dlg_handle;
+  gulong dlg_handle;
   gboolean initialized;
   gchar *tmpl_text;
   gsize tmpl_text_len;
@@ -433,7 +433,7 @@ static gboolean on_idle_timeout(MarkdownConfig *conf)
contents = g_key_file_to_data(conf->priv->kf, &len, &error);
-  //g_debug("Saving: %s\n%s", conf->priv->filename, contents);
+  /*g_debug("Saving: %s\n%s", conf->priv->filename, contents);*/
if (error) {
     g_warning("Error getting config data as string: %s", error->message);
@@ -452,7 +452,7 @@ static gboolean on_idle_timeout(MarkdownConfig *conf)
   return success;
 }
-gchar *
+static gchar *
 color_button_get_color(GtkColorButton *color_button)
 {
   GdkColor color;
Modified: markdown/src/viewer.c
4 files changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -39,9 +39,9 @@ enum
 struct _MarkdownViewerPrivate
 {
   MarkdownConfig *conf;
-  guint load_handle;
+  gulong load_handle;
   guint update_handle;
-  guint prop_handle;
+  gulong prop_handle;
   GString *text;
   gchar enc[MD_ENC_MAX];
   gdouble vscroll_pos;
@@ Diff output truncated at 100000 characters. @@
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

    