diff options
| author | Rob Kendrick (fatigue) <rjek@netsurf-browser.org> | 2014-06-04 12:10:58 +0100 |
|---|---|---|
| committer | Rob Kendrick (fatigue) <rjek@netsurf-browser.org> | 2014-06-04 12:10:58 +0100 |
| commit | a4940bb56c2ac232fa944bdfd560cefda501961b (patch) | |
| tree | f563d5c82afada875b15a8ddf04792d476f8af94 | |
| parent | 7b1332c5c51897efa34298e076488136dc1bb5b9 (diff) | |
| parent | 7f55cb58a0068226f90aabce2af609ab96736951 (diff) | |
| download | netsurf-a4940bb56c2ac232fa944bdfd560cefda501961b.tar.gz netsurf-a4940bb56c2ac232fa944bdfd560cefda501961b.tar.bz2 | |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
| -rw-r--r-- | desktop/gui.h | 2 | ||||
| -rw-r--r-- | riscos/global_history.c | 1 | ||||
| -rw-r--r-- | riscos/hotlist.c | 1 | ||||
| -rw-r--r-- | riscos/save.h | 11 |
4 files changed, 9 insertions, 6 deletions
diff --git a/desktop/gui.h b/desktop/gui.h index dc964db81..d44b57d1c 100644 --- a/desktop/gui.h +++ b/desktop/gui.h @@ -30,7 +30,7 @@ #include "desktop/plot_style.h" #include "desktop/mouse.h" -typedef enum { +typedef enum gui_save_type { GUI_SAVE_SOURCE, GUI_SAVE_DRAW, GUI_SAVE_PDF, diff --git a/riscos/global_history.c b/riscos/global_history.c index 5e9476ef8..9d1810503 100644 --- a/riscos/global_history.c +++ b/riscos/global_history.c @@ -32,6 +32,7 @@ #include "content/urldb.h" #include "desktop/global_history.h" #include "desktop/tree.h" +#include "desktop/gui.h" #include "riscos/dialog.h" #include "riscos/global_history.h" #include "riscos/gui.h" diff --git a/riscos/hotlist.c b/riscos/hotlist.c index 7a5a7edfa..82ad3b0f2 100644 --- a/riscos/hotlist.c +++ b/riscos/hotlist.c @@ -36,6 +36,7 @@ #include "content/urldb.h" #include "desktop/hotlist.h" #include "desktop/tree.h" +#include "desktop/gui.h" #include "utils/log.h" #include "utils/messages.h" #include "utils/utils.h" diff --git a/riscos/save.h b/riscos/save.h index 7e509cf40..d3ca5c214 100644 --- a/riscos/save.h +++ b/riscos/save.h @@ -25,22 +25,23 @@ #include <stdbool.h> #include "oslib/wimp.h" -#include "desktop/gui.h" -void gui_drag_save_object(struct gui_window *g, struct hlcache_handle *c, gui_save_type save_type); +enum gui_save_type; + +void gui_drag_save_object(struct gui_window *g, struct hlcache_handle *c, enum gui_save_type save_type); void gui_drag_save_selection(struct gui_window *g, const char *selection); wimp_w ro_gui_saveas_create(const char *template_name); void ro_gui_saveas_quit(void); -void ro_gui_save_prepare(gui_save_type save_type, struct hlcache_handle *h, +void ro_gui_save_prepare(enum gui_save_type save_type, struct hlcache_handle *h, char *s, const char *url, const char *title); void ro_gui_save_start_drag(wimp_pointer *pointer); -void ro_gui_drag_save_link(gui_save_type save_type, const char *url, +void ro_gui_drag_save_link(enum gui_save_type save_type, const char *url, const char *title, struct gui_window *g); void ro_gui_drag_icon(int x, int y, const char *sprite); void ro_gui_drag_box_cancel(void); -void ro_gui_send_datasave(gui_save_type save_type, wimp_full_message_data_xfer *message, wimp_t to); +void ro_gui_send_datasave(enum gui_save_type save_type, wimp_full_message_data_xfer *message, wimp_t to); void ro_gui_save_datasave_ack(wimp_message *message); bool ro_gui_save_ok(wimp_w w); void ro_gui_convert_save_path(char *dp, size_t len, const char *p); |