Permalink
Browse files

Merge pull request #70 from b4n/fixes/markdown

Fixes/markdown
  • Loading branch information...
2 parents d4cf1f1 + a62cfae commit a9d8417f88719aec36503943c8a7f1792cd44353 @frlan frlan committed Aug 27, 2012
Showing with 7 additions and 6 deletions.
  1. +1 −0 markdown/discount/Makefile.am
  2. +1 −1 markdown/docs/Makefile.am
  3. +3 −3 markdown/src/conf.c
  4. +2 −2 markdown/src/viewer.c
@@ -3,6 +3,7 @@ noinst_LTLIBRARIES = libdiscount.la
libdiscount_la_SOURCES = \
amalloc.c \
amalloc.h \
+ blocktags \
basename.c \
config.h \
Csio.c \
@@ -1,6 +1,6 @@
helpdir = $(docdir)/markdown/html
-help_DATA = \
+dist_help_DATA = \
help.html \
plugin.png \
plugin_mgr.png \
View
@@ -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 @@ markdown_config_save(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 @@ markdown_config_save(MarkdownConfig *conf)
return success;
}
-gchar *
+static gchar *
color_button_get_color(GtkColorButton *color_button)
{
GdkColor color;
View
@@ -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;

0 comments on commit a9d8417

Please sign in to comment.