diff options
| author | Xan Lopez <xan@src.gnome.org> | 2008-06-30 02:15:38 +0800 |
|---|---|---|
| committer | Xan Lopez <xan@src.gnome.org> | 2008-06-30 02:15:38 +0800 |
| commit | 898961c9a4cacc9379a3fe871a5f173baf69b866 (patch) | |
| tree | 17c704ca5a714398814496158a27c3d0b7d933cc | |
| parent | 42bc2e2079a240286b5f3e3891ec942f341a88f7 (diff) | |
| download | gsoc2013-epiphany-898961c9a4cacc9379a3fe871a5f173baf69b866.tar gsoc2013-epiphany-898961c9a4cacc9379a3fe871a5f173baf69b866.tar.gz gsoc2013-epiphany-898961c9a4cacc9379a3fe871a5f173baf69b866.tar.bz2 gsoc2013-epiphany-898961c9a4cacc9379a3fe871a5f173baf69b866.tar.lz gsoc2013-epiphany-898961c9a4cacc9379a3fe871a5f173baf69b866.tar.xz gsoc2013-epiphany-898961c9a4cacc9379a3fe871a5f173baf69b866.tar.zst gsoc2013-epiphany-898961c9a4cacc9379a3fe871a5f173baf69b866.zip | |
ephy-embed-utils: add macro to get webkitwebview from embed.
Will be used in the process to get rid of the embedding abstraction.
svn path=/trunk/; revision=8301
| -rw-r--r-- | embed/Makefile.am | 1 | ||||
| -rw-r--r-- | embed/ephy-embed-utils.h | 4 | ||||
| -rw-r--r-- | src/ephy-find-toolbar.c | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/embed/Makefile.am b/embed/Makefile.am index f8fc09861..42fc33ceb 100644 --- a/embed/Makefile.am +++ b/embed/Makefile.am @@ -78,6 +78,7 @@ libephyembed_la_CPPFLAGS = \ libephyembed_la_CFLAGS = \ -DSHARE_DIR=\"$(pkgdatadir)\" \ $(DEPENDENCIES_CFLAGS) \ + $(WEBKIT_CFLAGS) \ $(AM_CFLAGS) libephyembedfactory_la_SOURCES = \ diff --git a/embed/ephy-embed-utils.h b/embed/ephy-embed-utils.h index 7de058f53..a5c64bb7d 100644 --- a/embed/ephy-embed-utils.h +++ b/embed/ephy-embed-utils.h @@ -31,8 +31,12 @@ #include "ephy-embed.h" +#include <webkit/webkit.h> + G_BEGIN_DECLS +#define EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED(embed) (WEBKIT_WEB_VIEW (gtk_bin_get_child (GTK_BIN (gtk_bin_get_child (GTK_BIN (embed)))))) + char * ephy_embed_utils_link_message_parse (char *message); const char * ephy_embed_utils_get_title_composite (EphyEmbed *embed); gboolean ephy_embed_utils_address_has_web_scheme (const char *address); diff --git a/src/ephy-find-toolbar.c b/src/ephy-find-toolbar.c index 1d38d82c9..924b643fd 100644 --- a/src/ephy-find-toolbar.c +++ b/src/ephy-find-toolbar.c @@ -21,6 +21,7 @@ #include "config.h" +#include "ephy-embed-utils.h" #include "ephy-find-toolbar.h" #include "ephy-debug.h" @@ -32,8 +33,6 @@ #define EPHY_FIND_TOOLBAR_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object),EPHY_TYPE_FIND_TOOLBAR, EphyFindToolbarPrivate)) -#define EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED(embed) (WEBKIT_WEB_VIEW (gtk_bin_get_child (GTK_BIN (gtk_bin_get_child (GTK_BIN (embed)))))) - struct _EphyFindToolbarPrivate { EphyWindow *window; |