[epiphany] Remove EphyHistory from the repository. It's unused now.



commit f788322f9acdf3b490e3bba7aaf3c4c8d66f9ffb
Author: Xan Lopez <xan igalia com>
Date:   Tue Mar 20 12:15:09 2012 +0100

    Remove EphyHistory from the repository. It's unused now.

 embed/Makefile.am           |    2 -
 embed/ephy-embed-shell.c    |   27 --
 embed/ephy-embed-shell.h    |    2 -
 embed/ephy-history.c        | 1058 -------------------------------------------
 embed/ephy-history.h        |  134 ------
 embed/ephy-web-view.c       |    8 +-
 src/Makefile.am             |    2 -
 src/ephy-completion-model.c |    3 -
 src/ephy-history-window.h   |    1 -
 9 files changed, 1 insertions(+), 1236 deletions(-)
---
diff --git a/embed/Makefile.am b/embed/Makefile.am
index ddcdb14..4b0ee88 100644
--- a/embed/Makefile.am
+++ b/embed/Makefile.am
@@ -25,7 +25,6 @@ INST_H_FILES = \
 	ephy-embed-single.h		\
 	ephy-embed-shell.h		\
 	ephy-embed-utils.h              \
-	ephy-history.h			\
 	ephy-permission-manager.h       \
 	ephy-web-view.h
 
@@ -46,7 +45,6 @@ libephyembed_la_SOURCES = \
 	ephy-embed-shell.c		\
 	ephy-embed-utils.c              \
 	ephy-encodings.c		\
-	ephy-history.c			\
 	ephy-permission-manager.c	\
 	ephy-request-about.c		\
 	ephy-embed-prefs.c		\
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index 3b521f1..c359afa 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -35,7 +35,6 @@
 #include "ephy-embed-type-builtins.h"
 #include "ephy-encodings.h"
 #include "ephy-file-helpers.h"
-#include "ephy-history.h"
 #include "ephy-history-service.h"
 #include "ephy-print-utils.h"
 
@@ -50,7 +49,6 @@
 
 struct _EphyEmbedShellPrivate
 {
-	EphyHistory *global_history;
 	EphyHistoryService *global_history_service;
 	GList *downloads;
 	EphyEmbedSingle *embed_single;
@@ -129,12 +127,6 @@ ephy_embed_shell_finalize (GObject *object)
 		shell->priv->downloads = NULL;
 	}
 
-	if (shell->priv->global_history)
-	{
-		LOG ("Unref history");
-		g_object_unref (shell->priv->global_history);
-	}
-
 	if (shell->priv->global_history_service)
 	{
 		LOG ("Unref history service");
@@ -158,25 +150,6 @@ ephy_embed_shell_finalize (GObject *object)
 }
 
 /**
- * ephy_embed_shell_get_global_history:
- * @shell: the #EphyEmbedShell
- *
- * Return value: (transfer none):
- **/
-GObject *
-ephy_embed_shell_get_global_history (EphyEmbedShell *shell)
-{
-	g_return_val_if_fail (EPHY_IS_EMBED_SHELL (shell), NULL);
-
-	if (shell->priv->global_history == NULL)
-	{
-		shell->priv->global_history = ephy_history_new ();
-	}
-
-	return G_OBJECT (shell->priv->global_history);
-}
-
-/**
  * ephy_embed_shell_get_global_history_service:
  * @shell: the #EphyEmbedShell
  *
diff --git a/embed/ephy-embed-shell.h b/embed/ephy-embed-shell.h
index 84b507f..97ec38a 100644
--- a/embed/ephy-embed-shell.h
+++ b/embed/ephy-embed-shell.h
@@ -79,8 +79,6 @@ GType		   ephy_embed_shell_get_type		(void);
 
 EphyEmbedShell	  *ephy_embed_shell_get_default		(void);
 
-GObject		  *ephy_embed_shell_get_global_history	(EphyEmbedShell *shell);
-
 GObject		  *ephy_embed_shell_get_global_history_service (EphyEmbedShell *shell);
 
 GObject		  *ephy_embed_shell_get_encodings	(EphyEmbedShell *shell);
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 66c057d..5a5293a 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -33,7 +33,6 @@
 #include "ephy-embed-utils.h"
 #include "ephy-embed.h"
 #include "ephy-file-helpers.h"
-#include "ephy-history.h"
 #include "ephy-history-service.h"
 #include "ephy-permission-manager.h"
 #include "ephy-prefs.h"
@@ -1610,7 +1609,6 @@ _ephy_web_view_set_icon_address (EphyWebView *view,
 {
   GObject *object = G_OBJECT (view);
   EphyWebViewPrivate *priv = view->priv;
-  EphyHistory *history;
 
   if (priv->icon != NULL) {
     g_object_unref (priv->icon);
@@ -1619,12 +1617,8 @@ _ephy_web_view_set_icon_address (EphyWebView *view,
     g_object_notify (object, "icon");
   }
 
-  if (icon_address && priv->address) {
-    history = EPHY_HISTORY (ephy_embed_shell_get_global_history (embed_shell));
-    ephy_history_set_icon (history, priv->address, icon_address);
-
+  if (icon_address && priv->address)
     _ephy_web_view_load_icon (view);
-  }
 }
 
 static void
diff --git a/src/Makefile.am b/src/Makefile.am
index 7ea753b..0d75a29 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -224,7 +224,6 @@ EPHY_GIR_H_FILES = \
 	$(top_srcdir)/embed/ephy-embed-event.h \
 	$(top_srcdir)/embed/ephy-embed-shell.h \
 	$(top_srcdir)/embed/ephy-embed-single.h \
-	$(top_srcdir)/embed/ephy-history.h \
 	$(top_srcdir)/embed/ephy-permission-manager.h \
 	$(top_srcdir)/embed/ephy-web-view.h \
 	$(top_srcdir)/lib/ephy-dialog.h \
@@ -253,7 +252,6 @@ EPHY_GIR_C_FILES = \
 	$(top_srcdir)/embed/ephy-embed-event.c \
 	$(top_srcdir)/embed/ephy-embed-shell.c \
 	$(top_srcdir)/embed/ephy-embed-single.c \
-	$(top_srcdir)/embed/ephy-history.c \
 	$(top_srcdir)/embed/ephy-permission-manager.c \
 	$(top_srcdir)/embed/ephy-web-view.c \
 	$(top_srcdir)/lib/ephy-dialog.c \
diff --git a/src/ephy-completion-model.c b/src/ephy-completion-model.c
index 9b6507e..bea7776 100644
--- a/src/ephy-completion-model.c
+++ b/src/ephy-completion-model.c
@@ -23,7 +23,6 @@
 
 #include "ephy-embed-prefs.h"
 #include "ephy-embed-shell.h"
-#include "ephy-history.h"
 #include "ephy-history-service.h"
 #include "ephy-shell.h"
 
@@ -35,7 +34,6 @@ G_DEFINE_TYPE (EphyCompletionModel, ephy_completion_model, GTK_TYPE_LIST_STORE)
 
 struct _EphyCompletionModelPrivate {
   EphyHistoryService *history_service;
-  EphyHistory *legacy_history_service;
 
   EphyNode *bookmarks;
   GSList *search_terms;
@@ -97,7 +95,6 @@ ephy_completion_model_init (EphyCompletionModel *model)
   model->priv = priv = EPHY_COMPLETION_MODEL_GET_PRIVATE (model);
 
   priv->history_service = EPHY_HISTORY_SERVICE (ephy_embed_shell_get_global_history_service (embed_shell));
-  priv->legacy_history_service = EPHY_HISTORY (ephy_embed_shell_get_global_history (embed_shell));
 
   bookmarks_service = ephy_shell_get_bookmarks (ephy_shell);
   priv->bookmarks = ephy_bookmarks_get_bookmarks (bookmarks_service);
diff --git a/src/ephy-history-window.h b/src/ephy-history-window.h
index 6d7a15a..a5c98f4 100644
--- a/src/ephy-history-window.h
+++ b/src/ephy-history-window.h
@@ -26,7 +26,6 @@
 
 #include <gtk/gtk.h>
 
-#include "ephy-history.h"
 #include "ephy-history-service.h"
 
 G_BEGIN_DECLS



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]