diff options
| author | Ole Loots <ole@monochrom.net> | 2014-09-12 23:22:26 +0200 |
|---|---|---|
| committer | Ole Loots <ole@monochrom.net> | 2014-09-12 23:22:26 +0200 |
| commit | a9ac9c00fc2c73705db242a459160f14d279cdcd (patch) | |
| tree | 5f9aa630340bad67934e6fdbfda7f239f0fade57 /atari/about.c | |
| parent | 181bc41a9aa200cfac5bf4b84175003639fce488 (diff) | |
| parent | 9e6b0fb8b07cd3147b0a2727d3644860cf7c8c7e (diff) | |
| download | netsurf-a9ac9c00fc2c73705db242a459160f14d279cdcd.tar.gz netsurf-a9ac9c00fc2c73705db242a459160f14d279cdcd.tar.bz2 | |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
Conflicts:
atari/gui.h
Diffstat (limited to 'atari/about.c')
| -rw-r--r-- | atari/about.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/atari/about.c b/atari/about.c index f09dfb358..174e27b20 100644 --- a/atari/about.c +++ b/atari/about.c @@ -16,9 +16,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <limits.h>
-#include <unistd.h>
-#include <string.h>
+#include <limits.h> +#include <unistd.h> +#include <string.h> #include <stdlib.h> #include <stdbool.h> #include <stdint.h> @@ -28,16 +28,16 @@ #include "atari/plot/plot.h" #include "atari/gemtk/gemtk.h" #include "atari/res/netsurf.rsh" -#include "atari/about.h"
+#include "atari/about.h" -#include "utils/testament.h" +#include "testament.h" #include "utils/useragent.h" #include "desktop/netsurf.h" #include "utils/nsurl.h" #include "utils/messages.h" -#include "curl/curlver.h"
+#include "curl/curlver.h" static OBJECT * about_form = NULL; @@ -50,9 +50,6 @@ static short __CDECL about_userdraw(PARMBLK *parmblock) { short pxy[8]; short dummy; - int content_len; - char *content; - short cur_x, cur_y; short cheight = 8, cwidth = gl_wchar; char c[2] = {0,0}; @@ -73,6 +70,9 @@ static short __CDECL about_userdraw(PARMBLK *parmblock) }; if(parmblock->pb_currstate == parmblock->pb_prevstate){ + short cur_x, cur_y; + char *content; + int content_len; content = (char*)parmblock->pb_parm; content_len = strlen(content); @@ -170,8 +170,7 @@ void atari_about_show(void) if (goto_url != NULL) { nserr = nsurl_create(goto_url, &url); if (nserr == NSERROR_OK) { - nserr = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY, + nserr = browser_window_create(BW_CREATE_HISTORY, url, NULL, NULL, |