diff options
| -rw-r--r-- | desktop/gui.h | 13 | ||||
| -rw-r--r-- | framebuffer/fetch.c | 4 | ||||
| -rw-r--r-- | gtk/fetch.c | 1 | ||||
| -rw-r--r-- | monkey/cert.c | 3 |
4 files changed, 11 insertions, 10 deletions
diff --git a/desktop/gui.h b/desktop/gui.h index 37066e1a7..5fb656c52 100644 --- a/desktop/gui.h +++ b/desktop/gui.h @@ -17,18 +17,14 @@ */ /** \file - * Interface to platform-specific gui functions. + * Interface to platform-specific gui operation tables. */ #ifndef _NETSURF_DESKTOP_GUI_H_ #define _NETSURF_DESKTOP_GUI_H_ -#include <stdbool.h> -#include <stdlib.h> - #include "utils/types.h" #include "utils/errors.h" -#include "utils/nsurl.h" #include "desktop/plot_style.h" #include "desktop/mouse.h" @@ -63,6 +59,7 @@ struct form_control; struct ssl_cert_info; struct hlcache_handle; struct download_context; +struct nsurl; typedef struct nsnsclipboard_styles { size_t start; /**< Start of run */ @@ -356,7 +353,7 @@ struct gui_fetch_table { * \return A string containing the full URL of the target object or * NULL if no suitable resource can be found. */ - nsurl* (*get_resource_url)(const char *path); + struct nsurl* (*get_resource_url)(const char *path); /** * Find a MIME type for a local file @@ -437,12 +434,12 @@ struct gui_browser_table { /** * verify certificate */ - void (*cert_verify)(nsurl *url, const struct ssl_cert_info *certs, unsigned long num, nserror (*cb)(bool proceed, void *pw), void *cbpw); + void (*cert_verify)(struct nsurl *url, const struct ssl_cert_info *certs, unsigned long num, nserror (*cb)(bool proceed, void *pw), void *cbpw); /** * Prompt user for login */ - void (*login)(nsurl *url, const char *realm, + void (*login)(struct nsurl *url, const char *realm, nserror (*cb)(bool proceed, void *pw), void *cbpw); }; diff --git a/framebuffer/fetch.c b/framebuffer/fetch.c index f350f3634..2942c2d48 100644 --- a/framebuffer/fetch.c +++ b/framebuffer/fetch.c @@ -21,13 +21,15 @@ */ #include <stdio.h> +#include <stdlib.h> #include <string.h> #include <limits.h> -#include "desktop/gui.h" +#include "utils/nsurl.h" #include "utils/url.h" #include "utils/log.h" #include "utils/filepath.h" +#include "desktop/gui.h" #include "framebuffer/findfile.h" #include "framebuffer/fetch.h" diff --git a/gtk/fetch.c b/gtk/fetch.c index 0043cd062..8db102ce8 100644 --- a/gtk/fetch.c +++ b/gtk/fetch.c @@ -17,6 +17,7 @@ */ #include <stdio.h> +#include <stdlib.h> #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> diff --git a/monkey/cert.c b/monkey/cert.c index 48359e8c2..6f2172743 100644 --- a/monkey/cert.c +++ b/monkey/cert.c @@ -19,8 +19,9 @@ #include <stdlib.h> #include <stdio.h> -#include "desktop/gui.h" #include "utils/ring.h" +#include "utils/nsurl.h" +#include "desktop/gui.h" #include "monkey/cert.h" |