ephy-shell: use new HACKING style

2 files changed, 770 insertions, 832 deletions

diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index cbf261a01..797a69adc 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -1,7 +1,8 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2000-2004 Marco Pesenti Gritti
  *  Copyright © 2003, 2004, 2006 Christian Persch
+ *  Copyright © 2011 Igalia S.L.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -62,30 +63,29 @@
 
 #define EPHY_SHELL_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_SHELL, EphyShellPrivate))
 
-struct _EphyShellPrivate
-{
-	EphySession *session;
-	GObject *lockdown;
-	EphyBookmarks *bookmarks;
-	EggToolbarsModel *toolbars_model;
-	EggToolbarsModel *fs_toolbars_model;
-	EphyExtensionsManager *extensions_manager;
-	EphyNetworkManager *nm_proxy;
-	GtkWidget *bme;
-	GtkWidget *history_window;
-	GObject *pdm_dialog;
-	GObject *prefs_dialog;
-	GList *del_on_exit;
-	EphyShellStartupContext *startup_context;
-	guint embed_single_connected : 1;
+struct _EphyShellPrivate {
+  EphySession *session;
+  GObject *lockdown;
+  EphyBookmarks *bookmarks;
+  EggToolbarsModel *toolbars_model;
+  EggToolbarsModel *fs_toolbars_model;
+  EphyExtensionsManager *extensions_manager;
+  EphyNetworkManager *nm_proxy;
+  GtkWidget *bme;
+  GtkWidget *history_window;
+  GObject *pdm_dialog;
+  GObject *prefs_dialog;
+  GList *del_on_exit;
+  EphyShellStartupContext *startup_context;
+  guint embed_single_connected : 1;
 };
 
 EphyShell *ephy_shell = NULL;
 
-static void ephy_shell_class_init	(EphyShellClass *klass);
-static void ephy_shell_init		(EphyShell *shell);
-static void ephy_shell_dispose		(GObject *object);
-static void ephy_shell_finalize		(GObject *object);
+static void ephy_shell_class_init (EphyShellClass *klass);
+static void ephy_shell_init   (EphyShell *shell);
+static void ephy_shell_dispose    (GObject *object);
+static void ephy_shell_finalize   (GObject *object);
 static GObject *impl_get_embed_single   (EphyEmbedShell *embed_shell);
 
 G_DEFINE_TYPE (EphyShell, ephy_shell, EPHY_TYPE_EMBED_SHELL)
@@ -105,73 +105,72 @@ G_DEFINE_TYPE (EphyShell, ephy_shell, EPHY_TYPE_EMBED_SHELL)
  **/
 EphyShellStartupContext *
 ephy_shell_startup_context_new (EphyStartupFlags startup_flags,
-				char *bookmarks_filename,
-				char *session_filename,
-				char *bookmark_url,
-				char **arguments,
-				guint32 user_time)
+                                char *bookmarks_filename,
+                                char *session_filename,
+                                char *bookmark_url,
+                                char **arguments,
+                                guint32 user_time)
 {
-	EphyShellStartupContext *ctx = g_slice_new0 (EphyShellStartupContext);
-	
-	ctx->startup_flags = startup_flags;
-	
-	ctx->bookmarks_filename = g_strdup (bookmarks_filename);
-	ctx->session_filename = g_strdup (session_filename);
-	ctx->bookmark_url = g_strdup (bookmark_url);
+  EphyShellStartupContext *ctx = g_slice_new0 (EphyShellStartupContext);
+  
+  ctx->startup_flags = startup_flags;
+  
+  ctx->bookmarks_filename = g_strdup (bookmarks_filename);
+  ctx->session_filename = g_strdup (session_filename);
+  ctx->bookmark_url = g_strdup (bookmark_url);
+  
+  ctx->arguments = g_strdupv (arguments);
   
-	ctx->arguments = g_strdupv (arguments);
-	
-	ctx->user_time = user_time;
+  ctx->user_time = user_time;
   
-	return ctx;
+  return ctx;
 }
 
 static void
 queue_commands (EphyShell *shell)
 {
-	EphyShellStartupContext *ctx;
-	EphySession *session;
-
-	session = EPHY_SESSION (ephy_shell_get_session (shell));
-	g_assert (session != NULL);
-
-	ctx = shell->priv->startup_context;
-
-	/* We only get here when starting a new instance, so we first need
-	   to autoresume! */
-	ephy_session_queue_command (session,
-		EPHY_SESSION_CMD_RESUME_SESSION,
-		NULL, NULL, ctx->user_time, TRUE);
-
-	if (ctx->startup_flags & EPHY_STARTUP_BOOKMARKS_EDITOR)
-		ephy_session_queue_command (session,
-					    EPHY_SESSION_CMD_OPEN_BOOKMARKS_EDITOR,
-					    NULL, NULL, ctx->user_time, FALSE);
-	else if (ctx->session_filename != NULL)
-		ephy_session_queue_command (session,
-					    EPHY_SESSION_CMD_LOAD_SESSION,
-					    (const char *)ctx->session_filename, NULL,
-					    ctx->user_time, FALSE);
-	else if (ctx->arguments != NULL)
-	{
-		/* Don't queue any window openings if no extra arguments given, */
-		/* since session autoresume will open one for us. */
-		GString *options;
-
-		options = g_string_sized_new (64);
-
-		if (ctx->startup_flags & EPHY_STARTUP_NEW_WINDOW)
-			g_string_append (options, "new-window,");
-
-		if (ctx->startup_flags & EPHY_STARTUP_NEW_TAB)
-			g_string_append (options, "new-tab,external,");
-
-		ephy_session_queue_command (session,
-					    EPHY_SESSION_CMD_OPEN_URIS,
-					    (const char*)options->str,
-					    (const char **)ctx->arguments,
-					    ctx->user_time, FALSE);
-	}
+  EphyShellStartupContext *ctx;
+  EphySession *session;
+
+  session = EPHY_SESSION (ephy_shell_get_session (shell));
+  g_assert (session != NULL);
+
+  ctx = shell->priv->startup_context;
+
+  /* We only get here when starting a new instance, so we first need
+     to autoresume! */
+  ephy_session_queue_command (session,
+                              EPHY_SESSION_CMD_RESUME_SESSION,
+                              NULL, NULL, ctx->user_time, TRUE);
+
+  if (ctx->startup_flags & EPHY_STARTUP_BOOKMARKS_EDITOR)
+    ephy_session_queue_command (session,
+                                EPHY_SESSION_CMD_OPEN_BOOKMARKS_EDITOR,
+                                NULL, NULL, ctx->user_time, FALSE);
+  else if (ctx->session_filename != NULL)
+    ephy_session_queue_command (session,
+                                EPHY_SESSION_CMD_LOAD_SESSION,
+                                (const char *)ctx->session_filename, NULL,
+                                ctx->user_time, FALSE);
+  else if (ctx->arguments != NULL) {
+    /* Don't queue any window openings if no extra arguments given, */
+    /* since session autoresume will open one for us. */
+    GString *options;
+
+    options = g_string_sized_new (64);
+
+    if (ctx->startup_flags & EPHY_STARTUP_NEW_WINDOW)
+      g_string_append (options, "new-window,");
+
+    if (ctx->startup_flags & EPHY_STARTUP_NEW_TAB)
+      g_string_append (options, "new-tab,external,");
+
+    ephy_session_queue_command (session,
+                                EPHY_SESSION_CMD_OPEN_URIS,
+                                (const char*)options->str,
+                                (const char **)ctx->arguments,
+                                ctx->user_time, FALSE);
+  }
 }
 
 static void
@@ -181,32 +180,30 @@ ephy_shell_startup (GApplication* application)
   /* Migrate profile if we are not running a private instance */
   /* TODO: we want to migrate each WebApp profile too */
   if (ephy_embed_shell_get_mode (EPHY_EMBED_SHELL (application)) == EPHY_EMBED_SHELL_MODE_BROWSER &&
-      ephy_profile_utils_get_migration_version () < EPHY_PROFILE_MIGRATION_VERSION)
-  {
-	  GError *error = NULL;
-	  char *argv[1] = { "ephy-profile-migrator" };
-	  char *envp[1] = { "EPHY_LOG_MODULES=ephy-profile" };
-	  
-	  g_spawn_sync (NULL, argv, envp, G_SPAWN_SEARCH_PATH,
-			NULL, NULL, NULL, NULL,
-			NULL, &error);
-
-	  if (error)
-	  {
-		  LOG ("Failed to run migrator: %s", error->message);
-		  g_error_free (error);
-	 }
+      ephy_profile_utils_get_migration_version () < EPHY_PROFILE_MIGRATION_VERSION) {
+    GError *error = NULL;
+    char *argv[1] = { "ephy-profile-migrator" };
+    char *envp[1] = { "EPHY_LOG_MODULES=ephy-profile" };
+    
+    g_spawn_sync (NULL, argv, envp, G_SPAWN_SEARCH_PATH,
+                  NULL, NULL, NULL, NULL,
+                  NULL, &error);
+
+    if (error) {
+      LOG ("Failed to run migrator: %s", error->message);
+      g_error_free (error);
+    }
   }
 }
 
 static void
 ephy_shell_activate (GApplication *application)
 {
-	/*
-	 * We get here on each new instance (remote or not). Queue the
-	 * commands.
-	 */
-	queue_commands (EPHY_SHELL (application));
+  /*
+   * We get here on each new instance (remote or not). Queue the
+   * commands.
+   */
+  queue_commands (EPHY_SHELL (application));
 }
 
 /*
@@ -214,394 +211,373 @@ ephy_shell_activate (GApplication *application)
  * dictionary variant that is sent from the remote to the primary
  * instance.
  */
-typedef enum
-{
-	CTX_STARTUP_FLAGS,
-	CTX_BOOKMARKS_FILENAME,
-	CTX_SESSION_FILENAME,
-	CTX_BOOKMARK_URL,
-	CTX_ARGUMENTS,
-	CTX_USER_TIME
+typedef enum {
+  CTX_STARTUP_FLAGS,
+  CTX_BOOKMARKS_FILENAME,
+  CTX_SESSION_FILENAME,
+  CTX_BOOKMARK_URL,
+  CTX_ARGUMENTS,
+  CTX_USER_TIME
 } CtxEnum;
 
 static void
 ephy_shell_add_platform_data (GApplication *application,
-			      GVariantBuilder *builder)
+                              GVariantBuilder *builder)
 {
-	EphyShell *app;
-	EphyShellStartupContext *ctx;
-	GVariantBuilder *ctx_builder;
-
-	app = EPHY_SHELL (application);
-
-	G_APPLICATION_CLASS (ephy_shell_parent_class)->add_platform_data (application,
-                                                                          builder);
-
-	if (app->priv->startup_context)
-	{
-		/*
-		 * We create an array variant that contains only the elements in
-		 * ctx that are non-NULL.
-		 */
-		ctx_builder = g_variant_builder_new (G_VARIANT_TYPE_ARRAY);
-		ctx = app->priv->startup_context;
-		
-		if (ctx->startup_flags)
-			g_variant_builder_add (ctx_builder, "{iv}",
-					       CTX_STARTUP_FLAGS,
-					       g_variant_new_byte (ctx->startup_flags));
-		
-		if (ctx->bookmarks_filename)
-			g_variant_builder_add (ctx_builder, "{iv}",
-					       CTX_BOOKMARKS_FILENAME,
-					       g_variant_new_string (ctx->bookmarks_filename));
-		
-		if (ctx->session_filename)
-			g_variant_builder_add (ctx_builder, "{iv}",
-					       CTX_SESSION_FILENAME,
-					       g_variant_new_string (ctx->session_filename));
-		
-		if (ctx->bookmark_url)
-			g_variant_builder_add (ctx_builder, "{iv}",
-					       CTX_BOOKMARK_URL,
-					       g_variant_new_string (ctx->bookmark_url));
-		
-		if (ctx->arguments)
-			g_variant_builder_add (ctx_builder, "{iv}",
-					       CTX_ARGUMENTS,
-					       g_variant_new_strv ((const gchar * const *)ctx->arguments, -1));
-		
-		g_variant_builder_add (ctx_builder, "{iv}",
-				       CTX_USER_TIME,
-				       g_variant_new_uint32 (ctx->user_time));
-		
-		g_variant_builder_add (builder, "{sv}",
-				       "ephy-shell-startup-context",
-				       g_variant_builder_end (ctx_builder));
-		
-		g_variant_builder_unref (ctx_builder);
-	}
+  EphyShell *app;
+  EphyShellStartupContext *ctx;
+  GVariantBuilder *ctx_builder;
+
+  app = EPHY_SHELL (application);
+
+  G_APPLICATION_CLASS (ephy_shell_parent_class)->add_platform_data (application,
+                                                                    builder);
+
+  if (app->priv->startup_context) {
+    /*
+     * We create an array variant that contains only the elements in
+     * ctx that are non-NULL.
+     */
+    ctx_builder = g_variant_builder_new (G_VARIANT_TYPE_ARRAY);
+    ctx = app->priv->startup_context;
+    
+    if (ctx->startup_flags)
+      g_variant_builder_add (ctx_builder, "{iv}",
+                             CTX_STARTUP_FLAGS,
+                             g_variant_new_byte (ctx->startup_flags));
+    
+    if (ctx->bookmarks_filename)
+      g_variant_builder_add (ctx_builder, "{iv}",
+                             CTX_BOOKMARKS_FILENAME,
+                             g_variant_new_string (ctx->bookmarks_filename));
+    
+    if (ctx->session_filename)
+      g_variant_builder_add (ctx_builder, "{iv}",
+                             CTX_SESSION_FILENAME,
+                             g_variant_new_string (ctx->session_filename));
+    
+    if (ctx->bookmark_url)
+      g_variant_builder_add (ctx_builder, "{iv}",
+                             CTX_BOOKMARK_URL,
+                             g_variant_new_string (ctx->bookmark_url));
+    
+    if (ctx->arguments)
+      g_variant_builder_add (ctx_builder, "{iv}",
+                             CTX_ARGUMENTS,
+                             g_variant_new_strv ((const gchar * const *)ctx->arguments, -1));
+    
+    g_variant_builder_add (ctx_builder, "{iv}",
+                           CTX_USER_TIME,
+                           g_variant_new_uint32 (ctx->user_time));
+    
+    g_variant_builder_add (builder, "{sv}",
+                           "ephy-shell-startup-context",
+                           g_variant_builder_end (ctx_builder));
+    
+    g_variant_builder_unref (ctx_builder);
+  }
 }
 
 static void
 ephy_shell_free_startup_context (EphyShell *shell)
 {
-	EphyShellStartupContext *ctx = shell->priv->startup_context;
+  EphyShellStartupContext *ctx = shell->priv->startup_context;
 
-	g_assert (ctx != NULL);
+  g_assert (ctx != NULL);
 
-	g_free (ctx->bookmarks_filename);
-	g_free (ctx->session_filename);
-	g_free (ctx->bookmark_url);
+  g_free (ctx->bookmarks_filename);
+  g_free (ctx->session_filename);
+  g_free (ctx->bookmark_url);
 
-	g_strfreev (ctx->arguments);
+  g_strfreev (ctx->arguments);
 
-	g_slice_free (EphyShellStartupContext, ctx);
+  g_slice_free (EphyShellStartupContext, ctx);
 
-	shell->priv->startup_context = NULL;
+  shell->priv->startup_context = NULL;
 }
 
 static void
 ephy_shell_before_emit (GApplication *application,
-			GVariant *platform_data)
+                        GVariant *platform_data)
 {
-	GVariantIter iter, ctx_iter;
-	const char *key;
-	CtxEnum ctx_key;
-	GVariant *value, *ctx_value;
-	EphyShellStartupContext *ctx = NULL;
-
-	EphyShell *shell = EPHY_SHELL (application);
-
-	g_variant_iter_init (&iter, platform_data);
-	while (g_variant_iter_loop (&iter, "{&sv}", &key, &value))
-	{
-		if (strcmp (key, "ephy-shell-startup-context") == 0)
-		{
-			ctx = g_slice_new0 (EphyShellStartupContext);
-
-			/*
-			 * Iterate over the startup context variant and fill the members
-			 * that were wired. Everything else is just NULL.
-			 */
-			g_variant_iter_init (&ctx_iter, value);
-			while (g_variant_iter_loop (&ctx_iter, "{iv}", &ctx_key, &ctx_value))
-			{
-				switch (ctx_key)
-				{
-				case CTX_STARTUP_FLAGS:
-					ctx->startup_flags = g_variant_get_byte (ctx_value);
-					break;
-				case CTX_BOOKMARKS_FILENAME:
-					ctx->bookmarks_filename = g_variant_dup_string (ctx_value, NULL);
-					break;
-				case CTX_SESSION_FILENAME:
-					ctx->session_filename = g_variant_dup_string (ctx_value, NULL);
-					break;
-				case CTX_BOOKMARK_URL:
-					ctx->bookmark_url = g_variant_dup_string (ctx_value, NULL);
-					break;
-				case CTX_ARGUMENTS:
-					ctx->arguments = g_variant_dup_strv (ctx_value, NULL);
-					break;
-				case CTX_USER_TIME:
-					ctx->user_time = g_variant_get_uint32 (ctx_value);
-					break;
-				default:
-					g_assert_not_reached ();
-					break;
-				}
-			}
-		}
-	}
-
-	if (shell->priv->startup_context)
-		ephy_shell_free_startup_context (shell);
-	shell->priv->startup_context = ctx;
-
-	G_APPLICATION_CLASS (ephy_shell_parent_class)->before_emit (application,
-								    platform_data);
+  GVariantIter iter, ctx_iter;
+  const char *key;
+  CtxEnum ctx_key;
+  GVariant *value, *ctx_value;
+  EphyShellStartupContext *ctx = NULL;
+
+  EphyShell *shell = EPHY_SHELL (application);
+
+  g_variant_iter_init (&iter, platform_data);
+  while (g_variant_iter_loop (&iter, "{&sv}", &key, &value)) {
+    if (strcmp (key, "ephy-shell-startup-context") == 0) {
+      ctx = g_slice_new0 (EphyShellStartupContext);
+
+      /*
+       * Iterate over the startup context variant and fill the members
+       * that were wired. Everything else is just NULL.
+       */
+      g_variant_iter_init (&ctx_iter, value);
+      while (g_variant_iter_loop (&ctx_iter, "{iv}", &ctx_key, &ctx_value)) {
+        switch (ctx_key) {
+        case CTX_STARTUP_FLAGS:
+          ctx->startup_flags = g_variant_get_byte (ctx_value);
+          break;
+        case CTX_BOOKMARKS_FILENAME:
+          ctx->bookmarks_filename = g_variant_dup_string (ctx_value, NULL);
+          break;
+        case CTX_SESSION_FILENAME:
+          ctx->session_filename = g_variant_dup_string (ctx_value, NULL);
+          break;
+        case CTX_BOOKMARK_URL:
+          ctx->bookmark_url = g_variant_dup_string (ctx_value, NULL);
+          break;
+        case CTX_ARGUMENTS:
+          ctx->arguments = g_variant_dup_strv (ctx_value, NULL);
+          break;
+        case CTX_USER_TIME:
+          ctx->user_time = g_variant_get_uint32 (ctx_value);
+          break;
+        default:
+          g_assert_not_reached ();
+          break;
+        }
+      }
+    }
+  }
+  
+  if (shell->priv->startup_context)
+    ephy_shell_free_startup_context (shell);
+  shell->priv->startup_context = ctx;
+
+  G_APPLICATION_CLASS (ephy_shell_parent_class)->before_emit (application,
+                                                              platform_data);
 }
 
 static void
 ephy_shell_constructed (GObject *object)
 {
-	if (ephy_embed_shell_get_mode (EPHY_EMBED_SHELL (object)) != EPHY_EMBED_SHELL_MODE_BROWSER)
-	{
-		GApplicationFlags flags;
-
-		flags = g_application_get_flags (G_APPLICATION (object));
-		flags |= G_APPLICATION_NON_UNIQUE;
-		g_application_set_flags (G_APPLICATION (object), flags);
-	}
-
-	if (G_OBJECT_CLASS (ephy_shell_parent_class)->constructed)
-		G_OBJECT_CLASS (ephy_shell_parent_class)->constructed (object);
+  if (ephy_embed_shell_get_mode (EPHY_EMBED_SHELL (object)) != EPHY_EMBED_SHELL_MODE_BROWSER) {
+    GApplicationFlags flags;
+    
+    flags = g_application_get_flags (G_APPLICATION (object));
+    flags |= G_APPLICATION_NON_UNIQUE;
+    g_application_set_flags (G_APPLICATION (object), flags);
+  }
+  
+  if (G_OBJECT_CLASS (ephy_shell_parent_class)->constructed)
+    G_OBJECT_CLASS (ephy_shell_parent_class)->constructed (object);
 }
 
 static void
 ephy_shell_class_init (EphyShellClass *klass)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	GApplicationClass *application_class = G_APPLICATION_CLASS (klass);
-	EphyEmbedShellClass *embed_shell_class = EPHY_EMBED_SHELL_CLASS (klass);
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GApplicationClass *application_class = G_APPLICATION_CLASS (klass);
+  EphyEmbedShellClass *embed_shell_class = EPHY_EMBED_SHELL_CLASS (klass);
 
-	object_class->dispose = ephy_shell_dispose;
-	object_class->finalize = ephy_shell_finalize;
-	object_class->constructed = ephy_shell_constructed;
+  object_class->dispose = ephy_shell_dispose;
+  object_class->finalize = ephy_shell_finalize;
+  object_class->constructed = ephy_shell_constructed;
 
-	application_class->startup = ephy_shell_startup;
-	application_class->activate = ephy_shell_activate;
-	application_class->before_emit = ephy_shell_before_emit;
-	application_class->add_platform_data = ephy_shell_add_platform_data;
+  application_class->startup = ephy_shell_startup;
+  application_class->activate = ephy_shell_activate;
+  application_class->before_emit = ephy_shell_before_emit;
+  application_class->add_platform_data = ephy_shell_add_platform_data;
 
-	embed_shell_class->get_embed_single = impl_get_embed_single;
+  embed_shell_class->get_embed_single = impl_get_embed_single;
 
-	g_type_class_add_private (object_class, sizeof(EphyShellPrivate));
+  g_type_class_add_private (object_class, sizeof(EphyShellPrivate));
 }
 
 static EphyEmbed *
 ephy_shell_new_window_cb (EphyEmbedSingle *single,
-			  EphyEmbed *parent_embed,
-			  EphyWebViewChrome chromemask,
-			  EphyShell *shell)
+                          EphyEmbed *parent_embed,
+                          EphyWebViewChrome chromemask,
+                          EphyShell *shell)
 {
-	GtkWidget *parent = NULL;
-	gboolean is_popup;
-	EphyNewTabFlags flags = EPHY_NEW_TAB_DONT_SHOW_WINDOW |
-				EPHY_NEW_TAB_APPEND_LAST |
-				EPHY_NEW_TAB_IN_NEW_WINDOW |
-				EPHY_NEW_TAB_JUMP;
-
-	LOG ("ephy_shell_new_window_cb tab chrome %d", chromemask);
-
-	if (g_settings_get_boolean (EPHY_SETTINGS_LOCKDOWN,
-				    EPHY_PREFS_LOCKDOWN_JAVASCRIPT_CHROME))
-	{
-		chromemask = EPHY_WEB_VIEW_CHROME_ALL;
-	}
-
-	if (parent_embed != NULL)
-	{
-		/* this will either be a EphyWindow, or the embed itself
-		 * (in case it's about to be destroyed, which means it's already
-		 * removed from its tab)
-		 */
-		parent = gtk_widget_get_toplevel (GTK_WIDGET (parent_embed));
-	}
-
-	/* what's a popup ? ATM, any window opened with menubar toggled on 
-   	 * is *not* a popup 
-	 */
-	is_popup = (chromemask & EPHY_WEB_VIEW_CHROME_MENUBAR) == 0;
-
-	return ephy_shell_new_tab_full
-		(shell,
-		 EPHY_IS_WINDOW (parent) ? EPHY_WINDOW (parent) : NULL,
-		 NULL, NULL, flags, chromemask, is_popup, 0);
+  GtkWidget *parent = NULL;
+  gboolean is_popup;
+  EphyNewTabFlags flags = EPHY_NEW_TAB_DONT_SHOW_WINDOW |
+    EPHY_NEW_TAB_APPEND_LAST |
+    EPHY_NEW_TAB_IN_NEW_WINDOW |
+    EPHY_NEW_TAB_JUMP;
+
+  LOG ("ephy_shell_new_window_cb tab chrome %d", chromemask);
+
+  if (g_settings_get_boolean (EPHY_SETTINGS_LOCKDOWN,
+                              EPHY_PREFS_LOCKDOWN_JAVASCRIPT_CHROME)) {
+    chromemask = EPHY_WEB_VIEW_CHROME_ALL;
+  }
+
+  if (parent_embed != NULL) {
+    /* this will either be a EphyWindow, or the embed itself
+     * (in case it's about to be destroyed, which means it's already
+     * removed from its tab)
+     */
+    parent = gtk_widget_get_toplevel (GTK_WIDGET (parent_embed));
+  }
+  
+  /* what's a popup ? ATM, any window opened with menubar toggled on 
+   * is *not* a popup 
+   */
+  is_popup = (chromemask & EPHY_WEB_VIEW_CHROME_MENUBAR) == 0;
+
+  return ephy_shell_new_tab_full
+    (shell,
+     EPHY_IS_WINDOW (parent) ? EPHY_WINDOW (parent) : NULL,
+     NULL, NULL, flags, chromemask, is_popup, 0);
 }
 
 static void
 ephy_shell_sync_network_status (EphyNetworkManager *nm_proxy,
-				NMState state,
-				EphyShell *shell)
+                                NMState state,
+                                EphyShell *shell)
 {
-	EphyShellPrivate *priv = shell->priv;
-	EphyEmbedSingle *single;
-	gboolean net_status;
+  EphyShellPrivate *priv = shell->priv;
+  EphyEmbedSingle *single;
+  gboolean net_status;
 
-	if (!priv->embed_single_connected) return;
+  if (!priv->embed_single_connected) return;
 
-	single = EPHY_EMBED_SINGLE (ephy_embed_shell_get_embed_single (EPHY_EMBED_SHELL (shell)));
+  single = EPHY_EMBED_SINGLE (ephy_embed_shell_get_embed_single (EPHY_EMBED_SHELL (shell)));
 
-	net_status = state == NM_STATE_CONNECTED_GLOBAL;
-	ephy_embed_single_set_network_status (single, net_status);
+  net_status = state == NM_STATE_CONNECTED_GLOBAL;
+  ephy_embed_single_set_network_status (single, net_status);
 }
 
 static GObject*
 impl_get_embed_single (EphyEmbedShell *embed_shell)
 {
-	EphyShell *shell = EPHY_SHELL (embed_shell);
-	EphyShellPrivate *priv = shell->priv;
-	GObject *embed_single;
-
-	embed_single = EPHY_EMBED_SHELL_CLASS (ephy_shell_parent_class)->get_embed_single (embed_shell);
-
-	if (embed_single != NULL &&
-	    priv->embed_single_connected == FALSE)
-	{
-		g_signal_connect_object (embed_single, "new-window",
-					 G_CALLBACK (ephy_shell_new_window_cb),
-					 shell, G_CONNECT_AFTER);
-
-		priv->embed_single_connected = TRUE;
-
-		/* Now we need the net monitor */
-		ephy_shell_get_net_monitor (shell);
-		ephy_shell_sync_network_status (priv->nm_proxy,
-						ephy_network_manager_get_state (priv->nm_proxy),
-						shell);
-	}
-	
-	return embed_single;
+  EphyShell *shell = EPHY_SHELL (embed_shell);
+  EphyShellPrivate *priv = shell->priv;
+  GObject *embed_single;
+
+  embed_single = EPHY_EMBED_SHELL_CLASS (ephy_shell_parent_class)->get_embed_single (embed_shell);
+
+  if (embed_single != NULL &&
+      priv->embed_single_connected == FALSE) {
+    g_signal_connect_object (embed_single, "new-window",
+                             G_CALLBACK (ephy_shell_new_window_cb),
+                             shell, G_CONNECT_AFTER);
+
+    priv->embed_single_connected = TRUE;
+
+    /* Now we need the net monitor   */
+    ephy_shell_get_net_monitor (shell);
+    ephy_shell_sync_network_status (priv->nm_proxy,
+                                    ephy_network_manager_get_state (priv->nm_proxy),
+                                    shell);
+  }
+  
+  return embed_single;
 }
 
 static void
 ephy_shell_init (EphyShell *shell)
 {
-	EphyShell **ptr = &ephy_shell;
+  EphyShell **ptr = &ephy_shell;
 
-	shell->priv = EPHY_SHELL_GET_PRIVATE (shell);
+  shell->priv = EPHY_SHELL_GET_PRIVATE (shell);
 
-	/* globally accessible singleton */
-	g_assert (ephy_shell == NULL);
-	ephy_shell = shell;
-	g_object_add_weak_pointer (G_OBJECT(ephy_shell),
-				   (gpointer *)ptr);
+  /* globally accessible singleton */
+  g_assert (ephy_shell == NULL);
+  ephy_shell = shell;
+  g_object_add_weak_pointer (G_OBJECT(ephy_shell),
+                             (gpointer *)ptr);
 }
 
 static void
 ephy_shell_dispose (GObject *object)
 {
-	EphyShell *shell = EPHY_SHELL (object);
-	EphyShellPrivate *priv = shell->priv;
-
-	LOG ("EphyShell disposing");
-
-	if (shell->priv->extensions_manager != NULL)
-	{
-		LOG ("Unref extension manager");
-		/* this will unload the extensions */
-		g_object_unref (priv->extensions_manager);
-		priv->extensions_manager = NULL;
-	}
-
-	if (priv->session != NULL)
-	{
-		LOG ("Unref session manager");
-		g_object_unref (priv->session);
-		priv->session = NULL;
-	}
-
-	if (priv->lockdown != NULL)
-	{
-		LOG ("Unref lockdown controller");
-		g_object_unref (priv->lockdown);
-		priv->lockdown = NULL;
-	}
-
-	if (priv->toolbars_model != NULL)
-	{
-		LOG ("Unref toolbars model");
-		g_object_unref (priv->toolbars_model);
-		priv->toolbars_model = NULL;
-	}
-
-	if (priv->fs_toolbars_model != NULL)
-	{
-		LOG ("Unref fullscreen toolbars model");
-		g_object_unref (priv->fs_toolbars_model);
-		priv->fs_toolbars_model = NULL;
-	}
-
-	if (priv->bme != NULL)
-	{
-		LOG ("Unref Bookmarks Editor");
-		gtk_widget_destroy (GTK_WIDGET (priv->bme));
-		priv->bme = NULL;
-	}
-
-	if (priv->history_window != NULL)
-	{
-		LOG ("Unref History Window");
-		gtk_widget_destroy (GTK_WIDGET (priv->history_window));
-		priv->history_window = NULL;
-	}
-
-	if (priv->pdm_dialog != NULL)
-	{
-		LOG ("Unref PDM Dialog");
-		g_object_unref (priv->pdm_dialog);
-		priv->pdm_dialog = NULL;
-	}
-
-	if (priv->prefs_dialog != NULL)
-	{
-		LOG ("Unref prefs dialog");
-		g_object_unref (priv->prefs_dialog);
-		priv->prefs_dialog = NULL;
-	}
-
-	if (priv->bookmarks != NULL)
-	{
-		LOG ("Unref bookmarks");
-		g_object_unref (priv->bookmarks);
-		priv->bookmarks = NULL;
-	}
-
-	if (priv->nm_proxy != NULL)
-	{
-		LOG ("Unref net monitor");
-		g_signal_handlers_disconnect_by_func
-			(priv->nm_proxy, G_CALLBACK (ephy_shell_sync_network_status), shell);
-		g_object_unref (priv->nm_proxy);
-		priv->nm_proxy = NULL;
-	}
-
-	G_OBJECT_CLASS (ephy_shell_parent_class)->dispose (object);
+  EphyShell *shell = EPHY_SHELL (object);
+  EphyShellPrivate *priv = shell->priv;
+
+  LOG ("EphyShell disposing");
+
+  if (shell->priv->extensions_manager != NULL) {
+    LOG ("Unref extension manager");
+    /* this will unload the extens  ions */
+    g_object_unref (priv->extensions_manager);
+    priv->extensions_manager = NULL;
+  }
+  
+  if (priv->session != NULL) {
+    LOG ("Unref session ma  nager");
+    g_object_unref (priv->session);
+    priv->session = NULL;
+  }
+
+  if (priv->lockdown != NULL) {
+    LOG ("Unref lockdown co ntroller");
+    g_object_unref (priv->lockdown);
+    priv->lockdown = NULL;
+  }
+
+  if (priv->toolbars_model != NULL) {
+    LOG ("Unref toolbars model");
+    g_object_unref (priv->toolbars_model);
+    priv->toolbars_model = NULL;
+  }
+  
+  if (priv->fs_toolbars_model != NULL) {
+    LOG ("Unref fullscreen toolbars   model");
+    g_object_unref (priv->fs_toolbars_model);
+    priv->fs_toolbars_model = NULL;
+  }
+
+  if (priv->bme != NULL) {
+    LOG ("Unref Bookma  rks Editor");
+    gtk_widget_destroy (GTK_WIDGET (priv->bme));
+    priv->bme = NULL;
+  }
+  
+  if (priv->history_window != NULL) {
+    LOG ("Unref History Window");
+    gtk_widget_destroy (GTK_WIDGET (priv->history_window));
+    priv->history_window = NULL;
+  }
+
+  if (priv->pdm_dialog != NULL) {
+    LOG ("Unref PDM Dialog");
+    g_object_unref (priv->pdm_dialog);
+    priv->pdm_dialog = NULL;
+  }
+
+  if (priv->prefs_dialog != NULL) {
+    LOG ("Unref prefs dialog");
+    g_object_unref (priv->prefs_dialog);
+    priv->prefs_dialog = NULL;
+  }
+  
+  if (priv->bookmarks != NULL) {
+    LOG ("Unref bookmarks");
+    g_object_unref (priv->bookmarks);
+    priv->bookmarks = NULL;
+  }
+
+  if (priv->nm_proxy != NULL) {
+    LOG ("Unref net monitor ");
+    g_signal_handlers_disconnect_by_func
+      (priv->nm_proxy, G_CALLBACK (ephy_shell_sync_network_status), shell);
+    g_object_unref (priv->nm_proxy);
+    priv->nm_proxy = NULL;
+  }
+
+  G_OBJECT_CLASS (ephy_shell_parent_class)->dispose (object);
 }
 
 static void
 ephy_shell_finalize (GObject *object)
 {
-	EphyShell *shell = EPHY_SHELL (object);
+  EphyShell *shell = EPHY_SHELL (object);
 
-	if (shell->priv->startup_context)
-		ephy_shell_free_startup_context (shell);
+  if (shell->priv->startup_context)
+    ephy_shell_free_startup_context (shell);
 
-	G_OBJECT_CLASS (ephy_shell_parent_class)->finalize (object);
+  G_OBJECT_CLASS (ephy_shell_parent_class)->finalize (object);
 
-	LOG ("Ephy shell finalised");
+  LOG ("Ephy shell finalised");
 }
 
 /**
@@ -614,7 +590,7 @@ ephy_shell_finalize (GObject *object)
 EphyShell *
 ephy_shell_get_default (void)
 {
-	return ephy_shell;
+  return ephy_shell;
 }
 
 /**
@@ -634,139 +610,122 @@ ephy_shell_get_default (void)
  **/
 EphyEmbed *
 ephy_shell_new_tab_full (EphyShell *shell,
-			 EphyWindow *parent_window,
-			 EphyEmbed *previous_embed,
-			 WebKitNetworkRequest *request,
-			 EphyNewTabFlags flags,
-			 EphyWebViewChrome chrome,
-			 gboolean is_popup,
-			 guint32 user_time)
+                         EphyWindow *parent_window,
+                         EphyEmbed *previous_embed,
+                         WebKitNetworkRequest *request,
+                         EphyNewTabFlags flags,
+                         EphyWebViewChrome chrome,
+                         gboolean is_popup,
+                         guint32 user_time)
 {
-	EphyWindow *window;
-	EphyEmbed *embed = NULL;
-	gboolean in_new_window = TRUE;
-	gboolean open_page = FALSE;
-	gboolean jump_to;
-	gboolean active_is_blank = FALSE;
-	gboolean copy_history = TRUE;
-	GtkWidget *nb;
-	int position = -1;
-	gboolean is_empty = FALSE;
-	EphyToolbar *toolbar;
-
-	if (flags & EPHY_NEW_TAB_OPEN_PAGE) open_page = TRUE;
-	if (flags & EPHY_NEW_TAB_IN_NEW_WINDOW) in_new_window = TRUE;
-	if (flags & EPHY_NEW_TAB_IN_EXISTING_WINDOW) in_new_window = FALSE;
-	if (flags & EPHY_NEW_TAB_DONT_COPY_HISTORY) copy_history = FALSE;
-
-	in_new_window = in_new_window &&
-			!g_settings_get_boolean
-					(EPHY_SETTINGS_LOCKDOWN,
-					 EPHY_PREFS_LOCKDOWN_FULLSCREEN);
-	g_return_val_if_fail (open_page == (gboolean)(request != NULL), NULL);
-
-	jump_to = (flags & EPHY_NEW_TAB_JUMP) != 0;
-
-	LOG ("Opening new tab parent-window %p parent-embed %p in-new-window:%s jump-to:%s",
-	     parent_window, previous_embed, in_new_window ? "t" : "f", jump_to ? "t" : "f");
-
-	if (!in_new_window && parent_window != NULL)
-	{
-		window = parent_window;
-	}
-	else
-	{
-		window = ephy_window_new_with_chrome (chrome, is_popup);
-	}
-
-	toolbar = EPHY_TOOLBAR (ephy_window_get_toolbar (window));
-
-	if ((flags & EPHY_NEW_TAB_APPEND_AFTER) && previous_embed != NULL)
-	{
-		nb = ephy_window_get_notebook (window);
-		/* FIXME this assumes the tab is the direct notebook child */
-		position = gtk_notebook_page_num (GTK_NOTEBOOK (nb),
-						  GTK_WIDGET (previous_embed)) + 1;
-	}
-	
-	if (flags & EPHY_NEW_TAB_FROM_EXTERNAL)
-	{
-		/* If the active embed is blank, use that to open the url and jump to it */
-		embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window));
-		if (embed != NULL)
-		{
-			if (ephy_web_view_get_is_blank (ephy_embed_get_web_view (embed)) &&
-			    ephy_web_view_is_loading (ephy_embed_get_web_view (embed)) == FALSE)
-			{
-				active_is_blank = TRUE;
-			}
-		}
-	}
-	if (active_is_blank == FALSE)
-	{
-		embed = EPHY_EMBED (g_object_new (EPHY_TYPE_EMBED, NULL));
-		g_assert (embed != NULL);
-		gtk_widget_show (GTK_WIDGET (embed));
-		
-		ephy_embed_container_add_child (EPHY_EMBED_CONTAINER (window), embed, position, jump_to);
-	}
-
-	if (copy_history && previous_embed != NULL)
-	{
-		ephy_web_view_copy_back_history (ephy_embed_get_web_view (previous_embed),
-						 ephy_embed_get_web_view (embed));
-	}
-
-	ephy_gui_window_update_user_time (GTK_WIDGET (window), user_time);
-
-	if ((flags & EPHY_NEW_TAB_DONT_SHOW_WINDOW) == 0)
-	{
-		gtk_widget_show (GTK_WIDGET (window));
-	}
-
-	if (flags & EPHY_NEW_TAB_FULLSCREEN_MODE)
-	{
-		gtk_window_fullscreen (GTK_WINDOW (window));
-	}
-
-	if (flags & EPHY_NEW_TAB_HOME_PAGE ||
-	    flags & EPHY_NEW_TAB_NEW_PAGE)
-	{
-		EphyWebView *view = ephy_embed_get_web_view (embed);
-		ephy_web_view_set_typed_address (view, "");
-		ephy_toolbar_activate_location (toolbar);
-		is_empty = ephy_web_view_load_homepage (view);
-	}
-	else if (flags & EPHY_NEW_TAB_OPEN_PAGE)
-	{
-		ephy_web_view_load_request (ephy_embed_get_web_view (embed),
-					    request);
-
-		is_empty = ephy_embed_utils_url_is_empty (webkit_network_request_get_uri (request));
-	}
-
-	/* Make sure the initial focus is somewhere sensible and not, for
-	 * example, on the reload button.
-	 */
-	if (in_new_window || jump_to)
-	{
-		/* If the location entry is blank, focus that, except if the
-		 * page was a copy */
-		if (is_empty)
-		{
-			/* empty page, focus location entry */
-			toolbar = EPHY_TOOLBAR (ephy_window_get_toolbar (window));
-			ephy_toolbar_activate_location (toolbar);
-		}
-		else if (embed != NULL)
-		{
-			/* non-empty page, focus the page. but make sure the widget is realised first! */
-			gtk_widget_realize (GTK_WIDGET (embed));
-			gtk_widget_grab_focus (GTK_WIDGET (embed));
-		}
-	}
-
-	return embed;
+  EphyWindow *window;
+  EphyEmbed *embed = NULL;
+  gboolean in_new_window = TRUE;
+  gboolean open_page = FALSE;
+  gboolean jump_to;
+  gboolean active_is_blank = FALSE;
+  gboolean copy_history = TRUE;
+  GtkWidget *nb;
+  int position = -1;
+  gboolean is_empty = FALSE;
+  EphyToolbar *toolbar;
+
+  if (flags & EPHY_NEW_TAB_OPEN_PAGE) open_page = TRUE;
+  if (flags & EPHY_NEW_TAB_IN_NEW_WINDOW) in_new_window = TRUE;
+  if (flags & EPHY_NEW_TAB_IN_EXISTING_WINDOW) in_new_window = FALSE;
+  if (flags & EPHY_NEW_TAB_DONT_COPY_HISTORY) copy_history = FALSE;
+
+  in_new_window = in_new_window &&
+    !g_settings_get_boolean
+    (EPHY_SETTINGS_LOCKDOWN,
+     EPHY_PREFS_LOCKDOWN_FULLSCREEN);
+  g_return_val_if_fail (open_page == (gboolean)(request != NULL), NULL);
+
+  jump_to = (flags & EPHY_NEW_TAB_JUMP) != 0;
+
+  LOG ("Opening new tab parent-window %p parent-embed %p in-new-window:%s jump-to:%s",
+       parent_window, previous_embed, in_new_window ? "t" : "f", jump_to ? "t" : "f");
+
+  if (!in_new_window && parent_window != NULL) {
+    window = parent_window;
+  } else {
+    window = ephy_window_new_with_chrome (chrome, is_popup);
+  }
+  
+  toolbar = EPHY_TOOLBAR (ephy_window_get_toolbar (window));
+
+  if ((flags & EPHY_NEW_TAB_APPEND_AFTER) && previous_embed != NULL) {
+    nb = ephy_window_get_notebook (window);
+    /* FIXME this assumes the tab is the  direct notebook child */
+    position = gtk_notebook_page_num (GTK_NOTEBOOK (nb),
+                                      GTK_WIDGET (previous_embed)) + 1;
+  }
+  
+  if (flags & EPHY_NEW_TAB_FROM_EXTERNAL) {
+    /* If the active embed is blank, us e that to open the url and jump to it */
+    embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window));
+    if (embed != NULL) {
+      if (ephy_web_view_get_is_blank (ephy_embed_get_web_view (embed)) &&
+          ephy_web_view_is_loading (ephy_embed_get_web_view (embed)) == FALSE) {
+        active_is_blank = TRUE;
+      }
+    }
+  }
+
+  if (active_is_blank == FALSE) {
+    embed = EPHY_EMBED (g_object_new (EPHY_TYPE_EMBED, NULL));
+    g_assert (embed != NULL);
+    gtk_widget_show (GTK_WIDGET (embed));
+      
+    ephy_embed_container_add_child (EPHY_EMBED_CONTAINER (window), embed, position, jump_to);
+  }
+  
+  if (copy_history && previous_embed != NULL) {
+    ephy_web_view_copy_back_history (ephy_embed_get_web_view (previous_embed),
+                                     ephy_embed_get_web_view (embed));
+  }
+  
+  ephy_gui_window_update_user_time (GTK_WIDGET (window), user_time);
+
+  if ((flags & EPHY_NEW_TAB_DONT_SHOW_WINDOW) == 0) {
+    gtk_widget_show (GTK_WIDGET (window));
+  }
+
+  if (flags & EPHY_NEW_TAB_FULLSCREEN_MODE) {
+    gtk_window_fullscreen (GTK_WINDOW (window));
+  }
+  
+  if (flags & EPHY_NEW_TAB_HOME_PAGE ||
+      flags & EPHY_NEW_TAB_NEW_PAGE) {
+    EphyWebView *view = ephy_embed_get_web_view (embed);
+    ephy_web_view_set_typed_address (view, "");
+    ephy_toolbar_activate_location (toolbar);
+    is_empty = ephy_web_view_load_homepage (view);
+  } else if (flags & EPHY_NEW_TAB_OPEN_PAGE) {
+    ephy_web_view_load_request (ephy_embed_get_web_view (embed),
+                                request);
+    
+    is_empty = ephy_embed_utils_url_is_empty (webkit_network_request_get_uri (request));
+  }
+
+  /* Make sure the initial focus is somewhere sensible and not, for
+   * example, on the reload button.
+   */
+  if (in_new_window || jump_to) {
+    /* If the location entry is blank, focus that, except if the
+     * page was a copy */
+    if (is_empty) {
+      /* empty page, focus location entry */
+      toolbar = EPHY_TOOLBAR (ephy_window_get_toolbar (window));
+      ephy_toolbar_activate_location (toolbar);
+    } else if (embed != NULL) {
+      /* non-empty page, focus the page. but make sure the widget is realised first! */
+      gtk_widget_realize (GTK_WIDGET (embed));
+      gtk_widget_grab_focus (GTK_WIDGET (embed));
+    }
+  }
+  
+  return embed;
 }
 
 /**
@@ -783,22 +742,22 @@ ephy_shell_new_tab_full (EphyShell *shell,
  **/
 EphyEmbed *
 ephy_shell_new_tab (EphyShell *shell,
-		    EphyWindow *parent_window,
-		    EphyEmbed *previous_embed,
-		    const char *url,
-		    EphyNewTabFlags flags)
+                    EphyWindow *parent_window,
+                    EphyEmbed *previous_embed,
+                    const char *url,
+                    EphyNewTabFlags flags)
 {
-	EphyEmbed *embed;
-	WebKitNetworkRequest *request = url ? webkit_network_request_new (url) : NULL;
+  EphyEmbed *embed;
+  WebKitNetworkRequest *request = url ? webkit_network_request_new (url) : NULL;
 
-	embed = ephy_shell_new_tab_full (shell, parent_window,
-					 previous_embed, request, flags,
-					 EPHY_WEB_VIEW_CHROME_ALL, FALSE, 0);
+  embed = ephy_shell_new_tab_full (shell, parent_window,
+                                   previous_embed, request, flags,
+                                   EPHY_WEB_VIEW_CHROME_ALL, FALSE, 0);
 
-	if (request)
-		g_object_unref (request);
+  if (request)
+    g_object_unref (request);
 
-	return embed;
+  return embed;
 }
 
 /**
@@ -812,21 +771,20 @@ ephy_shell_new_tab (EphyShell *shell,
 GObject *
 ephy_shell_get_session (EphyShell *shell)
 {
-	g_return_val_if_fail (EPHY_IS_SHELL (shell), NULL);
-
-	if (shell->priv->session == NULL)
-	{
-		EphyExtensionsManager *manager;
-
-		shell->priv->session = g_object_new (EPHY_TYPE_SESSION, NULL);
-
-		manager = EPHY_EXTENSIONS_MANAGER
-			(ephy_shell_get_extensions_manager (shell));
-		ephy_extensions_manager_register (manager,
-						  G_OBJECT (shell->priv->session));
-	}
-
-	return G_OBJECT (shell->priv->session);
+  g_return_val_if_fail (EPHY_IS_SHELL (shell), NULL);
+
+  if (shell->priv->session == NULL) {
+    EphyExtensionsManager *manager;
+    
+    shell->priv->session = g_object_new (EPHY_TYPE_SESSION, NULL);
+    
+    manager = EPHY_EXTENSIONS_MANAGER
+      (ephy_shell_get_extensions_manager (shell));
+    ephy_extensions_manager_register (manager,
+                                      G_OBJECT (shell->priv->session));
+  }
+  
+  return G_OBJECT (shell->priv->session);
 }
 
 /**
@@ -840,21 +798,20 @@ ephy_shell_get_session (EphyShell *shell)
 static GObject *
 ephy_shell_get_lockdown (EphyShell *shell)
 {
-	g_return_val_if_fail (EPHY_IS_SHELL (shell), NULL);
-
-	if (shell->priv->lockdown == NULL)
-	{
-		EphyExtensionsManager *manager;
-
-		shell->priv->lockdown = g_object_new (EPHY_TYPE_LOCKDOWN, NULL);
-
-		manager = EPHY_EXTENSIONS_MANAGER
-			(ephy_shell_get_extensions_manager (shell));
-		ephy_extensions_manager_register (manager,
-						  G_OBJECT (shell->priv->lockdown));
-	}
-
-	return G_OBJECT (shell->priv->session);
+  g_return_val_if_fail (EPHY_IS_SHELL (shell), NULL);
+
+  if (shell->priv->lockdown == NULL) {
+    EphyExtensionsManager *manager;
+    
+    shell->priv->lockdown = g_object_new (EPHY_TYPE_LOCKDOWN, NULL);
+    
+    manager = EPHY_EXTENSIONS_MANAGER
+      (ephy_shell_get_extensions_manager (shell));
+    ephy_extensions_manager_register (manager,
+                                      G_OBJECT (shell->priv->lockdown));
+  }
+  
+  return G_OBJECT (shell->priv->session);
 }
 
 /**
@@ -865,12 +822,11 @@ ephy_shell_get_lockdown (EphyShell *shell)
 EphyBookmarks *
 ephy_shell_get_bookmarks (EphyShell *shell)
 {
-	if (shell->priv->bookmarks == NULL)
-	{
-		shell->priv->bookmarks = ephy_bookmarks_new ();
-	}
+  if (shell->priv->bookmarks == NULL) {
+    shell->priv->bookmarks = ephy_bookmarks_new ();
+  }
 
-	return shell->priv->bookmarks;
+  return shell->priv->bookmarks;
 }
 
 /**
@@ -881,47 +837,42 @@ ephy_shell_get_bookmarks (EphyShell *shell)
 GObject *
 ephy_shell_get_toolbars_model (EphyShell *shell, gboolean fullscreen)
 {
-	LOG ("ephy_shell_get_toolbars_model fs=%d", fullscreen);
-
-	if (fullscreen)
-	{
-		if (shell->priv->fs_toolbars_model == NULL)
-		{
-			EggTbModelFlags flags;
-			gboolean success;
-			const char *xml;
-
-			shell->priv->fs_toolbars_model = egg_toolbars_model_new ();
-			xml = ephy_file ("epiphany-fs-toolbar.xml");
-			g_return_val_if_fail (xml != NULL, NULL);
-
-			success = egg_toolbars_model_load_toolbars
-				(shell->priv->fs_toolbars_model, xml);
-			g_return_val_if_fail (success, NULL);
-
-			flags = egg_toolbars_model_get_flags 
-			  (shell->priv->fs_toolbars_model, 0);
-			egg_toolbars_model_set_flags
-			  (shell->priv->fs_toolbars_model, 0, 
-			   flags | EGG_TB_MODEL_NOT_REMOVABLE);
-		}
-
-		return G_OBJECT (shell->priv->fs_toolbars_model);
-	}
-	else
-	{
-		if (shell->priv->toolbars_model == NULL)
-		{
-			shell->priv->toolbars_model = ephy_toolbars_model_new ();
-			
-			ephy_bookmarks_ui_attach_toolbar_model (shell->priv->toolbars_model);
-			
-			ephy_toolbars_model_load
-				(EPHY_TOOLBARS_MODEL (shell->priv->toolbars_model));
-		}
-
-		return G_OBJECT (shell->priv->toolbars_model);
-	}
+  LOG ("ephy_shell_get_toolbars_model fs=%d", fullscreen);
+
+  if (fullscreen) {
+    if (shell->priv->fs_toolbars_model == NULL) {
+      EggTbModelFlags flags;
+      gboolean success;
+      const char *xml;
+      
+      shell->priv->fs_toolbars_model = egg_toolbars_model_new ();
+      xml = ephy_file ("epiphany-fs-toolbar.xml");
+      g_return_val_if_fail (xml != NULL, NULL);
+      
+      success = egg_toolbars_model_load_toolbars
+        (shell->priv->fs_toolbars_model, xml);
+      g_return_val_if_fail (success, NULL);
+          
+      flags = egg_toolbars_model_get_flags 
+        (shell->priv->fs_toolbars_model, 0);
+      egg_toolbars_model_set_flags
+        (shell->priv->fs_toolbars_model, 0, 
+         flags | EGG_TB_MODEL_NOT_REMOVABLE);
+    }
+    
+    return G_OBJECT (shell->priv->fs_toolbars_model);
+  } else {
+    if (shell->priv->toolbars_model == NULL) {
+      shell->priv->toolbars_model = ephy_toolbars_model_new ();
+      
+      ephy_bookmarks_ui_attach_toolbar_model (shell->priv->toolbars_model);
+      
+      ephy_toolbars_model_load
+        (EPHY_TOOLBARS_MODEL (shell->priv->toolbars_model));
+    }
+    
+    return G_OBJECT (shell->priv->toolbars_model);
+  }
 }
 
 /**
@@ -932,22 +883,21 @@ ephy_shell_get_toolbars_model (EphyShell *shell, gboolean fullscreen)
 GObject *
 ephy_shell_get_extensions_manager (EphyShell *es)
 {
-	g_return_val_if_fail (EPHY_IS_SHELL (es), NULL);
-
-	if (es->priv->extensions_manager == NULL)
-	{
-		/* Instantiate extensions manager */
-		es->priv->extensions_manager =
-			g_object_new (EPHY_TYPE_EXTENSIONS_MANAGER, NULL);
-
-		ephy_extensions_manager_startup (es->priv->extensions_manager);
-
-		/* FIXME */
-		ephy_shell_get_lockdown (es);
-		ephy_embed_shell_get_adblock_manager (embed_shell);
-	}
+  g_return_val_if_fail (EPHY_IS_SHELL (es), NULL);
+
+  if (es->priv->extensions_manager == NULL) {
+    /* Instantiate extensions manager */
+    es->priv->extensions_manager =
+      g_object_new (EPHY_TYPE_EXTENSIONS_MANAGER, NULL);
+    
+    ephy_extensions_manager_startup (es->priv->extensions_manager);
+    
+    /* FIXME */
+    ephy_shell_get_lockdown (es);
+    ephy_embed_shell_get_adblock_manager (embed_shell);
+  }
 
-	return G_OBJECT (es->priv->extensions_manager);
+  return G_OBJECT (es->priv->extensions_manager);
 }
 
 /**
@@ -958,37 +908,36 @@ ephy_shell_get_extensions_manager (EphyShell *es)
 GObject *
 ephy_shell_get_net_monitor (EphyShell *shell)
 {
-	EphyShellPrivate *priv = shell->priv;
-
-	if (priv->nm_proxy == NULL)
-	{
-		priv->nm_proxy = ephy_network_manager_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
-									      G_DBUS_PROXY_FLAGS_NONE,
-									      NM_DBUS_SERVICE,
-									      NM_DBUS_PATH,
-									      NULL,
-									      NULL);
-		g_signal_connect (priv->nm_proxy, "state-changed",
-				  G_CALLBACK (ephy_shell_sync_network_status), shell);
-	}
-
-	return G_OBJECT (priv->nm_proxy);
+  EphyShellPrivate *priv = shell->priv;
+
+  if (priv->nm_proxy == NULL) {
+    priv->nm_proxy = ephy_network_manager_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
+                                                                  G_DBUS_PROXY_FLAGS_NONE,
+                                                                  NM_DBUS_SERVICE,
+                                                                  NM_DBUS_PATH,
+                                                                  NULL,
+                                                                  NULL);
+    g_signal_connect (priv->nm_proxy, "state-changed",
+                      G_CALLBACK (ephy_shell_sync_network_status), shell);
+  }
+  
+  return G_OBJECT (priv->nm_proxy);
 }
 
 static void
 toolwindow_show_cb (GtkWidget *widget, EphyShell *es)
 {
-	LOG ("Ref shell for %s", G_OBJECT_TYPE_NAME (widget));
+  LOG ("Ref shell for %s", G_OBJECT_TYPE_NAME (widget));
 
-	ephy_session_add_window (ephy_shell->priv->session, GTK_WINDOW (widget));
+  ephy_session_add_window (ephy_shell->priv->session, GTK_WINDOW (widget));
 }
 
 static void
 toolwindow_hide_cb (GtkWidget *widget, EphyShell *es)
 {
-	LOG ("Unref shell for %s", G_OBJECT_TYPE_NAME (widget));
+  LOG ("Unref shell for %s", G_OBJECT_TYPE_NAME (widget));
 
-	ephy_session_remove_window (ephy_shell->priv->session, GTK_WINDOW (widget));
+  ephy_session_remove_window (ephy_shell->priv->session, GTK_WINDOW (widget));
 }
 
 /**
@@ -999,21 +948,20 @@ toolwindow_hide_cb (GtkWidget *widget, EphyShell *es)
 GtkWidget *
 ephy_shell_get_bookmarks_editor (EphyShell *shell)
 {
-	EphyBookmarks *bookmarks;
-
-	if (shell->priv->bme == NULL)
-	{
-		bookmarks = ephy_shell_get_bookmarks (ephy_shell);
-		g_assert (bookmarks != NULL);
-		shell->priv->bme = ephy_bookmarks_editor_new (bookmarks);
-
-		g_signal_connect (shell->priv->bme, "show", 
-				  G_CALLBACK (toolwindow_show_cb), shell);
-		g_signal_connect (shell->priv->bme, "hide", 
-				  G_CALLBACK (toolwindow_hide_cb), shell);
-	}
-
-	return shell->priv->bme;
+  EphyBookmarks *bookmarks;
+
+  if (shell->priv->bme == NULL) {
+    bookmarks = ephy_shell_get_bookmarks (ephy_shell);
+    g_assert (bookmarks != NULL);
+    shell->priv->bme = ephy_bookmarks_editor_new (bookmarks);
+    
+    g_signal_connect (shell->priv->bme, "show", 
+                      G_CALLBACK (toolwindow_show_cb), shell);
+    g_signal_connect (shell->priv->bme, "hide", 
+                      G_CALLBACK (toolwindow_hide_cb), shell);
+  }
+  
+  return shell->priv->bme;
 }
 
 /**
@@ -1024,22 +972,21 @@ ephy_shell_get_bookmarks_editor (EphyShell *shell)
 GtkWidget *
 ephy_shell_get_history_window (EphyShell *shell)
 {
-	EphyHistory *history;
-
-	if (shell->priv->history_window == NULL)
-	{
-		history = EPHY_HISTORY
-			(ephy_embed_shell_get_global_history (embed_shell));
-		g_assert (history != NULL);
-		shell->priv->history_window = ephy_history_window_new (history);
-
-		g_signal_connect (shell->priv->history_window, "show",
-				  G_CALLBACK (toolwindow_show_cb), shell);
-		g_signal_connect (shell->priv->history_window, "hide",
-				  G_CALLBACK (toolwindow_hide_cb), shell);
-	}
-
-	return shell->priv->history_window;
+  EphyHistory *history;
+
+  if (shell->priv->history_window == NULL) {
+    history = EPHY_HISTORY
+      (ephy_embed_shell_get_global_history (embed_shell));
+    g_assert (history != NULL);
+    shell->priv->history_window = ephy_history_window_new (history);
+    
+    g_signal_connect (shell->priv->history_window, "show",
+                      G_CALLBACK (toolwindow_show_cb), shell);
+    g_signal_connect (shell->priv->history_window, "hide",
+                      G_CALLBACK (toolwindow_hide_cb), shell);
+  }
+  
+  return shell->priv->history_window;
 }
 
 /**
@@ -1050,19 +997,18 @@ ephy_shell_get_history_window (EphyShell *shell)
 GObject *
 ephy_shell_get_pdm_dialog (EphyShell *shell)
 {
-	if (shell->priv->pdm_dialog == NULL)
-	{
-		GObject **dialog;
-
-		shell->priv->pdm_dialog = g_object_new (EPHY_TYPE_PDM_DIALOG, NULL);
-
-		dialog = &shell->priv->pdm_dialog;
-
-		g_object_add_weak_pointer (shell->priv->pdm_dialog,
-					   (gpointer *) dialog);
-	}
-
-	return shell->priv->pdm_dialog;
+  if (shell->priv->pdm_dialog == NULL) {
+    GObject **dialog;
+    
+    shell->priv->pdm_dialog = g_object_new (EPHY_TYPE_PDM_DIALOG, NULL);
+
+    dialog = &shell->priv->pdm_dialog;
+    
+    g_object_add_weak_pointer (shell->priv->pdm_dialog,
+                               (gpointer *) dialog);
+  }
+  
+  return shell->priv->pdm_dialog;
 }
 
 /**
@@ -1073,32 +1019,31 @@ ephy_shell_get_pdm_dialog (EphyShell *shell)
 GObject *
 ephy_shell_get_prefs_dialog (EphyShell *shell)
 {
-	if (shell->priv->prefs_dialog == NULL)
-	{
-		GObject **dialog;
-
-		shell->priv->prefs_dialog = g_object_new (EPHY_TYPE_PREFS_DIALOG, NULL);
-
-		dialog  = &shell->priv->prefs_dialog;
-
-		g_object_add_weak_pointer (shell->priv->prefs_dialog,
-					   (gpointer *) dialog);
-	}
-
-	return shell->priv->prefs_dialog;
+  if (shell->priv->prefs_dialog == NULL) {
+    GObject **dialog;
+    
+    shell->priv->prefs_dialog = g_object_new (EPHY_TYPE_PREFS_DIALOG, NULL);
+    
+    dialog  = &shell->priv->prefs_dialog;
+
+    g_object_add_weak_pointer (shell->priv->prefs_dialog,
+                               (gpointer *) dialog);
+  }
+  
+  return shell->priv->prefs_dialog;
 }
 
 void
 _ephy_shell_create_instance (EphyEmbedShellMode mode)
 {
-	g_assert (ephy_shell == NULL);
-
-	ephy_shell = EPHY_SHELL (g_object_new (EPHY_TYPE_SHELL,
-					       "application-id", "org.gnome.Epiphany",
-					       "mode", mode,
-					       NULL));
-	/* FIXME weak ref */
-	g_assert (ephy_shell != NULL);
+  g_assert (ephy_shell == NULL);
+
+  ephy_shell = EPHY_SHELL (g_object_new (EPHY_TYPE_SHELL,
+                                         "application-id", "org.gnome.Epiphany",
+                                         "mode", mode,
+                                         NULL));
+  /* FIXME weak ref */
+  g_assert (ephy_shell != NULL);
 }
 
 /**
@@ -1111,13 +1056,12 @@ _ephy_shell_create_instance (EphyEmbedShellMode mode)
  **/
 void
 ephy_shell_set_startup_context (EphyShell *shell,
-				EphyShellStartupContext *ctx)
+                                EphyShellStartupContext *ctx)
 {
-	g_return_if_fail (EPHY_IS_SHELL (shell));
+  g_return_if_fail (EPHY_IS_SHELL (shell));
 
-	if (shell->priv->startup_context)
-		ephy_shell_free_startup_context (shell);
+  if (shell->priv->startup_context)
+    ephy_shell_free_startup_context (shell);
 
-	shell->priv->startup_context = ctx;
+  shell->priv->startup_context = ctx;
 }
-
diff --git a/src/ephy-shell.h b/src/ephy-shell.h
index b3d19d7a6..55a90547e 100644
--- a/src/ephy-shell.h
+++ b/src/ephy-shell.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  *  Copyright © 2000-2004 Marco Pesenti Gritti
  *  Copyright © 2003, 2004, 2006 Christian Persch
@@ -39,128 +38,123 @@
 
 G_BEGIN_DECLS
 
-#define EPHY_TYPE_SHELL		(ephy_shell_get_type ())
-#define EPHY_SHELL(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_SHELL, EphyShell))
-#define EPHY_SHELL_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_SHELL, EphyShellClass))
-#define EPHY_IS_SHELL(o)	(G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_SHELL))
-#define EPHY_IS_SHELL_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_SHELL))
-#define EPHY_SHELL_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_SHELL, EphyShellClass))
+#define EPHY_TYPE_SHELL         (ephy_shell_get_type ())
+#define EPHY_SHELL(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_SHELL, EphyShell))
+#define EPHY_SHELL_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_SHELL, EphyShellClass))
+#define EPHY_IS_SHELL(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_SHELL))
+#define EPHY_IS_SHELL_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_SHELL))
+#define EPHY_SHELL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_SHELL, EphyShellClass))
 
-typedef struct _EphyShell		EphyShell;
-typedef struct _EphyShellClass		EphyShellClass;
-typedef struct _EphyShellPrivate	EphyShellPrivate;
+typedef struct _EphyShell   EphyShell;
+typedef struct _EphyShellClass    EphyShellClass;
+typedef struct _EphyShellPrivate  EphyShellPrivate;
 
 extern EphyShell *ephy_shell;
 
-typedef enum
-{
-	/* Page types */
-	EPHY_NEW_TAB_HOME_PAGE		= 1 << 0,
-	EPHY_NEW_TAB_NEW_PAGE		= 1 << 1,
-	EPHY_NEW_TAB_OPEN_PAGE		= 1 << 2,
-
-	/* Page mode */
-	EPHY_NEW_TAB_FULLSCREEN_MODE	= 1 << 4,
-	EPHY_NEW_TAB_DONT_SHOW_WINDOW	= 1 << 5,
-
-	/* Tabs */
-	EPHY_NEW_TAB_APPEND_LAST	= 1 << 7,
-	EPHY_NEW_TAB_APPEND_AFTER	= 1 << 8,
-	EPHY_NEW_TAB_JUMP		= 1 << 9,
-	EPHY_NEW_TAB_IN_NEW_WINDOW	= 1 << 10,
-	EPHY_NEW_TAB_IN_EXISTING_WINDOW	= 1 << 11,
-
-	/* The way to load */
-	EPHY_NEW_TAB_FROM_EXTERNAL      = 1 << 12,
-	EPHY_NEW_TAB_DONT_COPY_HISTORY  = 1 << 13,
-	
+typedef enum {
+  /* Page types */
+  EPHY_NEW_TAB_HOME_PAGE    = 1 << 0,
+  EPHY_NEW_TAB_NEW_PAGE   = 1 << 1,
+  EPHY_NEW_TAB_OPEN_PAGE    = 1 << 2,
+
+  /* Page mode */
+  EPHY_NEW_TAB_FULLSCREEN_MODE  = 1 << 4,
+  EPHY_NEW_TAB_DONT_SHOW_WINDOW = 1 << 5,
+
+  /* Tabs */
+  EPHY_NEW_TAB_APPEND_LAST  = 1 << 7,
+  EPHY_NEW_TAB_APPEND_AFTER = 1 << 8,
+  EPHY_NEW_TAB_JUMP   = 1 << 9,
+  EPHY_NEW_TAB_IN_NEW_WINDOW  = 1 << 10,
+  EPHY_NEW_TAB_IN_EXISTING_WINDOW = 1 << 11,
+
+  /* The way to load */
+  EPHY_NEW_TAB_FROM_EXTERNAL      = 1 << 12,
+  EPHY_NEW_TAB_DONT_COPY_HISTORY  = 1 << 13,
+  
 } EphyNewTabFlags;
 
-typedef enum
-{
-	EPHY_STARTUP_NEW_TAB          = 1 << 0,
-	EPHY_STARTUP_NEW_WINDOW       = 1 << 1,
-	EPHY_STARTUP_BOOKMARKS_EDITOR = 1 << 2
+typedef enum {
+  EPHY_STARTUP_NEW_TAB          = 1 << 0,
+  EPHY_STARTUP_NEW_WINDOW       = 1 << 1,
+  EPHY_STARTUP_BOOKMARKS_EDITOR = 1 << 2
 } EphyStartupFlags;
 
-typedef struct
-{
-	EphyStartupFlags startup_flags;
-	
-	char *bookmarks_filename;
-	char *session_filename;
-	char *bookmark_url;
-	
-	char **arguments;
-	
-	guint32 user_time;
+typedef struct {
+  EphyStartupFlags startup_flags;
+  
+  char *bookmarks_filename;
+  char *session_filename;
+  char *bookmark_url;
+  
+  char **arguments;
+  
+  guint32 user_time;
 } EphyShellStartupContext;
 
-struct _EphyShell
-{
-	EphyEmbedShell parent;
+struct _EphyShell {
+  EphyEmbedShell parent;
 
-	/*< private >*/
-	EphyShellPrivate *priv;
+  /*< private >*/
+  EphyShellPrivate *priv;
 };
 
-struct _EphyShellClass
-{
-	EphyEmbedShellClass parent_class;
+struct _EphyShellClass {
+  EphyEmbedShellClass parent_class;
 };
 
-GType		ephy_new_tab_flags_get_type		(void) G_GNUC_CONST;
+GType           ephy_new_tab_flags_get_type             (void) G_GNUC_CONST;
 
-GType		ephy_shell_get_type			(void);
+GType           ephy_shell_get_type                     (void);
 
-EphyShell      *ephy_shell_get_default			(void);
+EphyShell      *ephy_shell_get_default                  (void);
 
-EphyEmbed      *ephy_shell_new_tab			(EphyShell *shell,
-							 EphyWindow *parent_window,
-							 EphyEmbed *previous_embed,
-							 const char *url,
-							 EphyNewTabFlags flags);
+EphyEmbed      *ephy_shell_new_tab                      (EphyShell *shell,
+                                                         EphyWindow *parent_window,
+                                                         EphyEmbed *previous_embed,
+                                                         const char *url,
+                                                         EphyNewTabFlags flags);
 
-EphyEmbed      *ephy_shell_new_tab_full			(EphyShell *shell,
-							 EphyWindow *parent_window,
-							 EphyEmbed *previous_embed,
-							 WebKitNetworkRequest *request,
-							 EphyNewTabFlags flags,
-							 EphyWebViewChrome chrome,
-							 gboolean is_popup,
-							 guint32 user_time);
+EphyEmbed      *ephy_shell_new_tab_full                 (EphyShell *shell,
+                                                         EphyWindow *parent_window,
+                                                         EphyEmbed *previous_embed,
+                                                         WebKitNetworkRequest *request,
+                                                         EphyNewTabFlags flags,
+                                                         EphyWebViewChrome chrome,
+                                                         gboolean is_popup,
+                                                         guint32 user_time);
 
-GObject	       *ephy_shell_get_session			(EphyShell *shell);
+GObject        *ephy_shell_get_session                  (EphyShell *shell);
 
-GObject	       *ephy_shell_get_net_monitor		(EphyShell *shell);
+GObject        *ephy_shell_get_net_monitor              (EphyShell *shell);
 
-EphyBookmarks  *ephy_shell_get_bookmarks		(EphyShell *shell);
+EphyBookmarks  *ephy_shell_get_bookmarks                (EphyShell *shell);
 
-GObject	       *ephy_shell_get_toolbars_model		(EphyShell *shell,
-							 gboolean fullscreen);
+GObject        *ephy_shell_get_toolbars_model           (EphyShell *shell,
+                                                         gboolean fullscreen);
 
-GObject	       *ephy_shell_get_extensions_manager	(EphyShell *shell);
+GObject        *ephy_shell_get_extensions_manager       (EphyShell *shell);
 
-GtkWidget      *ephy_shell_get_bookmarks_editor 	(EphyShell *shell);
+GtkWidget      *ephy_shell_get_bookmarks_editor         (EphyShell *shell);
 
-GtkWidget      *ephy_shell_get_history_window		(EphyShell *shell);
+GtkWidget      *ephy_shell_get_history_window           (EphyShell *shell);
 
-GObject        *ephy_shell_get_pdm_dialog		(EphyShell *shell);
+GObject        *ephy_shell_get_pdm_dialog               (EphyShell *shell);
 
-GObject        *ephy_shell_get_prefs_dialog		(EphyShell *shell);
+GObject        *ephy_shell_get_prefs_dialog             (EphyShell *shell);
 
 void            ephy_shell_set_startup_context          (EphyShell *shell,
-							 EphyShellStartupContext  *ctx);
+                                                         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);
+                                                         char            *bookmarks_filename,
+                                                         char            *session_filename,
+                                                         char            *bookmark_url,
+                                                         char           **arguments,
+                                                         guint32          user_time);
 
 /* private API */
-void	       _ephy_shell_create_instance		(EphyEmbedShellMode mode);
+void           _ephy_shell_create_instance              (EphyEmbedShellMode mode);
 
 G_END_DECLS