Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes/markdown #70

Merged
merged 2 commits into from
Aug 27, 2012
Merged

Fixes/markdown #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6fe234
markdown: Fix Autotools build system
b4n Aug 27, 2012
a62cfae
markdown: Fix a few trivial warnings in the plugin code
b4n Aug 27, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions markdown/discount/Makefile.am
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ noinst_LTLIBRARIES = libdiscount.la
libdiscount_la_SOURCES = \ libdiscount_la_SOURCES = \
amalloc.c \ amalloc.c \
amalloc.h \ amalloc.h \
blocktags \
basename.c \ basename.c \
config.h \ config.h \
Csio.c \ Csio.c \
Expand Down
2 changes: 1 addition & 1 deletion markdown/docs/Makefile.am
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
@@ -1,6 +1,6 @@


helpdir = $(docdir)/markdown/html helpdir = $(docdir)/markdown/html
help_DATA = \ dist_help_DATA = \
help.html \ help.html \
plugin.png \ plugin.png \
plugin_mgr.png \ plugin_mgr.png \
Expand Down
6 changes: 3 additions & 3 deletions markdown/src/conf.c
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ struct _MarkdownConfigPrivate
gchar filename[PATH_MAX]; gchar filename[PATH_MAX];
GKeyFile *kf; GKeyFile *kf;
guint handle; guint handle;
guint dlg_handle; gulong dlg_handle;
gboolean initialized; gboolean initialized;
gchar *tmpl_text; gchar *tmpl_text;
gsize tmpl_text_len; gsize tmpl_text_len;
Expand Down Expand Up @@ -433,7 +433,7 @@ markdown_config_save(MarkdownConfig *conf)


contents = g_key_file_to_data(conf->priv->kf, &len, &error); 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) { if (error) {
g_warning("Error getting config data as string: %s", error->message); g_warning("Error getting config data as string: %s", error->message);
Expand All @@ -452,7 +452,7 @@ markdown_config_save(MarkdownConfig *conf)
return success; return success;
} }


gchar * static gchar *
color_button_get_color(GtkColorButton *color_button) color_button_get_color(GtkColorButton *color_button)
{ {
GdkColor color; GdkColor color;
Expand Down
4 changes: 2 additions & 2 deletions markdown/src/viewer.c
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ enum
struct _MarkdownViewerPrivate struct _MarkdownViewerPrivate
{ {
MarkdownConfig *conf; MarkdownConfig *conf;
guint load_handle; gulong load_handle;
guint update_handle; guint update_handle;
guint prop_handle; gulong prop_handle;
GString *text; GString *text;
gchar enc[MD_ENC_MAX]; gchar enc[MD_ENC_MAX];
gdouble vscroll_pos; gdouble vscroll_pos;
Expand Down