[epiphany/gnome-3-10] Fix build



commit e372e2935ebd9703684a260c584f53f8f3faa4c5
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Sun Sep 7 10:23:58 2014 -0500

    Fix build
    
    Looks like I mishandled a merge conflict?

 src/ephy-shell.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 4e56020..7c43c30 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -596,10 +596,6 @@ ephy_shell_init (EphyShell *shell)
   webkit_web_context_set_favicon_database_directory (web_context, favicon_db_path);
   g_free (favicon_db_path);
 #endif
-
-  shell->priv->search_provider = ephy_search_provider_new ();
-
-  g_application_set_inactivity_timeout (G_APPLICATION (shell), 60 * 1000);
 }
 
 static void


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