aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bookmarks/ephy-bookmarks.c9
-rw-r--r--src/ephy-completion-model.c4
-rw-r--r--src/ephy-shell.c4
-rw-r--r--src/ephy-tab.c16
-rwxr-xr-xsrc/ephy-toolbars-model.c4
-rw-r--r--src/prefs-dialog.c7
6 files changed, 21 insertions, 23 deletions
diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c
index c569ec2ca..2c4fdd413 100644
--- a/src/bookmarks/ephy-bookmarks.c
+++ b/src/bookmarks/ephy-bookmarks.c
@@ -24,6 +24,7 @@
#include "ephy-bookmarks.h"
#include "ephy-file-helpers.h"
+#include "ephy-embed-shell.h"
#include "ephy-shell.h"
#include "ephy-history.h"
#include "ephy-debug.h"
@@ -310,12 +311,10 @@ compute_lower_fav (EphyNode *favorites, double *score)
{
GPtrArray *children;
int i;
- EphyEmbedShell *embed_shell;
EphyHistory *history;
EphyNode *result = NULL;
- embed_shell = EPHY_EMBED_SHELL (ephy_shell);
- history = ephy_embed_shell_get_global_history (embed_shell);
+ history = EPHY_HISTORY (ephy_embed_shell_get_global_history (embed_shell));
*score = DBL_MAX;
children = ephy_node_get_children (favorites);
@@ -389,11 +388,9 @@ history_site_visited_cb (EphyHistory *gh, const char *url, EphyBookmarks *eb)
static void
ephy_setup_history_notifiers (EphyBookmarks *eb)
{
- EphyEmbedShell *embed_shell;
EphyHistory *history;
- embed_shell = EPHY_EMBED_SHELL (ephy_shell);
- history = ephy_embed_shell_get_global_history (embed_shell);
+ history = EPHY_HISTORY (ephy_embed_shell_get_global_history (embed_shell));
g_signal_connect (history, "visited",
G_CALLBACK (history_site_visited_cb), eb);
diff --git a/src/ephy-completion-model.c b/src/ephy-completion-model.c
index b8f75bce6..651afe882 100644
--- a/src/ephy-completion-model.c
+++ b/src/ephy-completion-model.c
@@ -23,6 +23,7 @@
#include "ephy-completion-model.h"
#include "ephy-node.h"
#include "ephy-shell.h"
+#include "ephy-history.h"
static void ephy_completion_model_class_init (EphyCompletionModelClass *klass);
static void ephy_completion_model_init (EphyCompletionModel *model);
@@ -230,8 +231,7 @@ ephy_completion_model_init (EphyCompletionModel *model)
model->priv = EPHY_COMPLETION_MODEL_GET_PRIVATE (model);
model->priv->stamp = g_random_int ();
- history = ephy_embed_shell_get_global_history
- (EPHY_EMBED_SHELL (ephy_shell));
+ history = EPHY_HISTORY (ephy_embed_shell_get_global_history (embed_shell));
model->priv->history = ephy_history_get_pages (history);
connect_signals (model, model->priv->history);
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index fd450634f..47b51f7c8 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -781,8 +781,8 @@ ephy_shell_get_history_window (EphyShell *shell)
if (shell->priv->history_window == NULL)
{
- history = ephy_embed_shell_get_global_history
- (EPHY_EMBED_SHELL (ephy_shell));
+ history = EPHY_HISTORY
+ (ephy_embed_shell_get_global_history (embed_shell));
g_assert (history != NULL);
shell->priv->history_window = ephy_history_window_new (history);
diff --git a/src/ephy-tab.c b/src/ephy-tab.c
index e40e51207..25c7f0e4e 100644
--- a/src/ephy-tab.c
+++ b/src/ephy-tab.c
@@ -24,7 +24,6 @@
#endif
#include "ephy-tab.h"
-#include "ephy-shell.h"
#include "eel-gconf-extensions.h"
#include "ephy-prefs.h"
#include "ephy-embed-factory.h"
@@ -36,6 +35,9 @@
#include "ephy-zoom.h"
#include "ephy-favicon-cache.h"
#include "ephy-embed-persist.h"
+#include "ephy-history.h"
+#include "ephy-embed-shell.h"
+#include "ephy-shell.h"
#include <glib/gi18n.h>
#include <libgnomevfs/gnome-vfs-uri.h>
@@ -555,8 +557,8 @@ ephy_tab_set_icon_address (EphyTab *tab, const char *address)
if (tab->priv->icon_address)
{
eb = ephy_shell_get_bookmarks (ephy_shell);
- history = ephy_embed_shell_get_global_history
- (EPHY_EMBED_SHELL (ephy_shell));
+ history = EPHY_HISTORY
+ (ephy_embed_shell_get_global_history (embed_shell));
ephy_bookmarks_set_icon (eb, tab->priv->address,
tab->priv->icon_address);
ephy_history_set_icon (history, tab->priv->address,
@@ -613,8 +615,8 @@ ephy_tab_address_cb (EphyEmbed *embed, const char *address, EphyTab *tab)
GValue value = { 0, };
float zoom = 1.0, current_zoom;
- history = ephy_embed_shell_get_global_history
- (EPHY_EMBED_SHELL (ephy_shell));
+ history = EPHY_HISTORY
+ (ephy_embed_shell_get_global_history (embed_shell));
host = ephy_history_get_host (history, address);
if (host != NULL && ephy_node_get_property
@@ -654,8 +656,8 @@ ephy_tab_zoom_changed_cb (EphyEmbed *embed, float zoom, EphyTab *tab)
EphyHistory *history;
EphyNode *host;
GValue value = { 0, };
- history = ephy_embed_shell_get_global_history
- (EPHY_EMBED_SHELL (ephy_shell));
+ history = EPHY_HISTORY
+ (ephy_embed_shell_get_global_history (embed_shell));
host = ephy_history_get_host (history, address);
if (host != NULL)
diff --git a/src/ephy-toolbars-model.c b/src/ephy-toolbars-model.c
index c022b9ba8..8e0c578b4 100755
--- a/src/ephy-toolbars-model.c
+++ b/src/ephy-toolbars-model.c
@@ -23,6 +23,8 @@
#include "ephy-bookmarks.h"
#include "ephy-node-common.h"
#include "ephy-file-helpers.h"
+#include "ephy-history.h"
+#include "ephy-embed-shell.h"
#include "ephy-shell.h"
#include "ephy-debug.h"
#include "ephy-string.h"
@@ -202,7 +204,7 @@ impl_get_item_id (EggToolbarsModel *t,
node = ephy_bookmarks_add (bookmarks, title, netscape_url[URL]);
g_return_val_if_fail (node != NULL, NULL);
- gh = ephy_embed_shell_get_global_history (EPHY_EMBED_SHELL (ephy_shell));
+ gh = EPHY_HISTORY (ephy_embed_shell_get_global_history (embed_shell));
icon = ephy_history_get_icon (gh, netscape_url[URL]);
if (icon)
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index f8d699e59..06d5ea77a 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -441,8 +441,7 @@ setup_font_combo (EphyDialog *dialog,
char key[255];
EphyEmbedSingle *single;
- single = ephy_embed_shell_get_embed_single
- (EPHY_EMBED_SHELL (ephy_shell));
+ single = EPHY_EMBED_SINGLE (ephy_embed_shell_get_embed_single (embed_shell));
fonts = ephy_embed_single_get_font_list (single, code);
g_snprintf (key, 255, "%s_%s_%s", CONF_RENDERING_FONT, type, code);
@@ -1230,9 +1229,7 @@ prefs_clear_cache_button_clicked_cb (GtkWidget *button,
{
EphyEmbedSingle *single;
- single = ephy_embed_shell_get_embed_single
- (EPHY_EMBED_SHELL (ephy_shell));
-
+ single = EPHY_EMBED_SINGLE (ephy_embed_shell_get_embed_single (embed_shell));
ephy_embed_single_clear_cache (single);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 12:11:11 +0800