[epiphany] Fix the build with new WebKit

[Carlos Garcia Campos <carlosgc src gnome org>]

commit f4a4db083cd221f2d4f6db588f496f5accd0b39d
Author: Carlos Garcia Campos <cgarcia igalia com>
Date:   Mon Mar 3 15:21:40 2014 +0100

    Fix the build with new WebKit
    
    New WebKit aborts the compilation if webkit2.h and
    webkit-web-extension.h headers are included together. We are including
    the ephy-web-extension.h header from the UI process only to get the
    names of the dbus service, interface and path, so move those defines to
    its own file that can be included by both UI and web process files.

 embed/ephy-embed-shell.c                       |    2 +-
 embed/ephy-web-extension-proxy.c               |    2 +-
 embed/web-extension/Makefile.am                |    1 +
 embed/web-extension/ephy-web-extension-main.c  |    1 +
 embed/web-extension/ephy-web-extension-names.h |   30 ++++++++++++++++++++++++
 embed/web-extension/ephy-web-extension.c       |    3 +-
 embed/web-extension/ephy-web-extension.h       |    6 +----
 7 files changed, 37 insertions(+), 8 deletions(-)
---
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index 618d901..7fa3be5 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -34,8 +34,8 @@
 #include "ephy-profile-utils.h"
 #include "ephy-settings.h"
 #include "ephy-snapshot-service.h"
-#include "ephy-web-extension.h"
 #include "ephy-web-extension-proxy.h"
+#include "ephy-web-extension-names.h"
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
diff --git a/embed/ephy-web-extension-proxy.c b/embed/ephy-web-extension-proxy.c
index 2056a74..4a564c6 100644
--- a/embed/ephy-web-extension-proxy.c
+++ b/embed/ephy-web-extension-proxy.c
@@ -21,7 +21,7 @@
 #include <config.h>
 #include "ephy-web-extension-proxy.h"
 
-#include "ephy-web-extension.h"
+#include "ephy-web-extension-names.h"
 #include "ephy-history-service.h"
 
 struct _EphyWebExtensionProxyPrivate
diff --git a/embed/web-extension/Makefile.am b/embed/web-extension/Makefile.am
index 7020d14..5bdb174 100644
--- a/embed/web-extension/Makefile.am
+++ b/embed/web-extension/Makefile.am
@@ -9,6 +9,7 @@ libephywebextension_la_SOURCES = \
        ephy-web-extension.c \
        ephy-web-extension.h \
        ephy-web-extension-main.c \
+       ephy-web-extension-names.h \
        ephy-web-overview.h \
        ephy-web-overview.c \
        ephy-web-overview-model.h \
diff --git a/embed/web-extension/ephy-web-extension-main.c b/embed/web-extension/ephy-web-extension-main.c
index e5e330c..2e82cd0 100644
--- a/embed/web-extension/ephy-web-extension-main.c
+++ b/embed/web-extension/ephy-web-extension-main.c
@@ -21,6 +21,7 @@
 #include "config.h"
 
 #include "ephy-web-extension.h"
+#include "ephy-web-extension-names.h"
 #include "ephy-debug.h"
 #include "ephy-file-helpers.h"
 
diff --git a/embed/web-extension/ephy-web-extension-names.h b/embed/web-extension/ephy-web-extension-names.h
new file mode 100644
index 0000000..78153eb
--- /dev/null
+++ b/embed/web-extension/ephy-web-extension-names.h
@@ -0,0 +1,30 @@
+/*
+ *  Copyright © 2014 Igalia S.L.
+ *
+ *  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
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef EPHY_WEB_EXTENSION_NAMES_H
+#define EPHY_WEB_EXTENSION_NAMES_H
+
+G_BEGIN_DECLS
+
+#define EPHY_WEB_EXTENSION_SERVICE_NAME "org.gnome.Epiphany.WebExtension"
+#define EPHY_WEB_EXTENSION_OBJECT_PATH  "/org/gnome/Epiphany/WebExtension"
+#define EPHY_WEB_EXTENSION_INTERFACE    "org.gnome.Epiphany.WebExtension"
+
+G_END_DECLS
+
+#endif /* EPHY_WEB_EXTENSION_NAMES_H */
diff --git a/embed/web-extension/ephy-web-extension.c b/embed/web-extension/ephy-web-extension.c
index 7681ec8..391cfb9 100644
--- a/embed/web-extension/ephy-web-extension.c
+++ b/embed/web-extension/ephy-web-extension.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set sw=2 ts=2 sts=2 et: */
 /*
- *  Copyright © 2012 Igalia S.L.
+ *  Copyright © 2014 Igalia S.L.
  *
  *  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
@@ -31,6 +31,7 @@
 #include "ephy-uri-helpers.h"
 #include "uri-tester.h"
 #include "ephy-web-overview.h"
+#include "ephy-web-extension-names.h"
 
 #include <gio/gio.h>
 #include <gtk/gtk.h>
diff --git a/embed/web-extension/ephy-web-extension.h b/embed/web-extension/ephy-web-extension.h
index e8d8437..910e0ef 100644
--- a/embed/web-extension/ephy-web-extension.h
+++ b/embed/web-extension/ephy-web-extension.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright © 2012 Igalia S.L.
+ *  Copyright © 2014 Igalia S.L.
  *
  *  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
@@ -31,10 +31,6 @@ G_BEGIN_DECLS
 #define EPHY_IS_WEB_EXTENSION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EPHY_TYPE_WEB_EXTENSION))
 #define EPHY_WEB_EXTENSION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), EPHY_TYPE_WEB_EXTENSION, 
EphyWebExtensionClass))
 
-#define EPHY_WEB_EXTENSION_SERVICE_NAME "org.gnome.Epiphany.WebExtension"
-#define EPHY_WEB_EXTENSION_OBJECT_PATH  "/org/gnome/Epiphany/WebExtension"
-#define EPHY_WEB_EXTENSION_INTERFACE    "org.gnome.Epiphany.WebExtension"
-
 typedef struct _EphyWebExtension        EphyWebExtension;
 typedef struct _EphyWebExtensionClass   EphyWebExtensionClass;
 typedef struct _EphyWebExtensionPrivate EphyWebExtensionPrivate;