[epiphany] Remove private headers
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] Remove private headers
- Date: Tue, 1 Nov 2016 02:22:01 +0000 (UTC)
commit 50dfe139266431972a22958ce40637aacd13214f
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Mon Oct 31 21:21:10 2016 -0500
Remove private headers
There's no public API anymore and no extensions. Having private headers
years later serves no purpose and is just confusing.
embed/Makefile.am | 1 -
embed/ephy-about-handler.c | 1 -
embed/ephy-embed-private.h | 55 -------------------
embed/ephy-embed-shell.c | 1 -
embed/ephy-embed-utils.c | 1 -
embed/ephy-web-view.c | 1 -
embed/ephy-web-view.h | 27 +++++++++
src/Makefile.am | 1 -
src/ephy-header-bar.c | 1 -
src/ephy-lockdown.c | 4 +-
src/ephy-main.c | 1 -
src/ephy-private.h | 65 -----------------------
src/ephy-session.c | 1 -
src/ephy-session.h | 3 +
src/ephy-shell.c | 1 -
src/ephy-shell.h | 13 +++++
src/ephy-window.c | 1 -
src/ephy-window.h | 11 ++++
src/popup-commands.c | 1 -
src/search-provider/ephy-search-provider-main.c | 3 +-
src/window-commands.c | 1 -
tests/ephy-completion-model-test.c | 1 -
tests/ephy-download-test.c | 1 -
tests/ephy-embed-shell-test.c | 1 -
tests/ephy-encodings-test.c | 1 -
tests/ephy-migration-test.c | 2 -
tests/ephy-session-test.c | 2 -
tests/ephy-shell-test.c | 2 -
tests/ephy-web-app-utils-test.c | 1 -
tests/ephy-web-view-test.c | 2 -
30 files changed, 58 insertions(+), 149 deletions(-)
---
diff --git a/embed/Makefile.am b/embed/Makefile.am
index 28dcd58..8d5f98b 100644
--- a/embed/Makefile.am
+++ b/embed/Makefile.am
@@ -27,7 +27,6 @@ libephyembed_la_SOURCES = \
ephy-embed-event.h \
ephy-embed-prefs.c \
ephy-embed-prefs.h \
- ephy-embed-private.h \
ephy-embed-shell.c \
ephy-embed-shell.h \
ephy-embed-utils.c \
diff --git a/embed/ephy-about-handler.c b/embed/ephy-about-handler.c
index f7be7c9..eeb9cab 100644
--- a/embed/ephy-about-handler.c
+++ b/embed/ephy-about-handler.c
@@ -30,7 +30,6 @@
#include "ephy-smaps.h"
#include "ephy-snapshot-service.h"
#include "ephy-web-app-utils.h"
-#include "ephy-embed-private.h"
#include <gio/gio.h>
#include <gtk/gtk.h>
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index e1886e5..5f71feb 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -26,7 +26,6 @@
#include "ephy-dbus-util.h"
#include "ephy-debug.h"
#include "ephy-embed-prefs.h"
-#include "ephy-embed-private.h"
#include "ephy-embed-type-builtins.h"
#include "ephy-embed-utils.h"
#include "ephy-encodings.h"
diff --git a/embed/ephy-embed-utils.c b/embed/ephy-embed-utils.c
index 7782a7b..055fb89 100644
--- a/embed/ephy-embed-utils.c
+++ b/embed/ephy-embed-utils.c
@@ -25,7 +25,6 @@
#include "ephy-embed-utils.h"
#include "ephy-about-handler.h"
-#include "ephy-embed-private.h"
#include "ephy-settings.h"
#include "ephy-string.h"
#include "ephy-view-source-handler.h"
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 9292742..4a28ee1 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -26,7 +26,6 @@
#include "ephy-debug.h"
#include "ephy-embed-container.h"
#include "ephy-embed-prefs.h"
-#include "ephy-embed-private.h"
#include "ephy-embed-shell.h"
#include "ephy-embed-type-builtins.h"
#include "ephy-embed-utils.h"
diff --git a/embed/ephy-web-view.h b/embed/ephy-web-view.h
index a81e258..47524dd 100644
--- a/embed/ephy-web-view.h
+++ b/embed/ephy-web-view.h
@@ -23,6 +23,8 @@
#include <webkit2/webkit2.h>
+#include "ephy-embed-shell.h"
+#include "ephy-history-types.h"
#include "ephy-security-levels.h"
G_BEGIN_DECLS
@@ -31,6 +33,19 @@ G_BEGIN_DECLS
G_DECLARE_FINAL_TYPE (EphyWebView, ephy_web_view, EPHY, WEB_VIEW, WebKitWebView)
+#define EPHY_WEB_VIEW_NON_SEARCH_REGEX "(" \
+ "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9](:[0-9]+)?.*$|" \
+ "^::[0-9a-f:]*$|" \
+ "^[0-9a-f:]+:[0-9a-f:]*$|" \
+ "^https?://[^/\\.[:space:]]+.*$|" \
+ "^about:.*$|" \
+ "^data:.*$|" \
+ "^file:.*$" \
+ ")"
+
+#define EPHY_WEB_VIEW_DOMAIN_REGEX "^localhost(\\.[^[:space:]]+)?(:\\d+)?(:[0-9]+)?(/.*)?$|" \
+ "^[^\\.[:space:]]+\\.[^\\.[:space:]]+.*$|"
+
typedef enum
{
EPHY_WEB_VIEW_NAV_BACK = 1 << 0,
@@ -116,4 +131,16 @@ char *ephy_web_view_get_web_app_title_finish (EphyWebView
GAsyncResult *result,
GError **error);
+void ephy_web_view_set_visit_type (EphyWebView *view,
+ EphyHistoryPageVisitType visit_type);
+EphyHistoryPageVisitType ephy_web_view_get_visit_type (EphyWebView *view);
+void ephy_web_view_popups_manager_reset (EphyWebView *view);
+void ephy_web_view_save (EphyWebView *view,
+ const char *uri);
+void ephy_web_view_load_homepage (EphyWebView *view);
+
+char * ephy_web_view_create_web_application (EphyWebView *view,
+ const char *title,
+ GdkPixbuf *icon);
+
G_END_DECLS
diff --git a/src/Makefile.am b/src/Makefile.am
index a32b946..ec8a1db 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,7 +52,6 @@ libephymain_la_SOURCES = \
ephy-lockdown.h \
ephy-notebook.c \
ephy-notebook.h \
- ephy-private.h \
ephy-session.c \
ephy-session.h \
ephy-shell.c \
diff --git a/src/ephy-header-bar.c b/src/ephy-header-bar.c
index 4b75fe2..4872ef8 100644
--- a/src/ephy-header-bar.c
+++ b/src/ephy-header-bar.c
@@ -38,7 +38,6 @@
#include "ephy-history-service.h"
#include "ephy-location-entry.h"
#include "ephy-middle-clickable-button.h"
-#include "ephy-private.h"
#include "ephy-shell.h"
#include "ephy-title-box.h"
#include "ephy-title-widget.h"
diff --git a/src/ephy-lockdown.c b/src/ephy-lockdown.c
index dc07213..5b8f52a 100644
--- a/src/ephy-lockdown.c
+++ b/src/ephy-lockdown.c
@@ -28,9 +28,11 @@
#include "ephy-embed-container.h"
#include "ephy-embed-shell.h"
#include "ephy-embed-utils.h"
+#include "ephy-location-controller.h"
#include "ephy-prefs.h"
-#include "ephy-private.h"
#include "ephy-settings.h"
+#include "ephy-shell.h"
+#include "ephy-window.h"
#include <gtk/gtk.h>
diff --git a/src/ephy-main.c b/src/ephy-main.c
index c6413c1..2d5f843 100644
--- a/src/ephy-main.c
+++ b/src/ephy-main.c
@@ -24,7 +24,6 @@
#include "ephy-debug.h"
#include "ephy-file-helpers.h"
-#include "ephy-private.h"
#include "ephy-profile-utils.h"
#include "ephy-session.h"
#include "ephy-settings.h"
diff --git a/src/ephy-session.c b/src/ephy-session.c
index 30eef45..5cf0874 100644
--- a/src/ephy-session.c
+++ b/src/ephy-session.c
@@ -33,7 +33,6 @@
#include "ephy-gui.h"
#include "ephy-notebook.h"
#include "ephy-prefs.h"
-#include "ephy-private.h"
#include "ephy-settings.h"
#include "ephy-shell.h"
#include "ephy-string.h"
diff --git a/src/ephy-session.h b/src/ephy-session.h
index 94c2f5c..c4d8252 100644
--- a/src/ephy-session.h
+++ b/src/ephy-session.h
@@ -67,4 +67,7 @@ void ephy_session_undo_close_tab (EphySession *session);
gboolean ephy_session_get_can_undo_tab_closed (EphySession *session);
+void ephy_session_clear (EphySession *session);
+
+
G_END_DECLS
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 3fbf302..6b085d6 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -33,7 +33,6 @@
#include "ephy-history-window.h"
#include "ephy-lockdown.h"
#include "ephy-prefs.h"
-#include "ephy-private.h"
#include "ephy-session.h"
#include "ephy-settings.h"
#include "ephy-title-box.h"
diff --git a/src/ephy-shell.h b/src/ephy-shell.h
index 31d763f..19f180d 100644
--- a/src/ephy-shell.h
+++ b/src/ephy-shell.h
@@ -118,4 +118,17 @@ void ephy_shell_open_uris (EphyShell *shell,
const char **uris,
EphyStartupFlags startup_flags,
guint32 user_time);
+
+void ephy_shell_set_startup_context (EphyShell *shell,
+ EphyShellStartupContext *ctx);
+
+EphyShellStartupContext *ephy_shell_startup_context_new (EphyStartupFlags startup_flags,
+ char *bookmarks_filename,
+ char *session_filename,
+ char *bookmark_url,
+ char **arguments,
+ guint32 user_time);
+
+void _ephy_shell_create_instance (EphyEmbedShellMode mode);
+
G_END_DECLS
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 88e01d3..a920b2f 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -40,7 +40,6 @@
#include "ephy-location-entry.h"
#include "ephy-notebook.h"
#include "ephy-prefs.h"
-#include "ephy-private.h"
#include "ephy-security-popover.h"
#include "ephy-session.h"
#include "ephy-settings.h"
diff --git a/src/ephy-window.h b/src/ephy-window.h
index 6de4fab..65df4ab 100644
--- a/src/ephy-window.h
+++ b/src/ephy-window.h
@@ -21,6 +21,8 @@
#pragma once
#include "ephy-bookmarks-manager.h"
+#include "ephy-embed-event.h"
+#include "ephy-location-controller.h"
#include "ephy-web-view.h"
#include <gtk/gtk.h>
@@ -60,4 +62,13 @@ gboolean ephy_window_close (EphyWindow *window);
EphyWindowChrome ephy_window_get_chrome (EphyWindow *window);
+EphyLocationController *ephy_window_get_location_controller (EphyWindow *window);
+
+EphyEmbedEvent *ephy_window_get_context_event (EphyWindow *window);
+
+GtkWidget *ephy_window_get_current_find_toolbar (EphyWindow *window);
+
+void ephy_window_set_location (EphyWindow *window,
+ const char *address);
+
G_END_DECLS
diff --git a/src/popup-commands.c b/src/popup-commands.c
index c15be89..aacb6a1 100644
--- a/src/popup-commands.c
+++ b/src/popup-commands.c
@@ -27,7 +27,6 @@
#include "ephy-file-chooser.h"
#include "ephy-file-helpers.h"
#include "ephy-prefs.h"
-#include "ephy-private.h"
#include "ephy-settings.h"
#include "ephy-shell.h"
#include "ephy-web-view.h"
diff --git a/src/search-provider/ephy-search-provider-main.c b/src/search-provider/ephy-search-provider-main.c
index b4a6205..9ee1385 100644
--- a/src/search-provider/ephy-search-provider-main.c
+++ b/src/search-provider/ephy-search-provider-main.c
@@ -21,9 +21,8 @@
#include "config.h"
#include "ephy-search-provider.h"
-#include "ephy-embed-shell.h"
+#include "ephy-shell.h"
#include "ephy-file-helpers.h"
-#include "ephy-private.h"
#include <glib/gi18n.h>
#include <locale.h>
diff --git a/src/window-commands.c b/src/window-commands.c
index 1bfa746..6370375 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -44,7 +44,6 @@
#include "ephy-location-entry.h"
#include "ephy-notebook.h"
#include "ephy-prefs.h"
-#include "ephy-private.h"
#include "ephy-session.h"
#include "ephy-settings.h"
#include "ephy-shell.h"
diff --git a/tests/ephy-completion-model-test.c b/tests/ephy-completion-model-test.c
index 01d3ca5..0cec1c3 100644
--- a/tests/ephy-completion-model-test.c
+++ b/tests/ephy-completion-model-test.c
@@ -24,7 +24,6 @@
#include "ephy-debug.h"
#include "ephy-embed-prefs.h"
#include "ephy-file-helpers.h"
-#include "ephy-private.h"
#include "ephy-shell.h"
static void
diff --git a/tests/ephy-download-test.c b/tests/ephy-download-test.c
index 51e5d68..e2184bc 100644
--- a/tests/ephy-download-test.c
+++ b/tests/ephy-download-test.c
@@ -23,7 +23,6 @@
#include "ephy-download.h"
#include "ephy-embed-prefs.h"
#include "ephy-file-helpers.h"
-#include "ephy-private.h"
#include "ephy-shell.h"
#include <glib.h>
diff --git a/tests/ephy-embed-shell-test.c b/tests/ephy-embed-shell-test.c
index 91134aa..74d9abe 100644
--- a/tests/ephy-embed-shell-test.c
+++ b/tests/ephy-embed-shell-test.c
@@ -26,7 +26,6 @@
#include "ephy-embed-shell.h"
#include "ephy-embed-utils.h"
#include "ephy-file-helpers.h"
-#include "ephy-private.h"
#include <glib.h>
#include <gtk/gtk.h>
diff --git a/tests/ephy-encodings-test.c b/tests/ephy-encodings-test.c
index 105d0b0..ac0839c 100644
--- a/tests/ephy-encodings-test.c
+++ b/tests/ephy-encodings-test.c
@@ -24,7 +24,6 @@
#include "ephy-embed-prefs.h"
#include "ephy-encodings.h"
#include "ephy-file-helpers.h"
-#include "ephy-private.h"
#include "ephy-shell.h"
#include <gtk/gtk.h>
diff --git a/tests/ephy-migration-test.c b/tests/ephy-migration-test.c
index 04b318e..c069585 100644
--- a/tests/ephy-migration-test.c
+++ b/tests/ephy-migration-test.c
@@ -22,9 +22,7 @@
#include "ephy-debug.h"
#include "ephy-embed-prefs.h"
-#include "ephy-embed-private.h"
#include "ephy-file-helpers.h"
-#include "ephy-private.h"
#include "ephy-profile-utils.h"
#include <gtk/gtk.h>
diff --git a/tests/ephy-session-test.c b/tests/ephy-session-test.c
index 7c99d03..cea6340 100644
--- a/tests/ephy-session-test.c
+++ b/tests/ephy-session-test.c
@@ -22,9 +22,7 @@
#include "ephy-debug.h"
#include "ephy-embed-container.h"
#include "ephy-embed-prefs.h"
-#include "ephy-embed-private.h"
#include "ephy-file-helpers.h"
-#include "ephy-private.h"
#include "ephy-settings.h"
#include "ephy-shell.h"
#include "ephy-session.h"
diff --git a/tests/ephy-shell-test.c b/tests/ephy-shell-test.c
index 7be334c..01e3aa8 100644
--- a/tests/ephy-shell-test.c
+++ b/tests/ephy-shell-test.c
@@ -23,10 +23,8 @@
#include "ephy-embed.h"
#include "ephy-embed-container.h"
#include "ephy-embed-prefs.h"
-#include "ephy-embed-private.h"
#include "ephy-embed-utils.h"
#include "ephy-file-helpers.h"
-#include "ephy-private.h"
#include "ephy-shell.h"
#include "ephy-test-utils.h"
#include "ephy-window.h"
diff --git a/tests/ephy-web-app-utils-test.c b/tests/ephy-web-app-utils-test.c
index 23bb060..8a4b7ba 100644
--- a/tests/ephy-web-app-utils-test.c
+++ b/tests/ephy-web-app-utils-test.c
@@ -21,7 +21,6 @@
#include "config.h"
#include "ephy-debug.h"
#include "ephy-embed-prefs.h"
-#include "ephy-embed-private.h"
#include "ephy-file-helpers.h"
#include "ephy-shell.h"
#include "ephy-web-app-utils.h"
diff --git a/tests/ephy-web-view-test.c b/tests/ephy-web-view-test.c
index 2ec52a3..794f202 100644
--- a/tests/ephy-web-view-test.c
+++ b/tests/ephy-web-view-test.c
@@ -21,11 +21,9 @@
#include "config.h"
#include "ephy-debug.h"
#include "ephy-embed-prefs.h"
-#include "ephy-embed-private.h"
#include "ephy-embed-utils.h"
#include "ephy-file-helpers.h"
#include "ephy-history-service.h"
-#include "ephy-private.h"
#include "ephy-settings.h"
#include "ephy-shell.h"
#include "ephy-web-view.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
