epiphany r8301 - in trunk: embed src

[xan svn gnome org]

Author: xan
Date: Sun Jun 29 18:15:38 2008
New Revision: 8301
URL: http://svn.gnome.org/viewvc/epiphany?rev=8301&view=rev

Log:
ephy-embed-utils: add macro to get webkitwebview from embed.

Will be used in the process to get rid of the embedding abstraction.


Modified:
   trunk/embed/Makefile.am
   trunk/embed/ephy-embed-utils.h
   trunk/src/ephy-find-toolbar.c

Modified: trunk/embed/Makefile.am
==============================================================================
--- trunk/embed/Makefile.am	(original)
+++ trunk/embed/Makefile.am	Sun Jun 29 18:15:38 2008
@@ -78,6 +78,7 @@
 libephyembed_la_CFLAGS = \
 	-DSHARE_DIR=\"$(pkgdatadir)\"	\
 	$(DEPENDENCIES_CFLAGS) 	\
+	$(WEBKIT_CFLAGS)	\
 	$(AM_CFLAGS)
 
 libephyembedfactory_la_SOURCES =	\

Modified: trunk/embed/ephy-embed-utils.h
==============================================================================
--- trunk/embed/ephy-embed-utils.h	(original)
+++ trunk/embed/ephy-embed-utils.h	Sun Jun 29 18:15:38 2008
@@ -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);

Modified: trunk/src/ephy-find-toolbar.c
==============================================================================
--- trunk/src/ephy-find-toolbar.c	(original)
+++ trunk/src/ephy-find-toolbar.c	Sun Jun 29 18:15:38 2008
@@ -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;