deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Harmonized ststus texts and and added status on wrong MIME type.

Browse source
This commit is contained in:
Oliver Schmidt 2013-02-18 23:08:05 +01:00
parent 6e8e9ffeae
commit 15fb63ba9a
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/webbrowser/www.c
View file

@ -325,7 +325,7 @@ open_url(void)
/* The hostname we present in the hostname table, so we send out the /* The hostname we present in the hostname table, so we send out the
initial GET request. */ initial GET request. */
if(webclient_get(host, 80, file) == 0) { if(webclient_get(host, 80, file) == 0) {
show_statustext("Out of memory error."); show_statustext("Out of memory error");
} else { } else {
show_statustext("Connecting..."); show_statustext("Connecting...");
} }
@ -534,7 +534,7 @@ PROCESS_THREAD(www_process, ev, data)
resolv_lookup((char *)data) != NULL) { resolv_lookup((char *)data) != NULL) {
open_url(); open_url();
} else { } else {
show_statustext("Host not found."); show_statustext("Host not found");
} }
#endif /* UIP_UDP */ #endif /* UIP_UDP */
} else if(ev == ctk_signal_window_close || } else if(ev == ctk_signal_window_close ||
@ -602,7 +602,7 @@ webclient_timedout(void)
void void
webclient_closed(void) webclient_closed(void)
{ {
show_statustext("Stopped."); show_statustext("Stopped");
petsciiconv_topetscii(webpageptr - x, x); petsciiconv_topetscii(webpageptr - x, x);
CTK_WIDGET_FOCUS(&mainwindow, &downbutton); CTK_WIDGET_FOCUS(&mainwindow, &downbutton);
redraw_window(); redraw_window();
@ -644,6 +644,7 @@ webclient_datahandler(char *data, uint16_t len)
htmlparser_parse(data, len); htmlparser_parse(data, len);
redraw_window(); redraw_window();
} else { } else {
show_statustext("Cannot display web page");
uip_abort(); uip_abort();
#if WWW_CONF_WITH_WGET #if WWW_CONF_WITH_WGET
ctk_dialog_open(&wgetdialog); ctk_dialog_open(&wgetdialog);
@ -656,7 +657,7 @@ webclient_datahandler(char *data, uint16_t len)
if(data == NULL) { if(data == NULL) {
loading = 0; loading = 0;
show_statustext("Done."); show_statustext("Done");
petsciiconv_topetscii(webpageptr - x, x); petsciiconv_topetscii(webpageptr - x, x);
CTK_WIDGET_FOCUS(&mainwindow, &urlentry); CTK_WIDGET_FOCUS(&mainwindow, &urlentry);
redraw_window(); redraw_window();