[epiphany] Add a ephy-private.h header
- From: Xan Lopez <xan src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] Add a ephy-private.h header
- Date: Fri, 20 Jan 2012 10:58:26 +0000 (UTC)
commit 92946fbb88977b544903982c3bb19f5423e3bdbd
Author: Xan Lopez <xan igalia com>
Date: Fri Jan 20 11:57:36 2012 +0100
Add a ephy-private.h header
This should hold methods needed by Epiphany internally but that we do
not want to export. Only a couple of them so far, but we should
probably add a lot more.
src/Makefile.am | 1 +
src/ephy-lockdown.c | 10 +++++-----
src/ephy-private.h | 40 ++++++++++++++++++++++++++++++++++++++++
src/ephy-toolbar.c | 1 +
src/ephy-window.c | 1 +
src/ephy-window.h | 4 ----
6 files changed, 48 insertions(+), 9 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index a92de5c..d6bf77f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,6 +28,7 @@ NOINST_H_FILES = \
ephy-navigation-history-action.h \
ephy-page-menu-action.h \
ephy-password-info.h \
+ ephy-private.h \
ephy-toolbar.h \
ephy-window-action.h \
languages.h \
diff --git a/src/ephy-lockdown.c b/src/ephy-lockdown.c
index 5a2dc98..0d03607 100644
--- a/src/ephy-lockdown.c
+++ b/src/ephy-lockdown.c
@@ -21,20 +21,20 @@
*/
#include "config.h"
+#include "ephy-lockdown.h"
#include "ephy-action-helper.h"
+#include "ephy-debug.h"
#include "ephy-embed-container.h"
#include "ephy-embed-shell.h"
#include "ephy-embed-utils.h"
-#include "ephy-web-view.h"
-#include "ephy-lockdown.h"
#include "ephy-extension.h"
-#include "ephy-settings.h"
#include "ephy-prefs.h"
-#include "ephy-debug.h"
+#include "ephy-private.h"
+#include "ephy-settings.h"
+#include "ephy-web-view.h"
#include <gtk/gtk.h>
-
#include <string.h>
#define LOCKDOWN_FLAG 1 << 8
diff --git a/src/ephy-private.h b/src/ephy-private.h
new file mode 100644
index 0000000..f8d0e2c
--- /dev/null
+++ b/src/ephy-private.h
@@ -0,0 +1,40 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * Copyright  2012 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.
+ *
+ */
+
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
+#ifndef EPHY_PRIVATE_H
+#define EPHY_PRIVATE_H
+
+#include "ephy-location-controller.h"
+#include "ephy-window.h"
+
+#include <gtk/gtk.h>
+
+/* EphyWindow */
+
+GtkActionGroup *ephy_window_get_toolbar_action_group (EphyWindow *window);
+
+EphyLocationController *ephy_window_get_location_controller (EphyWindow *window);
+
+#endif
+
diff --git a/src/ephy-toolbar.c b/src/ephy-toolbar.c
index 75f7ab5..6e10753 100644
--- a/src/ephy-toolbar.c
+++ b/src/ephy-toolbar.c
@@ -23,6 +23,7 @@
#include "ephy-location-entry.h"
#include "ephy-middle-clickable-button.h"
+#include "ephy-private.h"
G_DEFINE_TYPE (EphyToolbar, ephy_toolbar, GTK_TYPE_TOOLBAR)
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 88825f1..1c53fcb 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -48,6 +48,7 @@
#include "ephy-notebook.h"
#include "ephy-page-menu-action.h"
#include "ephy-prefs.h"
+#include "ephy-private.h"
#include "ephy-settings.h"
#include "ephy-shell.h"
#include "ephy-state.h"
diff --git a/src/ephy-window.h b/src/ephy-window.h
index dc5c27f..0bbd7e7 100644
--- a/src/ephy-window.h
+++ b/src/ephy-window.h
@@ -84,10 +84,6 @@ EphyEmbedEvent *ephy_window_get_context_event (EphyWindow *window);
void ephy_window_set_downloads_box_visibility (EphyWindow *window,
gboolean show);
-GtkActionGroup *ephy_window_get_toolbar_action_group (EphyWindow *window);
-
-EphyLocationController *ephy_window_get_location_controller (EphyWindow *window);
-
G_END_DECLS
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]