diff options
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/browser.c | 2 | ||||
| -rw-r--r-- | desktop/gui_factory.c | 2 | ||||
| -rw-r--r-- | desktop/gui_misc.h | 108 | ||||
| -rw-r--r-- | desktop/hotlist.c | 2 | ||||
| -rw-r--r-- | desktop/netsurf.c | 2 | ||||
| -rw-r--r-- | desktop/save_complete.c | 2 | ||||
| -rw-r--r-- | desktop/tree.c | 2 |
7 files changed, 6 insertions, 114 deletions
diff --git a/desktop/browser.c b/desktop/browser.c index bb39ee393..f69acc5f2 100644 --- a/desktop/browser.c +++ b/desktop/browser.c @@ -70,7 +70,7 @@ #include "desktop/selection.h" #include "desktop/plotters.h" #include "desktop/theme.h" -#include "desktop/gui_misc.h" +#include "netsurf/misc.h" #include "netsurf/window.h" #include "desktop/gui_internal.h" diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c index db675a7be..c1a061097 100644 --- a/desktop/gui_factory.c +++ b/desktop/gui_factory.c @@ -32,7 +32,7 @@ #include "desktop/searchweb.h" #include "netsurf/download.h" #include "desktop/gui_fetch.h" -#include "desktop/gui_misc.h" +#include "netsurf/misc.h" #include "netsurf/window.h" #include "netsurf/search.h" #include "netsurf/clipboard.h" diff --git a/desktop/gui_misc.h b/desktop/gui_misc.h deleted file mode 100644 index 399d93895..000000000 --- a/desktop/gui_misc.h +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright 2014 Vincent Sanders <vince@netsurf-browser.org> - * - * This file is part of NetSurf, http://www.netsurf-browser.org/ - * - * NetSurf is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * NetSurf is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -/** - * \file - * - * Interface to platform-specific miscellaneous browser operation table. - */ - -#ifndef _NETSURF_DESKTOP_GUI_MISC_H_ -#define _NETSURF_DESKTOP_GUI_MISC_H_ - -struct form_control; -struct gui_window; -struct ssl_cert_info; -struct nsurl; - -/** - * Graphical user interface browser misc function table. - * - * function table implementing GUI interface to miscelaneous browser - * functionality - */ -struct gui_misc_table { - /* Mandantory entries */ - - /** - * Schedule a callback. - * - * \param t interval before the callback should be made in ms or - * negative value to remove any existing callback. - * \param callback callback function - * \param p user parameter passed to callback function - * \return NSERROR_OK on sucess or appropriate error on faliure - * - * The callback function will be called as soon as possible - * after the timeout has elapsed. - * - * Additional calls with the same callback and user parameter will - * reset the callback time to the newly specified value. - * - */ - nserror (*schedule)(int t, void (*callback)(void *p), void *p); - - /** - * Warn the user of an event. - * - * \param[in] message A warning looked up in the message - * translation table - * \param[in] detail Additional text to be displayed or NULL. - * \return NSERROR_OK on success or error code if there was a - * faliure displaying the message to the user. - */ - nserror (*warning)(const char *message, const char *detail); - - - /* Optional entries */ - - /** - * called to allow the gui to cleanup. - */ - void (*quit)(void); - - /** - * core has no fetcher for url - */ - nserror (*launch_url)(struct nsurl *url); - - /** - * Prompt the user to verify a certificate with issuse. - * - * \param url The URL being verified. - * \param certs The certificate to be verified - * \param num The number of certificates to be verified. - * \param cb Callback upon user decision. - * \param cbpw Context pointer passed to cb - */ - 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)(struct nsurl *url, const char *realm, - nserror (*cb)(bool proceed, void *pw), void *cbpw); - - /** - * Prompt the user for a password for a PDF. - */ - void (*pdf_password)(char **owner_pass, char **user_pass, char *path); - -}; - -#endif diff --git a/desktop/hotlist.c b/desktop/hotlist.c index 98d5f9c19..f9a1f41be 100644 --- a/desktop/hotlist.c +++ b/desktop/hotlist.c @@ -33,7 +33,7 @@ #include "utils/log.h" #include "content/urldb.h" -#include "desktop/gui_misc.h" +#include "netsurf/misc.h" #include "desktop/gui_internal.h" #include "desktop/hotlist.h" #include "desktop/treeview.h" diff --git a/desktop/netsurf.c b/desktop/netsurf.c index d3d45ca66..8e763ca05 100644 --- a/desktop/netsurf.c +++ b/desktop/netsurf.c @@ -47,7 +47,7 @@ #include "desktop/browser.h" #include "desktop/system_colour.h" #include "desktop/searchweb.h" -#include "desktop/gui_misc.h" +#include "netsurf/misc.h" #include "desktop/gui_internal.h" #include "desktop/netsurf.h" diff --git a/desktop/save_complete.c b/desktop/save_complete.c index 6f63960aa..201e80b0d 100644 --- a/desktop/save_complete.c +++ b/desktop/save_complete.c @@ -45,7 +45,7 @@ #include "render/box.h" #include "render/html.h" -#include "desktop/gui_misc.h" +#include "netsurf/misc.h" #include "desktop/gui_internal.h" #include "desktop/save_complete.h" diff --git a/desktop/tree.c b/desktop/tree.c index e9a2dfdcc..91fd0b9d7 100644 --- a/desktop/tree.c +++ b/desktop/tree.c @@ -44,7 +44,7 @@ struct tree { void *client_data; /* User assigned data for the callbacks */ }; -#include "desktop/gui_misc.h" +#include "netsurf/misc.h" #include "desktop/gui_internal.h" #include "desktop/treeview.h" #include "desktop/hotlist.h" |