mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure GTK source viewer reports errors appropriately.

This commit is contained in:
Vincent Sanders 2015-04-17 10:40:11 +01:00
parent 7ec917eed2
commit 89a3f250d2
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/scaffolding.c
View File

@ -1158,7 +1158,13 @@ MULTIHANDLER(fullscreen)
MULTIHANDLER(viewsource)
{
nsgtk_viewsource(g->window, nsgtk_get_browser_window(g->top_level));
nserror ret;
ret = nsgtk_viewsource(g->window, nsgtk_get_browser_window(g->top_level));
if (ret != NSERROR_OK) {
warn_user(messages_get_errorcode(ret), 0);
}
return TRUE;
}

14
gtk/viewsource.c
View File

@ -28,7 +28,7 @@
#include "gtk/viewdata.h"
#include "gtk/viewsource.h"
void nsgtk_viewsource(GtkWindow *parent, struct browser_window *bw)
nserror nsgtk_viewsource(GtkWindow *parent, struct browser_window *bw)
{
nserror ret;
struct hlcache_handle *hlcontent;
@ -41,11 +41,11 @@ void nsgtk_viewsource(GtkWindow *parent, struct browser_window *bw)
hlcontent = browser_window_get_content(bw);
if (hlcontent == NULL) {
return;
return NSERROR_BAD_PARAMETER;
}
if (content_get_type(hlcontent) != CONTENT_HTML) {
return;
return NSERROR_BAD_CONTENT;
}
source_data = content_get_source_data(hlcontent, &source_size);
@ -54,11 +54,15 @@ void nsgtk_viewsource(GtkWindow *parent, struct browser_window *bw)
if (ret != NSERROR_OK) {
filename = strdup(messages_get("SaveSource"));
if (filename == NULL) {
return;
return NSERROR_NOMEM;
}
}
title = malloc(strlen(nsurl_access(browser_window_get_url(bw))) + SLEN("Source of - NetSurf") + 1);
if (title == NULL) {
free(filename);
return NSERROR_NOMEM;
}
sprintf(title, "Source of %s - NetSurf", nsurl_access(browser_window_get_url(bw)));
ret = utf8_from_enc(source_data,
@ -72,4 +76,6 @@ void nsgtk_viewsource(GtkWindow *parent, struct browser_window *bw)
free(filename);
free(title);
return ret;
}

2
gtk/viewsource.h
View File

@ -19,7 +19,7 @@
#ifndef _NETSURF_GTK_VIEWSOURCE_H_
#define _NETSURF_GTK_VIEWSOURCE_H_
void nsgtk_viewsource(GtkWindow *parent, struct browser_window *bw);
nserror nsgtk_viewsource(GtkWindow *parent, struct browser_window *bw);
#endif