Imported Upstream version 4.0.2+dfsg1

1 files changed, 45 insertions, 63 deletions

diff --git a/src/webkit/wk-html.h b/src/webkit/wk-html.h
index 9022271..e8f1dfb 100644
--- a/src/webkit/wk-html.h
+++ b/src/webkit/wk-html.h
@@ -2,7 +2,7 @@
  * Xiphos Bible Study Tool
  * wk-html.h - webkit-specific html support
  *
- * Copyright (C) 2010-2014 Xiphos Developer Team
+ * Copyright (C) 2010-2015 Xiphos Developer Team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,28 +23,33 @@
 #define __WK_HTML_H__
 
 #undef DATADIR
-#include <webkit/webkit.h>  
+
+#ifdef USE_WEBKIT2
+#include <webkit2/webkit2.h>
+#else
+#include <webkit/webkit.h>
+#endif
 #include "main/module_dialogs.h"
 
 #include "main/module_dialogs.h"
 
 G_BEGIN_DECLS
-
-#define WK_TYPE_HTML         (wk_html_get_type ())
-#define WK_HTML(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), WK_TYPE_HTML, WkHtml))
-#define WK_HTML_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), WK_TYPE_HTML, WkHtmlClass))
-#define WK_HTML_IS_HTML(o)   (G_TYPE_CHECK_INSTANCE_TYPE ((o), WK_TYPE_HTML))
-#define WK_HTML_IS_HTML_CLASS(k) (G_TYPE_CHECK_INSTANCE_GET_CLASS ((o), WK_TYPE_HTML, WkHtmlClass))
-
-typedef struct _WkHtml       WkHtml;
-typedef struct _WkHtmlClass  WkHtmlClass;
-typedef struct _WkHtmlPriv   WkHtmlPriv;
-
-struct _WkHtml {
+#define WK_TYPE_HTML (wk_html_get_type())
+#define WK_HTML(o) (G_TYPE_CHECK_INSTANCE_CAST((o), WK_TYPE_HTML, WkHtml))
+#define WK_HTML_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), WK_TYPE_HTML, WkHtmlClass))
+#define WK_HTML_IS_HTML(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), WK_TYPE_HTML))
+#define WK_HTML_IS_HTML_CLASS(k) (G_TYPE_CHECK_INSTANCE_GET_CLASS((o), WK_TYPE_HTML, WkHtmlClass))
+typedef struct _WkHtml WkHtml;
+typedef struct _WkHtmlClass WkHtmlClass;
+typedef struct _WkHtmlPriv WkHtmlPriv;
+
+struct _WkHtml
+{
 	WebKitWebView parent;
 	WkHtmlPriv *priv;
 };
-struct _WkHtmlPriv {
+struct _WkHtmlPriv
+{
 	gchar *content;
 	gchar *mime;
 	gchar *find_string;
@@ -55,64 +60,41 @@ struct _WkHtmlPriv {
 	guint timeout;
 	gint pane;
 	gboolean is_dialog;
-	DIALOG_DATA * dialog;
+	DIALOG_DATA *dialog;
 };
-struct _WkHtmlClass {
+struct _WkHtmlClass
+{
 	WebKitWebViewClass parent;
 
-        /* Signals */
-	void (*uri_selected) (WkHtml         *view,
-			      gchar          *uri,
-			      gboolean       handled);
-	gboolean (*frame_selected) (WkHtml   *view,
-				    gchar    *uri,
-				    gboolean handled);
-	void (*title_changed) (WkHtml        *view,
-			       const gchar   *new_title);
-	void (*popupmenu_requested) (WkHtml  *view,
-				     const gchar *link);
+	/* Signals */
+	void (*uri_selected)(WkHtml *view, gchar *uri, gboolean handled);
+	gboolean (*frame_selected)(WkHtml *view, gchar *uri, gboolean handled);
+	void (*title_changed)(WkHtml *view, const gchar *new_title);
+	void (*popupmenu_requested)(WkHtml *view, const gchar *link);
 };
 
-GType       wk_html_get_type           (void);
-WkHtml *    wk_html_new                (DIALOG_DATA * dialog, gboolean is_dialog, gint pane);
-void        wk_html_set_base_uri       (WkHtml      *html,
-	                                const gchar *uri);
-void        wk_html_open_stream        (WkHtml      *html,
-					const gchar *mime);
-void        wk_html_write              (WkHtml      *html,
-					const gchar *data,
-					gint         len);
-void        wk_html_printf             (WkHtml      *html,
-					gchar *format,
-					...) G_GNUC_PRINTF (2,3);
-void        wk_html_close              (WkHtml       *html);
+GType wk_html_get_type(void);
+WkHtml *wk_html_new(DIALOG_DATA *dialog, gboolean is_dialog, gint pane);
+void wk_html_set_base_uri(WkHtml *html, const gchar *uri);
+void wk_html_open_stream(WkHtml *html, const gchar *mime);
+void wk_html_write(WkHtml *html, const gchar *data, gint len);
+void wk_html_printf(WkHtml *html, gchar *format, ...) G_GNUC_PRINTF(2, 3);
+void wk_html_close(WkHtml *html);
 
-void        wk_html_render_data        (WkHtml       *html,
-					const char   *data,
-					guint32      len);
+void wk_html_render_data(WkHtml *html, const char *data, guint32 len);
 
-void        wk_html_frames             (WkHtml       *html,
-					gboolean      enable);
-gboolean    wk_html_find               (WkHtml       *html,
-					const gchar  *find_string);
-gboolean    wk_html_find_again         (WkHtml       *html,
-					gboolean     forward);
-void        wk_html_set_find_props     (WkHtml       *html,
-					const char   *str,
-					gboolean     match_case,
-					gboolean     wrap);
-void        wk_html_jump_to_anchor     (WkHtml       *html,
-					gchar        *anchor);
-void        wk_html_copy_selection     (WkHtml       *html);
+void wk_html_frames(WkHtml *html, gboolean enable);
+gboolean wk_html_find(WkHtml *html, const gchar *find_string);
+gboolean wk_html_find_again(WkHtml *html, gboolean forward);
+void wk_html_jump_to_anchor(WkHtml *html, gchar *anchor);
+void wk_html_copy_selection(WkHtml *html);
 
-void        wk_html_select_all         (WkHtml       *html);
+void wk_html_select_all(WkHtml *html);
 
-void        wk_html_print              (WkHtml       *html);
+void wk_html_print(WkHtml *html);
 
-gboolean    wk_html_initialize         (void);
-void        wk_html_shutdown           (void);
+gboolean wk_html_initialize(void);
+void wk_html_shutdown(void);
 
 G_END_DECLS
-
 #endif /* __WK_HTML_H__ */
-