diff options
| author | Xan Lopez <xlopez@igalia.com> | 2011-06-30 01:55:28 +0800 |
|---|---|---|
| committer | Xan Lopez <xlopez@igalia.com> | 2011-06-30 01:55:28 +0800 |
| commit | 4c444c0f7693b9a0f3058729bea04832b66d6214 (patch) | |
| tree | d91f6fafd638bd19c9421fd1eaf56dde5db12741 /src/ephy-session.c | |
| parent | 7628d25419c00d95da3e104ad6f132f4607b78c0 (diff) | |
| download | gsoc2013-epiphany-4c444c0f7693b9a0f3058729bea04832b66d6214.tar gsoc2013-epiphany-4c444c0f7693b9a0f3058729bea04832b66d6214.tar.gz gsoc2013-epiphany-4c444c0f7693b9a0f3058729bea04832b66d6214.tar.bz2 gsoc2013-epiphany-4c444c0f7693b9a0f3058729bea04832b66d6214.tar.lz gsoc2013-epiphany-4c444c0f7693b9a0f3058729bea04832b66d6214.tar.xz gsoc2013-epiphany-4c444c0f7693b9a0f3058729bea04832b66d6214.tar.zst gsoc2013-epiphany-4c444c0f7693b9a0f3058729bea04832b66d6214.zip | |
Merge EphyApplication into Ephy(Embed)Shell
We want to use EphyApplication from embed/ too, so instead of
following the EphyEmbedShell/EphyShell pattern just fold the code into
the Shell itself. This makes sense since both classes have basically
the same function, and we can easily leave the non-embed code in
EphyShell and move to EphyEmbedShell the bits we want to be global.
The better name would be EphyCoreApplication/EphyApplication for the
resulting object, but we can do this later.
Diffstat (limited to 'src/ephy-session.c')
| -rw-r--r-- | src/ephy-session.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ephy-session.c b/src/ephy-session.c index 9aadb1189..af2ec68a0 100644 --- a/src/ephy-session.c +++ b/src/ephy-session.c @@ -816,7 +816,7 @@ session_command_dispatch (EphySession *session) run_again = FALSE; } - g_application_release (G_APPLICATION (ephy_shell_get_application (ephy_shell_get_default ()))); + g_application_release (G_APPLICATION (ephy_shell_get_default ())); /* This unrefs the shell! */ session_command_free (cmd); @@ -1676,7 +1676,7 @@ ephy_session_add_window (EphySession *session, session->priv->tool_windows = g_list_append (session->priv->tool_windows, window); - gtk_application_add_window (GTK_APPLICATION (ephy_shell_get_application (ephy_shell_get_default ())), window); + gtk_application_add_window (GTK_APPLICATION (ephy_shell_get_default ()), window); ephy_session_save (session, SESSION_CRASHED); } @@ -1697,7 +1697,7 @@ ephy_session_remove_window (EphySession *session, session->priv->tool_windows = g_list_remove (session->priv->tool_windows, window); - gtk_application_remove_window (GTK_APPLICATION (ephy_shell_get_application (ephy_shell_get_default ())), window); + gtk_application_remove_window (GTK_APPLICATION (ephy_shell_get_default ()), window); ephy_session_save (session, SESSION_CRASHED); } @@ -1804,7 +1804,7 @@ ephy_session_queue_command (EphySession *session, session_command_queue_next (session); - g_application_hold (G_APPLICATION (ephy_shell_get_application (ephy_shell_get_default ()))); + g_application_hold (G_APPLICATION (ephy_shell_get_default ())); if (priv->resume_window != NULL) { |