diff options
| author | Xan Lopez <xan@igalia.com> | 2012-04-14 17:43:54 +0800 |
|---|---|---|
| committer | Xan Lopez <xan@igalia.com> | 2012-04-14 17:43:54 +0800 |
| commit | dad79f566e60f303a1d7b3078bf07e3491fd1fd0 (patch) | |
| tree | c960cf2647596b91bff4b21773edea9b7b83c1b0 /src | |
| parent | f91c081bb406b111b5674a9b91d2532b69fb1dd0 (diff) | |
| download | gsoc2013-epiphany-dad79f566e60f303a1d7b3078bf07e3491fd1fd0.tar gsoc2013-epiphany-dad79f566e60f303a1d7b3078bf07e3491fd1fd0.tar.gz gsoc2013-epiphany-dad79f566e60f303a1d7b3078bf07e3491fd1fd0.tar.bz2 gsoc2013-epiphany-dad79f566e60f303a1d7b3078bf07e3491fd1fd0.tar.lz gsoc2013-epiphany-dad79f566e60f303a1d7b3078bf07e3491fd1fd0.tar.xz gsoc2013-epiphany-dad79f566e60f303a1d7b3078bf07e3491fd1fd0.tar.zst gsoc2013-epiphany-dad79f566e60f303a1d7b3078bf07e3491fd1fd0.zip | |
Move a few EphyShell methods to ephy-private.h
These are clearly not meant to be used outside of Epiphany.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/ephy-main.c | 1 | ||||
| -rw-r--r-- | src/ephy-private.h | 28 | ||||
| -rw-r--r-- | src/ephy-shell.c | 1 | ||||
| -rw-r--r-- | src/ephy-shell.h | 13 |
5 files changed, 25 insertions, 19 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 8926d077e..634b5a8a7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -158,6 +158,7 @@ epiphany_CPPFLAGS = \ -I$(top_srcdir)/embed \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/lib/egg \ + -I$(top_srcdir)/lib/history \ -I$(top_srcdir)/src/bookmarks \ -DDATADIR=\""$(datadir)"\" \ -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ diff --git a/src/ephy-main.c b/src/ephy-main.c index 04ba38a3c..707f32532 100644 --- a/src/ephy-main.c +++ b/src/ephy-main.c @@ -25,6 +25,7 @@ #include "ephy-debug.h" #include "ephy-embed-prefs.h" #include "ephy-file-helpers.h" +#include "ephy-private.h" #include "ephy-session.h" #include "ephy-settings.h" #include "ephy-shell.h" diff --git a/src/ephy-private.h b/src/ephy-private.h index 1f3b0390a..8a7757ba3 100644 --- a/src/ephy-private.h +++ b/src/ephy-private.h @@ -29,22 +29,38 @@ #include "ephy-embed-event.h" #include "ephy-embed-private.h" #include "ephy-location-controller.h" +#include "ephy-shell.h" #include "ephy-window.h" #include <gtk/gtk.h> /* EphyWindow */ -GtkActionGroup *ephy_window_get_toolbar_action_group (EphyWindow *window); +GtkActionGroup *ephy_window_get_toolbar_action_group (EphyWindow *window); -EphyLocationController *ephy_window_get_location_controller (EphyWindow *window); +EphyLocationController *ephy_window_get_location_controller (EphyWindow *window); -EphyEmbedEvent *ephy_window_get_context_event (EphyWindow *window); +EphyEmbedEvent *ephy_window_get_context_event (EphyWindow *window); -GtkWidget *ephy_window_get_find_toolbar (EphyWindow *window); +GtkWidget *ephy_window_get_find_toolbar (EphyWindow *window); -void ephy_window_set_location (EphyWindow *window, - const char *address); +void ephy_window_set_location (EphyWindow *window, + const char *address); + + +/* EphyShell */ + +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); #endif diff --git a/src/ephy-shell.c b/src/ephy-shell.c index de6799313..9c5197c08 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -36,6 +36,7 @@ #include "ephy-home-action.h" #include "ephy-lockdown.h" #include "ephy-prefs.h" +#include "ephy-private.h" #include "ephy-profile-utils.h" #include "ephy-session.h" #include "ephy-settings.h" diff --git a/src/ephy-shell.h b/src/ephy-shell.h index 1780a2e4d..58cdb823a 100644 --- a/src/ephy-shell.h +++ b/src/ephy-shell.h @@ -140,19 +140,6 @@ GObject *ephy_shell_get_pdm_dialog (EphyShell *shell); GObject *ephy_shell_get_prefs_dialog (EphyShell *shell); -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); - -/* private API */ -void _ephy_shell_create_instance (EphyEmbedShellMode mode); - G_END_DECLS #endif |