Merge lp:~midori/midori/deathnote into lp:midori

[Cris Dywan]

Introduce notebook class converging separate implementations

Rewritten notebook, one code path to rule them all.
destroy and remove-tab are equivalent.
Tabs are always visible.
Tabbar has a 'new tab' button.
Katze.Throbber is dropped, Gtk.Spinner is enough.
Switch tabs by scrolling (absent from GTK+3 Gtk.Notebook).
Support for clicks logically outside label but visually inside.
New tab by double click.
Tab.colors_changed signal

[gue5t gue5t (gue5t)]

Other bug: scrolling the web-view area while adding a tab with ^T acts like a scroll on the tab-bar.

[lp:~midori/midori/deathnote]

6464. By Cris Dywan on 2013-11-27

Revert to minimum tab size of one icon without close button

6465. By Cris Dywan on 2013-11-29

Ensure the spinner is the size of the icon

6466. By Cris Dywan on 2013-11-29

Don't bother setting "current" which is unused with Tabby anyway

6467. By Cris Dywan on 2013-11-29

Wrap the spinner in an event box to retain its size when hidden

6468. By Cris Dywan on 2013-11-29

Always update current index when reordering

6469. By Cris Dywan on 2013-11-29

Micro-optimization, no need to count pages when -1 means the same

6470. By Cris Dywan on 2013-12-03

Don't wrap tabs when scrolling with a mouse wheel

6471. By Cris Dywan on 2013-12-03

Don't handle scrolling when the event is in the tab

6472. By Cris Dywan on 2013-12-05

Drop incomplete tab strip scrolling support

[Paweł Forysiuk (tuxator)]

I don't see any major issues at this point. Should be fine to merge.

review: Approve

[André Stösel (ivaldi)]

Nice :)

review: Approve

=== removed file 'katze/katze-throbber.c'
--- katze/katze-throbber.c	2013-06-20 21:15:42 +0000
+++ katze/katze-throbber.c	1970-01-01 00:00:00 +0000
@@ -1,932 +0,0 @@
-/*
- Copyright (C) 2007-2010 Christian Dywan <[e-mail]>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- See the file COPYING for the full license text.
-*/
-
-#include "katze-throbber.h"
-
-#include "katze-utils.h"
-
-#include <glib/gi18n.h>
-#include <math.h>
-
-struct _KatzeThrobber
-{
-    GtkSpinner parent_instance;
-    GtkIconSize icon_size;
-    gchar* icon_name;
-    GdkPixbuf* pixbuf;
-    gchar* stock_id;
-    gboolean animated;
-    gchar* static_icon_name;
-    GdkPixbuf* static_pixbuf;
-    gchar* static_stock_id;
-
-    gint index;
-    gint timer_id;
-    gint width;
-    gint height;
-};
-
-struct _KatzeThrobberClass
-{
-    GtkSpinnerClass parent_class;
-};
-
-G_DEFINE_TYPE (KatzeThrobber, katze_throbber, GTK_TYPE_SPINNER);
-
-enum
-{
-    PROP_0,
-
-    PROP_ICON_SIZE,
-    PROP_ICON_NAME,
-    PROP_PIXBUF,
-    PROP_ANIMATED,
-    PROP_STATIC_ICON_NAME,
-    PROP_STATIC_PIXBUF,
-    PROP_STATIC_STOCK_ID
-};
-
-static void
-katze_throbber_dispose (GObject* object);
-
-static void
-katze_throbber_set_property (GObject* object,
-                             guint prop_id,
-                             const GValue* value,
-                             GParamSpec* pspec);
-
-static void
-katze_throbber_get_property (GObject* object,
-                             guint prop_id,
-                             GValue* value,
-                             GParamSpec* pspec);
-
-static void
-#if GTK_CHECK_VERSION (3, 0, 0)
-katze_throbber_destroy (GtkWidget* object);
-#else
-katze_throbber_destroy (GtkObject* object);
-#endif
-
-static void
-katze_throbber_realize (GtkWidget* widget);
-
-#if GTK_CHECK_VERSION (3, 0, 0)
-static void
-katze_throbber_get_preferred_height (GtkWidget *widget,
-                                     gint      *minimal_height,
-                                     gint      *natural_height);
-static void
-katze_throbber_get_preferred_width (GtkWidget *widget,
-                                     gint      *minimal_width,
-                                     gint      *natural_width);
-#endif
-static void
-katze_throbber_unrealize (GtkWidget* widget);
-
-static void
-katze_throbber_map (GtkWidget* widget);
-
-static void
-katze_throbber_unmap (GtkWidget* widget);
-
-static void
-katze_throbber_style_set (GtkWidget* widget,
-                          GtkStyle* style);
-
-static void
-katze_throbber_screen_changed (GtkWidget* widget,
-                               GdkScreen* screen_prev);
-
-static void
-katze_throbber_size_request (GtkWidget*      widget,
-                             GtkRequisition* requisition);
-
-static gboolean
-katze_throbber_expose_event (GtkWidget*      widget,
-#if GTK_CHECK_VERSION (3, 0, 0)
-                             cairo_t* cr);
-#else
-                             GdkEventExpose* event);
-#endif
-
-static void
-icon_theme_changed (KatzeThrobber* throbber);
-
-static void
-katze_throbber_class_init (KatzeThrobberClass* class)
-{
-    GObjectClass* gobject_class;
-#if !GTK_CHECK_VERSION (3, 0, 0)
-    GtkObjectClass* object_class;
-#endif
-    GtkWidgetClass* widget_class;
-    GParamFlags flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT;
-
-    gobject_class = G_OBJECT_CLASS (class);
-    gobject_class->dispose = katze_throbber_dispose;
-    gobject_class->set_property = katze_throbber_set_property;
-    gobject_class->get_property = katze_throbber_get_property;
-
-    widget_class = GTK_WIDGET_CLASS (class);
-#if GTK_CHECK_VERSION (3, 0, 0)
-    widget_class->destroy = katze_throbber_destroy;
-#else
-    object_class = GTK_OBJECT_CLASS (class);
-    object_class->destroy = katze_throbber_destroy;
-#endif
-    widget_class->realize = katze_throbber_realize;
-    widget_class->unrealize = katze_throbber_unrealize;
-    widget_class->map = katze_throbber_map;
-    widget_class->unmap = katze_throbber_unmap;
-    widget_class->style_set = katze_throbber_style_set;
-    widget_class->screen_changed = katze_throbber_screen_changed;
-#if GTK_CHECK_VERSION (3, 0, 0)
-    widget_class->get_preferred_width= katze_throbber_get_preferred_width;
-    widget_class->get_preferred_height= katze_throbber_get_preferred_height;
-#else
-    widget_class->size_request = katze_throbber_size_request;
-#endif
-#if GTK_CHECK_VERSION (3, 0, 0)
-    widget_class->draw = katze_throbber_expose_event;
-#else
-    widget_class->expose_event = katze_throbber_expose_event;
-#endif
-    g_object_class_install_property (gobject_class,
-                                     PROP_ICON_SIZE,
-                                     g_param_spec_int (
-                                     "icon-size",
-                                     "Icon size",
-                                     "Symbolic size to use for the animation",
-                                     0, G_MAXINT, GTK_ICON_SIZE_MENU,
-                                     flags));
-
-    g_object_class_install_property (gobject_class,
-                                     PROP_ICON_NAME,
-                                     g_param_spec_string (
-                                     "icon-name",
-                                     "Icon Name",
-                                     "The name of an icon containing animation frames",
-                                     "process-working",
-                                     flags));
-
-    g_object_class_install_property (gobject_class,
-                                     PROP_PIXBUF,
-                                     g_param_spec_object (
-                                     "pixbuf",
-                                     "Pixbuf",
-                                     "A GdkPixbuf containing animation frames",
-                                     GDK_TYPE_PIXBUF,
-                                     G_PARAM_READWRITE));
-
-    g_object_class_install_property (gobject_class,
-                                     PROP_ANIMATED,
-                                     g_param_spec_boolean (
-                                     "animated",
-                                     "Animated",
-                                     "Whether the throbber should be animated",
-                                     FALSE,
-                                     flags));
-
-    g_object_class_install_property (gobject_class,
-                                     PROP_STATIC_ICON_NAME,
-                                     g_param_spec_string (
-                                     "static-icon-name",
-                                     "Static Icon Name",
-                                     "The name of an icon to be used as the static image",
-                                     NULL,
-                                     flags));
-
-    g_object_class_install_property (gobject_class,
-                                     PROP_STATIC_PIXBUF,
-                                     g_param_spec_object (
-                                     "static-pixbuf",
-                                     "Static Pixbuf",
-                                     "A GdkPixbuf to be used as the static image",
-                                     GDK_TYPE_PIXBUF,
-                                     G_PARAM_READWRITE));
-
-    g_object_class_install_property (gobject_class,
-                                     PROP_STATIC_STOCK_ID,
-                                     g_param_spec_string (
-                                     "static-stock-id",
-                                     "Static Stock ID",
-                                     "The stock ID of an icon to be used as the static image",
-                                     NULL,
-                                     flags));
-}
-
-static void
-katze_throbber_init (KatzeThrobber *throbber)
-{
-    gtk_widget_set_has_window (GTK_WIDGET (throbber), FALSE);
-
-    throbber->timer_id = -1;
-}
-
-static void
-katze_throbber_dispose (GObject* object)
-{
-    KatzeThrobber* throbber = KATZE_THROBBER (object);
-
-    if (G_UNLIKELY (throbber->timer_id >= 0))
-        g_source_remove (throbber->timer_id);
-
-    (*G_OBJECT_CLASS (katze_throbber_parent_class)->dispose) (object);
-}
-
-static void
-#if GTK_CHECK_VERSION (3, 0, 0)
-katze_throbber_destroy (GtkWidget* object)
-#else
-katze_throbber_destroy (GtkObject* object)
-#endif
-{
-    KatzeThrobber* throbber = KATZE_THROBBER (object);
-
-    katze_assign (throbber->icon_name, NULL);
-    katze_object_assign (throbber->pixbuf, NULL);
-    katze_assign (throbber->static_icon_name, NULL);
-    katze_object_assign (throbber->static_pixbuf, NULL);
-    katze_assign (throbber->static_stock_id, NULL);
-#if GTK_CHECK_VERSION (3, 0, 0)
-    GTK_WIDGET_CLASS (katze_throbber_parent_class)->destroy (object);
-#else
-    GTK_OBJECT_CLASS (katze_throbber_parent_class)->destroy (object);
-#endif
-}
-
-static void
-katze_throbber_set_property (GObject*      object,
-                             guint         prop_id,
-                             const GValue* value,
-                             GParamSpec*   pspec)
-{
-    KatzeThrobber* throbber = KATZE_THROBBER (object);
-
-    switch (prop_id)
-    {
-    case PROP_ICON_SIZE:
-        katze_throbber_set_icon_size (throbber, g_value_get_int (value));
-        break;
-    case PROP_ICON_NAME:
-        katze_throbber_set_icon_name (throbber, g_value_get_string (value));
-        break;
-    case PROP_PIXBUF:
-        katze_throbber_set_pixbuf (throbber, g_value_get_object (value));
-        break;
-    case PROP_ANIMATED:
-        katze_throbber_set_animated (throbber, g_value_get_boolean (value));
-        break;
-    case PROP_STATIC_ICON_NAME:
-        katze_throbber_set_static_icon_name (throbber, g_value_get_string (value));
-        break;
-    case PROP_STATIC_PIXBUF:
-        katze_throbber_set_static_pixbuf (throbber, g_value_get_object (value));
-        break;
-    case PROP_STATIC_STOCK_ID:
-        katze_throbber_set_static_stock_id (throbber, g_value_get_string (value));
-        break;
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
-    }
-}
-
-static void
-katze_throbber_get_property (GObject*    object,
-                             guint       prop_id,
-                             GValue*     value,
-                             GParamSpec* pspec)
-{
-    KatzeThrobber* throbber = KATZE_THROBBER (object);
-
-    switch (prop_id)
-    {
-    case PROP_ICON_SIZE:
-        g_value_set_int (value, katze_throbber_get_icon_size (throbber));
-        break;
-    case PROP_ICON_NAME:
-        g_value_set_string (value, katze_throbber_get_icon_name (throbber));
-        break;
-    case PROP_PIXBUF:
-        g_value_set_object (value, katze_throbber_get_pixbuf (throbber));
-        break;
-    case PROP_ANIMATED:
-        g_value_set_boolean (value, katze_throbber_get_animated (throbber));
-        break;
-    case PROP_STATIC_ICON_NAME:
-        g_value_set_string (value, katze_throbber_get_static_icon_name (throbber));
-        break;
-    case PROP_STATIC_PIXBUF:
-        g_value_set_object (value, katze_throbber_get_static_pixbuf (throbber));
-        break;
-    case PROP_STATIC_STOCK_ID:
-        g_value_set_string (value, katze_throbber_get_static_stock_id (throbber));
-        break;
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
-    }
-}
-
-/**
- * katze_throbber_new:
- *
- * Creates a new throbber widget.
- *
- * Return value: a new #KatzeThrobber
- **/
-GtkWidget*
-katze_throbber_new (void)
-{
-    KatzeThrobber* throbber = g_object_new (KATZE_TYPE_THROBBER,
-                                            NULL);
-
-    return GTK_WIDGET (throbber);
-}
-
-/**
- * katze_throbber_set_icon_size:
- * @throbber: a #KatzeThrobber
- * @icon_size: the new icon size
- *
- * Sets the desired size of the throbber image. The animation and static image
- * will be displayed in this size. If a pixbuf is used for the animation every
- * single frame is assumed to have this size.
- **/
-void
-katze_throbber_set_icon_size (KatzeThrobber* throbber,
-                              GtkIconSize    icon_size)
-{
-    GtkSettings* gtk_settings;
-
-    g_return_if_fail (KATZE_IS_THROBBER (throbber));
-    gtk_settings = gtk_widget_get_settings (GTK_WIDGET (throbber));
-    g_return_if_fail (gtk_icon_size_lookup_for_settings (gtk_settings,
-                                                         icon_size,
-                                                         &throbber->width,
-                                                         &throbber->height));
-
-    throbber->icon_size = icon_size;
-
-    g_object_notify (G_OBJECT (throbber), "icon-size");
-
-    gtk_widget_queue_draw (GTK_WIDGET (throbber));
-}
-
-/**
- * katze_throbber_set_icon_name:
- * @throbber: a #KatzeThrobber
- * @icon_name: an icon name or %NULL
- *
- * Sets the name of an icon that should provide the animation frames.
- *
- * The pixbuf is automatically invalidated.
- **/
-void
-katze_throbber_set_icon_name (KatzeThrobber*  throbber,
-                              const gchar*    icon_name)
-{
-    g_return_if_fail (KATZE_IS_THROBBER (throbber));
-
-    katze_assign (throbber->icon_name, g_strdup (icon_name));
-
-    if (icon_name)
-        icon_theme_changed (throbber);
-
-    g_object_notify (G_OBJECT (throbber), "icon-name");
-}
-
-/**
- * katze_throbber_set_pixbuf:
- * @throbber: a #KatzeThrobber
- * @pixbuf: a #GdkPixbuf or %NULL
- *
- * Sets the pixbuf that should provide the animation frames. Every frame
- * is assumed to have the icon size of the throbber, which can be specified
- * with katze_throbber_set_icon_size ().
- *
- * The icon name is automatically invalidated.
- **/
-void
-katze_throbber_set_pixbuf (KatzeThrobber* throbber,
-                           GdkPixbuf*     pixbuf)
-{
-    g_return_if_fail (KATZE_IS_THROBBER (throbber));
-    g_return_if_fail (!pixbuf || GDK_IS_PIXBUF (pixbuf));
-
-    katze_object_assign (throbber->pixbuf, pixbuf);
-
-    g_object_freeze_notify (G_OBJECT (throbber));
-
-    if (pixbuf)
-    {
-        g_object_ref (pixbuf);
-
-        katze_assign (throbber->icon_name, NULL);
-        g_object_notify (G_OBJECT (throbber), "icon-name");
-    }
-
-    gtk_widget_queue_draw (GTK_WIDGET (throbber));
-
-    g_object_notify (G_OBJECT (throbber), "pixbuf");
-    g_object_thaw_notify (G_OBJECT (throbber));
-}
-
-/**
- * katze_throbber_set_animated:
- * @throbber: a #KatzeThrobber
- * @animated: %TRUE to animate the throbber
- *
- * Sets the animation state of the throbber.
- **/
-void
-katze_throbber_set_animated (KatzeThrobber*  throbber,
-                             gboolean        animated)
-{
-    g_return_if_fail (KATZE_IS_THROBBER (throbber));
-
-    if (G_UNLIKELY (throbber->animated == animated))
-        return;
-
-    throbber->animated = animated;
-
-    g_object_set (throbber, "active", animated, NULL);
-    gtk_widget_queue_draw (GTK_WIDGET (throbber));
-
-    g_object_notify (G_OBJECT (throbber), "animated");
-}
-
-/**
- * katze_throbber_set_static_icon_name:
- * @throbber: a #KatzeThrobber
- * @icon_name: an icon name or %NULL
- *
- * Sets the name of an icon that should provide the static image.
- *
- * The static pixbuf and stock ID are automatically invalidated.
- **/
-void
-katze_throbber_set_static_icon_name (KatzeThrobber*  throbber,
-                                     const gchar*    icon_name)
-{
-    g_return_if_fail (KATZE_IS_THROBBER (throbber));
-
-    katze_assign (throbber->static_icon_name, g_strdup (icon_name));
-
-    g_object_freeze_notify (G_OBJECT (throbber));
-
-    if (icon_name)
-    {
-        katze_assign (throbber->static_stock_id, NULL);
-
-        icon_theme_changed (throbber);
-
-        g_object_notify (G_OBJECT (throbber), "static-pixbuf");
-        g_object_notify (G_OBJECT (throbber), "static-stock-id");
-    }
-
-    g_object_notify (G_OBJECT (throbber), "static-icon-name");
-    g_object_thaw_notify (G_OBJECT (throbber));
-}
-
-/**
- * katze_throbber_set_static_pixbuf:
- * @throbber: a #KatzeThrobber
- * @pixbuf: a #GdkPixbuf or %NULL
- *
- * Sets the pixbuf that should provide the static image. The pixbuf is
- * assumed to have the icon size of the throbber, which can be specified
- * with katze_throbber_set_icon_size ().
- *
- * The static icon name and stock ID are automatically invalidated.
- **/
-void
-katze_throbber_set_static_pixbuf (KatzeThrobber* throbber,
-                                  GdkPixbuf*     pixbuf)
-{
-    g_return_if_fail (KATZE_IS_THROBBER (throbber));
-    g_return_if_fail (pixbuf == NULL || GDK_IS_PIXBUF (pixbuf));
-
-    katze_object_assign (throbber->static_pixbuf, pixbuf);
-
-    g_object_freeze_notify (G_OBJECT (throbber));
-
-    if (pixbuf)
-    {
-        g_object_ref (pixbuf);
-
-        katze_assign (throbber->static_icon_name, NULL);
-        katze_assign (throbber->static_stock_id, NULL);
-
-        gtk_widget_queue_draw (GTK_WIDGET (throbber));
-
-        g_object_notify (G_OBJECT (throbber), "static-icon-name");
-        g_object_notify (G_OBJECT (throbber), "static-stock-id");
-    }
-
-    g_object_notify (G_OBJECT (throbber), "static-pixbuf");
-    g_object_thaw_notify (G_OBJECT (throbber));
-}
-
-/**
- * katze_throbber_set_static_stock_id:
- * @throbber: a #KatzeThrobber
- * @stock_id: a stock ID or %NULL
- *
- * Sets the stock ID of an icon that should provide the static image.
- *
- * The static icon name and pixbuf are automatically invalidated.
- **/
-void
-katze_throbber_set_static_stock_id (KatzeThrobber* throbber,
-                                    const gchar*   stock_id)
-{
-    g_return_if_fail (KATZE_IS_THROBBER (throbber));
-
-    g_object_freeze_notify (G_OBJECT (throbber));
-
-    if (stock_id)
-    {
-        GtkStockItem stock_item;
-        g_return_if_fail (gtk_stock_lookup (stock_id, &stock_item));
-
-        g_object_notify (G_OBJECT (throbber), "static-icon-name");
-        g_object_notify (G_OBJECT (throbber), "static-pixbuf");
-    }
-
-    katze_assign (throbber->static_stock_id, g_strdup (stock_id));
-
-    if (stock_id)
-        icon_theme_changed (throbber);
-
-    g_object_notify (G_OBJECT (throbber), "static-stock-id");
-    g_object_thaw_notify (G_OBJECT (throbber));
-}
-
-/**
- * katze_throbber_get_icon_size:
- * @throbber: a #KatzeThrobber
- *
- * Retrieves the size of the throbber.
- *
- * Return value: the size of the throbber
- **/
-GtkIconSize
-katze_throbber_get_icon_size (KatzeThrobber* throbber)
-{
-    g_return_val_if_fail (KATZE_IS_THROBBER (throbber), GTK_ICON_SIZE_INVALID);
-
-    return throbber->icon_size;
-}
-
-/**
- * katze_throbber_get_icon_name:
- * @throbber: a #KatzeThrobber
- *
- * Retrieves the name of the icon providing the animation frames.
- *
- * Return value: the name of the icon providing the animation frames, or %NULL
- **/
-const gchar*
-katze_throbber_get_icon_name (KatzeThrobber* throbber)
-{
-    g_return_val_if_fail (KATZE_IS_THROBBER (throbber), NULL);
-
-    return throbber->icon_name;
-}
-
-/**
- * katze_throbber_get_pixbuf:
- * @throbber: a #KatzeThrobber
- *
- * Retrieves the #GdkPixbuf providing the animation frames if an icon name
- * or pixbuf is available. The caller of this function does not own a
- * reference to the returned pixbuf.
- *
- * Return value: the pixbuf providing the animation frames, or %NULL
- **/
-GdkPixbuf*
-katze_throbber_get_pixbuf (KatzeThrobber* throbber)
-{
-    g_return_val_if_fail (KATZE_IS_THROBBER (throbber), NULL);
-
-    return throbber->pixbuf;
-}
-
-/**
- * katze_throbber_get_animated:
- * @throbber: a #KatzeThrobber
- *
- * Retrieves the status of the animation, whcih can be animated or static.
- *
- * Return value: %TRUE if the throbber is animated
- **/
-gboolean
-katze_throbber_get_animated (KatzeThrobber* throbber)
-{
-    g_return_val_if_fail (KATZE_IS_THROBBER (throbber), FALSE);
-
-    return throbber->animated;
-}
-
-/**
- * katze_throbber_get_static_icon_name:
- * @throbber: a #KatzeThrobber
- *
- * Retrieves the name of the icon providing the static image, if an icon name
- * for the static image was specified.
- *
- * Return value: the name of the icon providing the static image, or %NULL
- **/
-const gchar*
-katze_throbber_get_static_icon_name (KatzeThrobber* throbber)
-{
-    g_return_val_if_fail (KATZE_IS_THROBBER (throbber), NULL);
-
-    return throbber->static_icon_name;
-}
-
-/**
- * katze_throbber_get_static pixbuf:
- * @throbber: a #KatzeThrobber
- *
- * Retrieves the #GdkPixbuf providing the static image, if an icon name, a
- * pixbuf or a stock ID for the static image was specified. The caller of this
- * function does not own a reference to the returned pixbuf.
- *
- * Return value: the pixbuf providing the static image, or %NULL
- **/
-GdkPixbuf*
-katze_throbber_get_static_pixbuf (KatzeThrobber* throbber)
-{
-    g_return_val_if_fail (KATZE_IS_THROBBER (throbber), NULL);
-
-    return throbber->static_pixbuf;
-}
-
-/**
- * katze_throbber_get_static_stock_id:
- * @throbber: a #KatzeThrobber
- *
- * Retrieves the stock ID of the icon providing the static image, if a
- * stock ID for the static image was specified.
- *
- * Return value: the stock ID of the icon providing the static image, or %NULL
- **/
-const gchar*
-katze_throbber_get_static_stock_id (KatzeThrobber* throbber)
-{
-    g_return_val_if_fail (KATZE_IS_THROBBER (throbber), NULL);
-
-    return throbber->static_stock_id;
-}
-
-static void
-katze_throbber_realize (GtkWidget* widget)
-{
-    (*GTK_WIDGET_CLASS (katze_throbber_parent_class)->realize) (widget);
-
-    icon_theme_changed (KATZE_THROBBER (widget));
-}
-
-static void
-katze_throbber_unrealize (GtkWidget* widget)
-{
-    if (GTK_WIDGET_CLASS (katze_throbber_parent_class)->unrealize)
-        GTK_WIDGET_CLASS (katze_throbber_parent_class)->unrealize (widget);
-}
-
-static void
-pixbuf_assign_icon (GdkPixbuf**    pixbuf,
-                    const gchar*   icon_name,
-                    KatzeThrobber* throbber)
-{
-    GdkScreen* screen;
-    GtkIconTheme* icon_theme;
-
-    if (*pixbuf)
-        g_object_unref (*pixbuf);
-
-    screen = gtk_widget_get_screen (GTK_WIDGET (throbber));
-    icon_theme = gtk_icon_theme_get_for_screen (screen);
-    *pixbuf = gtk_icon_theme_load_icon (icon_theme,
-                                        icon_name,
-                                        MAX (throbber->width, throbber->height),
-                                        (GtkIconLookupFlags) 0,
-                                        NULL);
-}
-
-static void
-icon_theme_changed (KatzeThrobber* throbber)
-{
-    if (throbber->icon_name)
-        pixbuf_assign_icon (&throbber->pixbuf,
-                            throbber->icon_name, throbber);
-
-    if (throbber->static_icon_name)
-        pixbuf_assign_icon (&throbber->static_pixbuf,
-                            throbber->static_icon_name, throbber);
-    else if (throbber->static_stock_id)
-        katze_object_assign (throbber->static_pixbuf,
-            gtk_widget_render_icon (GTK_WIDGET (throbber),
-                                    throbber->static_stock_id,
-                                    throbber->icon_size,
-                                    NULL));
-
-    g_object_freeze_notify (G_OBJECT (throbber));
-    g_object_notify (G_OBJECT (throbber), "pixbuf");
-    g_object_notify (G_OBJECT (throbber), "static-pixbuf");
-    g_object_thaw_notify (G_OBJECT (throbber));
-
-    gtk_widget_queue_draw (GTK_WIDGET (throbber));
-}
-
-static void
-katze_throbber_map (GtkWidget* widget)
-{
-    (*GTK_WIDGET_CLASS (katze_throbber_parent_class)->map) (widget);
-}
-
-static void
-katze_throbber_unmap (GtkWidget* widget)
-{
-    if (GTK_WIDGET_CLASS (katze_throbber_parent_class)->unmap)
-        GTK_WIDGET_CLASS (katze_throbber_parent_class)->unmap (widget);
-}
-
-static void
-katze_throbber_style_set (GtkWidget* widget,
-                          GtkStyle*  prev_style)
-{
-    if (GTK_WIDGET_CLASS (katze_throbber_parent_class)->style_set)
-        GTK_WIDGET_CLASS (katze_throbber_parent_class)->style_set (widget,
-                                                                   prev_style);
-
-    icon_theme_changed (KATZE_THROBBER (widget));
-}
-
-static void
-katze_throbber_screen_changed (GtkWidget* widget,
-                               GdkScreen* prev_screen)
-{
-    if (GTK_WIDGET_CLASS (katze_throbber_parent_class)->screen_changed)
-        GTK_WIDGET_CLASS (katze_throbber_parent_class)->screen_changed (
-                                                        widget,
-                                                        prev_screen);
-
-    icon_theme_changed (KATZE_THROBBER (widget));
-}
-
-static void
-katze_throbber_size_request (GtkWidget*      widget,
-                             GtkRequisition* requisition)
-{
-    KatzeThrobber* throbber = KATZE_THROBBER (widget);
-
-    requisition->width = throbber->width;
-    requisition->height = throbber->height;
-#if !GTK_CHECK_VERSION (3, 0, 0)
-    GTK_WIDGET_CLASS (katze_throbber_parent_class)->size_request (widget,
-                                                                  requisition);
-#endif
-}
-
-#if GTK_CHECK_VERSION (3, 0, 0)
-static void
-katze_throbber_get_preferred_height (GtkWidget *widget,
-                                     gint      *minimal_height,
-                                     gint      *natural_height)
-{
-    GtkRequisition requisition;
-
-    katze_throbber_size_request (widget, &requisition);
-
-    *minimal_height = *natural_height = requisition.height;
-}
-
-static void
-katze_throbber_get_preferred_width (GtkWidget *widget,
-                                    gint      *minimal_width,
-                                    gint      *natural_width)
-{
-    GtkRequisition requisition;
-
-    katze_throbber_size_request (widget, &requisition);
-
-    *minimal_width = *natural_width = requisition.width;
-}
-#endif
-
-static void
-katze_throbber_aligned_coords (GtkWidget* widget,
-                               gint*      ax,
-                               gint*      ay)
-{
-    gfloat xalign, yalign;
-    gint xpad, ypad;
-    GtkAllocation allocation;
-    GtkRequisition requisition;
-
-    xalign = 0.0;
-    yalign = 0.5;
-    xpad = ypad = 0.0;
-
-    #if GTK_CHECK_VERSION (3, 0, 0)
-    allocation.x = allocation.y = 0;
-    allocation.width = gtk_widget_get_allocated_width (widget);
-    allocation.height = gtk_widget_get_allocated_height (widget);
-    gtk_widget_get_preferred_size (widget, &requisition, NULL);
-    #else
-    gtk_widget_get_allocation (widget, &allocation);
-    gtk_widget_size_request (widget, &requisition);
-    #endif
-    *ax = floor (allocation.x + xpad
-        + ((allocation.width - requisition.width) * xalign));
-    *ay = floor (allocation.y + ypad
-        + ((allocation.height - requisition.height) * yalign));
-}
-
-static gboolean
-katze_throbber_expose_event (GtkWidget*      widget,
-#if GTK_CHECK_VERSION (3, 0, 0)
-                             cairo_t* cr)
-#else
-                             GdkEventExpose* event)
-#endif
-{
-    KatzeThrobber* throbber = KATZE_THROBBER (widget);
-    gint ax, ay;
-
-    if (G_UNLIKELY (!throbber->width || !throbber->height))
-        return TRUE;
-
-    if (G_UNLIKELY (!throbber->pixbuf && !throbber->static_pixbuf))
-        if (throbber->animated && !throbber->pixbuf && !throbber->icon_name)
-            return TRUE;
-
-    if (!throbber->animated && (throbber->static_pixbuf
-        || throbber->static_icon_name || throbber->static_stock_id))
-    {
-#if !GTK_CHECK_VERSION (3, 0, 0)
-        cairo_t* cr;
-#endif
-        if (G_UNLIKELY (!throbber->static_pixbuf && throbber->static_icon_name))
-        {
-            icon_theme_changed (KATZE_THROBBER (widget));
-
-            if (!throbber->static_pixbuf)
-            {
-                g_warning (_("Named icon '%s' couldn't be loaded"),
-                           throbber->static_icon_name);
-                katze_assign (throbber->static_icon_name, NULL);
-                g_object_notify (G_OBJECT (throbber), "static-icon-name");
-                return TRUE;
-            }
-        }
-        else if (G_UNLIKELY (!throbber->static_pixbuf && throbber->static_stock_id))
-        {
-            icon_theme_changed (KATZE_THROBBER (widget));
-
-            if (!throbber->static_pixbuf)
-            {
-                g_warning (_("Stock icon '%s' couldn't be loaded"),
-                           throbber->static_stock_id);
-                katze_assign (throbber->static_stock_id, NULL);
-                g_object_notify (G_OBJECT (throbber), "static-stock-id");
-                return TRUE;
-            }
-        }
-
-        katze_throbber_aligned_coords (widget, &ax, &ay);
-
-#if !GTK_CHECK_VERSION (3, 0, 0)
-        cr = gdk_cairo_create (gtk_widget_get_window (widget));
-#endif
-        gdk_cairo_set_source_pixbuf (cr, throbber->static_pixbuf, ax, ay);
-        cairo_paint (cr);
-#if !GTK_CHECK_VERSION (3, 0, 0)
-        cairo_destroy (cr);
-#endif
-    }
-    else
-    {
-        if (throbber->animated)
-#if GTK_CHECK_VERSION (3, 0, 0)
-            return GTK_WIDGET_CLASS (katze_throbber_parent_class)->draw (widget, cr);
-#else
-            return GTK_WIDGET_CLASS (katze_throbber_parent_class)->expose_event (widget, event);
-#endif
-    }
-
-    return TRUE;
-}
 
=== removed file 'katze/katze-throbber.h'
--- katze/katze-throbber.h	2010-05-02 14:11:18 +0000
+++ katze/katze-throbber.h	1970-01-01 00:00:00 +0000
@@ -1,94 +0,0 @@
-/*
- Copyright (C) 2007 Christian Dywan <[e-mail]>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- See the file COPYING for the full license text.
-*/
-
-#ifndef __KATZE_THROBBER_H__
-#define __KATZE_THROBBER_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define KATZE_TYPE_THROBBER \
-    (katze_throbber_get_type ())
-#define KATZE_THROBBER(obj) \
-    (G_TYPE_CHECK_INSTANCE_CAST ((obj), KATZE_TYPE_THROBBER, KatzeThrobber))
-#define KATZE_THROBBER_CLASS(klass) \
-    (G_TYPE_CHECK_CLASS_CAST ((klass), KATZE_TYPE_THROBBER, KatzeThrobberClass))
-#define KATZE_IS_THROBBER(obj) \
-    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KATZE_TYPE_THROBBER))
-#define KATZE_IS_THROBBER_CLASS(klass) \
-    (G_TYPE_CHECK_CLASS_TYPE ((klass), KATZE_TYPE_THROBBER))
-#define KATZE_THROBBER_GET_CLASS(obj) \
-    (G_TYPE_INSTANCE_GET_CLASS ((obj), KATZE_TYPE_THROBBER, KatzeThrobberClass))
-
-typedef struct _KatzeThrobber                KatzeThrobber;
-typedef struct _KatzeThrobberPrivate         KatzeThrobberPrivate;
-typedef struct _KatzeThrobberClass           KatzeThrobberClass;
-
-
-GType
-katze_throbber_get_type             (void) G_GNUC_CONST;
-
-GtkWidget*
-katze_throbber_new                  (void);
-
-void
-katze_throbber_set_icon_size        (KatzeThrobber*   throbber,
-                                     GtkIconSize      icon_size);
-
-void
-katze_throbber_set_icon_name        (KatzeThrobber*   throbber,
-                                     const gchar*     icon_size);
-
-void
-katze_throbber_set_pixbuf           (KatzeThrobber*   throbber,
-                                     GdkPixbuf*       pixbuf);
-
-void
-katze_throbber_set_animated         (KatzeThrobber*   throbber,
-                                     gboolean         animated);
-
-void
-katze_throbber_set_static_icon_name (KatzeThrobber*   throbber,
-                                     const gchar*     icon_name);
-
-void
-katze_throbber_set_static_pixbuf    (KatzeThrobber*   throbber,
-                                     GdkPixbuf*       pixbuf);
-
-void
-katze_throbber_set_static_stock_id  (KatzeThrobber*   throbber,
-                                     const gchar*     stock_id);
-
-GtkIconSize
-katze_throbber_get_icon_size        (KatzeThrobber*   throbber);
-
-const gchar*
-katze_throbber_get_icon_name        (KatzeThrobber*   throbber);
-
-GdkPixbuf*
-katze_throbber_get_pixbuf           (KatzeThrobber*   throbber);
-
-gboolean
-katze_throbber_get_animated         (KatzeThrobber*   throbber);
-
-const gchar*
-katze_throbber_get_static_icon_name (KatzeThrobber    *throbber);
-
-GdkPixbuf*
-katze_throbber_get_static_pixbuf    (KatzeThrobber*   throbber);
-
-const gchar*
-katze_throbber_get_static_stock_id  (KatzeThrobber*   throbber);
-
-G_END_DECLS
-
-#endif /* __KATZE_THROBBER_H__ */
 
=== modified file 'katze/katze.h'
--- katze/katze.h	2013-07-30 21:00:46 +0000
+++ katze/katze.h	2013-12-05 00:25:31 +0000
@@ -13,7 +13,6 @@
 #define __KATZE_H__
 
 #include "katze-http-auth.h"
-#include "katze-throbber.h"
 #include "katze-utils.h"
 #include "katze-item.h"
 #include "katze-array.h"
 
=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2013-11-27 09:47:37 +0000
+++ midori/midori-browser.c	2013-12-05 00:25:31 +0000
@@ -82,7 +82,6 @@
 
     gint last_window_width, last_window_height;
     guint alloc_timeout;
-    gint last_tab_size;
     guint panel_timeout;
 
     MidoriWebSettings* settings;
@@ -202,11 +201,6 @@
 midori_browser_add_speed_dial (MidoriBrowser* browser);
 
 static void
-midori_browser_notebook_size_allocate_cb (GtkWidget*     notebook,
-                                          GdkRectangle*  allocation,
-                                          MidoriBrowser* browser);
-
-static void
 midori_browser_step_history (MidoriBrowser* browser,
                              MidoriView*    view);
 
@@ -220,6 +214,10 @@
     gtk_toggle_action_set_active (GTK_TOGGLE_ACTION ( \
     _action_by_name (brwsr, nme)), actv);
 
+static void
+midori_browser_disconnect_tab (MidoriBrowser* browser,
+                               MidoriView*    view);
+
 static gboolean
 midori_browser_is_fullscreen (MidoriBrowser* browser)
 {
@@ -236,15 +234,7 @@
     gboolean show_tabs = !midori_browser_is_fullscreen (browser) || ignore_fullscreen;
     if (!browser->show_tabs)
         show_tabs = FALSE;
-#ifdef HAVE_GRANITE
-    granite_widgets_dynamic_notebook_set_show_tabs (
-        GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), show_tabs);
-#else
-    if (!(has_tabs || katze_object_get_boolean (browser->settings, "always-show-tabbar")))
-        show_tabs = FALSE;
-    gtk_notebook_set_show_tabs (GTK_NOTEBOOK (browser->notebook), show_tabs);
-    gtk_notebook_set_show_border (GTK_NOTEBOOK (browser->notebook), show_tabs);
-#endif
+    midori_notebook_set_labels_visible (MIDORI_NOTEBOOK (browser->notebook), show_tabs);
     return has_tabs;
 }
 
@@ -451,8 +441,7 @@
                       "tooltip", _("Stop loading the current page"), NULL);
     }
 
-    gtk_widget_set_sensitive (browser->throbber, loading);
-    katze_throbber_set_animated (KATZE_THROBBER (browser->throbber), loading);
+    g_object_set (browser->throbber, "active", loading, "visible", loading, NULL);
 }
 
 /**
@@ -782,23 +771,6 @@
 }
 
 static void
-midori_view_notify_minimized_cb (GtkWidget*     widget,
-                                 GParamSpec*    pspec,
-                                 MidoriBrowser* browser)
-{
-    if (katze_object_get_boolean (widget, "minimized"))
-    {
-        #ifndef HAVE_GRANITE
-        GtkNotebook* notebook = GTK_NOTEBOOK (browser->notebook);
-        GtkWidget* label = gtk_notebook_get_tab_label (notebook, widget);
-        gtk_widget_set_size_request (label, -1, -1);
-        #endif
-    }
-    else
-        midori_browser_notebook_size_allocate_cb (NULL, NULL, browser);
-}
-
-static void
 midori_view_notify_zoom_level_cb (GtkWidget*     view,
                                   GParamSpec*    pspec,
                                   MidoriBrowser* browser)
@@ -1401,6 +1373,25 @@
 }
 
 static void
+midori_view_destroy_cb (GtkWidget*     view,
+                        MidoriBrowser* browser)
+{
+    if (browser->proxy_array)
+    {
+        KatzeItem* item = midori_view_get_proxy_item (MIDORI_VIEW (view));
+        if (katze_array_get_item_index (browser->proxy_array, item) != -1
+         && !midori_tab_is_blank (MIDORI_TAB (view)))
+        {
+            if (browser->trash)
+                katze_array_add_item (browser->trash, item);
+            midori_browser_update_history (item, "website", "leave");
+        }
+        midori_browser_disconnect_tab (browser, MIDORI_VIEW (view));
+        g_signal_emit (browser, signals[REMOVE_TAB], 0, view);
+    }
+}
+
+static void
 midori_view_attach_inspector_cb (GtkWidget*     view,
                                  GtkWidget*     inspector_view,
                                  MidoriBrowser* browser)
@@ -1785,98 +1776,14 @@
 gint
 midori_browser_get_n_pages (MidoriBrowser* browser)
 {
-    #ifdef HAVE_GRANITE
-    return granite_widgets_dynamic_notebook_get_n_tabs (
-        GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook));
-    #else
-    return gtk_notebook_get_n_pages (GTK_NOTEBOOK (browser->notebook));
-    #endif
-}
-
-static void
-midori_browser_disconnect_tab (MidoriBrowser* browser,
-                               MidoriView*    view);
-
-static gboolean
-midori_browser_tab_connected (MidoriBrowser* browser,
-                              MidoriView*    view)
-{
-    return browser->proxy_array &&
-        (katze_array_get_item_index (browser->proxy_array, midori_view_get_proxy_item (view)) != -1);
+    return midori_notebook_get_count (MIDORI_NOTEBOOK (browser->notebook));
 }
 
 static void
 _midori_browser_remove_tab (MidoriBrowser* browser,
                             GtkWidget*     widget)
 {
-    MidoriView* view = MIDORI_VIEW (widget);
-#ifdef HAVE_GRANITE
-    granite_widgets_dynamic_notebook_remove_tab (
-        GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), midori_view_get_tab (view));
-#else
     gtk_widget_destroy (widget);
-#endif
-    if (midori_browser_tab_connected (browser, view))
-        midori_browser_disconnect_tab (browser, view);
-}
-
-#ifndef HAVE_GRANITE
-static void
-midori_browser_notebook_resize (MidoriBrowser* browser,
-                                GdkRectangle*  allocation)
-{
-    gint new_size = 0;
-    gint n = MAX (1, gtk_notebook_get_n_pages (GTK_NOTEBOOK (browser->notebook)));
-    const gint max_size = 150;
-    gint min_size;
-    gint icon_size = 16;
-    GtkAllocation notebook_size;
-    GList* children;
-
-    if (allocation != NULL)
-        notebook_size.width = allocation->width;
-    else
-        gtk_widget_get_allocation (browser->notebook, &notebook_size);
-    new_size = notebook_size.width / n;
-
-    gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (browser->notebook),
-                                       GTK_ICON_SIZE_MENU, &icon_size, NULL);
-    min_size = icon_size;
-    if (katze_object_get_boolean (browser->settings, "close-buttons-on-tabs"))
-        min_size += icon_size;
-    if (new_size < min_size) new_size = min_size;
-    if (new_size > max_size) new_size = max_size;
-
-    if (new_size > browser->last_tab_size - 3
-     && new_size < browser->last_tab_size + 3)
-        return;
-    browser->last_tab_size = new_size;
-
-    children = gtk_container_get_children (GTK_CONTAINER (browser->notebook));
-    for (; children; children = g_list_next (children))
-    {
-        GtkWidget* view = children->data;
-        GtkWidget* label;
-        label = gtk_notebook_get_tab_label (GTK_NOTEBOOK(browser->notebook), view);
-        /* Don't resize empty bin, which is used for thumbnail tabs */
-        if (GTK_IS_BIN (label) && gtk_bin_get_child (GTK_BIN (label))
-         && !katze_object_get_boolean (view, "minimized"))
-            gtk_widget_set_size_request (label, new_size, -1);
-    }
-}
-#endif
-
-static void
-midori_browser_notebook_size_allocate_cb (GtkWidget*     widget,
-                                          GdkRectangle*  allocation,
-                                          MidoriBrowser* browser)
-{
-    #ifndef HAVE_GRANITE
-    if (!gtk_notebook_get_show_tabs (GTK_NOTEBOOK (browser->notebook)))
-        return;
-
-    midori_browser_notebook_resize (browser, allocation);
-    #endif
 }
 
 static void
@@ -1886,7 +1793,6 @@
     KatzeItem* item = midori_view_get_proxy_item (MIDORI_VIEW (view));
     katze_array_add_item (browser->proxy_array, item);
 
-    gtk_widget_set_can_focus (view, TRUE);
     g_object_connect (view,
                       "signal::notify::icon",
                       midori_view_notify_icon_cb, browser,
@@ -1898,8 +1804,6 @@
                       midori_view_notify_uri_cb, browser,
                       "signal::notify::title",
                       midori_view_notify_title_cb, browser,
-                      "signal::notify::minimized",
-                      midori_view_notify_minimized_cb, browser,
                       "signal::notify::zoom-level",
                       midori_view_notify_zoom_level_cb, browser,
                       "signal::notify::statusbar-text",
@@ -1920,30 +1824,12 @@
                       midori_view_search_text_cb, browser,
                       "signal::leave-notify-event",
                       midori_browser_tab_leave_notify_event_cb, browser,
+                      "signal::destroy",
+                      midori_view_destroy_cb, browser,
                       NULL);
 }
 
 static void
-midori_browser_add_tab_to_trash (MidoriBrowser* browser,
-                                 MidoriView*    view)
-{
-    if (browser->proxy_array)
-    {
-        KatzeItem* item = midori_view_get_proxy_item (view);
-        if (katze_array_get_item_index (browser->proxy_array, item) != -1)
-        {
-            if (!midori_view_is_blank (view))
-            {
-                if (browser->trash)
-                    katze_array_add_item (browser->trash, item);
-                midori_browser_update_history (item, "website", "leave");
-            }
-        }
-    }
-}
-
-
-static void
 midori_browser_disconnect_tab (MidoriBrowser* browser,
                                MidoriView*    view)
 {
@@ -1974,8 +1860,6 @@
                          "any_signal",
                          midori_view_notify_title_cb, browser,
                          "any_signal",
-                         midori_view_notify_minimized_cb, browser,
-                         "any_signal",
                          midori_view_notify_zoom_level_cb, browser,
                          "any_signal",
                          midori_view_notify_statusbar_text_cb, browser,
@@ -2002,11 +1886,7 @@
 _midori_browser_add_tab (MidoriBrowser* browser,
                          GtkWidget*     view)
 {
-    GtkWidget* notebook = browser->notebook;
     KatzeItem* item = midori_view_get_proxy_item (MIDORI_VIEW (view));
-    #ifndef HAVE_GRANITE
-    GtkWidget* tab_label;
-    #endif
     guint n;
 
     midori_browser_connect_tab (browser, view);
@@ -2018,24 +1898,10 @@
         katze_array_move_item (browser->proxy_array, item, n);
     }
     else
-        n = midori_browser_get_n_pages (browser);
+        n = -1;
     katze_item_set_meta_integer (item, "append", -1);
 
-#ifdef HAVE_GRANITE
-    granite_widgets_dynamic_notebook_insert_tab (
-        GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (notebook),
-        midori_view_get_tab (MIDORI_VIEW (view)), n);
-#else
-    tab_label = midori_view_get_proxy_tab_label (MIDORI_VIEW (view));
-    /* Don't resize empty bin, which is used for thumbnail tabs */
-    if (GTK_IS_BIN (tab_label) && gtk_bin_get_child (GTK_BIN (tab_label))
-     && !katze_object_get_boolean (view, "minimized"))
-        gtk_widget_set_size_request (tab_label, browser->last_tab_size, -1);
-    gtk_notebook_insert_page (GTK_NOTEBOOK (notebook), view, tab_label, n);
-    gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (notebook), view, TRUE);
-    gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (notebook), view, TRUE);
-    midori_browser_notebook_size_allocate_cb (browser->notebook, NULL, browser);
-#endif
+    midori_notebook_insert (MIDORI_NOTEBOOK (browser->notebook), MIDORI_TAB (view), n);
 
     _midori_browser_update_actions (browser);
 }
@@ -3697,13 +3563,7 @@
         gtk_widget_hide (browser->bookmarkbar);
         gtk_widget_hide (browser->navigationbar);
         gtk_widget_hide (browser->statusbar);
-        #ifdef HAVE_GRANITE
-        granite_widgets_dynamic_notebook_set_show_tabs (
-            GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), FALSE);
-        #else
-        gtk_notebook_set_show_tabs (GTK_NOTEBOOK (browser->notebook), FALSE);
-        gtk_notebook_set_show_border (GTK_NOTEBOOK (browser->notebook), FALSE);
-        #endif
+        midori_notebook_set_labels_visible (MIDORI_NOTEBOOK (browser->notebook), FALSE);
 
         gtk_window_fullscreen (GTK_WINDOW (browser));
     }
@@ -4741,13 +4601,7 @@
     else
         g_assert_not_reached ();
 
-    #ifdef HAVE_GRANITE
-    granite_widgets_dynamic_notebook_set_tab_position (
-        GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook),
-        midori_view_get_tab (MIDORI_VIEW (widget)), new_pos);
-    #else
-    gtk_notebook_reorder_child (GTK_NOTEBOOK (browser->notebook), widget, new_pos);
-    #endif
+    midori_notebook_move (MIDORI_NOTEBOOK (browser->notebook), MIDORI_TAB (widget), new_pos);
     g_signal_emit (browser, signals[MOVE_TAB], 0, browser->notebook, cur_pos, new_pos);
 }
 
@@ -4798,7 +4652,9 @@
 _action_tab_duplicate_activate (GtkAction*     action,
                                 MidoriBrowser* browser)
 {
-    GtkWidget* view = midori_browser_get_current_tab (browser);
+    GtkWidget* view = g_object_get_data (G_OBJECT (action), "tab");
+    if (view == NULL)
+        view = midori_browser_get_current_tab (browser);
     midori_view_duplicate (MIDORI_VIEW (view));
 }
 
@@ -5034,10 +4890,10 @@
 }
 
 static void
-midori_browser_switched_tab (MidoriBrowser* browser,
-                             GtkWidget*     old_widget,
-                             MidoriView*    new_view,
-                             gint           new_page)
+midori_browser_switched_tab_cb (MidoriNotebook* notebook,
+                                GtkWidget*      old_widget,
+                                MidoriView*     new_view,
+                                MidoriBrowser*  browser)
 {
     GtkAction* action;
     const gchar* text;
@@ -5051,13 +4907,8 @@
                                 g_strdup (text), g_free);
     }
 
-    if (new_view == NULL)
-    {
-        g_signal_emit (browser, signals[SWITCH_TAB], 0, old_widget, new_view);
-        return;
-    }
-
     g_return_if_fail (MIDORI_IS_VIEW (new_view));
+    g_return_if_fail (new_view != MIDORI_VIEW (old_widget));
 
     uri = g_object_get_data (G_OBJECT (new_view), "midori-browser-typed-text");
     if (!uri)
@@ -5068,9 +4919,10 @@
     if (midori_paths_get_runtime_mode () == MIDORI_RUNTIME_MODE_APP)
         gtk_window_set_icon (GTK_WINDOW (browser), midori_view_get_icon (new_view));
 
-    if (browser->proxy_array)
-        katze_item_set_meta_integer (KATZE_ITEM (browser->proxy_array), "current", new_page);
+    g_object_freeze_notify (G_OBJECT (browser));
+    g_object_notify (G_OBJECT (browser), "uri");
     g_object_notify (G_OBJECT (browser), "tab");
+    g_object_thaw_notify (G_OBJECT (browser));
     g_signal_emit (browser, signals[SWITCH_TAB], 0, old_widget, new_view);
 
     _midori_browser_set_statusbar_text (browser, new_view, NULL);
@@ -5079,17 +4931,17 @@
 }
 
 static void
-midori_browser_notebook_page_reordered_cb (GtkWidget*     notebook,
-                                           MidoriView*    view,
-                                           guint          page_num,
-                                           MidoriBrowser* browser)
+midori_browser_tab_moved_cb (GtkWidget*     notebook,
+                             MidoriView*    view,
+                             guint          page_num,
+                             MidoriBrowser* browser)
 {
     KatzeItem* item = midori_view_get_proxy_item (view);
     katze_array_move_item (browser->proxy_array, item, page_num);
     g_object_notify (G_OBJECT (browser), "tab");
 }
 
-static GtkWidget*
+static void
 midori_browser_notebook_create_window_cb (GtkWidget*     notebook,
                                           GtkWidget*     view,
                                           gint           x,
@@ -5100,216 +4952,53 @@
     g_signal_emit (browser, signals[NEW_WINDOW], 0, NULL, &new_browser);
     if (new_browser)
     {
-        GtkWidget* new_notebook = new_browser->notebook;
         gtk_window_move (GTK_WINDOW (new_browser), x, y);
-        return new_notebook;
-    }
-    else /* No MidoriApp, so this is app or private mode */
-        return NULL;
-}
-
-#ifdef HAVE_GRANITE
-static void
-midori_browser_notebook_tab_added_cb (GtkWidget*         notebook,
-                                      GraniteWidgetsTab* tab,
-                                      MidoriBrowser*     browser)
-{
-    gint n = granite_widgets_dynamic_notebook_get_tab_position (
-        GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (notebook), tab);
-    midori_browser_set_current_page (browser, n);
-    GtkWidget* view = midori_view_new_with_item (NULL, browser->settings);
-    midori_view_set_tab (MIDORI_VIEW (view), tab);
-    midori_browser_connect_tab (browser, view);
-    midori_view_set_uri (MIDORI_VIEW (view), "about:new");
-    /* FIXME: signal add-tab */
-    _midori_browser_update_actions (browser);
-    midori_browser_notebook_page_reordered_cb (GTK_WIDGET (notebook),
-        MIDORI_VIEW (view), n, browser);
-}
-
-static gboolean
-midori_browser_notebook_tab_removed_cb (GtkWidget*         notebook,
-                                        GraniteWidgetsTab* tab,
-                                        MidoriBrowser*     browser)
-{
-
-    MidoriView* view = MIDORI_VIEW (granite_widgets_tab_get_page (tab));
-    if (midori_browser_tab_connected (browser, MIDORI_VIEW (view)))
-        midori_browser_disconnect_tab (browser, MIDORI_VIEW (view));
-
-    return TRUE;
-}
-
-static void
-midori_browser_move_tab_to_notebook (MidoriBrowser*     browser,
-                                     GtkWidget*         view,
-                                     GraniteWidgetsTab* tab,
-                                     GtkWidget*         new_notebook)
-{
-    GraniteWidgetsTab* new_tab = granite_widgets_tab_new ("", NULL, NULL);
-    g_object_ref (view);
-    _midori_browser_remove_tab (browser, view);
-    granite_widgets_dynamic_notebook_insert_tab (
-        GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (new_notebook), new_tab, 0);
-    midori_view_set_tab (MIDORI_VIEW (view), new_tab);
-    _midori_browser_update_actions (browser);
-    midori_browser_connect_tab (midori_browser_get_for_widget (new_notebook), view);
-    g_object_unref (view);
-}
-
-static void
-midori_browser_notebook_tab_switched_cb (GraniteWidgetsDynamicNotebook* notebook,
-                                         GraniteWidgetsTab* old_tab,
-                                         GraniteWidgetsTab* new_tab,
-                                         MidoriBrowser*     browser)
-{
-    gint new_pos = granite_widgets_dynamic_notebook_get_tab_position (notebook, new_tab);
-
-    midori_browser_switched_tab (browser,
-        old_tab ? granite_widgets_tab_get_page (old_tab) : NULL,
-        MIDORI_VIEW (granite_widgets_tab_get_page (new_tab)), new_pos);
-}
-
-static void
-midori_browser_notebook_tab_moved_cb (GtkWidget*         notebook,
-                                      GraniteWidgetsTab* tab,
-                                      gint               old_pos,
-                                      gboolean           new_window,
-                                      gint               x,
-                                      gint               y,
-                                      MidoriBrowser*     browser)
-{
-    GtkWidget* view = granite_widgets_tab_get_page (tab);
-    if (new_window)
-    {
-        GtkWidget* notebook = midori_browser_notebook_create_window_cb (
-            browser->notebook, view, x, y, browser);
-        if (notebook != NULL)
-            midori_browser_move_tab_to_notebook (browser, view, tab, notebook);
-    }
-    else
-    {
-        gint new_pos = granite_widgets_dynamic_notebook_get_tab_position (
-            GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (notebook), tab);
-        midori_browser_notebook_page_reordered_cb (notebook,
-            MIDORI_VIEW (view), new_pos, browser);
-    }
-}
-
-static void
-midori_browser_notebook_tab_duplicated_cb (GtkWidget*         notebook,
-                                           GraniteWidgetsTab* tab,
-                                           MidoriBrowser*     browser)
-{
-    GtkWidget* view = granite_widgets_tab_get_page (tab);
-    midori_view_duplicate (MIDORI_VIEW (view));
-}
-
-#else
-static void
-midori_browser_notebook_page_added_cb (GtkNotebook*   notebook,
-                                       GtkWidget*     child,
-                                       guint          page_num,
-                                       MidoriBrowser* browser)
-{
-    if (!midori_browser_tab_connected (browser, MIDORI_VIEW (child)))
-        midori_browser_connect_tab (browser, child);
-    midori_browser_notebook_page_reordered_cb (GTK_WIDGET (notebook),
-        MIDORI_VIEW (child), page_num, browser);
-}
-
-static void
-midori_browser_notebook_switch_page_cb (GtkWidget*       notebook,
-                                        gpointer         page,
-                                        guint            page_num,
-                                        MidoriBrowser*   browser)
-{
-    midori_browser_switched_tab (browser,
-        midori_browser_get_current_tab (browser),
-        MIDORI_VIEW (midori_browser_get_nth_tab (browser, page_num)), page_num);
-}
-
-static void
-midori_browser_notebook_page_removed_cb (GtkWidget*     notebook,
-                                         GtkWidget*     view,
-                                         guint          page_num,
-                                         MidoriBrowser* browser)
-{
-    if (midori_browser_tab_connected (browser, MIDORI_VIEW (view)))
-        midori_browser_disconnect_tab (browser, MIDORI_VIEW (view));
-    midori_browser_notebook_size_allocate_cb (browser->notebook, NULL, browser);
-}
-
-static gboolean
-midori_browser_notebook_reorder_tab_cb (GtkNotebook*     notebook,
-                                        GtkDirectionType arg1,
-                                        gboolean         arg2,
-                                        gpointer         user_data)
-{
-    g_signal_stop_emission_by_name (notebook, "reorder-tab");
-    return TRUE;
-}
-
-static void
-midori_browser_menu_item_switch_tab_cb (GtkWidget*     menuitem,
-                                        MidoriBrowser* browser)
-{
-    gint page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (menuitem), "index"));
-    midori_browser_set_current_page (browser, page);
-}
-
-static gboolean
-midori_browser_notebook_button_press_event_after_cb (GtkNotebook*    notebook,
-                                                     GdkEventButton* event,
-                                                     MidoriBrowser*  browser)
-{
-#if !GTK_CHECK_VERSION(3,0,0) /* TODO */
-    if (event->window != notebook->event_window)
-        return FALSE;
-#endif
-
-    /* FIXME: Handle double click only when it wasn't handled by GtkNotebook */
-
-    /* Open a new tab on double click or middle mouse click */
-    if (/*(event->type == GDK_2BUTTON_PRESS && event->button == 1)
-    || */(event->type == GDK_BUTTON_PRESS && MIDORI_EVENT_NEW_TAB (event)))
-    {
-        GtkWidget* view = midori_browser_add_uri (browser, "about:new");
-        midori_browser_set_current_tab (browser, view);
-
-        return TRUE;
-    }
-    else if (event->type == GDK_BUTTON_PRESS && MIDORI_EVENT_CONTEXT_MENU (event))
-    {
-        MidoriContextAction* menu = midori_context_action_new ("NotebookContextMenu", NULL, NULL, NULL);
-        midori_context_action_add_action_group (menu, browser->action_group);
-        GList* tabs = midori_browser_get_tabs (browser);
-        midori_context_action_add_by_name (menu, "TabNew");
-        midori_context_action_add_by_name (menu, "UndoTabClose");
-        midori_context_action_add (menu, NULL);
-        gint i = 0;
-        for (; tabs != NULL; tabs = g_list_next (tabs))
-        {
-            const gchar* title = midori_view_get_display_title (tabs->data);
-            gchar* tab_option = g_strdup_printf ("Tab%u", i);
-            GtkAction* action = gtk_action_new (tab_option, title, NULL, NULL);
-            g_free (tab_option);
-            gtk_action_set_gicon (GTK_ACTION (action), G_ICON (midori_view_get_icon (tabs->data)));
-            g_object_set_data (G_OBJECT (action), "index", GINT_TO_POINTER (i));
-            g_signal_connect (action, "activate",
-                G_CALLBACK (midori_browser_menu_item_switch_tab_cb), browser);
-            midori_context_action_add (menu, action);
-            i++;
-        }
-        g_list_free (tabs);
-        GtkMenu* context_menu = midori_context_action_create_menu (menu, NULL, FALSE);
-        katze_widget_popup (GTK_WIDGET (notebook), context_menu, NULL,
-            KATZE_MENU_POSITION_CURSOR);
-    }
-
-    return FALSE;
-}
-#endif
+        g_object_ref (view);
+        midori_browser_disconnect_tab (browser, MIDORI_VIEW (view));
+        midori_notebook_remove (MIDORI_NOTEBOOK (browser->notebook), MIDORI_TAB (view));
+        midori_browser_add_tab (new_browser, view);
+        g_object_unref (view);
+    }
+}
+
+static void
+midori_browser_notebook_new_tab_cb (GtkWidget*     notebook,
+                                    MidoriBrowser* browser)
+{
+    GtkWidget* view = midori_browser_add_uri (browser, "about:new");
+    midori_browser_set_current_tab (browser, view);
+}
+
+static void
+midori_browser_notebook_context_menu_cb (MidoriNotebook*      notebook,
+                                         MidoriContextAction* menu,
+                                         MidoriBrowser*       browser)
+{
+    midori_context_action_add_action_group (menu, browser->action_group);
+    midori_context_action_add (menu, NULL);
+    midori_context_action_add_by_name (menu, "TabNew");
+    midori_context_action_add_by_name (menu, "UndoTabClose");
+}
+
+static void
+midori_browser_notebook_tab_context_menu_cb (MidoriNotebook*      notebook,
+                                             MidoriTab*           tab,
+                                             MidoriContextAction* menu,
+                                             MidoriBrowser*       browser)
+{
+    midori_context_action_add_action_group (menu, browser->action_group);
+    midori_context_action_add (menu, NULL);
+    midori_context_action_add_by_name (menu, "TabNew");
+    midori_context_action_add_by_name (menu, "UndoTabClose");
+    if (MIDORI_IS_VIEW (tab))
+    {
+        GtkAction* action = gtk_action_new ("TabDuplicate", _("_Duplicate Current Tab"), NULL, NULL);
+        g_object_set_data (G_OBJECT (action), "tab", tab);
+        g_signal_connect (action, "activate",
+            G_CALLBACK (_action_tab_duplicate_activate), browser);
+        midori_context_action_add (menu, action);
+    }
+}
 
 static void
 _action_undo_tab_close_activate (GtkAction*     action,
@@ -5760,14 +5449,6 @@
 
     /* Destroy panel first, so panels don't need special care */
     gtk_widget_destroy (browser->panel);
-    #ifndef HAVE_GRANITE
-    g_signal_handlers_disconnect_by_func (browser->notebook,
-                                          midori_browser_notebook_reorder_tab_cb,
-                                          NULL);
-    g_signal_handlers_disconnect_by_func (browser->notebook,
-                                          midori_browser_notebook_size_allocate_cb,
-                                          browser);
-    #endif
     /* Destroy tabs second, so child widgets don't need special care */
     gtk_container_foreach (GTK_CONTAINER (browser->notebook),
                            (GtkCallback) gtk_widget_destroy, NULL);
@@ -6288,10 +5969,17 @@
 
     menuitem = gtk_menu_item_new ();
     gtk_widget_show (menuitem);
-    browser->throbber = katze_throbber_new ();
-    gtk_widget_show (browser->throbber);
-    gtk_container_add (GTK_CONTAINER (menuitem), browser->throbber);
-    gtk_widget_set_sensitive (menuitem, FALSE);
+    browser->throbber = gtk_spinner_new ();
+    /* Wrap the spinner in an event box to retain its size when hidden */
+    GtkWidget* throbber_box = gtk_event_box_new ();
+    gtk_event_box_set_visible_window (GTK_EVENT_BOX (throbber_box), FALSE);
+    gint icon_size = 16;
+    gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (GTK_WIDGET (browser)),
+                                       GTK_ICON_SIZE_MENU, &icon_size, NULL);
+    gtk_widget_set_size_request (throbber_box, icon_size, icon_size);
+    gtk_container_add (GTK_CONTAINER (throbber_box), browser->throbber);
+    gtk_widget_show (throbber_box);
+    gtk_container_add (GTK_CONTAINER (menuitem), throbber_box);
     #if GTK_CHECK_VERSION (3, 2, 0)
     /* FIXME: Doesn't work */
     gtk_widget_set_hexpand (menuitem, TRUE);
@@ -6390,78 +6078,24 @@
     vpaned = gtk_vpaned_new ();
     gtk_paned_pack2 (GTK_PANED (hpaned), vpaned, TRUE, FALSE);
     gtk_widget_show (vpaned);
-    #ifdef HAVE_GRANITE
-    /* FIXME: granite: should return GtkWidget* like GTK+ */
-    browser->notebook = (GtkWidget*)granite_widgets_dynamic_notebook_new ();
-    granite_widgets_dynamic_notebook_set_allow_new_window (
-        GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), TRUE);
-    granite_widgets_dynamic_notebook_set_allow_duplication (
-        GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), TRUE);
-    /* FIXME: work-around a bug */
-    gtk_widget_show_all (browser->notebook);
-    granite_widgets_dynamic_notebook_set_group_name (
-        GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), PACKAGE_NAME);
-    #else
-    browser->notebook = gtk_notebook_new ();
-    gtk_notebook_set_scrollable (GTK_NOTEBOOK (browser->notebook), TRUE);
-    #if GTK_CHECK_VERSION (3, 0, 0)
-    gtk_notebook_set_group_name (GTK_NOTEBOOK (browser->notebook), PACKAGE_NAME);
-    #else
-    gtk_notebook_set_group_id (GTK_NOTEBOOK (browser->notebook), GPOINTER_TO_INT (PACKAGE_NAME));
-    #endif
-    #endif
+    browser->notebook = midori_notebook_new ();
 
-    #if !GTK_CHECK_VERSION (3, 0, 0)
-    {
-    /* Remove the inner border between scrollbars and the window border */
-    GtkRcStyle* rcstyle = gtk_rc_style_new ();
-    rcstyle->xthickness = 0;
-    gtk_widget_modify_style (browser->notebook, rcstyle);
-    g_object_unref (rcstyle);
-    }
-    #endif
     gtk_paned_pack1 (GTK_PANED (vpaned), browser->notebook, FALSE, FALSE);
-    #ifdef HAVE_GRANITE
-    /* FIXME menu items */
-    g_signal_connect (browser->notebook, "tab-added",
-                      G_CALLBACK (midori_browser_notebook_tab_added_cb),
-                      browser);
-    g_signal_connect (browser->notebook, "tab-removed",
-                      G_CALLBACK (midori_browser_notebook_tab_removed_cb),
-                      browser);
     g_signal_connect (browser->notebook, "tab-switched",
-                      G_CALLBACK (midori_browser_notebook_tab_switched_cb),
+                      G_CALLBACK (midori_browser_switched_tab_cb),
                       browser);
     g_signal_connect (browser->notebook, "tab-moved",
-                      G_CALLBACK (midori_browser_notebook_tab_moved_cb),
-                      browser);
-    g_signal_connect (browser->notebook, "tab-duplicated",
-                      G_CALLBACK (midori_browser_notebook_tab_duplicated_cb),
-                      browser);
-    #else
-    g_signal_connect (browser->notebook, "switch-page",
-                      G_CALLBACK (midori_browser_notebook_switch_page_cb),
-                      browser);
-    g_signal_connect (browser->notebook, "page-reordered",
-                      G_CALLBACK (midori_browser_notebook_page_reordered_cb),
-                      browser);
-    g_signal_connect (browser->notebook, "page-added",
-                      G_CALLBACK (midori_browser_notebook_page_added_cb),
-                      browser);
-    g_signal_connect (browser->notebook, "page-removed",
-                      G_CALLBACK (midori_browser_notebook_page_removed_cb),
-                      browser);
-    g_signal_connect (browser->notebook, "size-allocate",
-                      G_CALLBACK (midori_browser_notebook_size_allocate_cb),
-                      browser);
-    g_signal_connect_after (browser->notebook, "button-press-event",
-        G_CALLBACK (midori_browser_notebook_button_press_event_after_cb),
-                      browser);
-    g_signal_connect (browser->notebook, "reorder-tab",
-                      G_CALLBACK (midori_browser_notebook_reorder_tab_cb), NULL);
-    g_signal_connect (browser->notebook, "create-window",
+                      G_CALLBACK (midori_browser_tab_moved_cb),
+                      browser);
+    g_signal_connect (browser->notebook, "context-menu",
+        G_CALLBACK (midori_browser_notebook_context_menu_cb),
+                      browser);
+    g_signal_connect (browser->notebook, "tab-context-menu",
+        G_CALLBACK (midori_browser_notebook_tab_context_menu_cb), browser);
+    g_signal_connect (browser->notebook, "tab-detached",
                       G_CALLBACK (midori_browser_notebook_create_window_cb), browser);
-    #endif
+    g_signal_connect (browser->notebook, "new-tab",
+                      G_CALLBACK (midori_browser_notebook_new_tab_cb), browser);
     gtk_widget_show (browser->notebook);
 
     /* Inspector container */
@@ -6768,11 +6402,9 @@
             }
             else if (token_current != token_dontcare && token_last == token_dontcare)
                 continue;
-            #ifdef HAVE_GRANITE
             /* A "new tab" button is already part of the notebook */
             else if (!strcmp (gtk_action_get_name (action), "TabNew"))
                 continue;
-            #endif
             else
                 toolitem = gtk_action_create_tool_item (action);
 
@@ -6839,7 +6471,7 @@
     gboolean show_panel;
     MidoriToolbarStyle toolbar_style;
     gchar* toolbar_items;
-    gboolean close_buttons_on_tabs;
+    gboolean close_buttons_left, close_buttons_on_tabs;
 
     g_object_get (browser->settings,
                   "remember-last-window-size", &remember_last_window_size,
@@ -6859,19 +6491,19 @@
                   "show-statusbar", &browser->show_statusbar,
                   "toolbar-style", &toolbar_style,
                   "toolbar-items", &toolbar_items,
+                  "close-buttons-left", &close_buttons_left,
                   "close-buttons-on-tabs", &close_buttons_on_tabs,
                   "maximum-history-age", &browser->maximum_history_age,
                   NULL);
 
-    #ifdef HAVE_GRANITE
-    granite_widgets_dynamic_notebook_set_tabs_closable (
-        GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), close_buttons_on_tabs);
-    #endif
+    midori_notebook_set_close_buttons_visible (
+        MIDORI_NOTEBOOK (browser->notebook), close_buttons_on_tabs);
+    midori_notebook_set_close_buttons_left (
+        MIDORI_NOTEBOOK (browser->notebook), close_buttons_left);
     midori_findbar_set_close_button_left (MIDORI_FINDBAR (browser->find),
-        katze_object_get_boolean (browser->settings, "close-buttons-left"));
+        close_buttons_left);
     if (browser->dial != NULL)
-        midori_speed_dial_set_close_buttons_left (browser->dial,
-            katze_object_get_boolean (browser->settings, "close-buttons-left"));
+        midori_speed_dial_set_close_buttons_left (browser->dial, close_buttons_left);
 
     midori_browser_set_inactivity_reset (browser, inactivity_reset);
 
@@ -6992,17 +6624,17 @@
     }
     else if (name == g_intern_string ("maximum-history-age"))
         browser->maximum_history_age = g_value_get_int (&value);
-    #ifdef HAVE_GRANITE
     else if (name == g_intern_string ("close-buttons-on-tabs"))
-        granite_widgets_dynamic_notebook_set_tabs_closable (
-            GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), g_value_get_boolean (&value));
-    #endif
+        midori_notebook_set_close_buttons_visible (
+            MIDORI_NOTEBOOK (browser->notebook), g_value_get_boolean (&value));
     else if (name == g_intern_string ("close-buttons-left"))
     {
         midori_findbar_set_close_button_left (MIDORI_FINDBAR (browser->find),
                                               g_value_get_boolean (&value));
         midori_speed_dial_set_close_buttons_left (browser->dial,
-            katze_object_get_boolean (browser->settings, "close-buttons-left"));
+            g_value_get_boolean (&value));
+        midori_notebook_set_close_buttons_left (
+            MIDORI_NOTEBOOK (browser->notebook), g_value_get_boolean (&value));
     }
     else if (name == g_intern_string ("inactivity-reset"))
         midori_browser_set_inactivity_reset (browser, g_value_get_uint (&value));
@@ -7325,7 +6957,7 @@
         g_value_set_object (value, browser->navigationbar);
         break;
     case PROP_NOTEBOOK:
-        g_value_set_object (value, browser->notebook);
+        g_value_set_object (value, MIDORI_NOTEBOOK (browser->notebook)->notebook);
         break;
     case PROP_PANEL:
         g_value_set_object (value, browser->panel);
@@ -7446,13 +7078,7 @@
     g_return_val_if_fail (MIDORI_IS_BROWSER (browser), -1);
     g_return_val_if_fail (MIDORI_IS_VIEW (view), -1);
 
-#ifdef HAVE_GRANITE
-    return granite_widgets_dynamic_notebook_get_tab_position (
-        GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook),
-        midori_view_get_tab (MIDORI_VIEW (view)));
-#else
-    return gtk_notebook_page_num (GTK_NOTEBOOK (browser->notebook), view);
-#endif
+    return midori_notebook_get_tab_index (MIDORI_NOTEBOOK (browser->notebook), MIDORI_TAB (view));
 }
 
 
@@ -7471,7 +7097,6 @@
     g_return_if_fail (MIDORI_IS_BROWSER (browser));
     g_return_if_fail (GTK_IS_WIDGET (view));
 
-    midori_browser_add_tab_to_trash (browser, MIDORI_VIEW (view));
     g_signal_emit (browser, signals[REMOVE_TAB], 0, view);
 }
 
@@ -7697,22 +7322,7 @@
     view = midori_browser_get_nth_tab (browser, n);
     g_return_if_fail (view != NULL);
 
-    #ifdef HAVE_GRANITE
-    granite_widgets_dynamic_notebook_set_current (
-        GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook),
-        midori_view_get_tab (MIDORI_VIEW (view)));
-    #else
-    gtk_notebook_set_current_page (GTK_NOTEBOOK (browser->notebook), n);
-    #endif
-    if (midori_view_is_blank (MIDORI_VIEW (view)))
-        midori_browser_activate_action (browser, "Location");
-    else
-        gtk_widget_grab_focus (view);
-
-    g_object_freeze_notify (G_OBJECT (browser));
-    g_object_notify (G_OBJECT (browser), "uri");
-    g_object_notify (G_OBJECT (browser), "tab");
-    g_object_thaw_notify (G_OBJECT (browser));
+    midori_browser_set_tab (browser, view);
 }
 
 /**
@@ -7730,14 +7340,7 @@
 {
     g_return_val_if_fail (MIDORI_IS_BROWSER (browser), -1);
 
-    #ifdef HAVE_GRANITE
-    GraniteWidgetsTab* tab = granite_widgets_dynamic_notebook_get_current (
-        GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook));
-    return tab ? granite_widgets_dynamic_notebook_get_tab_position (
-        GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), tab) : -1;
-    #else
-    return gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook));
-    #endif
+    return midori_notebook_get_index (MIDORI_NOTEBOOK (browser->notebook));
 }
 
 /**
@@ -7783,19 +7386,9 @@
 midori_browser_get_nth_tab (MidoriBrowser* browser,
                             gint           page)
 {
-#ifdef HAVE_GRANITE
-    GraniteWidgetsTab* tab;
-
-    g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL);
-
-    tab = granite_widgets_dynamic_notebook_get_tab_by_index (
-        GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), page);
-    return tab != NULL ? granite_widgets_tab_get_page (tab) : NULL;
-#else
-    g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL);
-
-    return gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), page);
-#endif
+    g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL);
+
+    return (GtkWidget*)midori_notebook_get_nth_tab (MIDORI_NOTEBOOK (browser->notebook), page);
 }
 
 /**
@@ -7813,13 +7406,19 @@
 midori_browser_set_current_tab (MidoriBrowser* browser,
                                 GtkWidget*     view)
 {
-    gint n;
-
     g_return_if_fail (MIDORI_IS_BROWSER (browser));
     g_return_if_fail (GTK_IS_WIDGET (view));
 
-    n = midori_browser_page_num (browser, view);
-    midori_browser_set_current_page (browser, n);
+    midori_notebook_set_tab (MIDORI_NOTEBOOK (browser->notebook), MIDORI_TAB (view));
+    if (midori_tab_is_blank (MIDORI_TAB (view)))
+        midori_browser_activate_action (browser, "Location");
+    else
+        gtk_widget_grab_focus (view);
+
+    g_object_freeze_notify (G_OBJECT (browser));
+    g_object_notify (G_OBJECT (browser), "uri");
+    g_object_notify (G_OBJECT (browser), "tab");
+    g_object_thaw_notify (G_OBJECT (browser));
 }
 
 /**
@@ -7839,22 +7438,9 @@
 GtkWidget*
 midori_browser_get_current_tab (MidoriBrowser* browser)
 {
-    #if 0 // def HAVE_GRANITE
-    GraniteWidgetsTab* tab;
-    #else
-    gint n;
-    #endif
-
     g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL);
 
-    #if 0 // FIXME: not reliable def HAVE_GRANITE
-    tab = granite_widgets_dynamic_notebook_get_current (
-        GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook));
-    return tab ? granite_widgets_tab_get_page (tab) : NULL;
-    #else
-    n = midori_browser_get_current_page (browser);
-    return (n >= 0) ? midori_browser_get_nth_tab (browser, n) : NULL;
-    #endif
+    return (GtkWidget*)midori_notebook_get_tab (MIDORI_NOTEBOOK (browser->notebook));
 }
 
 /**
@@ -7872,12 +7458,7 @@
 {
     g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL);
 
-    #ifdef HAVE_GRANITE
-    /* FIXME: granite doesn't correctly implemented gtk.container */
-    return granite_widgets_dynamic_notebook_get_children (GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook));
-    #else
     return gtk_container_get_children (GTK_CONTAINER (browser->notebook));
-    #endif
 }
 
 /**
 
=== added file 'midori/midori-notebook.vala'
--- midori/midori-notebook.vala	1970-01-01 00:00:00 +0000
+++ midori/midori-notebook.vala	2013-12-05 00:25:31 +0000
@@ -0,0 +1,526 @@
+/*
+ Copyright (C) 2013 Christian Dywan <[e-mail]>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ See the file COPYING for the full license text.
+*/
+
+namespace Midori {
+    protected class Tally : Gtk.EventBox {
+        public Midori.Tab tab { get; set; }
+        Gtk.Spinner spinner;
+        public Gtk.Label label;
+        Gtk.HBox box;
+        public Gtk.Image icon;
+        Gtk.Alignment align;
+        Gtk.Button close;
+
+        public bool close_button_left { get; set; default = false; }
+        public bool close_button_visible { get; set; default = false; }
+
+        protected Tally (Midori.Tab tab) {
+            this.tab = tab;
+            box = new Gtk.HBox (false, 1);
+            add (box);
+
+            spinner = new Gtk.Spinner ();
+            spinner.active = true;
+            /* Ensure the spinner is the size of the icon */
+            int icon_size = 16;
+            Gtk.icon_size_lookup_for_settings (get_settings (),
+                Gtk.IconSize.MENU, out icon_size, null);
+            spinner.set_size_request (icon_size, icon_size);
+            box.pack_start (spinner, false, false, 0);
+            label = new Gtk.Label (null);
+            label.set_alignment (0.0f, 0.5f);
+            label.set_padding (0, 0);
+            box.pack_start (label, true, true, 0);
+            close = new Gtk.Button ();
+            close.relief = Gtk.ReliefStyle.NONE;
+            close.focus_on_click = false;
+#if !HAVE_GTK3
+            close.name = "midori-close-button";
+            close.style_set.connect (close_style_set);
+#endif
+            icon = new Gtk.Image.from_gicon (new ThemedIcon.with_default_fallbacks ("window-close-symbolic"), Gtk.IconSize.MENU);
+            close.add (icon);
+            align = new Gtk.Alignment (1.0f, 0.5f, 0.0f, 0.0f);
+            align.add (close);
+            box.pack_start (align, false, false, 0);
+            close.clicked.connect (close_clicked);
+            icon = new Gtk.Image.from_gicon (new ThemedIcon.with_default_fallbacks ("text-html-symbolic"), Gtk.IconSize.MENU);
+            box.pack_start (icon, false, false, 0);
+            box.show_all ();
+
+            tab.notify["uri"].connect (uri_changed);
+            tab.notify["title"].connect (title_changed);
+            tab.notify["icon"].connect (icon_changed);
+            tab.notify["minimized"].connect (minimized_changed);
+            tab.notify["progress"].connect (progress_changed);
+            tab.colors_changed.connect (colors_changed);
+            update_label ();
+            label.visible = !tab.minimized;
+            spinner.visible = tab.progress > 0.0;
+            icon.visible = !spinner.visible;
+            update_color ();
+
+            notify["close-button-left"].connect (close_button_left_changed);
+            notify_property ("close-button-left");
+            notify["close-button-visible"].connect (close_button_visible_changed);
+            notify_property ("close-button-visible");
+
+            Gtk.drag_dest_set (this, Gtk.DestDefaults.ALL, (Gtk.TargetEntry[])null, Gdk.DragAction.COPY);
+            Gtk.drag_dest_add_text_targets (this);
+            Gtk.drag_dest_add_uri_targets (this);
+            drag_data_received.connect (uri_dragged);
+        }
+
+#if !HAVE_GTK3
+        void close_style_set (Gtk.Style? previous_style) {
+            Gtk.Requisition size;
+            close.child.size_request (out size);
+            close.set_size_request (size.width, size.height);
+        }
+#endif
+
+        void close_clicked () {
+            tab.destroy ();
+        }
+
+        void uri_changed (GLib.ParamSpec pspec) {
+            label.label = tab.uri;
+        }
+
+        void title_changed (GLib.ParamSpec pspec) {
+            update_label ();
+        }
+
+        void update_label () {
+            string? title;
+            tab.get ("title", out title);
+            label.label = Midori.Tab.get_display_title (title, tab.uri);
+            /* Use computed label below! */
+            label.ellipsize = Midori.Tab.get_display_ellipsize (label.label, tab.uri);
+            tooltip_text = label.label;
+        }
+
+        void icon_changed (GLib.ParamSpec pspec) {
+            Icon? icon;
+            tab.get ("icon", out icon);
+            this.icon.set_from_gicon (icon, Gtk.IconSize.MENU);
+        }
+
+        void colors_changed () {
+            update_color ();
+        }
+
+        void update_color () {
+            visible_window = tab.fg_color != null || tab.bg_color != null;
+            label.modify_fg (Gtk.StateType.NORMAL, tab.fg_color);
+            label.modify_fg (Gtk.StateType.ACTIVE, tab.fg_color);
+            modify_bg (Gtk.StateType.NORMAL, tab.bg_color);
+            modify_bg (Gtk.StateType.ACTIVE, tab.bg_color);
+        }
+
+        void close_button_left_changed (GLib.ParamSpec pspec) {
+            if (close_button_left) {
+                box.reorder_child (align, 0);
+                box.reorder_child (label, 1);
+                box.reorder_child (icon, 2);
+                box.reorder_child (spinner, 3);
+            } else {
+                box.reorder_child (spinner, 0);
+                box.reorder_child (icon, 1);
+                box.reorder_child (label, 2);
+                box.reorder_child (align, 3);
+            }
+        }
+
+        void close_button_visible_changed (GLib.ParamSpec pspec) {
+            align.visible = !tab.minimized && close_button_visible;
+        }
+
+        void minimized_changed (GLib.ParamSpec pspec) {
+            label.visible = !tab.minimized;
+            notify_property ("close-button-visible");
+        }
+
+        void progress_changed (GLib.ParamSpec pspec) {
+            spinner.visible = tab.progress > 0.0;
+            icon.visible = !spinner.visible;
+        }
+
+        void uri_dragged (Gdk.DragContext context, int x, int y, Gtk.SelectionData data, uint ttype, uint timestamp) {
+            /* FIXME: Navigate to the URI
+            string[] uri = data.get_uris ();
+            if (uri != null)
+                tab.uri = uri[0];
+            else
+                tab.uri = data.get_text ();
+            */
+        }
+    }
+
+    public class Notebook : Gtk.EventBox {
+        public Gtk.Notebook notebook;
+        int last_tab_size = 0;
+
+#if !HAVE_GTK3
+        static const string style_fixup = """
+            style "midori-close-button-style"
+            {
+            GtkWidget::focus-padding = 0
+            GtkWidget::focus-line-width = 0
+            xthickness = 0
+            ythickness = 0
+            }
+            widget "*.midori-close-button" style "midori-close-button-style"
+            """;
+#endif
+
+        /* Since: 0.5.7 */
+        public uint count { get; private set; default = 0; }
+        /* Since: 0.5.7 */
+        public int index { get; set; default = -1; }
+        /* Since: 0.5.7 */
+        public Midori.Tab? tab {  get; set; default = null; }
+        /* Since: 0.5.7 */
+        private Midori.Tab? previous {  get; set; default = null; }
+
+        /* Since: 0.5.7 */
+        public bool close_buttons_left { get; set; default = true; }
+        /* Since: 0.5.7 */
+        public bool close_buttons_visible { get; set; default = true; }
+        /* Since: 0.5.7 */
+        public bool labels_visible { get; set; default = true; }
+
+        /* Since: 0.5.7 */
+        public signal void tab_context_menu (Midori.Tab tab, ContextAction menu);
+        /* Since: 0.5.7 */
+        public signal void context_menu (ContextAction menu);
+        /* The current tab is about to switch, but the old tab still has focus.
+           Since: 0.5.7 */
+        public signal void tab_switched (Midori.Tab? old, Midori.Tab @new);
+        /* A tab is about to move to a new position.
+           Since: 0.5.7 */
+        public signal void tab_moved (Midori.Tab tab, uint new_index);
+        /* A tab is being dragging out of the window.
+           Since: 0.5.7 */
+        public signal void tab_detached (Midori.Tab tab, int x, int y);
+        /* Since: 0.5.7 */
+        public signal void new_tab ();
+
+        [CCode (type = "GtkWidget*")]
+        public Notebook () {
+            visible_window = false;
+            notebook = new Gtk.Notebook ();
+            notebook.visible = notebook.scrollable = true;
+            notebook.show_border = false;
+            notebook.set ("group-name", PACKAGE_NAME);
+            add (notebook);
+
+#if !HAVE_GTK3
+            /* Remove the inner border between scrollbars and window border */
+            Gtk.RcStyle rcstyle = new Gtk.RcStyle ();
+            rcstyle.xthickness = 0;
+            notebook.modify_style (rcstyle);
+            Gtk.rc_parse_string (style_fixup);
+#endif
+            notify["index"].connect (index_changed);
+            notify["tab"].connect (tab_changed);
+            notify["labels-visible"].connect (labels_visible_changed);
+            notify["close-buttons-visible"].connect (close_buttons_visible_changed);
+            notify["close-buttons-left"].connect (close_buttons_left_changed);
+
+            notebook.size_allocate.connect (size_allocated);
+            notebook.switch_page.connect (page_switched);
+            notebook.page_reordered.connect (page_moved);
+            notebook.create_window.connect (window_created);
+
+            var add = new Gtk.Button ();
+            add.relief = Gtk.ReliefStyle.NONE;
+            add.add (new Gtk.Image.from_gicon (new ThemedIcon.with_default_fallbacks ("tab-new-symbolic"), Gtk.IconSize.MENU));
+            add.show_all ();
+            notebook.set_action_widget (add, Gtk.PackType.START);
+            add.clicked.connect (()=>{
+                new_tab ();
+            });
+
+            button_press_event.connect (button_pressed);
+        }
+
+        ~Notebook () {
+            notebook.size_allocate.disconnect (size_allocated);
+            notebook.switch_page.disconnect (page_switched);
+            notebook.page_reordered.disconnect (page_moved);
+            notebook.create_window.disconnect (window_created);
+        }
+
+        bool button_pressed (Gdk.EventButton event) {
+            /* Propagate events in logical label area */
+            foreach (var child in notebook.get_children ()) {
+                var tally = notebook.get_tab_label (tab) as Tally;
+                Gtk.Allocation size;
+                tally.get_allocation (out size);
+                if (tally.get_mapped ()
+                 && event.x_root >= size.x
+                 && event.x_root <= (size.x + size.width)) {
+                    tally.button_press_event (event);
+                    return true;
+                }
+            }
+
+            if (event.type == Gdk.EventType.2BUTTON_PRESS && event.button == 1
+             || event.button == 2) {
+                new_tab ();
+                return true;
+            }
+            else if (event.button == 3) {
+                var menu = new Midori.ContextAction ("NotebookContextMenu", null, null, null);
+                uint counter = 0;
+                foreach (var child in notebook.get_children ()) {
+                    var tab = child as Midori.Tab;
+                    var tally = notebook.get_tab_label (tab) as Tally;
+                    var action = new Gtk.Action ("Tab%u".printf (counter), tally.label.label, null, null);
+                    action.gicon = tally.icon.gicon;
+                    action.activate.connect (()=>{
+                        notebook.set_current_page (notebook.page_num (tab));
+                    });
+                    menu.add (action);
+                    counter++;
+                }
+                context_menu (menu);
+                var popup = menu.create_menu (null, false);
+                popup.show ();
+                popup.attach_to_widget (this, null);
+                popup.popup (null, null, null, event.button, event.time);
+                return true;
+            }
+            return false;
+        }
+
+        public void insert (Midori.Tab tab, int index) {
+            var tally = new Tally (tab);
+            tally.close_button_left = close_buttons_left;
+            tally.close_button_visible = close_buttons_visible;
+            tally.button_press_event.connect (tab_button_pressed);
+            tally.show ();
+            tally.set_size_request (tab.minimized ? -1 : last_tab_size, -1);
+
+            /* Minimum requirements for any tab */
+            tab.can_focus = tab.visible = true;
+            notebook.insert_page (tab, tally, index);
+            notebook.set_tab_reorderable (tab, true);
+            notebook.set_tab_detachable (tab, true);
+            tab.destroy.connect (tab_removed);
+            tab.notify["minimized"].connect (tab_minimized);
+            count++;
+            tab.ref ();
+            relayout ();
+        }
+
+        void tab_removed () {
+            count--;
+            if (count > 0)
+                relayout ();
+        }
+
+        void relayout () {
+            Gtk.Allocation size;
+            notebook.get_allocation (out size);
+            resize (size.width);
+        }
+
+        bool tab_button_pressed (Gtk.Widget label, Gdk.EventButton event) {
+            Tally tally = label as Tally;
+            if (event.button == 1) {
+                /* Leave switching and dragging up to the notebook */
+                return false;
+            } else if (event.button == 2)
+                tally.tab.destroy ();
+            else if (event.button == 3) {
+                var menu = new Midori.ContextAction ("TabContextMenu", null, null, null);
+                tab_context_menu (tally.tab, menu);
+                var action_window = new Midori.ContextAction ("TabWindowNew", _("Open in New _Window"), null, "window-new");
+                action_window.activate.connect (()=>{
+                    tab_detached (tally.tab, 128, 128);
+                });
+                menu.add (action_window);
+                var action_minimize = new Midori.ContextAction ("TabMinimize", tally.tab.minimized ? _("Show Tab _Label") : _("Show Tab _Icon Only"), null, null);
+                action_minimize.activate.connect (()=>{
+                    tally.tab.minimized = !tally.tab.minimized;
+                });
+                menu.add (action_minimize);
+                var action_right = new Midori.ContextAction ("TabCloseRight", ngettext ("Close Tab to the R_ight", "Close Tabs to the R_ight", count - 1), null, null);
+                action_right.sensitive = count > 1;
+                action_right.activate.connect (()=>{
+                    bool found_tab = false;
+                    foreach (var child in notebook.get_children ()) {
+                        if (found_tab)
+                            child.destroy ();
+                        else
+                            found_tab = child == tally.tab;
+                    }
+                });
+                menu.add (action_right);
+                var action_other = new Midori.ContextAction ("TabCloseOther", ngettext ("Close Ot_her Tab", "Close Ot_her Tabs", count - 1), null, null);
+                action_other.sensitive = count > 1;
+                action_other.activate.connect (()=>{
+                    foreach (var child in notebook.get_children ())
+                        if (child != tally.tab)
+                            child.destroy ();
+                });
+                menu.add (action_other);
+                var action_close = new Midori.ContextAction ("TabClose", null, null, Gtk.STOCK_CLOSE);
+                action_close.activate.connect (()=>{
+                    tally.tab.destroy ();
+                });
+                menu.add (action_close);
+                var popup = menu.create_menu (null, false);
+                popup.show ();
+                popup.attach_to_widget (this, null);
+                popup.popup (null, null, null, event.button, event.time);
+            }
+            return true;
+        }
+
+        public void move (Midori.Tab tab, int index) {
+            notebook.reorder_child (tab, index);
+        }
+
+        /* Chain up drawing manually to circumvent parent checks */
+#if HAVE_GTK3
+        public override bool draw (Cairo.Context cr) {
+            notebook.draw (cr);
+            return true;
+        }
+#else
+        public override bool expose_event (Gdk.EventExpose event) {
+            notebook.expose_event (event);
+            return true;
+        }
+#endif
+
+        public override void forall_internal (bool include_internal, Gtk.Callback callback) {
+            if (include_internal)
+                callback (notebook);
+            foreach (var child in notebook.get_children ())
+                callback (child);
+        }
+
+        /* Can't override Gtk.Container.remove because it checks the parent */
+        public new void remove (Midori.Tab tab) {
+            return_if_fail (notebook.get_children ().find (tab) != null);
+
+            notebook.remove (tab);
+            tab.destroy.disconnect (tab_removed);
+            tab.notify["minimized"].disconnect (tab_minimized);
+            tab_removed ();
+            tab.unref ();
+        }
+
+        void tab_minimized (GLib.ParamSpec pspec) {
+            var tally = notebook.get_tab_label (tab) as Tally;
+            tally.set_size_request (tab.minimized ? -1 : last_tab_size, -1);
+        }
+
+        public Midori.Tab get_nth_tab (int index) {
+            return notebook.get_nth_page (index) as Midori.Tab;
+        }
+
+        public int get_tab_index (Midori.Tab tab) {
+            return notebook.page_num (tab);
+        }
+
+        void index_changed (GLib.ParamSpec pspec) {
+            notebook.set_current_page (index);
+        }
+
+        void tab_changed (GLib.ParamSpec pspec) {
+            notebook.set_current_page (notebook.page_num (tab));
+        }
+
+        void labels_visible_changed (GLib.ParamSpec pspec) {
+            notebook.show_tabs = labels_visible;
+        }
+
+        void close_buttons_visible_changed (GLib.ParamSpec pspec) {
+            foreach (var child in notebook.get_children ()) {
+                var tally = notebook.get_tab_label (child) as Tally;
+                tally.close_button_visible = close_buttons_visible;
+            }
+        }
+
+        void close_buttons_left_changed (GLib.ParamSpec pspec) {
+            foreach (var child in notebook.get_children ()) {
+                var tally = notebook.get_tab_label (child) as Tally;
+                tally.close_button_left = close_buttons_left;
+            }
+        }
+
+#if HAVE_GTK3
+        void size_allocated (Gtk.Allocation allocation) {
+#else
+        void size_allocated (Gdk.Rectangle allocation) {
+#endif
+            if (labels_visible && count > 0)
+                resize (allocation.width);
+        }
+
+#if HAVE_GTK3
+        void page_switched (Gtk.Widget new_tab, uint new_index) {
+#else
+        void page_switched (Gtk.NotebookPage new_tab, uint new_index) {
+#endif
+            tab_switched (previous, new_tab as Tab);
+            previous = (Midori.Tab)new_tab;
+
+            notify["index"].disconnect (index_changed);
+            notify["tab"].disconnect (tab_changed);
+            index = (int)new_index;
+            tab = (Midori.Tab)new_tab;
+            notify["index"].connect (index_changed);
+            notify["tab"].connect (tab_changed);
+        }
+
+        void page_moved (Gtk.Widget moving_tab, uint new_index) {
+            tab_moved (moving_tab as Midori.Tab, new_index);
+            /* Indices change, current tab is not in the same position */
+            notify["index"].disconnect (index_changed);
+            index = (int)get_tab_index (tab);
+            notify["index"].connect (index_changed);
+        }
+
+        unowned Gtk.Notebook window_created (Gtk.Widget tab, int x, int y) {
+            tab_detached (tab as Tab, x, y);
+            /* The API allows now, the cast is due to bindings not having ? */
+            return (Gtk.Notebook)null;
+        }
+
+        void resize (int new_size) {
+            int n = int.max (1, (int)count);
+            new_size /= n;
+            int icon_size = 16;
+            Gtk.icon_size_lookup_for_settings (get_settings (),
+                Gtk.IconSize.MENU, out icon_size, null);
+            int max_size = 150;
+            int min_size = icon_size;
+            if (close_buttons_visible)
+                min_size += icon_size;
+            new_size = new_size.clamp (min_size, max_size);
+            if ((new_size - last_tab_size).abs () < 3)
+                return;
+
+            last_tab_size = new_size;
+            foreach (var child in notebook.get_children ()) {
+                var tab = child as Midori.Tab;
+                var tally = notebook.get_tab_label (child) as Tally;
+                tally.set_size_request (tab.minimized ? -1 : last_tab_size, -1);
+            }
+        }
+    }
+}
 
=== modified file 'midori/midori-preferences.c'
--- midori/midori-preferences.c	2013-11-25 23:12:58 +0000
+++ midori/midori-preferences.c	2013-12-05 00:25:31 +0000
@@ -482,11 +482,6 @@
     button = katze_property_proxy (settings, "close-buttons-on-tabs", NULL);
     gtk_button_set_label (GTK_BUTTON (button), _("Close Buttons on Tabs"));
     INDENTED_ADD (button);
-    #ifndef HAVE_GRANITE
-    button = katze_property_proxy (settings, "always-show-tabbar", NULL);
-    gtk_button_set_label (GTK_BUTTON (button), _("Always Show Tabbar"));
-    SPANNED_ADD (button);
-    #endif
     button = katze_property_proxy (settings, "open-tabs-next-to-current", NULL);
     gtk_button_set_label (GTK_BUTTON (button), _("Open Tabs next to Current"));
     gtk_widget_set_tooltip_text (button, _("Whether to open new tabs next to the current tab or after the last one"));
 
=== modified file 'midori/midori-settings.vala'
--- midori/midori-settings.vala	2013-08-04 14:27:34 +0000
+++ midori/midori-settings.vala	2013-12-05 00:25:31 +0000
@@ -153,6 +153,7 @@
         public bool close_buttons_on_tabs { get; set; default = true; }
         public bool open_tabs_in_the_background { get; set; default = true; }
         public bool open_tabs_next_to_current { get; set; default = true; }
+        // [Deprecated (since = "0.5.7")]
         public bool always_show_tabbar { get; set; default = true; }
 
         public string homepage { get; set; default = "about:search"; }
 
=== modified file 'midori/midori-tab.vala'
--- midori/midori-tab.vala	2013-10-08 20:13:36 +0000
+++ midori/midori-tab.vala	2013-12-05 00:25:31 +0000
@@ -51,6 +51,9 @@
 
         /* Special is an error, blank or delayed page */
         public bool special { get; protected set; default = false; }
+        /* Minimizing a tab indicates that only the icon should be shown.
+           Since: 0.1.8 */
+        public bool minimized { get; set; default = false; }
         /* Since: 0.4.8 */
         public string mime_type { get; protected set; default = "text/plain"; }
         /* Since: 0.1.2 */
@@ -58,8 +61,18 @@
         public LoadStatus load_status { get; protected set; default = LoadStatus.FINISHED; }
         public string? statusbar_text { get; protected set; default = null; }
         /* Since: 0.5.0 */
+
         public Gdk.Color? fg_color { get; protected set; default = null; }
-        public Gdk.Color? bg_color { get; protected set; default = null; }
+        private Gdk.Color? bg_color_ = null;
+        public Gdk.Color? bg_color { get {
+            return bg_color_;
+        } protected set {
+            bg_color_ = value;
+            colors_changed ();
+        } }
+        /* After fg_color and bg_color have changed.
+           Since: 0.5.7 */
+        public signal void colors_changed ();
 
         /* Special pages don't convey progress */
         private double current_progress = 0.0;
 
=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2013-11-22 18:03:14 +0000
+++ midori/midori-view.c	2013-12-05 00:25:31 +0000
@@ -109,21 +109,13 @@
     KatzeArray* news_feeds;
 
     gboolean open_tabs_in_the_background;
-    gboolean close_buttons_on_tabs;
     MidoriNewPage open_new_pages_in;
     gint find_links;
     gint alerts;
 
+    GtkWidget* tab_label;
     GtkWidget* menu_item;
     PangoEllipsizeMode ellipsize;
-    #ifdef HAVE_GRANITE
-    GraniteWidgetsTab* tab;
-    #else
-    GtkWidget* tab_label;
-    GtkWidget* tab_icon;
-    GtkWidget* tab_title;
-    GtkWidget* tab_close;
-    #endif
     KatzeItem* item;
     gint scrollh, scrollv;
     GtkWidget* scrolled_window;
@@ -355,26 +347,6 @@
                                      GDK_TYPE_PIXBUF,
                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
-    /**
-    * MidoriView:minimized:
-    *
-    * Whether the view is minimized or in normal state.
-    *
-    * Minimizing a view indicates that only the icon should
-    * be advertised rather than the full blown tab label and
-    * it might otherwise be presented specially.
-    *
-    * Since: 0.1.8
-    */
-    g_object_class_install_property (gobject_class,
-                                     PROP_MINIMIZED,
-                                     g_param_spec_boolean (
-                                     "minimized",
-                                     "Minimized",
-                                     "Whether the view is minimized or in normal state",
-                                     FALSE,
-                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
     g_object_class_install_property (gobject_class,
                                      PROP_ZOOM_LEVEL,
                                      g_param_spec_float (
@@ -428,21 +400,6 @@
     const gchar* uri = midori_tab_get_uri (MIDORI_TAB (view));
     katze_assign (view->title, g_strdup (midori_tab_get_display_title (title, uri)));
     view->ellipsize = midori_tab_get_display_ellipsize (view->title, uri);
-
-    #ifdef HAVE_GRANITE
-    if (view->tab)
-        g_object_set (view->tab,
-            "label", view->title, "ellipsize-mode", view->ellipsize, NULL);
-    #else
-    if (view->tab_label)
-    {
-        gtk_label_set_text (GTK_LABEL (view->tab_title), view->title);
-        gtk_widget_set_tooltip_text (view->tab_icon, view->title);
-        gtk_widget_set_tooltip_text (view->tab_title, view->title);
-        if (gtk_label_get_angle (GTK_LABEL (view->tab_title)) == 0.0)
-            gtk_label_set_ellipsize (GTK_LABEL (view->tab_title), view->ellipsize);
-    }
-    #endif
     if (view->menu_item)
         gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (
                             view->menu_item))), view->title);
@@ -463,20 +420,6 @@
     katze_object_assign (view->icon, icon);
     g_object_notify (G_OBJECT (view), "icon");
 
-    #ifdef HAVE_GRANITE
-    if (view->tab)
-        g_object_set (view->tab, "icon", icon, NULL);
-    #else
-    if (view->tab_icon)
-    {
-        if (icon_name && !strchr (icon_name, '/'))
-            katze_throbber_set_static_icon_name (KATZE_THROBBER (view->tab_icon),
-                                                 icon_name);
-        else
-            katze_throbber_set_static_pixbuf (KATZE_THROBBER (view->tab_icon),
-                                              view->icon);
-    }
-    #endif
     if (view->menu_item)
     {
         GtkWidget* image = katze_item_get_image (view->item, view->web_view);
@@ -543,19 +486,6 @@
 {
     if (midori_tab_get_load_status (MIDORI_TAB (view)) != load_status)
         midori_tab_set_load_status (MIDORI_TAB (view), load_status);
-
-    #ifdef HAVE_GRANITE
-    if (view->tab)
-    {
-        g_object_set (view->tab, "working",
-            midori_view_get_progress (view) > 0.0, NULL);
-        g_object_set (view->tab, "menu", midori_view_get_tab_menu (view), NULL);
-    }
-    #else
-    if (view->tab_icon)
-        katze_throbber_set_animated (KATZE_THROBBER (view->tab_icon),
-            midori_view_get_progress (view) > 0.0);
-    #endif
 }
 
 #if defined (HAVE_LIBSOUP_2_29_91)
@@ -3056,7 +2986,6 @@
     view->title = NULL;
     view->icon = NULL;
     view->icon_uri = NULL;
-    view->minimized = FALSE;
     view->hit_test = NULL;
     view->link_uri = NULL;
     view->selected_text = NULL;
@@ -3129,16 +3058,6 @@
                                      view->minimized ? 1 : -1);
         g_signal_handlers_unblock_by_func (view->item,
             midori_view_item_meta_data_changed, view);
-        #ifdef HAVE_GRANITE
-        if (view->tab)
-            g_object_set (view->tab,
-                "fixed", view->minimized,
-                "label", midori_view_get_display_title (view),
-                NULL);
-        #else
-        if (view->tab_label)
-            sokoke_widget_set_visible (view->tab_title, !view->minimized);
-        #endif
         break;
     case PROP_ZOOM_LEVEL:
         midori_view_set_zoom_level (view, g_value_get_float (value));
@@ -3168,9 +3087,6 @@
     case PROP_ICON:
         g_value_set_object (value, view->icon);
         break;
-    case PROP_MINIMIZED:
-        g_value_set_boolean (value, view->minimized);
-        break;
     case PROP_ZOOM_LEVEL:
         g_value_set_float (value, midori_view_get_zoom_level (view));
         break;
@@ -3217,7 +3133,6 @@
     g_object_get (view->settings,
         "zoom-level", &zoom_level,
         "zoom-text-and-images", &zoom_text_and_images,
-        "close-buttons-on-tabs", &view->close_buttons_on_tabs,
         "open-new-pages-in", &view->open_new_pages_in,
         "open-tabs-in-the-background", &view->open_tabs_in_the_background,
         NULL);
@@ -3279,8 +3194,8 @@
     if (item)
     {
         katze_object_assign (view->item, katze_item_copy (item));
-        view->minimized = katze_item_get_meta_string (
-            view->item, "minimized") != NULL;
+        midori_tab_set_minimized (MIDORI_TAB (view),
+            katze_item_get_meta_string (view->item, "minimized") != NULL);
     }
     gtk_widget_show ((GtkWidget*)view);
     return (GtkWidget*)view;
@@ -3308,14 +3223,6 @@
                 g_value_get_boolean (&value));
     }
     #endif
-    else if (name == g_intern_string ("close-buttons-on-tabs"))
-    {
-        view->close_buttons_on_tabs = g_value_get_boolean (&value);
-        #ifndef HAVE_GRANITE
-        sokoke_widget_set_visible (view->tab_close,
-                                   view->close_buttons_on_tabs);
-        #endif
-    }
     else if (name == g_intern_string ("open-tabs-in-the-background"))
         view->open_tabs_in_the_background = g_value_get_boolean (&value);
     else if (name == g_intern_string ("enable-javascript"))
@@ -4395,14 +4302,6 @@
     return view->menu_item;
 }
 
-static void
-midori_view_tab_label_menu_duplicate_tab_cb (GtkAction* action,
-                                             gpointer   user_data)
-{
-    MidoriView* view = user_data;
-    midori_view_duplicate (view);
-}
-
 GtkWidget*
 midori_view_duplicate (MidoriView* view)
 {
@@ -4415,58 +4314,6 @@
     return new_view;
 }
 
-static void
-midori_view_tab_label_menu_close_tabs_right_cb (GtkAction* action,
-                                                gpointer   user_data)
-{
-    GtkWidget* view = user_data;
-    MidoriBrowser* browser = midori_browser_get_for_widget (view);
-    GList* tabs = midori_browser_get_tabs (browser);
-    gboolean found_tab = FALSE;
-    for (; tabs; tabs = g_list_next (tabs))
-    {
-        if (tabs->data == view)
-        {
-            found_tab = TRUE;
-            continue;
-        }
-        if (found_tab)
-            midori_browser_close_tab (browser, tabs->data);
-    }
-    g_list_free (tabs);
-}
-
-static void
-midori_view_tab_label_menu_close_other_tabs_cb (GtkAction* action,
-                                                gpointer   user_data)
-{
-    GtkWidget* view = user_data;
-    MidoriBrowser* browser = midori_browser_get_for_widget (view);
-    GList* tabs = midori_browser_get_tabs (browser);
-    for (; tabs; tabs = g_list_next (tabs))
-    {
-        if (tabs->data != view)
-            midori_browser_close_tab (browser, tabs->data);
-    }
-    g_list_free (tabs);
-}
-
-static void
-midori_view_tab_label_menu_minimize_tab_cb (GtkAction* action,
-                                            gpointer   user_data)
-{
-    MidoriView* view = user_data;
-    g_object_set (view, "minimized", !view->minimized, NULL);
-}
-
-static void
-midori_view_tab_label_menu_close_cb (GtkAction* action,
-                                     gpointer   user_data)
-{
-    GtkWidget* view = user_data;
-    midori_browser_close_tab (midori_browser_get_for_widget (view), view);
-}
-
 /**
  * midori_view_get_tab_menu:
  * @view: a #MidoriView
@@ -4477,242 +4324,14 @@
  * Return value: a #GtkMenu
  *
  * Since: 0.1.8
+ * Deprecated: 0.5.7: Use MidoriNotebook API instead.
  **/
 GtkWidget*
 midori_view_get_tab_menu (MidoriView* view)
 {
     g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL);
 
-    MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (view));
-    g_return_val_if_fail (browser != NULL, NULL);
-
-    GtkActionGroup* actions = midori_browser_get_action_group (browser);
-    MidoriContextAction* menu = midori_context_action_new ("TabContextMenu", NULL, NULL, NULL);
-    midori_context_action_add_action_group (menu, actions);
-    gint pages = midori_browser_get_n_pages (browser);
-
-    midori_context_action_add_by_name (menu, "TabNew");
-    midori_context_action_add_by_name (menu, "UndoTabClose");
-    midori_context_action_add (menu, NULL);
-    midori_context_action_add_simple (menu, "TabWindowNew", _("Open in New _Window"), NULL, STOCK_WINDOW_NEW,
-        midori_view_tab_label_menu_window_new_cb, view);
-    midori_context_action_add_simple (menu, "TabDuplicate", _("_Duplicate Tab"), NULL, NULL,
-        midori_view_tab_label_menu_duplicate_tab_cb, view);
-    midori_context_action_add_simple (menu, "TabMinimize",
-        view->minimized ? _("Show Tab _Label") : _("Show Tab _Icon Only"), NULL, NULL,
-        midori_view_tab_label_menu_minimize_tab_cb, view);
-    midori_context_action_add (menu, NULL);
-    midori_context_action_add_simple (menu, "TabCloseRight", _("Close Tabs to the R_ight"), NULL, NULL,
-        midori_view_tab_label_menu_close_tabs_right_cb, view);
-    GtkAction* action = gtk_action_new ("TabCloseOther", g_dngettext (NULL, "Close Ot_her Tab", "Close Ot_her Tabs", pages - 1), NULL, NULL);
-    g_signal_connect (action, "activate", G_CALLBACK (midori_view_tab_label_menu_close_other_tabs_cb), view);
-    gtk_action_set_sensitive (action, pages > 1);
-    midori_context_action_add (menu, action);
-    midori_context_action_add_simple (menu, "TabClose", NULL, NULL, GTK_STOCK_CLOSE,
-        midori_view_tab_label_menu_close_cb, view);
-
-    return GTK_WIDGET (midori_context_action_create_menu (menu, NULL, FALSE));
-}
-
-#ifdef HAVE_GRANITE
-GraniteWidgetsTab*
-midori_view_get_tab (MidoriView* view)
-{
-    if (view->tab == NULL)
-    {
-        view->tab = granite_widgets_tab_new (
-            midori_view_get_display_title (view), G_ICON (view->icon), GTK_WIDGET (view));
-        g_object_set (view->tab, "fixed", view->minimized, NULL);
-    }
-    return view->tab;
-}
-
-void
-midori_view_set_tab (MidoriView*        view,
-                     GraniteWidgetsTab* tab)
-{
-    g_return_if_fail (MIDORI_IS_VIEW (view));
-
-    view->tab = tab;
-    g_object_set (tab,
-        "label", midori_view_get_display_title (view),
-        "icon", G_ICON (view->icon),
-        "page", GTK_WIDGET (view),
-        "fixed", view->minimized,
-        NULL);
-}
-
-GtkWidget*
-midori_view_get_proxy_tab_label (MidoriView* view)
-{
-    g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL);
-
-    GtkWidget* tab = GTK_WIDGET (midori_view_get_tab (view));
-    return tab;
-}
-
-#else
-static gboolean
-midori_view_tab_label_button_press_event (GtkWidget*      tab_label,
-                                          GdkEventButton* event,
-                                          GtkWidget*      widget)
-{
-    if (event->button == 2)
-    {
-        /* Close the widget on middle click */
-        midori_browser_close_tab (midori_browser_get_for_widget (widget), widget);
-        return TRUE;
-    }
-    else if (MIDORI_EVENT_CONTEXT_MENU (event))
-    {
-        /* Show a context menu on right click */
-        GtkWidget* menu = midori_view_get_tab_menu (MIDORI_VIEW (widget));
-
-        katze_widget_popup (widget, GTK_MENU (menu),
-                            event, KATZE_MENU_POSITION_CURSOR);
-        return TRUE;
-    }
-
-    return FALSE;
-}
-
-static void
-midori_view_tab_close_clicked (GtkWidget* tab_close,
-                               GtkWidget* widget)
-{
-    midori_browser_close_tab (midori_browser_get_for_widget (widget), widget);
-}
-
-#if !GTK_CHECK_VERSION (3, 0, 0)
-static void
-midori_view_tab_icon_style_set_cb (GtkWidget* tab_close,
-                                   GtkStyle*  previous_style)
-{
-    GtkRequisition size;
-    gtk_widget_size_request (gtk_bin_get_child (GTK_BIN (tab_close)), &size);
-    gtk_widget_set_size_request (tab_close, size.width, size.height);
-}
-#endif
-
-static void
-midori_view_update_tab_title (MidoriView* view,
-                              gdouble     angle)
-{
-    if (angle == 0.0)
-        gtk_label_set_ellipsize (GTK_LABEL (view->tab_title), view->ellipsize);
-    else
-        gtk_label_set_ellipsize (GTK_LABEL (view->tab_title), PANGO_ELLIPSIZE_NONE);
-    gtk_label_set_angle (GTK_LABEL (view->tab_title), angle);
-}
-
-static void
-gtk_box_repack (GtkBox*    box,
-                GtkWidget* child)
-{
-    GtkWidget* old_box;
-    gboolean expand, fill;
-    guint padding;
-    GtkPackType pack_type;
-
-    old_box = gtk_widget_get_parent (child);
-    g_return_if_fail (GTK_IS_BOX (old_box));
-
-    gtk_box_query_child_packing (GTK_BOX (old_box), child,
-        &expand, &fill, &padding, &pack_type);
-
-    g_object_ref (child);
-    gtk_container_remove (GTK_CONTAINER (old_box), child);
-    if (pack_type == GTK_PACK_START)
-        gtk_box_pack_start (box, child, expand, fill, padding);
-    else
-        gtk_box_pack_end (box, child, expand, fill, padding);
-    g_object_unref (child);
-}
-
-static void
-midori_view_tab_label_parent_set (GtkWidget*  tab_label,
-#if GTK_CHECK_VERSION(3,0,0)
-                                  GObject*  old_parent,
-#else
-                                  GtkObject*  old_parent,
-#endif
-                                  MidoriView* view)
-{
-    GtkWidget* parent;
-
-    /* FIXME: Disconnect orientation notification
-    if (old_parent)
-        ; */
-
-    if (!(parent = gtk_widget_get_parent (tab_label)))
-        return;
-
-    if (GTK_IS_NOTEBOOK (parent))
-    {
-        GtkPositionType pos;
-        gdouble old_angle, angle;
-        GtkWidget* box;
-
-        pos = gtk_notebook_get_tab_pos (GTK_NOTEBOOK (parent));
-        old_angle = gtk_label_get_angle (GTK_LABEL (view->tab_title));
-        switch (pos)
-        {
-        case GTK_POS_LEFT:
-            angle = 90.0;
-            break;
-        case GTK_POS_RIGHT:
-            angle = 270.0;
-            break;
-        default:
-            angle = 0.0;
-        }
-
-        if (old_angle != angle)
-        {
-            GtkWidget* align;
-
-            if (angle == 0.0)
-                box = gtk_hbox_new (FALSE, 1);
-            else
-                box = gtk_vbox_new (FALSE, 1);
-            gtk_box_repack (GTK_BOX (box), view->tab_icon);
-            gtk_box_repack (GTK_BOX (box), view->tab_title);
-            align = gtk_widget_get_parent (view->tab_close);
-            gtk_box_repack (GTK_BOX (box), align);
-
-            gtk_container_remove (GTK_CONTAINER (tab_label),
-                gtk_bin_get_child (GTK_BIN (tab_label)));
-            gtk_container_add (GTK_CONTAINER (tab_label), GTK_WIDGET (box));
-            gtk_widget_show (box);
-        }
-
-        midori_view_update_tab_title (view, angle);
-
-        /* FIXME: Connect orientation notification */
-    }
-}
-
-static void midori_view_tab_label_data_received (GtkWidget* widget,
-                                                 GdkDragContext* context,
-                                                 gint x,
-                                                 gint y,
-                                                 GtkSelectionData* data,
-                                                 guint ttype,
-                                                 guint timestamp,
-                                                 MidoriView* view)
-{
-    gchar** uri = gtk_selection_data_get_uris (data);
-    if (uri != NULL)
-    {
-        midori_view_set_uri (view, uri[0]);
-        g_strfreev (uri);
-    }
-    else
-    {
-        gchar* text = (gchar*) gtk_selection_data_get_text (data);
-        midori_view_set_uri (view, text);
-        g_free (text);
-    }
+    return gtk_menu_new ();
 }
 
 /**
@@ -4722,115 +4341,22 @@
  * Retrieves a proxy tab label that is typically used when
  * adding the view to a notebook.
  *
- * Note that the label actually adjusts its orientation
- * to the according tab position when used in a notebook.
- *
- * The label is created on the first call and will be updated to reflect
- * changes of the loading progress and title.
- *
- * The label is valid until it is removed from its container.
- *
  * Return value: the proxy #GtkEventBox
+ *
+ * Deprecated: 0.5.7: Don't use this label.
  **/
 GtkWidget*
 midori_view_get_proxy_tab_label (MidoriView* view)
 {
-    GtkWidget* event_box;
-    GtkWidget* hbox;
-    #if !GTK_CHECK_VERSION (3, 0, 0)
-    static const gchar style_fixup[] =
-        "style \"midori-close-button-style\"\n"
-        "{\n"
-        "GtkWidget::focus-padding = 0\n"
-        "GtkWidget::focus-line-width = 0\n"
-        "xthickness = 0\n"
-        "ythickness = 0\n"
-        "}\n"
-        "widget \"*.midori-close-button\" style \"midori-close-button-style\"";
-    #endif
-    GtkWidget* image;
-    GtkWidget* align;
-
     g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL);
 
     if (!view->tab_label)
     {
-        view->tab_icon = katze_throbber_new ();
-        katze_throbber_set_static_pixbuf (KATZE_THROBBER (view->tab_icon),
-            midori_view_get_icon (view));
-
-        view->tab_title = gtk_label_new (midori_view_get_display_title (view));
-        gtk_misc_set_alignment (GTK_MISC (view->tab_title), 0.0, 0.5);
-        gtk_misc_set_padding (GTK_MISC (view->tab_title), 0, 0);
-
-        event_box = gtk_event_box_new ();
-        gtk_event_box_set_visible_window (GTK_EVENT_BOX (event_box), FALSE);
-        hbox = gtk_hbox_new (FALSE, 1);
-        gtk_container_add (GTK_CONTAINER (event_box), GTK_WIDGET (hbox));
-        midori_view_update_tab_title (view, 0.0);
-
-        view->tab_close = gtk_button_new ();
-        gtk_button_set_relief (GTK_BUTTON (view->tab_close), GTK_RELIEF_NONE);
-        gtk_button_set_focus_on_click (GTK_BUTTON (view->tab_close), FALSE);
-        #if !GTK_CHECK_VERSION (3, 0, 0)
-        gtk_rc_parse_string (style_fixup);
-        gtk_widget_set_name (view->tab_close, "midori-close-button");
-        g_signal_connect (view->tab_close, "style-set",
-            G_CALLBACK (midori_view_tab_icon_style_set_cb), NULL);
-        #endif
-        image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
-        gtk_container_add (GTK_CONTAINER (view->tab_close), image);
-        align = gtk_alignment_new (1.0, 0.5, 0.0, 0.0);
-        gtk_container_add (GTK_CONTAINER (align), view->tab_close);
-
-        if (katze_object_get_boolean (view->settings, "close-buttons-left"))
-        {
-            gtk_box_pack_end (GTK_BOX (hbox), view->tab_icon, FALSE, FALSE, 0);
-            gtk_box_pack_end (GTK_BOX (hbox), view->tab_title, TRUE, TRUE, 0);
-            gtk_box_pack_start (GTK_BOX (hbox), align, FALSE, FALSE, 0);
-        }
-        else
-        {
-            gtk_box_pack_start (GTK_BOX (hbox), view->tab_icon, FALSE, FALSE, 0);
-            gtk_box_pack_start (GTK_BOX (hbox), view->tab_title, TRUE, TRUE, 0);
-            gtk_box_pack_end (GTK_BOX (hbox), align, FALSE, FALSE, 0);
-        }
-        gtk_widget_show_all (GTK_WIDGET (event_box));
-
-        if (view->minimized)
-            gtk_widget_hide (view->tab_title);
-        if (!view->close_buttons_on_tabs)
-            gtk_widget_hide (view->tab_close);
-
-        g_signal_connect (event_box, "button-press-event",
-            G_CALLBACK (midori_view_tab_label_button_press_event), view);
-        g_signal_connect (view->tab_close, "button-press-event",
-            G_CALLBACK (midori_view_tab_label_button_press_event), view);
-        g_signal_connect (view->tab_close, "clicked",
-            G_CALLBACK (midori_view_tab_close_clicked), view);
-
-        view->tab_label = event_box;
-        g_signal_connect (view->tab_icon, "destroy",
-                          G_CALLBACK (gtk_widget_destroyed),
-                          &view->tab_icon);
-        g_signal_connect (view->tab_label, "destroy",
-                          G_CALLBACK (gtk_widget_destroyed),
-                          &view->tab_label);
-
-        g_signal_connect (view->tab_label, "parent-set",
-                          G_CALLBACK (midori_view_tab_label_parent_set),
-                          view);
-        gtk_drag_dest_set (view->tab_label, GTK_DEST_DEFAULT_ALL, NULL,
-                           0, GDK_ACTION_COPY);
-        gtk_drag_dest_add_text_targets (view->tab_label);
-        gtk_drag_dest_add_uri_targets (view->tab_label);
-        g_signal_connect (view->tab_label, "drag-data-received",
-                          G_CALLBACK (midori_view_tab_label_data_received),
-                          view);
+        view->tab_label = gtk_label_new ("dummy");
+        gtk_widget_show (view->tab_label);
     }
     return view->tab_label;
 }
-#endif
 
 /**
  * midori_view_get_label_ellipsize:
@@ -5450,60 +4976,22 @@
     #endif
     return MIDORI_VIEW (view);
 }
-
+/**
+ * midori_view_set_colors:
+ * @view: a #MidoriView
+ * @fg_color: a #GdkColor, or %NULL
+ * @bg_color: a #GdkColor, or %NULL
+ *
+ * Sets colors on the label.
+ *
+ * Deprecated: 0.5.7: Use fg_color/ bg_color on Midori.Tab.
+ **/
 void
 midori_view_set_colors (MidoriView* view,
                         GdkColor*   fg_color,
                         GdkColor*   bg_color)
 {
-    /*
-        The proxy tab label is what's put in the notebook,
-        in all known cases a GtkEventBox
-        Contained can be a GtkLabel or a GtkBox including a GtkLabel
-        Granite as of this writing uses a GtkLabel (which may change)
-    */
-    GtkWidget* box = midori_view_get_proxy_tab_label (view);
-    GtkWidget* event_box = box;
-    if (GTK_IS_BOX (box))
-    {
-        GList* children = gtk_container_get_children (GTK_CONTAINER (box));
-        for (; children != NULL; children = g_list_next (children))
-            if (GTK_IS_EVENT_BOX (children->data))
-            {
-                event_box = children->data;
-                break;
-            }
-        g_list_free (children);
-    }
-
-    GtkWidget* label = gtk_bin_get_child (GTK_BIN (event_box));
-    if (GTK_IS_BOX (label))
-    {
-        GList* children = gtk_container_get_children (GTK_CONTAINER (label));
-        for (; children != NULL; children = g_list_next (children))
-            if (GTK_IS_LABEL (children->data))
-            {
-                label = children->data;
-                break;
-            }
-        g_list_free (children);
-    }
-
     midori_tab_set_fg_color (MIDORI_TAB (view), fg_color);
     midori_tab_set_bg_color (MIDORI_TAB (view), bg_color);
-
-    gtk_event_box_set_visible_window (GTK_EVENT_BOX (event_box),
-        fg_color != NULL || bg_color != NULL);
-
-    gtk_widget_modify_fg (label, GTK_STATE_NORMAL, fg_color);
-    gtk_widget_modify_fg (label, GTK_STATE_ACTIVE, fg_color);
-
-    #if GTK_CHECK_VERSION (3, 0, 0)
-    gtk_widget_modify_bg (event_box, GTK_STATE_NORMAL, bg_color);
-    gtk_widget_modify_bg (event_box, GTK_STATE_ACTIVE, bg_color);
-    #else
-    gtk_widget_modify_bg (box, GTK_STATE_NORMAL, bg_color);
-    gtk_widget_modify_bg (box, GTK_STATE_ACTIVE, bg_color);
-    #endif
 }
 
 
=== modified file 'midori/midori.vapi'
--- midori/midori.vapi	2013-11-19 19:30:54 +0000
+++ midori/midori.vapi	2013-12-05 00:25:31 +0000
@@ -197,7 +197,6 @@
 
         public string title { get; }
         public Gdk.Pixbuf icon { get; }
-        public bool minimized { get; }
         public float zoom_level { get; }
         public Katze.Array news_feeds { get; }
         [NoAccessorMethod]
 
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2013-10-09 09:15:33 +0000
+++ po/POTFILES.in	2013-12-05 00:25:31 +0000
@@ -14,6 +14,7 @@
 midori/midori-settings.vala
 midori/midori-websettings.c
 midori/midori-tab.vala
+midori/midori-notebook.vala
 midori/midori-view.c
 midori/midori-download.vala
 midori/midori-speeddial.vala
@@ -28,7 +29,6 @@
 panels/midori-extensions.c
 panels/midori-history.c
 katze/katze-http-auth.c
-katze/katze-throbber.c
 katze/katze-utils.c
 katze/katze-item.c
 katze/katze-array.c