markus/mdiary
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

Updated load_html function of webkit to version 2

Browse Source
This commit is contained in:
Markus Koch 2017-03-12 18:00:44 +01:00
parent aa8a9a003b
commit b0b6a553b7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mainwindow.c
View File

@ -708,17 +708,17 @@ static void mainWindow_set_text(struct mainWindow *mainWindow, gchar *text, gcha
cmd = g_strdup_printf("markdown %s", tempfile_path); cmd = g_strdup_printf("markdown %s", tempfile_path);
if (g_spawn_command_line_sync(cmd, &cmd_stdout, &cmd_stderr, &exit_status, NULL) && if (g_spawn_command_line_sync(cmd, &cmd_stdout, &cmd_stderr, &exit_status, NULL) &&
exit_status == 0) { exit_status == 0) {
webkit_web_view_load_html_string(WEBKIT_WEB_VIEW(mainWindow->webkitView), webkit_web_view_load_html(WEBKIT_WEB_VIEW(mainWindow->webkitView),
cmd_stdout, base_url); cmd_stdout, base_url);
} else { } else {
g_warning("Could not render markdown for file. Showing plain text instead.\n"); g_warning("Could not render markdown for file. Showing plain text instead.\n");
webkit_web_view_load_html_string(WEBKIT_WEB_VIEW(mainWindow->webkitView), webkit_web_view_load_html(WEBKIT_WEB_VIEW(mainWindow->webkitView),
text, base_url); text, base_url);
} }
g_free(base_url); g_free(base_url);
} else { } else {
webkit_web_view_load_html_string(WEBKIT_WEB_VIEW(mainWindow->webkitView), webkit_web_view_load_html(WEBKIT_WEB_VIEW(mainWindow->webkitView),
text, ""); text, "");
} }
if (stream) { if (stream) {