[devhelp] WebView: move the class to the libdevhelp



commit 996de7b0292f005195f8ae5ccb623db185e70099
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Thu Jun 7 14:50:31 2018 +0200

    WebView: move the class to the libdevhelp
    
    GTK-Doc comments will be added later.

 devhelp/devhelp.h              | 1 +
 {src => devhelp}/dh-web-view.c | 4 +++-
 {src => devhelp}/dh-web-view.h | 2 +-
 devhelp/meson.build            | 6 ++++--
 meson.build                    | 3 +--
 src/dh-notebook.h              | 1 -
 src/dh-tab-label.c             | 2 +-
 src/dh-tab.h                   | 2 +-
 src/dh-window.c                | 1 -
 src/meson.build                | 1 -
 10 files changed, 12 insertions(+), 11 deletions(-)
---
diff --git a/devhelp/devhelp.h b/devhelp/devhelp.h
index 302197db..f79af7fb 100644
--- a/devhelp/devhelp.h
+++ b/devhelp/devhelp.h
@@ -41,5 +41,6 @@
 #include <devhelp/dh-settings.h>
 #include <devhelp/dh-settings-builder.h>
 #include <devhelp/dh-sidebar.h>
+#include <devhelp/dh-web-view.h>
 
 #endif /* DEVHELP_H */
diff --git a/src/dh-web-view.c b/devhelp/dh-web-view.c
similarity index 99%
rename from src/dh-web-view.c
rename to devhelp/dh-web-view.c
index 9c17e109..8f9a9181 100644
--- a/src/dh-web-view.c
+++ b/devhelp/dh-web-view.c
@@ -18,9 +18,11 @@
  * along with Devhelp.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "config.h"
 #include "dh-web-view.h"
 #include <math.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
+#include "dh-link.h"
 
 /* #DhWebView is a subclass of #WebKitWebView, to have a higher-level API for
  * some features.
diff --git a/src/dh-web-view.h b/devhelp/dh-web-view.h
similarity index 98%
rename from src/dh-web-view.h
rename to devhelp/dh-web-view.h
index d675dc6f..a3c1880a 100644
--- a/src/dh-web-view.h
+++ b/devhelp/dh-web-view.h
@@ -22,7 +22,7 @@
 #define DH_WEB_VIEW_H
 
 #include <webkit2/webkit2.h>
-#include <devhelp/devhelp.h>
+#include <devhelp/dh-profile.h>
 
 G_BEGIN_DECLS
 
diff --git a/devhelp/meson.build b/devhelp/meson.build
index 57300f59..b8b439f2 100644
--- a/devhelp/meson.build
+++ b/devhelp/meson.build
@@ -15,7 +15,8 @@ libdevhelp_public_headers = [
         'dh-profile-builder.h',
         'dh-settings.h',
         'dh-settings-builder.h',
-        'dh-sidebar.h'
+        'dh-sidebar.h',
+        'dh-web-view.h'
 ]
 
 libdevhelp_public_c_files = [
@@ -34,7 +35,8 @@ libdevhelp_public_c_files = [
         'dh-profile-builder.c',
         'dh-settings.c',
         'dh-settings-builder.c',
-        'dh-sidebar.c'
+        'dh-sidebar.c',
+        'dh-web-view.c'
 ]
 
 libdevhelp_private_c_files = [
diff --git a/meson.build b/meson.build
index 525c4d35..b41cb02e 100644
--- a/meson.build
+++ b/meson.build
@@ -38,7 +38,7 @@ libdevhelp_deps_array = [
 ]
 
 LIBDEVHELP_DEPS_STR = []
-LIBDEVHELP_DEPS = []
+LIBDEVHELP_DEPS = [meson.get_compiler('c').find_library('m')]
 foreach dep : libdevhelp_deps_array
         dep_name = dep[0]
         dep_version = dep[1]
@@ -50,7 +50,6 @@ DEVHELP_APP_DEPS = [
         LIBDEVHELP_DEPS,
         dependency('amtk-5', version : '>= 4.99.1'),
         dependency('gsettings-desktop-schemas'),
-        meson.get_compiler('c').find_library('m')
 ]
 
 # config.h
diff --git a/src/dh-notebook.h b/src/dh-notebook.h
index 19ea01c0..c0d92c9d 100644
--- a/src/dh-notebook.h
+++ b/src/dh-notebook.h
@@ -24,7 +24,6 @@
 #include <gtk/gtk.h>
 #include <devhelp/devhelp.h>
 #include "dh-tab.h"
-#include "dh-web-view.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/dh-tab-label.c b/src/dh-tab-label.c
index 11791317..e99229c7 100644
--- a/src/dh-tab-label.c
+++ b/src/dh-tab-label.c
@@ -19,7 +19,7 @@
  */
 
 #include "dh-tab-label.h"
-#include "dh-web-view.h"
+#include <devhelp/devhelp.h>
 
 /* The #DhTabLabel widget is used for the tab labels in #DhNotebook. */
 
diff --git a/src/dh-tab.h b/src/dh-tab.h
index 5b9ba0ac..80091c0e 100644
--- a/src/dh-tab.h
+++ b/src/dh-tab.h
@@ -22,7 +22,7 @@
 #define DH_TAB_H
 
 #include <gtk/gtk.h>
-#include "dh-web-view.h"
+#include <devhelp/devhelp.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/dh-window.c b/src/dh-window.c
index 2ab4f6f9..64edb109 100644
--- a/src/dh-window.c
+++ b/src/dh-window.c
@@ -31,7 +31,6 @@
 #include "dh-settings-app.h"
 #include "dh-tab.h"
 #include "dh-util-app.h"
-#include "dh-web-view.h"
 
 typedef struct {
         GtkHeaderBar *header_bar;
diff --git a/src/meson.build b/src/meson.build
index 2b429e52..9d410f0f 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -9,7 +9,6 @@ devhelp_app_sources = [
         'dh-tab.c',
         'dh-tab-label.c',
         'dh-util-app.c',
-        'dh-web-view.c',
         'dh-window.c'
 ]
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]