Merge lp:~noskcaj/ubuntu/trusty/yelp/3.10.2 into lp:ubuntu/trusty/yelp

[Jackson Doak]

New upstream bugfix release

[lp:~noskcaj/ubuntu/trusty/yelp/3.10.2]

139. By Jackson Doak on 2014-03-08

target trusty

[Sebastien Bacher (seb128)]

Thanks, but please be careful with packaging Vcs (those are indicated in debian/control or by apt-get source), the location for this one is ~ubuntu-desktop/yelp/ubuntu (debian dir only). I'm merging your changes by hand for this time but it would be nice if you could target the right vcs next time

review: Approve

=== modified file '.pc/07_disable_package_search.patch/libyelp/yelp-view.c'
--- .pc/07_disable_package_search.patch/libyelp/yelp-view.c	2013-12-17 10:40:39 +0000
+++ .pc/07_disable_package_search.patch/libyelp/yelp-view.c	2014-03-08 22:22:39 +0000
@@ -308,12 +308,12 @@
     view_clear_load (YELP_VIEW (object));
 
     if (priv->vadjuster > 0) {
-        g_source_remove (priv->vadjuster);
+        g_signal_handler_disconnect (priv->vadjustment, priv->vadjuster);
         priv->vadjuster = 0;
     }
 
     if (priv->hadjuster > 0) {
-        g_source_remove (priv->hadjuster);
+        g_signal_handler_disconnect (priv->hadjustment, priv->hadjuster);
         priv->hadjuster = 0;
     }
 
@@ -885,7 +885,7 @@
     YelpViewPrivate *priv = GET_PRIV (view);
     priv->hadjustment = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (view));
     if (priv->hadjuster > 0)
-        g_source_remove (priv->hadjuster);
+        g_signal_handler_disconnect (priv->hadjustment, priv->hadjuster);
     priv->hadjuster = 0;
     if (priv->hadjustment)
         priv->hadjuster = g_signal_connect (priv->hadjustment, "value-changed",
@@ -900,7 +900,7 @@
     YelpViewPrivate *priv = GET_PRIV (view);
     priv->vadjustment = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (view));
     if (priv->vadjuster > 0)
-        g_source_remove (priv->vadjuster);
+        g_signal_handler_disconnect (priv->vadjustment, priv->vadjuster);
     priv->vadjuster = 0;
     if (priv->vadjustment)
         priv->vadjuster = g_signal_connect (priv->vadjustment, "value-changed",

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2014-02-27 13:28:05 +0000
+++ .pc/applied-patches	2014-03-08 22:22:39 +0000
@@ -2,4 +2,3 @@
 05_menu_tooltip.patch
 06_make_ubuntu_docs_default.patch
 07_disable_package_search.patch
-git_signal_handler.patch

=== removed directory '.pc/git_signal_handler.patch'
=== removed directory '.pc/git_signal_handler.patch/libyelp'
=== removed file '.pc/git_signal_handler.patch/libyelp/yelp-location-entry.c'
--- .pc/git_signal_handler.patch/libyelp/yelp-location-entry.c	2014-02-27 13:28:05 +0000
+++ .pc/git_signal_handler.patch/libyelp/yelp-location-entry.c	1970-01-01 00:00:00 +0000
@@ -1,1650 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Copyright (C) 2009 Shaun McCance <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Shaun McCance <[e-mail]>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-
-#include "yelp-location-entry.h"
-#include "yelp-marshal.h"
-#include "yelp-settings.h"
-
-/**
- * SECTION:yelp-location-entry
- * @short_description: A location entry with history and search
- * @include: yelp.h
- *
- * #YelpLocationEntry is a #GtkComboBox designed to show the current location,
- * provide a drop-down menu of previous locations, and allow the user to perform
- * searches.
- *
- * The #GtkTreeModel used by a #YelpLocationEntry is expected to have at least
- * four columns: #GtkComboBox::entry-text-column contains the displayed name
- * of the location, #YelpLocationEntry::desc-column contains a description
- * for each entry, #YelpLocationEntry::icon-column contains an icon name for
- * the location, and #YelpLocationEntry::flags-column contains a bit field
- * of #YelpLocationEntryFlags.  These columns are specified when creating a
- * #YelpLocationEntry widget with yelp_location_entry_new_with_model().
- *
- * Usually, a single row in the #GtkTreeModel corresponds to a location.  When
- * a user selects a row from the drop-down menu, the icon and text for that
- * row will be placed in the embedded text entry, and the
- * #YelpLocationEntry:location-selected signal will be emitted.
- *
- * If a row has the %YELP_LOCATION_ENTRY_IS_SEARCH flag set, selecting that
- * row will not emit the #YelpLocationEntry::location-selected signal.  Instead,
- * the #YelpLocationEntry widget will be placed into search mode, as if by a
- * call to yelp_location_entry_start_search().
- *
- * When a row has the %YELP_LOCATION_ENTRY_CAN_BOOKMARK flag set, an icon
- * will be displayed in the secondary icon position of the embedded text
- * entry allowing the user to bookmark the location.  Clicking this icon
- * will cause the FIXME signal to be emitted.
- **/
-
-static void     location_entry_constructed     (GObject           *object);
-static void     location_entry_dispose         (GObject           *object);
-static void     location_entry_finalize        (GObject           *object);
-static void     location_entry_get_property    (GObject           *object,
-                                                guint              prop_id,
-                                                GValue            *value,
-                                                GParamSpec        *pspec);
-static void     location_entry_set_property    (GObject           *object,
-                                                guint              prop_id,
-                                                const GValue      *value,
-                                                GParamSpec        *pspec);
-
-/* Signals */
-static void     location_entry_location_selected (YelpLocationEntry *entry);
-static void     location_entry_search_activated  (YelpLocationEntry *entry);
-static void     location_entry_bookmark_clicked  (YelpLocationEntry *entry);
-
-/* Utilities */
-static void     location_entry_start_search    (YelpLocationEntry *entry,
-                                                gboolean           clear);
-static void     location_entry_cancel_search   (YelpLocationEntry *entry);
-static void     location_entry_set_entry       (YelpLocationEntry *entry,
-                                                gboolean           emit);
-static gboolean location_entry_start_pulse     (gpointer           data);
-static gboolean location_entry_pulse           (gpointer           data);
-static void     location_entry_set_completion  (YelpLocationEntry *entry,
-                                                GtkTreeModel      *model);
-
-
-/* GtkTreeModel callbacks */
-static void     history_row_changed                 (GtkTreeModel      *model,
-                                                     GtkTreePath       *path,
-                                                     GtkTreeIter       *iter,
-                                                     gpointer           user_data);
-/* GtkComboBox callbacks */
-static void     combo_box_changed_cb                (GtkComboBox       *widget,
-                                                     gpointer           user_data);
-static gboolean combo_box_row_separator_func        (GtkTreeModel      *model,
-                                                     GtkTreeIter       *iter,
-                                                     gpointer           user_data);
-/* GtkEntry callbacks */
-static gboolean entry_focus_in_cb                   (GtkWidget         *widget,
-                                                     GdkEventFocus     *event,
-                                                     gpointer           user_data);
-static gboolean entry_focus_out_cb                  (GtkWidget         *widget,
-                                                     GdkEventFocus     *event,
-                                                     gpointer           user_data);
-static void     entry_activate_cb                   (GtkEntry          *text_entry,
-                                                     gpointer           user_data);
-static void     entry_icon_press_cb                 (GtkEntry          *gtkentry,
-                                                     GtkEntryIconPosition icon_pos,
-                                                     GdkEvent          *event,
-                                                     YelpLocationEntry *entry);
-static gboolean entry_key_press_cb                  (GtkWidget         *widget,
-                                                     GdkEventKey       *event,
-                                                     YelpLocationEntry *entry);
-/* GtkCellLayout callbacks */
-static void     cell_set_text_cell                  (GtkCellLayout     *layout,
-                                                     GtkCellRenderer   *cell,
-                                                     GtkTreeModel      *model,
-                                                     GtkTreeIter       *iter,
-                                                     YelpLocationEntry *entry);
-static void     cell_set_bookmark_icon              (GtkCellLayout     *layout,
-                                                     GtkCellRenderer   *cell,
-                                                     GtkTreeModel      *model,
-                                                     GtkTreeIter       *iter,
-                                                     YelpLocationEntry *entry);
-/* GtkEntryCompletion callbacks */
-static void     cell_set_completion_bookmark_icon   (GtkCellLayout     *layout,
-                                                     GtkCellRenderer   *cell,
-                                                     GtkTreeModel      *model,
-                                                     GtkTreeIter       *iter,
-                                                     YelpLocationEntry *entry);
-static void     cell_set_completion_text_cell       (GtkCellLayout     *layout,
-                                                     GtkCellRenderer   *cell,
-                                                     GtkTreeModel      *model,
-                                                     GtkTreeIter       *iter,
-                                                     YelpLocationEntry *entry);
-static gboolean entry_match_func                    (GtkEntryCompletion *completion,
-                                                     const gchar        *key,
-                                                     GtkTreeIter        *iter,
-                                                     YelpLocationEntry  *entry);
-static gint     entry_completion_sort               (GtkTreeModel       *model,
-                                                     GtkTreeIter        *iter1,
-                                                     GtkTreeIter        *iter2,
-                                                     gpointer            user_data);
-static gboolean entry_match_selected                (GtkEntryCompletion *completion,
-                                                     GtkTreeModel       *model,
-                                                     GtkTreeIter        *iter,
-                                                     YelpLocationEntry  *entry);
-/* YelpView callbacks */
-static void          view_loaded                    (YelpView           *view,
-                                                     YelpLocationEntry  *entry);
-static void          view_uri_selected              (YelpView           *view,
-                                                     GParamSpec         *pspec,
-                                                     YelpLocationEntry  *entry);
-static void          view_page_title                (YelpView           *view,
-                                                     GParamSpec         *pspec,
-                                                     YelpLocationEntry  *entry);
-static void          view_page_desc                 (YelpView           *view,
-                                                     GParamSpec         *pspec,
-                                                     YelpLocationEntry  *entry);
-static void          view_page_icon                 (YelpView           *view,
-                                                     GParamSpec         *pspec,
-                                                     YelpLocationEntry  *entry);
-/* YelpBookmarks callbacks */
-static void          bookmarks_changed              (YelpBookmarks      *bookmarks,
-                                                     const gchar        *doc_uri,
-                                                     YelpLocationEntry  *entry);
-
-
-
-typedef struct _YelpLocationEntryPrivate  YelpLocationEntryPrivate;
-struct _YelpLocationEntryPrivate
-{
-    YelpView *view;
-    YelpBookmarks *bookmarks;
-    GtkTreeRowReference *row;
-    gchar *completion_uri;
-
-    /* do not free below */
-    GtkWidget          *text_entry;
-    GtkCellRenderer    *icon_cell;
-    GtkListStore       *history;
-    GtkEntryCompletion *completion;
-
-    gboolean   enable_search;
-    gboolean   view_uri_selected;
-    gboolean   search_mode;
-    guint      pulse;
-    gulong bookmarks_changed;
-
-    gboolean   icon_is_clear;
-};
-
-enum {
-    LOCATION_ENTRY_IS_LOADING    = 1 << 0,
-    LOCATION_ENTRY_IS_SEPARATOR  = 1 << 1,
-    LOCATION_ENTRY_IS_SEARCH     = 1 << 2
-};
-
-enum {
-    HISTORY_COL_TITLE,
-    HISTORY_COL_DESC,
-    HISTORY_COL_ICON,
-    HISTORY_COL_URI,
-    HISTORY_COL_DOC,
-    HISTORY_COL_PAGE,
-    HISTORY_COL_FLAGS,
-    HISTORY_COL_TERMS
-};
-
-enum {
-    COMPLETION_COL_TITLE,
-    COMPLETION_COL_DESC,
-    COMPLETION_COL_ICON,
-    COMPLETION_COL_PAGE,
-    COMPLETION_COL_FLAGS
-};
-
-enum {
-    COMPLETION_FLAG_ACTIVATE_SEARCH = 1<<0
-};
-
-enum {
-    LOCATION_SELECTED,
-    SEARCH_ACTIVATED,
-    BOOKMARK_CLICKED,
-    LAST_SIGNAL
-};
-
-enum {  
-    PROP_0,
-    PROP_VIEW,
-    PROP_BOOKMARKS,
-    PROP_ENABLE_SEARCH
-};
-
-static GHashTable *completions;
-
-static guint location_entry_signals[LAST_SIGNAL] = {0,};
-
-#define MAX_HISTORY 8
-
-G_DEFINE_TYPE (YelpLocationEntry, yelp_location_entry, GTK_TYPE_COMBO_BOX)
-#define GET_PRIV(object) (G_TYPE_INSTANCE_GET_PRIVATE((object), YELP_TYPE_LOCATION_ENTRY, YelpLocationEntryPrivate))
-
-static void
-yelp_location_entry_class_init (YelpLocationEntryClass *klass)
-{
-    GObjectClass *object_class;
-
-    klass->location_selected = location_entry_location_selected;
-    klass->search_activated = location_entry_search_activated;
-    klass->bookmark_clicked = location_entry_bookmark_clicked;
-
-    object_class = G_OBJECT_CLASS (klass);
-  
-    object_class->constructed = location_entry_constructed;
-    object_class->dispose = location_entry_dispose;
-    object_class->finalize = location_entry_finalize;
-    object_class->get_property = location_entry_get_property;
-    object_class->set_property = location_entry_set_property;
-
-    /**
-     * YelpLocationEntry::location-selected
-     * @widget: The #YelpLocationEntry for which the signal was emitted.
-     * @user_data: User data set when the handler was connected.
-     *
-     * This signal will be emitted whenever a user selects a normal row from the
-     * drop-down menu.  Note that if a row has the flag %YELP_LOCATION_ENTRY_IS_SEARCH,
-     * clicking the row will cause @widget to enter search mode, and this signal
-     * will not be emitted.
-     **/
-    location_entry_signals[LOCATION_SELECTED] =
-        g_signal_new ("location-selected",
-                      G_OBJECT_CLASS_TYPE (klass),
-                      G_SIGNAL_RUN_LAST,
-                      G_STRUCT_OFFSET (YelpLocationEntryClass, location_selected),
-                      NULL, NULL,
-                      g_cclosure_marshal_VOID__VOID,
-                      G_TYPE_NONE, 0);
-
-    /**
-     * YelpLocationEntry::search-activated
-     * @widget: The #YelpLocationEntry for which the signal was emitted.
-     * @text: The search text.
-     * @user_data: User data set when the handler was connected.
-     *
-     * This signal will be emitted whenever the user activates a search, generally
-     * by pressing <keycap>Enter</keycap> in the embedded text entry while @widget
-     * is in search mode.
-     **/
-    location_entry_signals[SEARCH_ACTIVATED] =
-        g_signal_new ("search-activated",
-                      G_OBJECT_CLASS_TYPE (klass),
-                      G_SIGNAL_RUN_LAST,
-                      G_STRUCT_OFFSET (YelpLocationEntryClass, search_activated),
-                      NULL, NULL,
-                      g_cclosure_marshal_VOID__STRING,
-                      G_TYPE_NONE, 1,
-                      G_TYPE_STRING);
-
-    /**
-     * YelpLocationEntry::bookmark-clicked
-     * @widget: The #YelpLocationEntry for which the signal was emitted.
-     * @user_data: User data set when the handler was connected.
-     *
-     * This signal will be emitted whenever a user clicks the bookmark icon
-     * embedded in the location entry.
-     **/
-    location_entry_signals[BOOKMARK_CLICKED] =
-        g_signal_new ("bookmark-clicked",
-                      G_OBJECT_CLASS_TYPE (klass),
-                      G_SIGNAL_RUN_LAST,
-                      G_STRUCT_OFFSET (YelpLocationEntryClass, bookmark_clicked),
-                      NULL, NULL,
-                      g_cclosure_marshal_VOID__VOID,
-                      G_TYPE_NONE, 0);
-
-    /**
-     * YelpLocationEntry:view
-     *
-     * The YelpView instance that this location entry controls.
-     **/
-    g_object_class_install_property (object_class,
-                                     PROP_VIEW,
-                                     g_param_spec_object ("view",
-							  _("View"),
-							  _("A YelpView instance to control"),
-                                                          YELP_TYPE_VIEW,
-                                                          G_PARAM_CONSTRUCT_ONLY |
-							  G_PARAM_READWRITE |
-                                                          G_PARAM_STATIC_STRINGS));
-
-    /**
-     * YelpLocationEntry:bookmarks
-     *
-     * An instance of an implementation of YelpBookmarks to provide
-     * bookmark information for this location entry.
-     **/
-    g_object_class_install_property (object_class,
-                                     PROP_BOOKMARKS,
-                                     g_param_spec_object ("bookmarks",
-							  _("Bookmarks"),
-							  _("A YelpBookmarks implementation instance"),
-                                                          YELP_TYPE_BOOKMARKS,
-                                                          G_PARAM_CONSTRUCT_ONLY |
-							  G_PARAM_READWRITE |
-                                                          G_PARAM_STATIC_STRINGS));
-
-    /**
-     * YelpLocationEntry:enable-search
-     *
-     * Whether the location entry can act as a search entry.  If search is not
-     * enabled, the user will not be able to initiate a search by clicking in
-     * the embedded text entry or selecting a search row in the drop-down menu.
-     **/
-    g_object_class_install_property (object_class,
-                                     PROP_ENABLE_SEARCH,
-                                     g_param_spec_boolean ("enable-search",
-                                                           N_("Enable Search"),
-                                                           N_("Whether the location entry can be used as a search field"),
-                                                           TRUE,
-                                                           G_PARAM_CONSTRUCT |
-                                                           G_PARAM_READWRITE |
-                                                           G_PARAM_STATIC_STRINGS));
-
-    g_type_class_add_private ((GObjectClass *) klass,
-                              sizeof (YelpLocationEntryPrivate));
-
-    completions = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
-}
-
-static void
-yelp_location_entry_init (YelpLocationEntry *entry)
-{
-    YelpLocationEntryPrivate *priv = GET_PRIV (entry);
-
-    priv->search_mode = FALSE;
-    g_object_set (entry, "entry-text-column", HISTORY_COL_TITLE, NULL);
-}
-
-static void
-location_entry_constructed (GObject *object)
-{
-    GtkCellRenderer *bookmark_cell;
-    GList *cells;
-    GtkTreeIter iter;
-    YelpLocationEntryPrivate *priv = GET_PRIV (object);
-
-    /* Set up the text entry child */
-    priv->text_entry = gtk_bin_get_child (GTK_BIN (object));
-    gtk_entry_set_icon_from_icon_name (GTK_ENTRY (priv->text_entry),
-                                       GTK_ENTRY_ICON_PRIMARY,
-                                       "help-browser");
-    gtk_entry_set_icon_activatable (GTK_ENTRY (priv->text_entry),
-                                    GTK_ENTRY_ICON_PRIMARY,
-                                    FALSE);
-    gtk_entry_set_icon_activatable (GTK_ENTRY (priv->text_entry),
-                                    GTK_ENTRY_ICON_SECONDARY,
-                                    TRUE);
-    gtk_editable_set_editable (GTK_EDITABLE (priv->text_entry),
-                               priv->enable_search);
-    if (!priv->enable_search) {
-        priv->search_mode = FALSE;
-        location_entry_set_entry ((YelpLocationEntry *) object, FALSE);
-    }
-
-    /* Set up the history model */
-    priv->history = gtk_list_store_new (8,
-                                        G_TYPE_STRING,  /* title */
-                                        G_TYPE_STRING,  /* desc */
-                                        G_TYPE_STRING,  /* icon */
-                                        G_TYPE_STRING,  /* uri */
-                                        G_TYPE_STRING,  /* doc */
-                                        G_TYPE_STRING,  /* page */
-                                        G_TYPE_INT,     /* flags */
-                                        G_TYPE_STRING   /* search terms */
-                                        );
-    g_signal_connect (priv->history, "row-changed",
-                      G_CALLBACK (history_row_changed),
-                      object);
-    g_object_set (object, "model", priv->history, NULL);
-    if (priv->enable_search) {
-        gtk_list_store_append (priv->history, &iter);
-        gtk_list_store_set (priv->history, &iter,
-                            HISTORY_COL_FLAGS, LOCATION_ENTRY_IS_SEPARATOR,
-                            -1);
-        gtk_list_store_append (priv->history, &iter);
-        gtk_list_store_set (priv->history, &iter,
-                            HISTORY_COL_ICON, "edit-find-symbolic",
-                            HISTORY_COL_TITLE, _("Search..."),
-                            HISTORY_COL_FLAGS, LOCATION_ENTRY_IS_SEARCH,
-                            -1);
-    }
-
-    /* Set up the history drop-down */
-    /* Trying to get the text to line up with the text in the GtkEntry.
-     * The text cell is the zeroeth cell right now, since we haven't
-     * yet called reorder.  I realize using a guesstimate pixel value
-     * won't be perfect all the time, but 4 looks niceish.
-     */
-    cells = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (object));
-    g_object_set (cells->data, "xpad", 4, NULL);
-    gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (object),
-                                        GTK_CELL_RENDERER (cells->data),
-                                        (GtkCellLayoutDataFunc) cell_set_text_cell,
-                                        object, NULL);
-    g_object_set (cells->data, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
-    g_list_free (cells);
-
-    priv->icon_cell = gtk_cell_renderer_pixbuf_new ();
-    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (object), priv->icon_cell, FALSE);
-    g_object_set (priv->icon_cell, "yalign", 0.2, NULL);
-    gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (object),
-                                    priv->icon_cell,
-                                    "icon-name",
-                                    HISTORY_COL_ICON,
-                                    NULL);
-    gtk_cell_layout_reorder (GTK_CELL_LAYOUT (object), priv->icon_cell, 0);
-
-    if (priv->bookmarks) {
-        bookmark_cell = gtk_cell_renderer_pixbuf_new ();
-        gtk_cell_layout_pack_end (GTK_CELL_LAYOUT (object), bookmark_cell, FALSE);
-        gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (object),
-                                            bookmark_cell,
-                                            (GtkCellLayoutDataFunc) cell_set_bookmark_icon,
-                                            object, NULL);
-    }
-    gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (object),
-                                          (GtkTreeViewRowSeparatorFunc)
-                                          combo_box_row_separator_func,
-                                          object, NULL);
-    /* Without this, you get a warning about the popup widget
-     * being NULL the firt time you click the arrow.
-     */
-    gtk_widget_show_all (GTK_WIDGET (object));
-
-    /* Connect signals */
-    g_signal_connect (object, "changed",
-                      G_CALLBACK (combo_box_changed_cb), NULL);
-
-    g_signal_connect (priv->text_entry, "focus-in-event",
-                      G_CALLBACK (entry_focus_in_cb), object);
-    g_signal_connect (priv->text_entry, "focus-out-event",
-                      G_CALLBACK (entry_focus_out_cb), object);
-    g_signal_connect (priv->text_entry, "icon-press",
-                      G_CALLBACK (entry_icon_press_cb), object);
-    g_signal_connect (priv->text_entry, "key-press-event",
-                      G_CALLBACK (entry_key_press_cb), object);
-    g_signal_connect (priv->text_entry, "activate",
-                      G_CALLBACK (entry_activate_cb), object);
-
-    if (priv->bookmarks)
-        priv->bookmarks_changed = g_signal_connect (priv->bookmarks,
-                                                    "bookmarks-changed",
-                                                    G_CALLBACK (bookmarks_changed),
-                                                    object);
-
-    g_signal_connect (priv->view, "loaded", G_CALLBACK (view_loaded), object);
-    g_signal_connect (priv->view, "notify::yelp-uri", G_CALLBACK (view_uri_selected), object);
-    g_signal_connect (priv->view, "notify::page-title", G_CALLBACK (view_page_title), object);
-    g_signal_connect (priv->view, "notify::page-desc", G_CALLBACK (view_page_desc), object);
-    g_signal_connect (priv->view, "notify::page-icon", G_CALLBACK (view_page_icon), object);
-}
-
-static void
-location_entry_dispose (GObject *object)
-{
-    YelpLocationEntryPrivate *priv = GET_PRIV (object);
-
-    if (priv->view) {
-        g_object_unref (priv->view);
-        priv->view = NULL;
-    }
-
-    if (priv->bookmarks) {
-        g_object_unref (priv->bookmarks);
-        priv->bookmarks = NULL;
-    }
-
-    if (priv->bookmarks_changed) {
-        g_source_remove (priv->bookmarks_changed);
-        priv->bookmarks_changed = 0;
-    }
-
-    if (priv->row) {
-        gtk_tree_row_reference_free (priv->row);
-        priv->row = NULL;
-    }
-
-    if (priv->pulse > 0) {
-        g_source_remove (priv->pulse);
-        priv->pulse = 0;
-    }
-
-    G_OBJECT_CLASS (yelp_location_entry_parent_class)->dispose (object);
-}
-
-static void
-location_entry_finalize (GObject *object)
-{
-    YelpLocationEntryPrivate *priv = GET_PRIV (object);
-
-    g_free (priv->completion_uri);
-
-    G_OBJECT_CLASS (yelp_location_entry_parent_class)->finalize (object);
-}
-
-static void
-location_entry_get_property   (GObject      *object,
-                               guint         prop_id,
-                               GValue       *value,
-                               GParamSpec   *pspec)
-{
-    YelpLocationEntryPrivate *priv = GET_PRIV (object);
-
-    switch (prop_id) {
-    case PROP_VIEW:
-        g_value_set_object (value, priv->view);
-        break;
-    case PROP_BOOKMARKS:
-        g_value_set_object (value, priv->bookmarks);
-        break;
-    case PROP_ENABLE_SEARCH:
-        g_value_set_boolean (value, priv->enable_search);
-        break;
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
-    }
-}
-
-static void
-location_entry_set_property   (GObject      *object,
-                               guint         prop_id,
-                               const GValue *value,
-                               GParamSpec   *pspec)
-{
-    YelpLocationEntryPrivate *priv = GET_PRIV (object);
-
-    switch (prop_id) {
-    case PROP_VIEW:
-        priv->view = g_value_dup_object (value);
-        break;
-    case PROP_BOOKMARKS:
-        priv->bookmarks = g_value_dup_object (value);
-        break;
-    case PROP_ENABLE_SEARCH:
-        priv->enable_search = g_value_get_boolean (value);
-        break;
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
-    }
-}
-
-static void
-location_entry_location_selected (YelpLocationEntry *entry)
-{
-    GtkTreeIter iter;
-    YelpLocationEntryPrivate *priv = GET_PRIV (entry);
-
-    if (priv->view_uri_selected)
-        return;
-
-    if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (entry), &iter)) {
-        gchar *uri;
-        gtk_tree_model_get (GTK_TREE_MODEL (priv->history), &iter,
-                            HISTORY_COL_URI, &uri,
-                            -1);
-        yelp_view_load (priv->view, uri);
-        g_free (uri);
-    }
-}
-
-static void
-location_entry_search_activated  (YelpLocationEntry *entry)
-{
-    YelpUri *base, *uri;
-    YelpLocationEntryPrivate *priv = GET_PRIV (entry);
-
-    g_object_get (priv->view, "yelp-uri", &base, NULL);
-    if (base == NULL)
-        return;
-    uri = yelp_uri_new_search (base,
-                               gtk_entry_get_text (GTK_ENTRY (priv->text_entry)));
-    g_object_unref (base);
-    yelp_view_load_uri (priv->view, uri);
-    gtk_widget_grab_focus (GTK_WIDGET (priv->view));
-}
-
-static void
-location_entry_bookmark_clicked  (YelpLocationEntry *entry)
-{
-    YelpUri *uri;
-    gchar *doc_uri, *page_id;
-    YelpLocationEntryPrivate *priv = GET_PRIV (entry);
-
-    g_object_get (priv->view,
-                  "yelp-uri", &uri,
-                  "page-id", &page_id,
-                  NULL);
-    doc_uri = yelp_uri_get_document_uri (uri);
-    if (priv->bookmarks && doc_uri && page_id) {
-        if (!yelp_bookmarks_is_bookmarked (priv->bookmarks, doc_uri, page_id)) {
-            gchar *icon, *title;
-            g_object_get (priv->view,
-                          "page-icon", &icon,
-                          "page-title", &title,
-                          NULL);
-            yelp_bookmarks_add_bookmark (priv->bookmarks, doc_uri, page_id, icon, title);
-            g_free (icon);
-            g_free (title);
-        }
-        else {
-            yelp_bookmarks_remove_bookmark (priv->bookmarks, doc_uri, page_id);
-        }
-    }
-    g_free (doc_uri);
-    g_free (page_id);
-    g_object_unref (uri);
-}
-
-static void
-location_entry_start_search (YelpLocationEntry *entry,
-                             gboolean           clear)
-{
-    YelpLocationEntryPrivate *priv = GET_PRIV (entry);
-
-    if (!priv->enable_search)
-        return;
-    if (clear && !priv->search_mode) {
-        const gchar *icon = gtk_entry_get_icon_name (GTK_ENTRY (priv->text_entry),
-                                                     GTK_ENTRY_ICON_PRIMARY);
-        if (!g_str_equal (icon, "folder-saved-search"))
-            gtk_entry_set_text (GTK_ENTRY (priv->text_entry), "");
-    }
-    priv->search_mode = TRUE;
-    location_entry_set_entry (entry, FALSE);
-    gtk_widget_grab_focus (priv->text_entry);
-}
-
-static void
-location_entry_cancel_search (YelpLocationEntry *entry)
-{
-    gboolean ret;
-    YelpLocationEntryPrivate *priv = GET_PRIV (entry);
-    GdkEventFocus *event = g_new0 (GdkEventFocus, 1);
-    priv->search_mode = FALSE;
-    location_entry_set_entry (entry, FALSE);
-    event->type = GDK_FOCUS_CHANGE;
-    event->window = gtk_widget_get_window (GTK_WIDGET (entry));
-    event->send_event = FALSE;
-    event->in = FALSE;
-    g_signal_emit_by_name (entry, "focus-out-event", event, &ret);
-    g_free (event);
-    /* Hack: This makes the popup disappear when you hit Esc. */
-    if (priv->completion) {
-        g_object_ref (priv->completion);
-        gtk_entry_set_completion (GTK_ENTRY (priv->text_entry), NULL);
-        gtk_entry_set_completion (GTK_ENTRY (priv->text_entry),
-                                  priv->completion);
-        g_object_unref (priv->completion);
-    }
-    gtk_editable_select_region (GTK_EDITABLE (priv->text_entry), 0, 0);
-}
-
-static void
-location_entry_set_completion (YelpLocationEntry *entry,
-                               GtkTreeModel *model)
-{
-    YelpLocationEntryPrivate *priv = GET_PRIV (entry);
-    GList *cells;
-    GtkCellRenderer *icon_cell, *bookmark_cell;
-
-    priv->completion = gtk_entry_completion_new ();
-    gtk_entry_completion_set_minimum_key_length (priv->completion, 3);
-    gtk_entry_completion_set_model (priv->completion, model);
-    gtk_entry_completion_set_text_column (priv->completion, COMPLETION_COL_TITLE);
-    gtk_entry_completion_set_match_func (priv->completion,
-                                         (GtkEntryCompletionMatchFunc) entry_match_func,
-                                         entry, NULL);
-    g_signal_connect (priv->completion, "match-selected",
-                      G_CALLBACK (entry_match_selected), entry);
-
-    cells = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (priv->completion));
-    g_object_set (cells->data, "xpad", 4, NULL);
-    gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (priv->completion),
-                                        GTK_CELL_RENDERER (cells->data),
-                                        (GtkCellLayoutDataFunc) cell_set_completion_text_cell,
-                                        entry, NULL);
-    g_object_set (cells->data, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
-    g_list_free (cells);
-
-    icon_cell = gtk_cell_renderer_pixbuf_new ();
-    g_object_set (priv->icon_cell, "yalign", 0.2, NULL);
-    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (priv->completion), icon_cell, FALSE);
-    gtk_cell_layout_reorder (GTK_CELL_LAYOUT (priv->completion), icon_cell, 0);
-    gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (priv->completion),
-                                    icon_cell,
-                                    "icon-name",
-                                    COMPLETION_COL_ICON,
-                                    NULL);
-    if (priv->bookmarks) {
-        bookmark_cell = gtk_cell_renderer_pixbuf_new ();
-        gtk_cell_layout_pack_end (GTK_CELL_LAYOUT (priv->completion), bookmark_cell, FALSE);
-        gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (priv->completion),
-                                            bookmark_cell,
-                                            (GtkCellLayoutDataFunc) cell_set_completion_bookmark_icon,
-                                            entry, NULL);
-    }
-    gtk_entry_set_completion (GTK_ENTRY (priv->text_entry),
-                              priv->completion);
-}
-
-static void
-location_entry_set_entry (YelpLocationEntry *entry, gboolean emit)
-{
-    YelpLocationEntryPrivate *priv = GET_PRIV (entry);
-    GtkTreeModel *model = gtk_combo_box_get_model (GTK_COMBO_BOX (entry));
-    GtkTreePath *path = NULL;
-    GtkTreeIter iter;
-    gchar *icon_name;
-
-    if (priv->search_mode) {
-        gtk_entry_set_icon_from_icon_name (GTK_ENTRY (priv->text_entry),
-                                           GTK_ENTRY_ICON_PRIMARY,
-                                           "edit-find-symbolic");
-        gtk_entry_set_icon_from_icon_name (GTK_ENTRY (priv->text_entry),
-                                           GTK_ENTRY_ICON_SECONDARY,
-                                           "edit-clear-symbolic");
-        gtk_entry_set_icon_tooltip_text (GTK_ENTRY (priv->text_entry),
-                                         GTK_ENTRY_ICON_SECONDARY,
-                                         _("Clear the search text"));
-        priv->icon_is_clear = TRUE;
-        return;
-    }
-    else {
-        priv->icon_is_clear = FALSE;
-    }
-
-
-    if (priv->row)
-        path = gtk_tree_row_reference_get_path (priv->row);
-
-    if (path) {
-        gchar *text, *doc_uri, *page_id;
-        gint flags;
-        gtk_tree_model_get_iter (model, &iter, path);
-        gtk_tree_model_get (model, &iter,
-                            HISTORY_COL_TITLE, &text,
-                            HISTORY_COL_ICON, &icon_name,
-                            HISTORY_COL_FLAGS, &flags,
-                            HISTORY_COL_DOC, &doc_uri,
-                            HISTORY_COL_PAGE, &page_id,
-                            -1);
-        if (flags & LOCATION_ENTRY_IS_LOADING) {
-            /* Would be nice to have a "loading" icon. I was using image-loading,
-             * but it look out of place with symbolic page icons. Plus, using
-             * image-loading-symbolic shows a broken image, because GtkEntry
-             * doesn't correctly use symbolic icons as of GNOME 3.0.
-             */
-            gtk_entry_set_icon_from_icon_name (GTK_ENTRY (priv->text_entry),
-                                               GTK_ENTRY_ICON_PRIMARY,
-                                               "yelp-page-symbolic");
-            if (priv->pulse == 0)
-                priv->pulse = g_timeout_add (500, location_entry_start_pulse, entry);
-        }
-        else {
-            gtk_entry_set_icon_from_icon_name (GTK_ENTRY (priv->text_entry),
-                                               GTK_ENTRY_ICON_PRIMARY,
-                                               icon_name);
-        }
-        if (priv->bookmarks && doc_uri && page_id) {
-            GdkPixbuf *pixbuf;
-            if (!yelp_bookmarks_is_bookmarked (priv->bookmarks, doc_uri, page_id)) {
-                gtk_entry_set_icon_from_icon_name (GTK_ENTRY (priv->text_entry),
-                                                   GTK_ENTRY_ICON_SECONDARY,
-                                                   "yelp-bookmark-add-symbolic");
-                gtk_entry_set_icon_tooltip_text (GTK_ENTRY (priv->text_entry),
-                                                 GTK_ENTRY_ICON_SECONDARY,
-                                                 _("Bookmark this page"));
-            }
-            else {
-                gtk_entry_set_icon_from_icon_name (GTK_ENTRY (priv->text_entry),
-                                                   GTK_ENTRY_ICON_SECONDARY,
-                                                   "yelp-bookmark-remove-symbolic");
-                gtk_entry_set_icon_tooltip_text (GTK_ENTRY (priv->text_entry),
-                                                 GTK_ENTRY_ICON_SECONDARY,
-                                                 _("Remove bookmark"));
-            }
-        }
-        else {
-            gtk_entry_set_icon_from_icon_name (GTK_ENTRY (priv->text_entry),
-                                               GTK_ENTRY_ICON_SECONDARY,
-                                               NULL);
-        }
-        g_free (doc_uri);
-        g_free (page_id);
-        gtk_entry_set_text (GTK_ENTRY (priv->text_entry), text);
-        if (emit)
-            g_signal_emit (entry, location_entry_signals[LOCATION_SELECTED], 0);
-        g_free (text);
-        gtk_tree_path_free (path);
-    }
-    else {
-        gtk_entry_set_icon_from_icon_name (GTK_ENTRY (priv->text_entry),
-                                           GTK_ENTRY_ICON_PRIMARY,
-                                           "help-browser");
-        gtk_entry_set_icon_from_icon_name (GTK_ENTRY (priv->text_entry),
-                                           GTK_ENTRY_ICON_SECONDARY,
-                                           NULL);
-    }
-}
-
-static gboolean
-location_entry_start_pulse (gpointer data)
-{
-    YelpLocationEntryPrivate *priv = GET_PRIV (data);
-    priv->pulse = g_timeout_add (80, location_entry_pulse, data);
-    return FALSE;
-}
-
-static gboolean
-location_entry_pulse (gpointer data)
-{
-    YelpLocationEntryPrivate *priv = GET_PRIV (data);
-    GtkTreeModel *model;
-    GtkTreePath *path;
-    GtkTreeIter iter;
-    gint flags;
-
-    model = gtk_tree_row_reference_get_model (priv->row);
-    path = gtk_tree_row_reference_get_path (priv->row);
-    if (path) {
-        gtk_tree_model_get_iter (model, &iter, path);
-        gtk_tree_model_get (model, &iter,
-                            HISTORY_COL_FLAGS, &flags,
-                            -1);
-        gtk_tree_path_free (path);
-    }
-
-    if (flags & LOCATION_ENTRY_IS_LOADING && !priv->search_mode) {
-        gtk_entry_progress_pulse (GTK_ENTRY (priv->text_entry));
-    }
-    else {
-        gtk_entry_set_progress_fraction (GTK_ENTRY (priv->text_entry), 0.0);
-        priv->pulse = 0;
-    }
-
-    return flags & LOCATION_ENTRY_IS_LOADING;
-}
-
-static void
-combo_box_changed_cb (GtkComboBox  *widget,
-                      gpointer      user_data)
-{
-    YelpLocationEntryPrivate *priv = GET_PRIV (widget);
-    GtkTreeIter iter;
-    GtkTreeModel *model;
-
-    model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget));
-
-    if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (widget), &iter)) {
-        gint flags;
-        gtk_tree_model_get (model, &iter,
-                            HISTORY_COL_FLAGS, &flags,
-                            -1);
-        if (flags & LOCATION_ENTRY_IS_SEARCH) {
-            location_entry_start_search ((YelpLocationEntry *) widget, TRUE);
-        }
-        else {            
-            GtkTreePath *cur, *path;
-            path = gtk_tree_model_get_path (model, &iter);
-            if (priv->row) {
-                cur = gtk_tree_row_reference_get_path (priv->row);
-                if (gtk_tree_path_compare (cur, path) == 0) {
-                    gtk_tree_path_free (cur);
-                    gtk_tree_path_free (path);
-                    return;
-                }
-                gtk_tree_path_free (cur);
-                gtk_tree_row_reference_free (priv->row);
-            }
-            priv->row = gtk_tree_row_reference_new (model, path);
-            gtk_tree_path_free (path);
-            priv->search_mode = FALSE;
-            location_entry_set_entry ((YelpLocationEntry *) widget, TRUE);
-        }
-    }
-}
-
-static gboolean
-combo_box_row_separator_func (GtkTreeModel  *model,
-                              GtkTreeIter   *iter,
-                              gpointer       user_data)
-{
-    YelpLocationEntryPrivate *priv = GET_PRIV (user_data);
-    gint flags;
-    gtk_tree_model_get (model, iter,
-                        HISTORY_COL_FLAGS, &flags,
-                        -1);
-    return (flags & LOCATION_ENTRY_IS_SEPARATOR);
-}
-
-static void
-history_row_changed (GtkTreeModel  *model,
-                     GtkTreePath   *path,
-                     GtkTreeIter   *iter,
-                     gpointer       user_data)
-{
-    /* FIXME: Should we bother checking path/iter against priv->row?
-       It doesn't really make a difference, since set_entry is pretty much
-       safe to call whenever.  Does it make a performance impact?
-    */
-    location_entry_set_entry (YELP_LOCATION_ENTRY (user_data), FALSE);
-}
-
-static gboolean
-entry_focus_in_cb (GtkWidget     *widget,
-                   GdkEventFocus *event,
-                   gpointer       user_data)
-{
-    GtkEntry *text_entry = GTK_ENTRY (widget);
-    YelpLocationEntryPrivate *priv = GET_PRIV (user_data);
-
-    if (priv->enable_search && !priv->search_mode)
-        location_entry_start_search ((YelpLocationEntry *) user_data, TRUE);
-
-    return FALSE;
-}
-
-static gboolean
-entry_focus_out_cb (GtkWidget         *widget,
-                    GdkEventFocus     *event,
-                    gpointer           user_data)
-{
-    YelpLocationEntryPrivate *priv = GET_PRIV (user_data);
-
-    if (gtk_entry_get_text_length (GTK_ENTRY (widget)) == 0) {
-        priv->search_mode = FALSE;
-        location_entry_set_entry ((YelpLocationEntry *) user_data, FALSE);
-    }
-
-    return FALSE;
-}
-
-static void
-entry_activate_cb (GtkEntry  *text_entry,
-                   gpointer   user_data)
-{
-    YelpLocationEntryPrivate *priv = GET_PRIV (user_data);
-    gchar *text = g_strdup (gtk_entry_get_text (text_entry));
-
-    if (!priv->enable_search)
-        return;
-
-    if (!priv->search_mode || text == NULL || strlen(text) == 0)
-        return;
-
-    g_signal_emit (user_data, location_entry_signals[SEARCH_ACTIVATED], 0, text);
-
-    g_free (text);
-}
-
-static void
-entry_icon_press_cb (GtkEntry            *gtkentry,
-                     GtkEntryIconPosition icon_pos,
-                     GdkEvent            *event,
-                     YelpLocationEntry   *entry)
-{
-    YelpLocationEntryPrivate *priv = GET_PRIV (entry);
-
-    if (icon_pos == GTK_ENTRY_ICON_SECONDARY) {
-        if (priv->icon_is_clear)
-            location_entry_cancel_search (entry);
-        else
-            g_signal_emit (entry, location_entry_signals[BOOKMARK_CLICKED], 0);
-    }
-}
-
-static gboolean
-entry_key_press_cb (GtkWidget   *widget,
-                    GdkEventKey *event,
-                    YelpLocationEntry *entry)
-{
-    YelpLocationEntryPrivate *priv = GET_PRIV (entry);
-    if (event->keyval == GDK_KEY_Escape) {
-        location_entry_cancel_search (entry);
-        return TRUE;
-    }
-    else if (!priv->search_mode) {
-        location_entry_start_search (entry, FALSE);
-    }
-
-    return FALSE;
-}
-
-static void
-cell_set_text_cell (GtkCellLayout     *layout,
-                    GtkCellRenderer   *cell,
-                    GtkTreeModel      *model,
-                    GtkTreeIter       *iter,
-                    YelpLocationEntry *entry)
-{
-    gchar *title, *desc, *color, *text;
-    YelpLocationEntryPrivate *priv = GET_PRIV (entry);
-
-    gtk_tree_model_get (model, iter,
-                        HISTORY_COL_TITLE, &title,
-                        HISTORY_COL_DESC, &desc,
-                        -1);
-    if (desc) {
-        color = yelp_settings_get_color (yelp_settings_get_default (),
-                                         YELP_SETTINGS_COLOR_TEXT_LIGHT);
-        text = g_markup_printf_escaped ("<span size='larger'>%s</span>\n<span color='%s'>%s</span>",
-                                        title, color, desc);
-        g_free (color);
-        g_free (desc);
-    }
-    else {
-        text = g_markup_printf_escaped ("<span size='larger'>%s</span>", title);
-    }
-
-    g_object_set (cell, "markup", text, NULL);
-    g_free (text);
-    g_free (title);
-}
-
-static void
-cell_set_bookmark_icon (GtkCellLayout     *layout,
-                        GtkCellRenderer   *cell,
-                        GtkTreeModel      *model,
-                        GtkTreeIter       *iter,
-                        YelpLocationEntry *entry)
-{
-    gint flags;
-    gchar *doc_uri, *page_id;
-    YelpLocationEntryPrivate *priv = GET_PRIV (entry);
-
-    if (priv->bookmarks == NULL) {
-        g_object_set (cell, "icon-name", NULL, NULL);
-        return;
-    }
-
-    gtk_tree_model_get (model, iter, HISTORY_COL_FLAGS, &flags, -1);
-    if (flags & (LOCATION_ENTRY_IS_SEPARATOR | LOCATION_ENTRY_IS_SEARCH)) {
-        g_object_set (cell, "icon-name", NULL, NULL);
-        return;
-    }
-    
-    gtk_tree_model_get (model, iter,
-                        HISTORY_COL_DOC, &doc_uri,
-                        HISTORY_COL_PAGE, &page_id,
-                        -1);
-    if (doc_uri && page_id &&
-        yelp_bookmarks_is_bookmarked (priv->bookmarks, doc_uri, page_id))
-        g_object_set (cell, "icon-name", "yelp-bookmark-remove-symbolic", NULL);
-    else
-        g_object_set (cell, "icon-name", NULL, NULL);
-
-    g_free (doc_uri);
-    g_free (page_id);
-}
-
-static void
-cell_set_completion_bookmark_icon (GtkCellLayout     *layout,
-                                   GtkCellRenderer   *cell,
-                                   GtkTreeModel      *model,
-                                   GtkTreeIter       *iter,
-                                   YelpLocationEntry *entry)
-{
-    YelpLocationEntryPrivate *priv = GET_PRIV (entry);
-
-    if (priv->completion_uri) {
-        gchar *page_id = NULL;
-        gtk_tree_model_get (model, iter,
-                            COMPLETION_COL_PAGE, &page_id,
-                            -1);
-
-        if (page_id && yelp_bookmarks_is_bookmarked (priv->bookmarks,
-                                                     priv->completion_uri, page_id))
-            g_object_set (cell, "icon-name", "yelp-bookmark-remove-symbolic", NULL);
-        else
-            g_object_set (cell, "icon-name", NULL, NULL);
-
-        g_free (page_id);
-    }
-}
-
-static void
-cell_set_completion_text_cell (GtkCellLayout     *layout,
-                               GtkCellRenderer   *cell,
-                               GtkTreeModel      *model,
-                               GtkTreeIter       *iter,
-                               YelpLocationEntry *entry)
-{
-    gchar *title, *desc, *color, *text;
-    gint flags;
-    GList *cells, *cur;
-    YelpLocationEntryPrivate *priv = GET_PRIV (entry);
-
-    gtk_tree_model_get (model, iter, COMPLETION_COL_FLAGS, &flags, -1);
-    if (flags & COMPLETION_FLAG_ACTIVATE_SEARCH) {
-        title = g_strdup_printf (_("Search for “%s”"),
-                                 gtk_entry_get_text (GTK_ENTRY (priv->text_entry)));
-        text = g_markup_printf_escaped ("<span size='larger' font_weight='bold'>%s</span>", title);
-        g_object_set (cell, "markup", text, NULL);
-        g_free (text);
-        g_free (title);
-
-        color = yelp_settings_get_color (yelp_settings_get_default (),
-                                         YELP_SETTINGS_COLOR_YELLOW_BASE);
-        cells = gtk_cell_layout_get_cells (layout);
-        for (cur = cells; cur; cur = cur->next) {
-            g_object_set (cur->data,
-                          "cell-background", color,
-                          "cell-background-set", TRUE,
-                          NULL);
-        }
-        g_list_free (cells);
-        g_free (color);
-        return;
-    }
-
-    gtk_tree_model_get (model, iter,
-                        COMPLETION_COL_TITLE, &title,
-                        COMPLETION_COL_DESC, &desc,
-                        -1);
-    if (desc) {
-        color = yelp_settings_get_color (yelp_settings_get_default (),
-                                         YELP_SETTINGS_COLOR_TEXT_LIGHT);
-        text = g_markup_printf_escaped ("<span size='larger'>%s</span>\n<span color='%s'>%s</span>",
-                                        title, color, desc);
-        g_free (color);
-        g_free (desc);
-    }
-    else {
-        text = g_markup_printf_escaped ("<span size='larger'>%s</span>", title);
-    }
-
-    g_object_set (cell, "markup", text, NULL);
-    g_free (text);
-    g_free (title);
-
-    cells = gtk_cell_layout_get_cells (layout);
-    for (cur = cells; cur; cur = cur->next)
-        g_object_set (cur->data, "cell-background-set", FALSE, NULL);
-    g_list_free (cells);
-}
-
-static gboolean
-entry_match_func (GtkEntryCompletion *completion,
-                  const gchar        *key,
-                  GtkTreeIter        *iter,
-                  YelpLocationEntry  *entry)
-{
-    gint stri;
-    gchar *title, *desc, *titlecase = NULL, *desccase = NULL;
-    gboolean ret = FALSE;
-    gchar **strs;
-    gint flags;
-    GtkTreeModel *model = gtk_entry_completion_get_model (completion);
-    YelpLocationEntryPrivate *priv = GET_PRIV (entry);
-    static GRegex *nonword = NULL;
-
-    if (nonword == NULL)
-        nonword = g_regex_new ("\\W", 0, 0, NULL);
-    if (nonword == NULL)
-        return FALSE;
-
-    gtk_tree_model_get (model, iter, COMPLETION_COL_FLAGS, &flags, -1);
-    if (flags & COMPLETION_FLAG_ACTIVATE_SEARCH)
-        return TRUE;
-
-    gtk_tree_model_get (model, iter,
-                        COMPLETION_COL_TITLE, &title,
-                        COMPLETION_COL_DESC, &desc,
-                        -1);
-    if (title) {
-        titlecase = g_utf8_casefold (title, -1);
-        g_free (title);
-    }
-    if (desc) {
-        desccase = g_utf8_casefold (desc, -1);
-        g_free (desc);
-    }
-
-    strs = g_regex_split (nonword, key, 0);
-    ret = TRUE;
-    for (stri = 0; strs[stri]; stri++) {
-        if (!titlecase || !strstr (titlecase, strs[stri])) {
-            if (!desccase || !strstr (desccase, strs[stri])) {
-                ret = FALSE;
-                break;
-            }
-        }
-    }
-
-    g_free (titlecase);
-    g_free (desccase);
-    g_strfreev (strs);
-
-    return ret;
-}
-
-static gint
-entry_completion_sort (GtkTreeModel *model,
-                       GtkTreeIter  *iter1,
-                       GtkTreeIter  *iter2,
-                       gpointer      user_data)
-{
-    gint ret = 0;
-    gint flags1, flags2;
-    gchar *key1, *key2;
-
-    gtk_tree_model_get (model, iter1, COMPLETION_COL_FLAGS, &flags1, -1);
-    gtk_tree_model_get (model, iter2, COMPLETION_COL_FLAGS, &flags2, -1);
-    if (flags1 & COMPLETION_FLAG_ACTIVATE_SEARCH)
-        return 1;
-    else if (flags2 & COMPLETION_FLAG_ACTIVATE_SEARCH)
-        return -1;
-
-    gtk_tree_model_get (model, iter1, COMPLETION_COL_ICON, &key1, -1);
-    gtk_tree_model_get (model, iter2, COMPLETION_COL_ICON, &key2, -1);
-    ret = yelp_settings_cmp_icons (key1, key2);
-    g_free (key1);
-    g_free (key2);
-
-    if (ret)
-        return ret;
-
-    gtk_tree_model_get (model, iter1, COMPLETION_COL_TITLE, &key1, -1);
-    gtk_tree_model_get (model, iter2, COMPLETION_COL_TITLE, &key2, -1);
-    if (key1 && key2)
-        ret = g_utf8_collate (key1, key2);
-    else if (key2 == NULL)
-        return -1;
-    else if (key1 == NULL)
-        return 1;
-    g_free (key1);
-    g_free (key2);
-
-    return ret;
-}
-
-static gboolean
-entry_match_selected (GtkEntryCompletion *completion,
-                      GtkTreeModel       *model,
-                      GtkTreeIter        *iter,
-                      YelpLocationEntry  *entry)
-{
-    YelpUri *base, *uri;
-    gchar *page, *xref;
-    gint flags;
-    YelpLocationEntryPrivate *priv = GET_PRIV (entry);
-
-    gtk_tree_model_get (model, iter, COMPLETION_COL_FLAGS, &flags, -1);
-    if (flags & COMPLETION_FLAG_ACTIVATE_SEARCH) {
-        entry_activate_cb (GTK_ENTRY (priv->text_entry), entry);
-        return TRUE;
-    }
-
-    g_object_get (priv->view, "yelp-uri", &base, NULL);
-    gtk_tree_model_get (model, iter, COMPLETION_COL_PAGE, &page, -1);
-
-    xref = g_strconcat ("xref:", page, NULL);
-    uri = yelp_uri_new_relative (base, xref);
-
-    yelp_view_load_uri (priv->view, uri);
-
-    g_free (page);
-    g_free (xref);
-    g_object_unref (uri);
-    g_object_unref (base);
-
-    gtk_widget_grab_focus (GTK_WIDGET (priv->view));
-    return TRUE;
-}
-
-static void
-view_loaded (YelpView          *view,
-             YelpLocationEntry *entry)
-{
-    gchar **ids;
-    gint i;
-    GtkTreeIter iter;
-    gint flags;
-    YelpUri *uri;
-    gchar *doc_uri, *page_id;
-    GtkTreeModel *completion;
-    YelpLocationEntryPrivate *priv = GET_PRIV (entry);
-    YelpDocument *document = yelp_view_get_document (view);
-
-    gtk_tree_model_get_iter_first (GTK_TREE_MODEL (priv->history), &iter);
-    gtk_tree_model_get (GTK_TREE_MODEL (priv->history), &iter,
-                        HISTORY_COL_FLAGS, &flags,
-                        -1);
-    if (flags & LOCATION_ENTRY_IS_LOADING) {
-        flags = flags & ~LOCATION_ENTRY_IS_LOADING;
-        gtk_list_store_set (priv->history, &iter, HISTORY_COL_FLAGS, flags, -1);
-    }
-
-    g_object_get (view,
-                  "yelp-uri", &uri,
-                  "page-id", &page_id,
-                  NULL);
-    doc_uri = yelp_uri_get_document_uri (uri);
-    gtk_list_store_set (priv->history, &iter,
-                        HISTORY_COL_DOC, doc_uri,
-                        HISTORY_COL_PAGE, page_id,
-                        -1);
-    g_free (page_id);
-
-    if ((priv->completion_uri == NULL) || 
-        !g_str_equal (doc_uri, priv->completion_uri)) {
-        completion = (GtkTreeModel *) g_hash_table_lookup (completions, doc_uri);
-        if (completion == NULL) {
-            GtkListStore *base = gtk_list_store_new (5,
-                                                     G_TYPE_STRING,  /* title */
-                                                     G_TYPE_STRING,  /* desc */
-                                                     G_TYPE_STRING,  /* icon */
-                                                     G_TYPE_STRING,  /* uri */
-                                                     G_TYPE_INT      /* flags */
-                                                     );
-            completion = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (base));
-            gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (completion),
-                                                     entry_completion_sort,
-                                                     NULL, NULL);
-            g_hash_table_insert (completions, g_strdup (doc_uri), completion);
-            if (document != NULL) {
-                GtkTreeIter iter;
-                ids = yelp_document_list_page_ids (document);
-                for (i = 0; ids[i]; i++) {
-                    gchar *title, *desc, *icon;
-                    gtk_list_store_insert (GTK_LIST_STORE (base), &iter, 0);
-                    title = yelp_document_get_page_title (document, ids[i]);
-                    desc = yelp_document_get_page_desc (document, ids[i]);
-                    icon = yelp_document_get_page_icon (document, ids[i]);
-                    gtk_list_store_set (base, &iter,
-                                        COMPLETION_COL_TITLE, title,
-                                        COMPLETION_COL_DESC, desc,
-                                        COMPLETION_COL_ICON, icon,
-                                        COMPLETION_COL_PAGE, ids[i],
-                                        -1);
-                    g_free (icon);
-                    g_free (desc);
-                    g_free (title);
-                }
-                g_strfreev (ids);
-                gtk_list_store_insert (GTK_LIST_STORE (base), &iter, 0);
-                gtk_list_store_set (base, &iter,
-                                    COMPLETION_COL_ICON, "edit-find-symbolic",
-                                    COMPLETION_COL_FLAGS, COMPLETION_FLAG_ACTIVATE_SEARCH,
-                                    -1);
-            }
-            g_object_unref (base);
-        }
-        g_free (priv->completion_uri);
-        priv->completion_uri = doc_uri;
-        location_entry_set_completion (entry, completion);
-    }
-
-    g_object_unref (uri);
-}
-
-static void
-view_uri_selected (YelpView          *view,
-                   GParamSpec        *pspec,
-                   YelpLocationEntry *entry)
-{
-    GtkTreeIter iter;
-    gchar *iter_uri;
-    gboolean cont;
-    YelpUri *uri;
-    gchar *struri, *doc_uri;
-    YelpLocationEntryPrivate *priv = GET_PRIV (entry);
-
-    g_object_get (G_OBJECT (view), "yelp-uri", &uri, NULL);
-    if (uri == NULL)
-        return;
-
-    struri = yelp_uri_get_canonical_uri (uri);
-
-    cont = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (priv->history), &iter);
-    while (cont) {
-        gtk_tree_model_get (GTK_TREE_MODEL (priv->history), &iter,
-                            HISTORY_COL_URI, &iter_uri,
-                            -1);
-        if (iter_uri && g_str_equal (struri, iter_uri)) {
-            g_free (iter_uri);
-            break;
-        }
-        else {
-            g_free (iter_uri);
-            cont = gtk_tree_model_iter_next (GTK_TREE_MODEL (priv->history), &iter);
-        }
-    }
-    if (cont) {
-        GtkTreeIter first;
-        gtk_tree_model_get_iter_first (GTK_TREE_MODEL (priv->history), &first);
-        gtk_list_store_move_before (priv->history, &iter, &first);
-    }
-    else {
-        gint num;
-        GtkTreeIter last;
-        gtk_list_store_prepend (priv->history, &iter);
-        gtk_list_store_set (priv->history, &iter,
-                            HISTORY_COL_TITLE, _("Loading"),
-                            HISTORY_COL_ICON, "help-contents",
-                            HISTORY_COL_URI, struri,
-                            HISTORY_COL_FLAGS, LOCATION_ENTRY_IS_LOADING,
-                            -1);
-        /* Limit to MAX_HISTORY entries. There are two extra for the search entry
-         * and the separator above it.
-         */
-        num = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (priv->history), NULL);
-        if (num > MAX_HISTORY + 2) {
-            if (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (priv->history),
-                                                               &last, NULL,
-                                                               num - 3)) {
-                gtk_list_store_remove (priv->history, &last);
-            }
-        }
-    }
-    priv->view_uri_selected = TRUE;
-    gtk_combo_box_set_active_iter (GTK_COMBO_BOX (entry), &iter);
-    priv->view_uri_selected = FALSE;
-
-    g_free (struri);
-    g_object_unref (uri);
-}
-
-static void
-view_page_title (YelpView          *view,
-                 GParamSpec        *pspec,
-                 YelpLocationEntry *entry)
-{
-    GtkTreeIter first;
-    YelpLocationEntryPrivate *priv = GET_PRIV (entry);
-
-    if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (priv->history), &first)) {
-        gchar *title, *frag = NULL;
-        YelpViewState state;
-        YelpUri *uri;
-
-        g_object_get (view,
-                      "page-title", &title,
-                      "state", &state,
-                      NULL);
-        if (title == NULL)
-            return;
-
-        if (state != YELP_VIEW_STATE_ERROR) {
-            YelpUri *uri;
-            g_object_get (view, "yelp-uri", &uri, NULL);
-            frag = yelp_uri_get_frag_id (uri);
-            g_object_unref (uri);
-        }
-
-        if (frag) {
-            gchar *tmp = g_strdup_printf ("%s (#%s)", title, frag);
-            gtk_list_store_set (priv->history, &first,
-                                HISTORY_COL_TITLE, tmp,
-                                -1);
-            g_free (tmp);
-            g_free (frag);     
-        }
-        else {
-            gtk_list_store_set (priv->history, &first,
-                                HISTORY_COL_TITLE, title,
-                                -1);
-        }
-        g_free (title);
-    }
-}
-
-static void
-view_page_desc (YelpView          *view,
-                GParamSpec        *pspec,
-                YelpLocationEntry *entry)
-{
-    GtkTreeIter first;
-    gchar *desc;
-    YelpLocationEntryPrivate *priv = GET_PRIV (entry);
-
-    g_object_get (view, "page-desc", &desc, NULL);
-    if (desc == NULL)
-        return;
-
-    if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (priv->history), &first))
-        gtk_list_store_set (priv->history, &first,
-                            HISTORY_COL_DESC, desc,
-                            -1);
-    g_free (desc);
-}
-
-static void
-view_page_icon (YelpView          *view,
-                GParamSpec        *pspec,
-                YelpLocationEntry *entry)
-{
-    GtkTreeIter first;
-    gchar *icon;
-    YelpLocationEntryPrivate *priv = GET_PRIV (entry);
-
-    g_object_get (view, "page-icon", &icon, NULL);
-    if (icon == NULL)
-        return;
-
-    if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (priv->history), &first))
-        gtk_list_store_set (priv->history, &first,
-                            HISTORY_COL_ICON, icon,
-                            -1);
-    g_free (icon);
-}
-
-static void
-bookmarks_changed (YelpBookmarks      *bookmarks,
-                   const gchar        *doc_uri,
-                   YelpLocationEntry  *entry)
-{
-    GtkTreePath *path;
-    YelpLocationEntryPrivate *priv = GET_PRIV (entry);
-
-    if (priv->row)
-        path = gtk_tree_row_reference_get_path (priv->row);
-
-    if (path) {
-        GtkTreeIter iter;
-        gchar *this_uri, *page_id;
-        gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->history), &iter, path);
-        gtk_tree_model_get (GTK_TREE_MODEL (priv->history), &iter,
-                            HISTORY_COL_DOC, &this_uri,
-                            HISTORY_COL_PAGE, &page_id,
-                            -1);
-        if (this_uri && g_str_equal (this_uri, doc_uri) && page_id) {
-            if (!yelp_bookmarks_is_bookmarked (priv->bookmarks, doc_uri, page_id)) {
-                gtk_entry_set_icon_from_icon_name (GTK_ENTRY (priv->text_entry),
-                                                   GTK_ENTRY_ICON_SECONDARY,
-                                                   "yelp-bookmark-add-symbolic");
-                gtk_entry_set_icon_tooltip_text (GTK_ENTRY (priv->text_entry),
-                                                 GTK_ENTRY_ICON_SECONDARY,
-                                                 _("Bookmark this page"));
-            }
-            else {
-                gtk_entry_set_icon_from_icon_name (GTK_ENTRY (priv->text_entry),
-                                                   GTK_ENTRY_ICON_SECONDARY,
-                                                   "yelp-bookmark-remove-symbolic");
-                gtk_entry_set_icon_tooltip_text (GTK_ENTRY (priv->text_entry),
-                                                 GTK_ENTRY_ICON_SECONDARY,
-                                                 _("Remove bookmark"));
-            }
-        }
-        else {
-            gtk_entry_set_icon_from_icon_name (GTK_ENTRY (priv->text_entry),
-                                               GTK_ENTRY_ICON_SECONDARY,
-                                               NULL);
-        }
-        g_free (this_uri);
-        g_free (page_id);
-    }
-}
-
-/**
- * yelp_location_entry_new:
- * @view: A #YelpView.
- *
- * Creates a new #YelpLocationEntry widget to control @view.
- *
- * Returns: A new #YelpLocationEntry.
- **/
-GtkWidget*
-yelp_location_entry_new (YelpView      *view,
-                         YelpBookmarks *bookmarks)
-{
-    GtkWidget *ret;
-    g_return_val_if_fail (YELP_IS_VIEW (view), NULL);
-
-    ret = GTK_WIDGET (g_object_new (YELP_TYPE_LOCATION_ENTRY,
-                                    "has-entry", TRUE,
-                                    "view", view,
-                                    "bookmarks", bookmarks,
-                                    NULL));
-
-    return ret;
-}
-
-/**
- * yelp_location_entry_start_search:
- * @entry: A #YelpLocationEntry.
- *
- * Puts @entry into search mode.  This focuses the entry and clears its text
- * contents.  When the user activates the search, the
- * #YelpLocationEntry::search-activated signal will be emitted.
- **/
-void
-yelp_location_entry_start_search (YelpLocationEntry *entry)
-{
-    location_entry_start_search (entry, TRUE);
-}

=== removed file '.pc/git_signal_handler.patch/libyelp/yelp-view.c'
--- .pc/git_signal_handler.patch/libyelp/yelp-view.c	2014-02-27 13:28:05 +0000
+++ .pc/git_signal_handler.patch/libyelp/yelp-view.c	1970-01-01 00:00:00 +0000
@@ -1,2220 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Copyright (C) 2009 Shaun McCance <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Shaun McCance <[e-mail]>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib/gi18n.h>
-#include <glib-object.h>
-#include <gio/gio.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
-#include <webkit/webkit.h>
-
-#include "yelp-debug.h"
-#include "yelp-docbook-document.h"
-#include "yelp-error.h"
-#include "yelp-marshal.h"
-#include "yelp-settings.h"
-#include "yelp-types.h"
-#include "yelp-view.h"
-
-#define BOGUS_URI "file:///bogus/"
-#define BOGUS_URI_LEN 14
-
-static void        yelp_view_init                 (YelpView           *view);
-static void        yelp_view_class_init           (YelpViewClass      *klass);
-static void        yelp_view_dispose              (GObject            *object);
-static void        yelp_view_finalize             (GObject            *object);
-static void        yelp_view_get_property         (GObject            *object,
-                                                   guint               prop_id,
-                                                   GValue             *value,
-                                                   GParamSpec         *pspec);
-static void        yelp_view_set_property         (GObject            *object,
-                                                   guint               prop_id,
-                                                   const GValue       *value,
-                                                   GParamSpec         *pspec);
-
-static gboolean    view_external_uri              (YelpView           *view,
-                                                   YelpUri            *uri);
-static void        view_install_uri               (YelpView           *view,
-                                                   const gchar        *uri);
-static void        view_scrolled                  (GtkAdjustment      *adjustment,
-                                                   YelpView           *view);
-static void        view_set_hadjustment           (YelpView           *view,
-                                                   GParamSpec         *pspec,
-                                                   gpointer            data);
-static void        view_set_vadjustment           (YelpView           *view,
-                                                   GParamSpec         *pspec,
-                                                   gpointer            data);
-static void        popup_open_link                (GtkMenuItem        *item,
-                                                   YelpView           *view);
-static void        popup_open_link_new            (GtkMenuItem        *item,
-                                                   YelpView           *view);
-static void        popup_copy_link                (GtkMenuItem        *item,
-                                                   YelpView           *view);
-static void        popup_save_image               (GtkMenuItem        *item,
-                                                   YelpView           *view);
-static void        popup_send_image               (GtkMenuItem        *item,
-                                                   YelpView           *view);
-static void        popup_copy_code                (GtkMenuItem        *item,
-                                                   YelpView           *view);
-static void        popup_save_code                (GtkMenuItem        *item,
-                                                   YelpView           *view);
-static void        view_populate_popup            (YelpView           *view,
-                                                   GtkMenu            *menu,
-                                                   gpointer            data);
-static void        view_script_alert              (YelpView           *view,
-                                                   WebKitWebFrame     *frame,
-                                                   gchar              *message,
-                                                   gpointer            data);
-static gboolean    view_navigation_requested      (WebKitWebView             *view,
-                                                   WebKitWebFrame            *frame,
-                                                   WebKitNetworkRequest      *request,
-                                                   WebKitWebNavigationAction *action,
-                                                   WebKitWebPolicyDecision   *decision,
-                                                   gpointer                   user_data);
-static void        view_resource_request          (WebKitWebView             *view,
-                                                   WebKitWebFrame            *frame,
-                                                   WebKitWebResource         *resource,
-                                                   WebKitNetworkRequest      *request,
-                                                   WebKitNetworkResponse     *response,
-                                                   gpointer                   user_data);
-static void        view_document_loaded           (WebKitWebView             *view,
-                                                   WebKitWebFrame            *frame,
-                                                   gpointer                   user_data);
-
-static void        view_print                     (GtkAction          *action,
-                                                   YelpView           *view);
-static void        view_history_action            (GtkAction          *action,
-                                                   YelpView           *view);
-static void        view_navigation_action         (GtkAction          *action,
-                                                   YelpView           *view);
-
-static void        view_clear_load                (YelpView           *view);
-static void        view_load_page                 (YelpView           *view);
-static void        view_show_error_page           (YelpView           *view,
-                                                   GError             *error);
-
-static void        settings_set_fonts             (YelpSettings       *settings);
-static void        settings_show_text_cursor      (YelpSettings       *settings);
-
-static void        uri_resolved                   (YelpUri            *uri,
-                                                   YelpView           *view);
-static void        document_callback              (YelpDocument       *document,
-                                                   YelpDocumentSignal  signal,
-                                                   YelpView           *view,
-                                                   GError             *error);
-
-static const GtkActionEntry entries[] = {
-    {"YelpViewPrint", GTK_STOCK_PRINT,
-     N_("_Print..."),
-     "<Control>P",
-     NULL,
-     G_CALLBACK (view_print) },
-    {"YelpViewGoBack", GTK_STOCK_GO_BACK,
-     N_("_Back"),
-     "<Alt>Left",
-     NULL,
-     G_CALLBACK (view_history_action) },
-    {"YelpViewGoForward", GTK_STOCK_GO_FORWARD,
-     N_("_Forward"),
-     "<Alt>Right",
-     NULL,
-     G_CALLBACK (view_history_action) },
-    {"YelpViewGoPrevious", NULL,
-     N_("_Previous Page"),
-     "<Control>Page_Up",
-     NULL,
-     G_CALLBACK (view_navigation_action) },
-    {"YelpViewGoNext", NULL,
-     N_("_Next Page"),
-     "<Control>Page_Down",
-     NULL,
-     G_CALLBACK (view_navigation_action) }
-};
-
-static gchar *nautilus_sendto = NULL;
-
-enum {
-    PROP_0,
-    PROP_URI,
-    PROP_STATE,
-    PROP_PAGE_ID,
-    PROP_ROOT_TITLE,
-    PROP_PAGE_TITLE,
-    PROP_PAGE_DESC,
-    PROP_PAGE_ICON
-};
-
-enum {
-    NEW_VIEW_REQUESTED,
-    EXTERNAL_URI,
-    LOADED,
-    LAST_SIGNAL
-};
-static gint signals[LAST_SIGNAL] = { 0 };
-
-G_DEFINE_TYPE (YelpView, yelp_view, WEBKIT_TYPE_WEB_VIEW);
-#define GET_PRIV(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), YELP_TYPE_VIEW, YelpViewPrivate))
-
-static WebKitWebSettings *websettings;
-
-typedef struct _YelpActionEntry YelpActionEntry;
-struct _YelpActionEntry {
-    GtkAction               *action;
-    YelpViewActionValidFunc  func;
-    gpointer                 data;
-};
-static void
-action_entry_free (YelpActionEntry *entry)
-{
-    if (entry == NULL)
-        return;
-    g_object_unref (entry->action);
-    g_free (entry);
-}
-
-typedef struct _YelpBackEntry YelpBackEntry;
-struct _YelpBackEntry {
-    YelpUri *uri;
-    gchar   *title;
-    gchar   *desc;
-    gdouble  hadj;
-    gdouble  vadj;
-};
-static void
-back_entry_free (YelpBackEntry *back)
-{
-    if (back == NULL)
-        return;
-    g_object_unref (back->uri);
-    g_free (back->title);
-    g_free (back->desc);
-    g_free (back);
-}
-
-typedef struct _YelpViewPrivate YelpViewPrivate;
-struct _YelpViewPrivate {
-    YelpUri       *uri;
-    YelpUri       *resolve_uri;
-    gulong         uri_resolved;
-    gchar         *bogus_uri;
-    YelpDocument  *document;
-    GCancellable  *cancellable;
-    GtkAdjustment *vadjustment;
-    GtkAdjustment *hadjustment;
-    gdouble        vadjust;
-    gdouble        hadjust;
-    gulong         vadjuster;
-    gulong         hadjuster;
-
-    gchar         *popup_link_uri;
-    gchar         *popup_link_text;
-    gchar         *popup_image_uri;
-    WebKitDOMNode *popup_code_node;
-    WebKitDOMNode *popup_code_title;
-    gchar         *popup_code_text;
-
-    YelpViewState  state;
-    YelpViewState  prevstate;
-
-    gchar         *page_id;
-    gchar         *root_title;
-    gchar         *page_title;
-    gchar         *page_desc;
-    gchar         *page_icon;
-
-    GList          *back_list;
-    GList          *back_cur;
-    gboolean        back_load;
-
-    GtkActionGroup *action_group;
-
-    GSList         *link_actions;
-
-    gint            navigation_requested;
-};
-
-#define TARGET_TYPE_URI_LIST     "text/uri-list"
-enum {
-    TARGET_URI_LIST
-};
-
-static void
-yelp_view_init (YelpView *view)
-{
-    GtkAction *action;
-    YelpViewPrivate *priv = GET_PRIV (view);
-
-    g_object_set (view, "settings", websettings, NULL);
-
-    priv->cancellable = NULL;
-
-    priv->prevstate = priv->state = YELP_VIEW_STATE_BLANK;
-
-    priv->navigation_requested =
-        g_signal_connect (view, "navigation-policy-decision-requested",
-                          G_CALLBACK (view_navigation_requested), NULL);
-    g_signal_connect (view, "resource-request-starting",
-                      G_CALLBACK (view_resource_request), NULL);
-    g_signal_connect (view, "document-load-finished",
-                      G_CALLBACK (view_document_loaded), NULL);
-    g_signal_connect (view, "notify::hadjustment",
-                      G_CALLBACK (view_set_hadjustment), NULL);
-    g_signal_connect (view, "notify::vadjustment",
-                      G_CALLBACK (view_set_vadjustment), NULL);
-    g_signal_connect (view, "populate-popup",
-                      G_CALLBACK (view_populate_popup), NULL);
-    g_signal_connect (view, "script-alert",
-                      G_CALLBACK (view_script_alert), NULL);
-
-    priv->action_group = gtk_action_group_new ("YelpView");
-    gtk_action_group_set_translation_domain (priv->action_group, GETTEXT_PACKAGE);
-    gtk_action_group_add_actions (priv->action_group,
-				  entries, G_N_ELEMENTS (entries),
-				  view);
-    action = gtk_action_group_get_action (priv->action_group, "YelpViewGoBack");
-    gtk_action_set_sensitive (action, FALSE);
-    action = gtk_action_group_get_action (priv->action_group, "YelpViewGoForward");
-    gtk_action_set_sensitive (action, FALSE);
-}
-
-static void
-yelp_view_dispose (GObject *object)
-{
-    YelpViewPrivate *priv = GET_PRIV (object);
-
-    view_clear_load (YELP_VIEW (object));
-
-    if (priv->vadjuster > 0) {
-        g_source_remove (priv->vadjuster);
-        priv->vadjuster = 0;
-    }
-
-    if (priv->hadjuster > 0) {
-        g_source_remove (priv->hadjuster);
-        priv->hadjuster = 0;
-    }
-
-    if (priv->action_group) {
-        g_object_unref (priv->action_group);
-        priv->action_group = NULL;
-    }
-
-    if (priv->document) {
-        g_object_unref (priv->document);
-        priv->document = NULL;
-    }
-
-    while (priv->link_actions) {
-        action_entry_free (priv->link_actions->data);
-        priv->link_actions = g_slist_delete_link (priv->link_actions, priv->link_actions);
-    }
-
-    priv->back_cur = NULL;
-    while (priv->back_list) {
-        back_entry_free ((YelpBackEntry *) priv->back_list->data);
-        priv->back_list = g_list_delete_link (priv->back_list, priv->back_list);
-    }
-
-    G_OBJECT_CLASS (yelp_view_parent_class)->dispose (object);
-}
-
-static void
-yelp_view_finalize (GObject *object)
-{
-    YelpViewPrivate *priv = GET_PRIV (object);
-
-    g_free (priv->popup_link_uri);
-    g_free (priv->popup_link_text);
-    g_free (priv->popup_image_uri);
-    g_free (priv->popup_code_text);
-
-    g_free (priv->page_id);
-    g_free (priv->root_title);
-    g_free (priv->page_title);
-    g_free (priv->page_desc);
-    g_free (priv->page_icon);
-
-    g_free (priv->bogus_uri);
-
-    G_OBJECT_CLASS (yelp_view_parent_class)->finalize (object);
-}
-
-static void
-yelp_view_class_init (YelpViewClass *klass)
-{
-    GObjectClass *object_class = G_OBJECT_CLASS (klass);
-    YelpSettings *settings = yelp_settings_get_default ();
-
-    nautilus_sendto = g_find_program_in_path ("nautilus-sendto");
-
-    websettings = webkit_web_settings_new ();
-    g_object_set (websettings, "enable-universal-access-from-file-uris", TRUE, NULL);
-    g_signal_connect (settings,
-                      "fonts-changed",
-                      G_CALLBACK (settings_set_fonts),
-                      NULL);
-    settings_set_fonts (settings);
-    g_signal_connect (settings,
-                      "notify::show-text-cursor",
-                      G_CALLBACK (settings_show_text_cursor),
-                      NULL);
-    settings_show_text_cursor (settings);
-
-    klass->external_uri = view_external_uri;
-
-    object_class->dispose = yelp_view_dispose;
-    object_class->finalize = yelp_view_finalize;
-    object_class->get_property = yelp_view_get_property;
-    object_class->set_property = yelp_view_set_property;
-
-    signals[NEW_VIEW_REQUESTED] =
-	g_signal_new ("new-view-requested",
-		      G_TYPE_FROM_CLASS (klass),
-		      G_SIGNAL_RUN_LAST,
-                      0, NULL, NULL,
-		      g_cclosure_marshal_VOID__OBJECT,
-		      G_TYPE_NONE, 1, YELP_TYPE_URI);
-
-    signals[EXTERNAL_URI] =
-	g_signal_new ("external-uri",
-		      G_TYPE_FROM_CLASS (klass),
-		      G_SIGNAL_RUN_LAST,
-                      G_STRUCT_OFFSET (YelpViewClass, external_uri),
-                      g_signal_accumulator_true_handled, NULL,
-		      yelp_marshal_BOOLEAN__OBJECT,
-		      G_TYPE_BOOLEAN, 1, YELP_TYPE_URI);
-
-    signals[LOADED] =
-        g_signal_new ("loaded",
-                      G_TYPE_FROM_CLASS (klass),
-                      G_SIGNAL_RUN_LAST,
-                      0, NULL, NULL,
-                      g_cclosure_marshal_VOID__VOID,
-                      G_TYPE_NONE, 0);
-
-    g_type_class_add_private (klass, sizeof (YelpViewPrivate));
-
-    g_object_class_install_property (object_class,
-                                     PROP_URI,
-                                     g_param_spec_object ("yelp-uri",
-							  _("Yelp URI"),
-							  _("A YelpUri with the current location"),
-                                                          YELP_TYPE_URI,
-							  G_PARAM_READWRITE | G_PARAM_STATIC_NAME |
-							  G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
-
-    g_object_class_install_property (object_class,
-                                     PROP_STATE,
-                                     g_param_spec_enum ("state",
-                                                        N_("Loading State"),
-                                                        N_("The loading state of the view"),
-                                                        YELP_TYPE_VIEW_STATE,
-                                                        YELP_VIEW_STATE_BLANK,
-                                                        G_PARAM_READWRITE | G_PARAM_STATIC_NAME |
-                                                        G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
-
-    g_object_class_install_property (object_class,
-                                     PROP_PAGE_ID,
-                                     g_param_spec_string ("page-id",
-                                                          N_("Page ID"),
-                                                          N_("The ID of the root page of the page being viewed"),
-                                                          NULL,
-                                                          G_PARAM_READABLE |
-                                                          G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
-
-    g_object_class_install_property (object_class,
-                                     PROP_ROOT_TITLE,
-                                     g_param_spec_string ("root-title",
-                                                          N_("Root Title"),
-                                                          N_("The title of the root page of the page being viewed"),
-                                                          NULL,
-                                                          G_PARAM_READABLE |
-                                                          G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
-
-    g_object_class_install_property (object_class,
-                                     PROP_PAGE_TITLE,
-                                     g_param_spec_string ("page-title",
-                                                          N_("Page Title"),
-                                                          N_("The title of the page being viewed"),
-                                                          NULL,
-                                                          G_PARAM_READABLE |
-                                                          G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
-
-    g_object_class_install_property (object_class,
-                                     PROP_PAGE_DESC,
-                                     g_param_spec_string ("page-desc",
-                                                          N_("Page Description"),
-                                                          N_("The description of the page being viewed"),
-                                                          NULL,
-                                                          G_PARAM_READABLE |
-                                                          G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
-
-    g_object_class_install_property (object_class,
-                                     PROP_PAGE_ICON,
-                                     g_param_spec_string ("page-icon",
-                                                          N_("Page Icon"),
-                                                          N_("The icon of the page being viewed"),
-                                                          NULL,
-                                                          G_PARAM_READABLE |
-                                                          G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
-}
-
-static void
-yelp_view_get_property (GObject    *object,
-                        guint       prop_id,
-                        GValue     *value,
-                        GParamSpec *pspec)
-{
-    YelpViewPrivate *priv = GET_PRIV (object);
-
-    switch (prop_id)
-        {
-        case PROP_URI:
-            g_value_set_object (value, priv->uri);
-            break;
-        case PROP_PAGE_ID:
-            g_value_set_string (value, priv->page_id);
-            break;
-        case PROP_ROOT_TITLE:
-            g_value_set_string (value, priv->root_title);
-            break;
-        case PROP_PAGE_TITLE:
-            g_value_set_string (value, priv->page_title);
-            break;
-        case PROP_PAGE_DESC:
-            g_value_set_string (value, priv->page_desc);
-            break;
-        case PROP_PAGE_ICON:
-            if (priv->page_icon)
-                g_value_set_string (value, priv->page_icon);
-            else
-                g_value_set_string (value, "yelp-page-symbolic");
-            break;
-        case PROP_STATE:
-            g_value_set_enum (value, priv->state);
-            break;
-        default:
-            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-            break;
-    }
-}
-
-static void
-yelp_view_set_property (GObject      *object,
-                        guint         prop_id,
-                        const GValue *value,
-                        GParamSpec   *pspec)
-{
-    YelpUri *uri;
-    YelpViewPrivate *priv = GET_PRIV (object);
-
-    switch (prop_id)
-        {
-        case PROP_URI:
-            uri = g_value_get_object (value);
-            yelp_view_load_uri (YELP_VIEW (object), uri);
-            g_object_unref (uri);
-            break;
-        case PROP_STATE:
-            priv->prevstate = priv->state;
-            priv->state = g_value_get_enum (value);
-            break;
-        default:
-            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-            break;
-    }
-}
-
-/******************************************************************************/
-
-GtkWidget *
-yelp_view_new (void)
-{
-    return (GtkWidget *) g_object_new (YELP_TYPE_VIEW, NULL);
-}
-
-void
-yelp_view_load (YelpView    *view,
-                const gchar *uri)
-{
-    YelpUri *yuri = yelp_uri_new (uri);
-    yelp_view_load_uri (view, yuri);
-    g_object_unref (yuri);
-}
-
-void
-yelp_view_load_uri (YelpView *view,
-                    YelpUri  *uri)
-{
-    YelpViewPrivate *priv = GET_PRIV (view);
-
-    g_object_set (view, "state", YELP_VIEW_STATE_LOADING, NULL);
-
-    gtk_action_set_sensitive (gtk_action_group_get_action (priv->action_group,
-                                                           "YelpViewGoPrevious"),
-                              FALSE);
-    gtk_action_set_sensitive (gtk_action_group_get_action (priv->action_group,
-                                                           "YelpViewGoNext"),
-                              FALSE);
-
-    if (!yelp_uri_is_resolved (uri)) {
-        if (priv->resolve_uri != NULL) {
-            if (priv->uri_resolved != 0) {
-                g_signal_handler_disconnect (priv->resolve_uri, priv->uri_resolved);
-                priv->uri_resolved = 0;
-            }
-            g_object_unref (priv->resolve_uri);
-        }
-        priv->resolve_uri = g_object_ref (uri);
-        priv->uri_resolved = g_signal_connect (uri, "resolved",
-                                               G_CALLBACK (uri_resolved),
-                                               view);
-        yelp_uri_resolve (uri);
-    }
-    else {
-        uri_resolved (uri, view);
-    }
-}
-
-void
-yelp_view_load_document (YelpView     *view,
-                         YelpUri      *uri,
-                         YelpDocument *document)
-{
-    GParamSpec *spec;
-    YelpViewPrivate *priv = GET_PRIV (view);
-
-    g_return_if_fail (yelp_uri_is_resolved (uri));
-
-    g_object_set (view, "state", YELP_VIEW_STATE_LOADING, NULL);
-
-    g_object_ref (uri);
-    view_clear_load (view);
-    priv->uri = uri;
-    spec = g_object_class_find_property ((GObjectClass *) YELP_VIEW_GET_CLASS (view),
-                                         "yelp-uri");
-    g_signal_emit_by_name (view, "notify::yelp-uri", spec);
-    g_object_ref (document);
-    if (priv->document)
-        g_object_unref (document);
-    priv->document = document;
-
-    view_load_page (view);
-}
-
-YelpDocument *
-yelp_view_get_document (YelpView *view)
-{
-    YelpViewPrivate *priv = GET_PRIV (view);
-    return priv->document;
-}
-
-GtkActionGroup *
-yelp_view_get_action_group (YelpView *view)
-{
-    YelpViewPrivate *priv = GET_PRIV (view);
-    return priv->action_group;
-}
-
-/******************************************************************************/
-
-void
-yelp_view_add_link_action (YelpView                *view,
-                           GtkAction               *action,
-                           YelpViewActionValidFunc  func,
-                           gpointer                 data)
-{
-    YelpActionEntry *entry;
-    YelpViewPrivate *priv = GET_PRIV (view);
-
-    entry = g_new0 (YelpActionEntry, 1);
-    entry->action = g_object_ref (action);
-    entry->func = func;
-    entry->data = data;
-
-    priv->link_actions = g_slist_append (priv->link_actions, entry);
-}
-
-YelpUri *
-yelp_view_get_active_link_uri (YelpView *view)
-{
-    YelpViewPrivate *priv = GET_PRIV (view);
-    YelpUri *uri;
-
-    if (g_str_has_prefix (priv->popup_link_uri, BOGUS_URI))
-        uri = yelp_uri_new_relative (priv->uri, priv->popup_link_uri + BOGUS_URI_LEN);
-    else
-        uri = yelp_uri_new_relative (priv->uri, priv->popup_link_uri);
-
-    return uri;
-}
-
-gchar *
-yelp_view_get_active_link_text (YelpView *view)
-{
-    YelpViewPrivate *priv = GET_PRIV (view);
-    return g_strdup (priv->popup_link_text);
-}
-
-/******************************************************************************/
-
-static gboolean
-view_external_uri (YelpView *view,
-                   YelpUri  *uri)
-{
-    gchar *struri = yelp_uri_get_canonical_uri (uri);
-    g_app_info_launch_default_for_uri (struri, NULL, NULL);
-    g_free (struri);
-    return TRUE;
-}
-
-typedef struct _YelpInstallInfo YelpInstallInfo;
-struct _YelpInstallInfo {
-    YelpView *view;
-    gchar *uri;
-};
-
-static void
-yelp_install_info_free (YelpInstallInfo *info)
-{
-    g_object_unref (info->view);
-    if (info->uri)
-        g_free (info->uri);
-    g_free (info);
-}
-
-static void
-view_install_installed (GDBusConnection *connection,
-                        GAsyncResult    *res,
-                        YelpInstallInfo *info)
-{
-    GError *error = NULL;
-    g_dbus_connection_call_finish (connection, res, &error);
-    if (error) {
-        const gchar *err = NULL;
-        if (error->domain == G_DBUS_ERROR) {
-            if (error->code == G_DBUS_ERROR_SERVICE_UNKNOWN)
-                err = _("You do not have PackageKit. Package install links require PackageKit.");
-            else
-                err = error->message;
-        }
-        if (err != NULL) {
-            GtkWidget *dialog = gtk_message_dialog_new (NULL, 0,
-                                                        GTK_MESSAGE_ERROR,
-                                                        GTK_BUTTONS_CLOSE,
-                                                        "%s", err);
-            gtk_dialog_run ((GtkDialog *) dialog);
-            gtk_widget_destroy (dialog);
-        }
-        g_error_free (error);
-    }
-    else if (info->uri) {
-        gchar *struri, *docuri;
-        YelpViewPrivate *priv = GET_PRIV (info->view);
-        docuri = yelp_uri_get_document_uri (priv->uri);
-        if (g_str_equal (docuri, info->uri)) {
-            struri = yelp_uri_get_canonical_uri (priv->uri);
-            yelp_view_load (info->view, struri);
-            g_free (struri);
-        }
-        g_free (docuri);
-    }
-
-    yelp_install_info_free (info);
-}
-
-static void
-view_install_uri (YelpView    *view,
-                  const gchar *uri)
-{
-    GDBusConnection *connection;
-    GError *error;
-    gboolean help = FALSE, ghelp = FALSE;
-    GVariantBuilder *strv;
-    YelpInstallInfo *info;
-    guint32 xid = 0;
-    YelpViewPrivate *priv = GET_PRIV (view);
-    GtkWidget *gtkwin;
-    GdkWindow *gdkwin;
-    /* do not free */
-    gchar *pkg, *confirm_search;
-
-    if (g_str_has_prefix (uri, "install-help:")) {
-        help = TRUE;
-        pkg = (gchar *) uri + 13;
-    }
-    else if (g_str_has_prefix (uri, "install-ghelp:")) {
-        ghelp = TRUE;
-        pkg = (gchar *) uri + 14;
-    }
-    else if (g_str_has_prefix (uri, "install:")) {
-        pkg = (gchar *) uri + 8;
-    }
-
-    connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
-    if (connection == NULL) {
-        g_warning ("Unable to connect to dbus: %s", error->message);
-        g_error_free (error);
-        return;
-    }
-
-    info = g_new0 (YelpInstallInfo, 1);
-    info->view = g_object_ref (view);
-
-    gtkwin = gtk_widget_get_toplevel (GTK_WIDGET (view));
-    if (gtkwin != NULL && gtk_widget_is_toplevel (gtkwin)) {
-        gdkwin = gtk_widget_get_window (gtkwin);
-        if (gdkwin != NULL)
-            xid = gdk_x11_window_get_xid (gdkwin);
-    }
-
-    if (priv->state == YELP_VIEW_STATE_ERROR)
-        confirm_search = "hide-confirm-search";
-    else
-        confirm_search = "";
-
-    if (help || ghelp) {
-        const gchar * const *datadirs = g_get_system_data_dirs ();
-        gint datadirs_i;
-        gchar *docbook, *fname;
-        docbook = g_strconcat (pkg, ".xml", NULL);
-        strv = g_variant_builder_new (G_VARIANT_TYPE ("as"));
-        for (datadirs_i = 0; datadirs[datadirs_i] != NULL; datadirs_i++) {
-            if (ghelp) {
-                fname = g_build_filename (datadirs[datadirs_i], "gnome", "help",
-                                          pkg, "C", "index.page", NULL);
-                g_variant_builder_add (strv, "s", fname);
-                g_free (fname);
-                fname = g_build_filename (datadirs[datadirs_i], "gnome", "help",
-                                          pkg, "C", docbook, NULL);
-                g_variant_builder_add (strv, "s", fname);
-                g_free (fname);
-            }
-            else {
-                fname = g_build_filename (datadirs[datadirs_i], "help", "C",
-                                          pkg, "index.page", NULL);
-                g_variant_builder_add (strv, "s", fname);
-                g_free (fname);
-                fname = g_build_filename (datadirs[datadirs_i], "help", "C",
-                                          pkg, "index.docbook", NULL);
-                g_variant_builder_add (strv, "s", fname);
-                g_free (fname);
-            }
-        }
-        g_free (docbook);
-        info->uri = g_strconcat (ghelp ? "ghelp:" : "help:", pkg, NULL);
-        g_dbus_connection_call (connection,
-                                "org.freedesktop.PackageKit",
-                                "/org/freedesktop/PackageKit",
-                                "org.freedesktop.PackageKit.Modify",
-                                "InstallProvideFiles",
-                                g_variant_new ("(uass)", xid, strv, confirm_search),
-                                NULL,
-                                G_DBUS_CALL_FLAGS_NONE,
-                                G_MAXINT, NULL,
-                                (GAsyncReadyCallback) view_install_installed,
-                                info);
-        g_variant_builder_unref (strv);
-    }
-    else {
-        gchar **pkgs;
-        gint i;
-        strv = g_variant_builder_new (G_VARIANT_TYPE ("as"));
-        pkgs = g_strsplit (pkg, ",", 0);
-        for (i = 0; pkgs[i]; i++)
-            g_variant_builder_add (strv, "s", pkgs[i]);
-        g_strfreev (pkgs);
-        g_dbus_connection_call (connection,
-                                "org.freedesktop.PackageKit",
-                                "/org/freedesktop/PackageKit",
-                                "org.freedesktop.PackageKit.Modify",
-                                "InstallPackageNames",
-                                g_variant_new ("(uass)", xid, strv, confirm_search),
-                                NULL,
-                                G_DBUS_CALL_FLAGS_NONE,
-                                G_MAXINT, NULL,
-                                (GAsyncReadyCallback) view_install_installed,
-                                info);
-        g_variant_builder_unref (strv);
-    }
-
-    g_object_unref (connection);
-}
-
-static void
-view_scrolled (GtkAdjustment *adjustment,
-               YelpView      *view)
-{
-    YelpViewPrivate *priv = GET_PRIV (view);
-    if (priv->back_cur == NULL || priv->back_cur->data == NULL)
-        return;
-    if (adjustment == priv->vadjustment)
-        ((YelpBackEntry *) priv->back_cur->data)->vadj = gtk_adjustment_get_value (adjustment);
-    else if (adjustment = priv->hadjustment)
-        ((YelpBackEntry *) priv->back_cur->data)->hadj = gtk_adjustment_get_value (adjustment);
-}
-
-static void
-view_set_hadjustment (YelpView      *view,
-                      GParamSpec    *pspec,
-                      gpointer       data)
-{
-    YelpViewPrivate *priv = GET_PRIV (view);
-    priv->hadjustment = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (view));
-    if (priv->hadjuster > 0)
-        g_source_remove (priv->hadjuster);
-    priv->hadjuster = 0;
-    if (priv->hadjustment)
-        priv->hadjuster = g_signal_connect (priv->hadjustment, "value-changed",
-                                            G_CALLBACK (view_scrolled), view);
-}
-
-static void
-view_set_vadjustment (YelpView      *view,
-                      GParamSpec    *pspec,
-                      gpointer       data)
-{
-    YelpViewPrivate *priv = GET_PRIV (view);
-    priv->vadjustment = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (view));
-    if (priv->vadjuster > 0)
-        g_source_remove (priv->vadjuster);
-    priv->vadjuster = 0;
-    if (priv->vadjustment)
-        priv->vadjuster = g_signal_connect (priv->vadjustment, "value-changed",
-                                            G_CALLBACK (view_scrolled), view);
-}
-
-static void
-popup_open_link (GtkMenuItem *item,
-                 YelpView    *view)
-{
-    YelpViewPrivate *priv = GET_PRIV (view);
-    YelpUri *uri;
-
-    if (g_str_has_prefix (priv->popup_link_uri, BOGUS_URI))
-        uri = yelp_uri_new_relative (priv->uri, priv->popup_link_uri + BOGUS_URI_LEN);
-    else
-        uri = yelp_uri_new_relative (priv->uri, priv->popup_link_uri);
-
-    yelp_view_load_uri (view, uri);
-    g_object_unref (uri);
-
-    g_free (priv->popup_link_uri);
-    priv->popup_link_uri = NULL;
-
-    g_free (priv->popup_link_text);
-    priv->popup_link_text = NULL;
-}
-
-static void
-popup_open_link_new (GtkMenuItem *item,
-                     YelpView    *view)
-{
-    YelpViewPrivate *priv = GET_PRIV (view);
-    YelpUri *uri;
-
-    if (g_str_has_prefix (priv->popup_link_uri, BOGUS_URI))
-        uri = yelp_uri_new_relative (priv->uri, priv->popup_link_uri + BOGUS_URI_LEN);
-    else
-        uri = yelp_uri_new_relative (priv->uri, priv->popup_link_uri);
-
-    g_free (priv->popup_link_uri);
-    priv->popup_link_uri = NULL;
-
-    g_free (priv->popup_link_text);
-    priv->popup_link_text = NULL;
-
-    g_signal_emit (view, signals[NEW_VIEW_REQUESTED], 0, uri);
-    g_object_unref (uri);
-}
-
-static void
-popup_copy_link (GtkMenuItem *item,
-                 YelpView    *view)
-{
-    YelpViewPrivate *priv = GET_PRIV (view);
-    gtk_clipboard_set_text (gtk_widget_get_clipboard (GTK_WIDGET (view), GDK_SELECTION_CLIPBOARD),
-                            priv->popup_link_uri,
-                            -1);
-}
-
-typedef struct _YelpSaveData YelpSaveData;
-struct _YelpSaveData {
-    GFile     *orig;
-    GFile     *dest;
-    YelpView  *view;
-    GtkWindow *window;
-};
-
-static void
-file_copied (GFile        *file,
-             GAsyncResult *res,
-             YelpSaveData *data)
-{
-    GError *error = NULL;
-    if (!g_file_copy_finish (file, res, &error)) {
-        GtkWidget *dialog = gtk_message_dialog_new (gtk_widget_get_visible (GTK_WIDGET (data->window)) ? data->window : NULL,
-                                                    GTK_DIALOG_DESTROY_WITH_PARENT,
-                                                    GTK_MESSAGE_ERROR,
-                                                    GTK_BUTTONS_OK,
-                                                    "%s", error->message);
-        gtk_dialog_run (GTK_DIALOG (dialog));
-        gtk_widget_destroy (dialog);
-    }
-    g_object_unref (data->orig);
-    g_object_unref (data->dest);
-    g_object_unref (data->view);
-    g_object_unref (data->window);
-}
-
-static void
-popup_save_image (GtkMenuItem *item,
-                  YelpView    *view)
-{
-    YelpSaveData *data;
-    GtkWidget *dialog, *window;
-    gchar *basename;
-    gint res;
-    YelpViewPrivate *priv = GET_PRIV (view);
-
-    for (window = gtk_widget_get_parent (GTK_WIDGET (view));
-         window && !GTK_IS_WINDOW (window);
-         window = gtk_widget_get_parent (window));
-
-    data = g_new0 (YelpSaveData, 1);
-    data->orig = g_file_new_for_uri (priv->popup_image_uri);
-    data->view = g_object_ref (view);
-    data->window = g_object_ref (window);
-    g_free (priv->popup_image_uri);
-    priv->popup_image_uri = NULL;
-
-    dialog = gtk_file_chooser_dialog_new (_("Save Image"),
-                                          GTK_WINDOW (window),
-                                          GTK_FILE_CHOOSER_ACTION_SAVE,
-                                          GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                          GTK_STOCK_SAVE, GTK_RESPONSE_OK,
-                                          NULL);
-    gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
-    basename = g_file_get_basename (data->orig);
-    gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), basename);
-    g_free (basename);
-    gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog),
-                                         g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP));
-
-    res = gtk_dialog_run (GTK_DIALOG (dialog));
-
-    if (res == GTK_RESPONSE_OK) {
-        data->dest = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog));
-        g_file_copy_async (data->orig, data->dest,
-                           G_FILE_COPY_OVERWRITE,
-                           G_PRIORITY_DEFAULT,
-                           NULL, NULL, NULL,
-                           (GAsyncReadyCallback) file_copied,
-                           data);
-    }
-    else {
-        g_object_unref (data->orig);
-        g_object_unref (data->view);
-        g_object_unref (data->window);
-        g_free (data);
-    }
-
-    gtk_widget_destroy (dialog);
-}
-
-static void
-popup_send_image (GtkMenuItem *item,
-                  YelpView    *view)
-{
-    gchar *command;
-    GAppInfo *app;
-    GAppLaunchContext *context;
-    GError *error = NULL;
-    YelpViewPrivate *priv = GET_PRIV (view);
-
-    command = g_strdup_printf ("%s %s", nautilus_sendto, priv->popup_image_uri);
-    context = (GAppLaunchContext *) gdk_display_get_app_launch_context (gtk_widget_get_display (GTK_WIDGET (item)));
-
-    app = g_app_info_create_from_commandline (command, NULL, 0, &error);
-    if (app) {
-        g_app_info_launch (app, NULL, context, &error);
-        g_object_unref (app);
-    }
-
-    if (error) {
-        g_debug ("Could not launch nautilus-sendto: %s", error->message);
-        g_error_free (error);
-    }
-
-    g_object_unref (context);
-    g_free (command);
-    g_free (priv->popup_image_uri);
-    priv->popup_image_uri = NULL;
-}
-
-static void
-popup_copy_code (GtkMenuItem *item,
-                 YelpView    *view)
-{
-    YelpViewPrivate *priv = GET_PRIV (view);
-    GtkClipboard *clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
-    gchar *content = webkit_dom_node_get_text_content (priv->popup_code_node);
-    gtk_clipboard_set_text (clipboard, content, -1);
-    g_free (content);
-}
-
-static void
-popup_save_code (GtkMenuItem *item,
-                 YelpView    *view)
-{
-    YelpViewPrivate *priv = GET_PRIV (view);
-    GtkWidget *dialog, *window;
-    gint res;
-
-    g_free (priv->popup_code_text);
-    priv->popup_code_text = webkit_dom_node_get_text_content (priv->popup_code_node);
-    if (!g_str_has_suffix (priv->popup_code_text, "\n")) {
-        gchar *tmp = g_strconcat (priv->popup_code_text, "\n", NULL);
-        g_free (priv->popup_code_text);
-        priv->popup_code_text = tmp;
-    }
-
-    for (window = gtk_widget_get_parent (GTK_WIDGET (view));
-         window && !GTK_IS_WINDOW (window);
-         window = gtk_widget_get_parent (window));
-
-    dialog = gtk_file_chooser_dialog_new (_("Save Code"),
-                                          GTK_WINDOW (window),
-                                          GTK_FILE_CHOOSER_ACTION_SAVE,
-                                          GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                          GTK_STOCK_SAVE, GTK_RESPONSE_OK,
-                                          NULL);
-    gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
-    if (priv->popup_code_title) {
-        gchar *filename = webkit_dom_node_get_text_content (priv->popup_code_title);
-        gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), filename);
-        g_free (filename);
-    }
-    gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog),
-                                         g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS));
-
-    res = gtk_dialog_run (GTK_DIALOG (dialog));
-
-    if (res == GTK_RESPONSE_OK) {
-        GError *error = NULL;
-        GFile *file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog));
-        GFileOutputStream *stream = g_file_replace (file, NULL, FALSE,
-                                                    G_FILE_CREATE_NONE,
-                                                    NULL,
-                                                    &error);
-        if (stream == NULL) {
-            GtkWidget *dialog = gtk_message_dialog_new (gtk_widget_get_visible (window) ? GTK_WINDOW (window) : NULL,
-                                                        GTK_DIALOG_DESTROY_WITH_PARENT,
-                                                        GTK_MESSAGE_ERROR,
-                                                        GTK_BUTTONS_OK,
-                                                        "%s", error->message);
-            gtk_dialog_run (GTK_DIALOG (dialog));
-            gtk_widget_destroy (dialog);
-            g_error_free (error);
-        }
-        else {
-            /* FIXME: we should do this async */
-            GDataOutputStream *datastream = g_data_output_stream_new (G_OUTPUT_STREAM (stream));
-            if (!g_data_output_stream_put_string (datastream, priv->popup_code_text, NULL, &error)) {
-                GtkWidget *dialog = gtk_message_dialog_new (gtk_widget_get_visible (window) ? GTK_WINDOW (window) : NULL,
-                                                            GTK_DIALOG_DESTROY_WITH_PARENT,
-                                                            GTK_MESSAGE_ERROR,
-                                                            GTK_BUTTONS_OK,
-                                                            "%s", error->message);
-                gtk_dialog_run (GTK_DIALOG (dialog));
-                gtk_widget_destroy (dialog);
-                g_error_free (error);
-            }
-            g_object_unref (datastream);
-        }
-        g_object_unref (file);
-    }
-
-    priv->popup_code_node = NULL;
-    priv->popup_code_title = NULL;
-    g_free (priv->popup_code_text);
-    priv->popup_code_text = NULL;
-
-    gtk_widget_destroy (dialog);
-}
-
-static void
-view_populate_popup (YelpView *view,
-                     GtkMenu  *menu,
-                     gpointer  data)
-{
-    WebKitHitTestResult *result;
-    WebKitHitTestResultContext context;
-    GdkEvent *event;
-    YelpViewPrivate *priv = GET_PRIV (view);
-    GList *children;
-    GtkWidget *item;
-    WebKitDOMNode *node, *cur, *link_node = NULL, *code_node = NULL, *code_title_node = NULL;
-
-    children = gtk_container_get_children (GTK_CONTAINER (menu));
-    while (children) {
-        gtk_container_remove (GTK_CONTAINER (menu),
-                              GTK_WIDGET (children->data));
-        children = children->next;
-    }
-    g_list_free (children);
-
-    event = gtk_get_current_event ();
-
-    result = webkit_web_view_get_hit_test_result (WEBKIT_WEB_VIEW (view), (GdkEventButton *) event);
-    g_object_get (result,
-                  "context", &context,
-                  "inner-node", &node,
-                  NULL);
-    for (cur = node; cur != NULL; cur = webkit_dom_node_get_parent_node (cur)) {
-        if (WEBKIT_DOM_IS_ELEMENT (cur) &&
-            webkit_dom_element_webkit_matches_selector ((WebKitDOMElement *) cur,
-                                                        "a", NULL))
-            link_node = cur;
-
-        if (WEBKIT_DOM_IS_ELEMENT (cur) &&
-            webkit_dom_element_webkit_matches_selector ((WebKitDOMElement *) cur,
-                                                        "div.code", NULL)) {
-            WebKitDOMNode *title;
-            code_node = (WebKitDOMNode *)
-                webkit_dom_element_query_selector ((WebKitDOMElement *) cur,
-                                                   "pre.contents", NULL);
-            title = webkit_dom_node_get_parent_node (cur);
-            if (title != NULL && WEBKIT_DOM_IS_ELEMENT (title) &&
-                webkit_dom_element_webkit_matches_selector ((WebKitDOMElement *) title,
-                                                            "div.contents", NULL)) {
-                title = webkit_dom_node_get_previous_sibling (title);
-                if (title != NULL && WEBKIT_DOM_IS_ELEMENT (title) &&
-                    webkit_dom_element_webkit_matches_selector ((WebKitDOMElement *) title,
-                                                                "div.title", NULL)) {
-                    code_title_node = title;
-                }
-            }
-        }
-    }
-
-    if (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK) {
-        gchar *uri;
-        g_object_get (result, "link-uri", &uri, NULL);
-        g_free (priv->popup_link_uri);
-        priv->popup_link_uri = uri;
-
-        g_free (priv->popup_link_text);
-        priv->popup_link_text = NULL;
-        if (link_node != NULL) {
-            WebKitDOMNode *child;
-            gchar *tmp;
-            gint i, tmpi;
-            gboolean ws;
-
-            child = (WebKitDOMNode *)
-                webkit_dom_element_query_selector (WEBKIT_DOM_ELEMENT (link_node),
-                                                   "span.title", NULL);
-            if (child != NULL)
-                priv->popup_link_text = webkit_dom_node_get_text_content (child);
-
-            if (priv->popup_link_text == NULL)
-                priv->popup_link_text = webkit_dom_node_get_text_content (link_node);
-
-            tmp = g_new0 (gchar, strlen(priv->popup_link_text) + 1);
-            ws = FALSE;
-            for (i = 0, tmpi = 0; priv->popup_link_text[i] != '\0'; i++) {
-                if (priv->popup_link_text[i] == ' ' || priv->popup_link_text[i] == '\n') {
-                    if (!ws) {
-                        tmp[tmpi] = ' ';
-                        tmpi++;
-                        ws = TRUE;
-                    }
-                }
-                else {
-                    tmp[tmpi] = priv->popup_link_text[i];
-                    tmpi++;
-                    ws = FALSE;
-                }
-            }
-            tmp[tmpi] = '\0';
-            g_free (priv->popup_link_text);
-            priv->popup_link_text = tmp;
-        }
-        else {
-            priv->popup_link_text = g_strdup (uri);
-        }
-
-        if (g_str_has_prefix (priv->popup_link_uri, "mailto:")) {
-            gchar *label = g_strdup_printf (_("Send email to %s"),
-                                            priv->popup_link_uri + 7);
-            /* Not using a mnemonic because underscores are common in email
-             * addresses, and we'd have to escape them. There doesn't seem
-             * to be a quick GTK+ function for this. In practice, there will
-             * probably only be one menu item for mailto link popups anyway,
-             * so the mnemonic's not that big of a deal.
-             */
-            item = gtk_menu_item_new_with_label (label);
-            g_signal_connect (item, "activate",
-                              G_CALLBACK (popup_open_link), view);
-            gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-            g_free (label);
-        }
-        else if (g_str_has_prefix (priv->popup_link_uri, "install:")) {
-            item = gtk_menu_item_new_with_mnemonic (_("_Install Packages"));
-            g_signal_connect (item, "activate",
-                              G_CALLBACK (popup_open_link), view);
-            gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-        }
-        else {
-            GSList *cur;
-
-            item = gtk_menu_item_new_with_mnemonic (_("_Open Link"));
-            g_signal_connect (item, "activate",
-                              G_CALLBACK (popup_open_link), view);
-            gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-            if (g_str_has_prefix (priv->popup_link_uri, "http://") ||
-                g_str_has_prefix (priv->popup_link_uri, "https://")) {
-                item = gtk_menu_item_new_with_mnemonic (_("_Copy Link Location"));
-                g_signal_connect (item, "activate",
-                                  G_CALLBACK (popup_copy_link), view);
-                gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-            }
-            else {
-                item = gtk_menu_item_new_with_mnemonic (_("Open Link in New _Window"));
-                g_signal_connect (item, "activate",
-                                  G_CALLBACK (popup_open_link_new), view);
-                gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-            }
-
-            for (cur = priv->link_actions; cur != NULL; cur = cur->next) {
-                gboolean add;
-                YelpActionEntry *entry = (YelpActionEntry *) cur->data;
-                if (entry->func == NULL)
-                    add = TRUE;
-                else
-                    add = (* entry->func) (view, entry->action,
-                                           priv->popup_link_uri,
-                                           entry->data);
-                if (add) {
-                    item = gtk_action_create_menu_item (entry->action);
-                    gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-                }
-            }
-        }
-    }
-    else {
-        item = gtk_action_create_menu_item (gtk_action_group_get_action (priv->action_group,
-                                                                         "YelpViewGoBack"));
-        gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-        item = gtk_action_create_menu_item (gtk_action_group_get_action (priv->action_group,
-                                                                         "YelpViewGoForward"));
-        gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-    }
-
-    if ((context & WEBKIT_HIT_TEST_RESULT_CONTEXT_IMAGE) ||
-        (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_MEDIA)) {
-        /* This doesn't currently work for video with automatic controls,
-         * because WebKit puts the hit test on the div with the controls.
-         */
-        gboolean image = context & WEBKIT_HIT_TEST_RESULT_CONTEXT_IMAGE;
-        gchar *uri;
-        g_object_get (result, image ? "image-uri" : "media-uri", &uri, NULL);
-        g_free (priv->popup_image_uri);
-        if (g_str_has_prefix (uri, BOGUS_URI)) {
-            priv->popup_image_uri = yelp_uri_locate_file_uri (priv->uri, uri + BOGUS_URI_LEN);
-            g_free (uri);
-        }
-        else {
-            priv->popup_image_uri = uri;
-        }
-
-        item = gtk_separator_menu_item_new ();
-        gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-        if (image)
-            item = gtk_menu_item_new_with_mnemonic (_("_Save Image As..."));
-        else
-            item = gtk_menu_item_new_with_mnemonic (_("_Save Video As..."));
-        g_signal_connect (item, "activate",
-                          G_CALLBACK (popup_save_image), view);
-        gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-        if (nautilus_sendto) {
-            if (image)
-                item = gtk_menu_item_new_with_mnemonic (_("S_end Image To..."));
-            else
-                item = gtk_menu_item_new_with_mnemonic (_("S_end Video To..."));
-            g_signal_connect (item, "activate",
-                              G_CALLBACK (popup_send_image), view);
-            gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-        }
-    }
-
-    if (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_SELECTION) {
-        item = gtk_separator_menu_item_new ();
-        gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-        item = gtk_menu_item_new_with_mnemonic (_("_Copy Text"));
-        g_signal_connect_swapped (item, "activate",
-                                  G_CALLBACK (webkit_web_view_copy_clipboard), view);
-        gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-    }
-
-    if (code_node != NULL) {
-        item = gtk_separator_menu_item_new ();
-        gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-        priv->popup_code_node = code_node;
-        priv->popup_code_title = code_title_node;
-
-        item = gtk_menu_item_new_with_mnemonic (_("C_opy Code Block"));
-        g_signal_connect (item, "activate",
-                          G_CALLBACK (popup_copy_code), view);
-        gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-        item = gtk_menu_item_new_with_mnemonic (_("Save Code _Block As..."));
-        g_signal_connect (item, "activate",
-                          G_CALLBACK (popup_save_code), view);
-        gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-    }
-
-    g_object_unref (result);
-    gdk_event_free (event);
-    gtk_widget_show_all (GTK_WIDGET (menu));
-}
-
-static void
-view_script_alert (YelpView        *view,
-                   WebKitWebFrame  *frame,
-                   gchar           *message,
-                   gpointer         data)
-{
-    printf ("\n\n===ALERT===\n%s\n\n", message);
-}
-
-static gboolean
-view_navigation_requested (WebKitWebView             *view,
-                           WebKitWebFrame            *frame,
-                           WebKitNetworkRequest      *request,
-                           WebKitWebNavigationAction *action,
-                           WebKitWebPolicyDecision   *decision,
-                           gpointer                   user_data)
-{
-    const gchar *requri = webkit_network_request_get_uri (request);
-    YelpViewPrivate *priv = GET_PRIV (view);
-    YelpUri *uri;
-
-    if (priv->bogus_uri &&
-        g_str_has_prefix (requri, priv->bogus_uri) &&
-        requri[strlen(priv->bogus_uri)] == '#') {
-        gchar *tmp = g_strconcat("xref:", requri + strlen(priv->bogus_uri), NULL);
-        uri = yelp_uri_new_relative (priv->uri, tmp);
-        g_free (tmp);
-    }
-    else if (g_str_has_prefix (requri, BOGUS_URI)) {
-        uri = yelp_uri_new_relative (priv->uri, requri + BOGUS_URI_LEN);
-    }
-    else
-        uri = yelp_uri_new_relative (priv->uri, requri);
-
-    webkit_web_policy_decision_ignore (decision);
-
-    yelp_view_load_uri ((YelpView *) view, uri);
-    g_object_unref (uri);
-
-    return TRUE;
-}
-
-static void
-view_resource_request (WebKitWebView         *view,
-                       WebKitWebFrame        *frame,
-                       WebKitWebResource     *resource,
-                       WebKitNetworkRequest  *request,
-                       WebKitNetworkResponse *response,
-                       gpointer               user_data)
-{
-    YelpViewPrivate *priv = GET_PRIV (view);
-    const gchar *requri = webkit_network_request_get_uri (request);
-    gchar last;
-    gchar *newpath;
-
-    if (!g_str_has_prefix (requri, BOGUS_URI))
-        return;
-
-    /* We get this signal for the page itself.  Ignore. */
-    if (g_str_equal (requri, priv->bogus_uri))
-        return;
-
-    newpath = yelp_uri_locate_file_uri (priv->uri, requri + BOGUS_URI_LEN);
-    if (newpath != NULL) {
-        webkit_network_request_set_uri (request, newpath);
-        g_free (newpath);
-    }
-    else {
-        webkit_network_request_set_uri (request, "about:blank");
-    }
-}
-
-static void
-view_document_loaded (WebKitWebView   *view,
-                      WebKitWebFrame  *frame,
-                      gpointer         user_data)
-{
-    YelpViewPrivate *priv = GET_PRIV (view);
-    gchar *search_terms;
-
-    search_terms = yelp_uri_get_query (priv->uri, "terms");
-
-    if (search_terms) {
-        WebKitDOMDocument *doc;
-        WebKitDOMElement *body, *link;
-        doc = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (view));
-        body = webkit_dom_document_query_selector (doc, "div.body", NULL);
-        if (body) {
-            gchar *tmp, *uri, *txt;
-            link = webkit_dom_document_create_element (doc, "a", NULL);
-            webkit_dom_element_set_attribute (link, "class", "fullsearch", NULL);
-            tmp = g_uri_escape_string (search_terms, NULL, FALSE);
-            uri = g_strconcat ("xref:search=", tmp, NULL);
-            webkit_dom_element_set_attribute (link, "href", uri, NULL);
-            g_free (tmp);
-            g_free (uri);
-            txt = g_strdup_printf (_("See all search results for “%s”"),
-                                   search_terms);
-            webkit_dom_node_set_text_content (WEBKIT_DOM_NODE (link), txt, NULL);
-            g_free (txt);
-            webkit_dom_node_insert_before (WEBKIT_DOM_NODE (body),
-                                           WEBKIT_DOM_NODE (link),
-                                           webkit_dom_node_get_first_child (WEBKIT_DOM_NODE (body)),
-                                           NULL);
-        }
-        g_free (search_terms);
-    }
-}
-
-static void
-view_print (GtkAction *action, YelpView  *view)
-{
-    webkit_web_frame_print (webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view)));
-}
-
-static void
-view_history_action (GtkAction *action,
-                     YelpView  *view)
-{
-    GList *newcur;
-    YelpViewPrivate *priv = GET_PRIV (view);
-
-    if (priv->back_cur == NULL)
-        return;
-
-    if (g_str_equal (gtk_action_get_name (action), "YelpViewGoBack"))
-        newcur = priv->back_cur->next;
-    else
-        newcur = priv->back_cur->prev;
-
-    if (newcur == NULL)
-        return;
-
-    priv->back_cur = newcur;
-
-    if (priv->back_cur->data == NULL)
-        return;
-
-    priv->back_load = TRUE;
-    yelp_view_load_uri (view, ((YelpBackEntry *) priv->back_cur->data)->uri);
-    priv->vadjust = ((YelpBackEntry *) priv->back_cur->data)->vadj;
-    priv->hadjust = ((YelpBackEntry *) priv->back_cur->data)->hadj;
-}
-
-static void
-view_navigation_action (GtkAction *action,
-                        YelpView  *view)
-{
-    YelpViewPrivate *priv = GET_PRIV (view);
-    gchar *page_id, *new_id, *xref;
-    YelpUri *new_uri;
-
-    page_id = yelp_uri_get_page_id (priv->uri);
-
-    if (g_str_equal (gtk_action_get_name (action), "YelpViewGoPrevious"))
-        new_id = yelp_document_get_prev_id (priv->document, page_id);
-    else
-        new_id = yelp_document_get_next_id (priv->document, page_id);
-
-    /* Just in case we screwed up somewhere */
-    if (new_id == NULL) {
-        gtk_action_set_sensitive (action, FALSE);
-        return;
-    }
-
-    xref = g_strconcat ("xref:", new_id, NULL);
-    new_uri = yelp_uri_new_relative (priv->uri, xref);
-    yelp_view_load_uri (view, new_uri);
-
-    g_free (xref);
-    g_free (new_id);
-    g_object_unref (new_uri);
-}
-
-static void
-view_clear_load (YelpView *view)
-{
-    YelpViewPrivate *priv = GET_PRIV (view);
-
-    if (priv->resolve_uri != NULL) {
-        if (priv->uri_resolved != 0) {
-            g_signal_handler_disconnect (priv->resolve_uri, priv->uri_resolved);
-            priv->uri_resolved = 0;
-        }
-        g_object_unref (priv->resolve_uri);
-    }
-    priv->resolve_uri = NULL;
-
-    if (priv->uri) {
-        g_object_unref (priv->uri);
-        priv->uri = NULL;
-    }
-
-    if (priv->cancellable) {
-        g_cancellable_cancel (priv->cancellable);
-        priv->cancellable = NULL;
-    }
-}
-
-static void
-view_load_page (YelpView *view)
-{
-    YelpViewPrivate *priv = GET_PRIV (view);
-    gchar *page_id;
-
-    debug_print (DB_FUNCTION, "entering\n");
-
-    g_return_if_fail (priv->cancellable == NULL);
-
-    if (priv->document == NULL) {
-        GError *error;
-        gchar *docuri;
-        /* FIXME: and if priv->uri is NULL? */
-        docuri = yelp_uri_get_document_uri (priv->uri);
-        /* FIXME: CANT_READ isn't right */
-        if (docuri) {
-            error = g_error_new (YELP_ERROR, YELP_ERROR_CANT_READ,
-                                 _("Could not load a document for ‘%s’"),
-                                 docuri);
-            g_free (docuri);
-        }
-        else {
-            error = g_error_new (YELP_ERROR, YELP_ERROR_CANT_READ,
-                                 _("Could not load a document"));
-        }
-        view_show_error_page (view, error);
-        g_error_free (error);
-        return;
-    }
-
-    page_id = yelp_uri_get_page_id (priv->uri);
-    priv->cancellable = g_cancellable_new ();
-    yelp_document_request_page (priv->document,
-                                page_id,
-                                priv->cancellable,
-                                (YelpDocumentCallback) document_callback,
-                                view);
-    g_free (page_id);
-}
-
-static void
-view_show_error_page (YelpView *view,
-                      GError   *error)
-{
-    YelpViewPrivate *priv = GET_PRIV (view);
-    static const gchar *errorpage =
-        "<html><head>"
-        "<style type='text/css'>"
-        "body {"
-        " margin: 1em;"
-        " color: %s;"
-        " background-color: %s;"
-        " }\n"
-        "p { margin: 1em 0 0 0; }\n"
-        "div.note {"
-        " padding: 6px;"
-        " border-color: %s;"
-        " border-top: solid 1px;"
-        " border-bottom: solid 1px;"
-        " background-color: %s;"
-        " }\n"
-        "div.note div.inner {"
-        " margin: 0; padding: 0;"
-        " background-image: url(%s);"
-        " background-position: %s top;"
-        " background-repeat: no-repeat;"
-        " min-height: %ipx;"
-        " }\n"
-        "div.note div.contents {"
-        " margin-%s: %ipx;"
-        " }\n"
-        "div.note div.title {"
-        " margin-%s: %ipx;"
-        " margin-bottom: 0.2em;"
-        " font-weight: bold;"
-        " color: %s;"
-        " }\n"
-        "a { color: %s; text-decoration: none; }\n"
-        "</style>"
-        "</head><body>"
-        "<div class='note'><div class='inner'>"
-        "%s<div class='contents'>%s%s</div>"
-        "</div></div>"
-        "</body></html>";
-    YelpSettings *settings = yelp_settings_get_default ();
-    gchar *page, *title = NULL, *link = NULL, *title_m, *content_beg, *content_end;
-    gchar *textcolor, *bgcolor, *noteborder, *notebg, *titlecolor, *noteicon, *linkcolor;
-    gint iconsize;
-    GParamSpec *spec;
-    gboolean doc404 = FALSE;
-    const gchar *left = (gtk_widget_get_direction((GtkWidget *) view) == GTK_TEXT_DIR_RTL) ? "right" : "left";
-
-    if (priv->uri && yelp_uri_get_document_type (priv->uri) == YELP_URI_DOCUMENT_TYPE_NOT_FOUND)
-        doc404 = TRUE;
-    if (error->domain == YELP_ERROR)
-        switch (error->code) {
-        case YELP_ERROR_NOT_FOUND:
-            if (doc404)
-                title = _("Document Not Found");
-            else
-                title = _("Page Not Found");
-            break;
-        case YELP_ERROR_CANT_READ:
-            title = _("Cannot Read");
-            break;
-        default:
-            break;
-        }
-    if (title == NULL)
-        title = _("Unknown Error");
-    title_m = g_markup_printf_escaped ("<div class='title'>%s</div>", title);
-
-    content_beg = g_markup_printf_escaped ("<p>%s</p>", error->message);
-    content_end = NULL;
-    if (doc404) {
-        gchar *struri = yelp_uri_get_document_uri (priv->uri);
-        /* do not free */
-        gchar *pkg = NULL, *scheme = NULL;
-        if (g_str_has_prefix (struri, "help:")) {
-            scheme = "help";
-            pkg = struri + 5;
-        }
-        else if (g_str_has_prefix (struri, "ghelp:")) {
-            scheme = "ghelp";
-            pkg = struri + 6;
-        }
-        g_free (struri);
-    }
-
-    textcolor = yelp_settings_get_color (settings, YELP_SETTINGS_COLOR_TEXT);
-    bgcolor = yelp_settings_get_color (settings, YELP_SETTINGS_COLOR_BASE);
-    noteborder = yelp_settings_get_color (settings, YELP_SETTINGS_COLOR_RED_BORDER);
-    notebg = yelp_settings_get_color (settings, YELP_SETTINGS_COLOR_YELLOW_BASE);
-    titlecolor = yelp_settings_get_color (settings, YELP_SETTINGS_COLOR_TEXT_LIGHT);
-    linkcolor = yelp_settings_get_color (settings, YELP_SETTINGS_COLOR_LINK);
-    noteicon = yelp_settings_get_icon (settings, YELP_SETTINGS_ICON_WARNING);
-    iconsize = yelp_settings_get_icon_size (settings) + 6;
-
-    page = g_strdup_printf (errorpage,
-                            textcolor, bgcolor, noteborder, notebg, noteicon,
-                            left, iconsize, left, iconsize, left, iconsize,
-                            titlecolor, linkcolor, title_m, content_beg,
-                            (content_end != NULL) ? content_end : "");
-
-    g_object_set (view, "state", YELP_VIEW_STATE_ERROR, NULL);
-
-    if (doc404) {
-        g_free (priv->root_title);
-        priv->root_title = g_strdup (title);
-        spec = g_object_class_find_property ((GObjectClass *) YELP_VIEW_GET_CLASS (view),
-                                             "root-title");
-        g_signal_emit_by_name (view, "notify::root-title", spec);
-        g_free (priv->page_id);
-        priv->page_id = g_strdup ("index");
-        spec = g_object_class_find_property ((GObjectClass *) YELP_VIEW_GET_CLASS (view),
-                                             "page-id");
-        g_signal_emit_by_name (view, "notify::page-id", spec);
-    }
-
-    g_free (priv->page_title);
-    priv->page_title = g_strdup (title);
-    spec = g_object_class_find_property ((GObjectClass *) YELP_VIEW_GET_CLASS (view),
-                                         "page-title");
-    g_signal_emit_by_name (view, "notify::page-title", spec);
-
-    g_free (priv->page_desc);
-    priv->page_desc = NULL;
-    if (priv->uri)
-        priv->page_desc = yelp_uri_get_canonical_uri (priv->uri);
-    spec = g_object_class_find_property ((GObjectClass *) YELP_VIEW_GET_CLASS (view),
-                                         "page-desc");
-    g_signal_emit_by_name (view, "notify::page-desc", spec);
-
-    g_free (priv->page_icon);
-    priv->page_icon = g_strdup ("dialog-warning");
-    spec = g_object_class_find_property ((GObjectClass *) YELP_VIEW_GET_CLASS (view),
-                                         "page-icon");
-    g_signal_emit_by_name (view, "notify::page-icon", spec);
-
-    g_signal_emit (view, signals[LOADED], 0);
-    g_signal_handler_block (view, priv->navigation_requested);
-    webkit_web_view_load_string (WEBKIT_WEB_VIEW (view),
-                                 page,
-                                 "text/html",
-                                 "UTF-8",
-                                 "file:///error/");
-    g_signal_handler_unblock (view, priv->navigation_requested);
-    g_free (title_m);
-    g_free (content_beg);
-    if (content_end != NULL)
-        g_free (content_end);
-    g_free (page);
-}
-
-
-static void
-settings_set_fonts (YelpSettings *settings)
-{
-    gchar *family;
-    gint size;
-
-    g_object_set (websettings,
-                  "default-encoding", "utf-8",
-                  "enable-private-browsing", TRUE,
-                  NULL);
-
-    family = yelp_settings_get_font_family (settings,
-                                            YELP_SETTINGS_FONT_VARIABLE);
-    size = yelp_settings_get_font_size (settings,
-                                        YELP_SETTINGS_FONT_VARIABLE);
-    g_object_set (websettings,
-                  "default-font-family", family,
-                  "sans-serif-font-family", family,
-                  "default-font-size", size,
-                  NULL);
-    g_free (family);
-
-    family = yelp_settings_get_font_family (settings,
-                                            YELP_SETTINGS_FONT_FIXED);
-    size = yelp_settings_get_font_size (settings,
-                                        YELP_SETTINGS_FONT_FIXED);
-    g_object_set (websettings,
-                  "monospace-font-family", family,
-                  "default-monospace-font-size", size,
-                  NULL);
-    g_free (family);
-}
-
-static void
-settings_show_text_cursor (YelpSettings *settings)
-{
-    g_object_set (websettings,
-                  "enable-caret-browsing",
-                  yelp_settings_get_show_text_cursor (settings),
-                  NULL);
-}
-
-/******************************************************************************/
-
-static void
-uri_resolved (YelpUri  *uri,
-              YelpView *view)
-{
-    YelpViewPrivate *priv = GET_PRIV (view);
-    YelpDocument *document;
-    YelpBackEntry *back;
-    GtkAction *action;
-    GSList *proxies, *cur;
-    GError *error = NULL;
-    gchar *struri;
-    GParamSpec *spec;
-
-    if (yelp_uri_get_document_type (uri) != YELP_URI_DOCUMENT_TYPE_EXTERNAL) {
-        g_object_ref (uri);
-        view_clear_load (view);
-        priv->uri = uri;
-    }
-
-    switch (yelp_uri_get_document_type (uri)) {
-    case YELP_URI_DOCUMENT_TYPE_EXTERNAL:
-        g_object_set (view, "state", priv->prevstate, NULL);
-        struri = yelp_uri_get_canonical_uri (uri);
-        if (g_str_has_prefix (struri, "install:") ||
-            g_str_has_prefix (struri, "install-ghelp:") ||
-            g_str_has_prefix (struri, "install-help:")) {
-            view_install_uri (view, struri);
-        }
-        else {
-            gboolean result;
-            g_signal_emit (view, signals[EXTERNAL_URI], 0, uri, &result);
-        }
-        g_free (struri);
-        return;
-    case YELP_URI_DOCUMENT_TYPE_NOT_FOUND:
-        struri = yelp_uri_get_canonical_uri (uri);
-        if (struri != NULL) {
-            error = g_error_new (YELP_ERROR, YELP_ERROR_NOT_FOUND,
-                                 _("The URI ‘%s’ does not point to a valid page."),
-                                 struri);
-            g_free (struri);
-        }
-        else {
-            error = g_error_new (YELP_ERROR, YELP_ERROR_NOT_FOUND,
-                                 _("The URI does not point to a valid page."));
-        }
-        break;
-    case YELP_URI_DOCUMENT_TYPE_ERROR:
-        struri = yelp_uri_get_canonical_uri (uri);
-        error = g_error_new (YELP_ERROR, YELP_ERROR_PROCESSING,
-                             _("The URI ‘%s’ could not be parsed."),
-                             struri);
-        g_free (struri);
-        break;
-    default:
-        break;
-    }
-
-    if (error == NULL) {
-        document  = yelp_document_get_for_uri (uri);
-        if (priv->document)
-            g_object_unref (priv->document);
-        priv->document = document;
-    }
-    else {
-        if (priv->document != NULL) {
-            g_object_unref (priv->document);
-            priv->document = NULL;
-        }
-    }
-
-    if (!priv->back_load) {
-        back = g_new0 (YelpBackEntry, 1);
-        back->uri = g_object_ref (uri);
-        while (priv->back_list != priv->back_cur) {
-            back_entry_free ((YelpBackEntry *) priv->back_list->data);
-            priv->back_list = g_list_delete_link (priv->back_list, priv->back_list);
-        }
-        priv->back_list = g_list_prepend (priv->back_list, back);
-        priv->back_cur = priv->back_list;
-    }
-    priv->back_load = FALSE;
-
-    action = gtk_action_group_get_action (priv->action_group, "YelpViewGoBack");
-    gtk_action_set_sensitive (action, FALSE);
-    proxies = gtk_action_get_proxies (action);
-    if (priv->back_cur->next && priv->back_cur->next->data) {
-        gchar *tooltip = "";
-        back = priv->back_cur->next->data;
-
-        gtk_action_set_sensitive (action, TRUE);
-        if (back->title && back->desc) {
-            gchar *color;
-            color = yelp_settings_get_color (yelp_settings_get_default (),
-                                             YELP_SETTINGS_COLOR_TEXT_LIGHT);
-            tooltip = g_markup_printf_escaped ("<span size='larger'>%s</span>\n<span color='%s'>%s</span>",
-                                               back->title, color, back->desc);
-            g_free (color);
-        }
-        else if (back->title)
-            tooltip = g_markup_printf_escaped ("<span size='larger'>%s</span>",
-                                               back->title);
-        /* Can't seem to use markup on GtkAction tooltip */
-        for (cur = proxies; cur != NULL; cur = cur->next)
-            gtk_widget_set_tooltip_markup (GTK_WIDGET (cur->data), tooltip);
-    }
-    else {
-        for (cur = proxies; cur != NULL; cur = cur->next)
-            gtk_widget_set_tooltip_text (GTK_WIDGET (cur->data), "");
-    }
-
-    action = gtk_action_group_get_action (priv->action_group, "YelpViewGoForward");
-    gtk_action_set_sensitive (action, FALSE);
-    proxies = gtk_action_get_proxies (action);
-    if (priv->back_cur->prev && priv->back_cur->prev->data) {
-        gchar *tooltip = "";
-        back = priv->back_cur->prev->data;
-
-        gtk_action_set_sensitive (action, TRUE);
-        if (back->title && back->desc) {
-            gchar *color;
-            color = yelp_settings_get_color (yelp_settings_get_default (),
-                                             YELP_SETTINGS_COLOR_TEXT_LIGHT);
-            tooltip = g_markup_printf_escaped ("<span size='larger'>%s</span>\n<span color='%s'>%s</span>",
-                                               back->title, color, back->desc);
-            g_free (color);
-        }
-        else if (back->title)
-            tooltip = g_markup_printf_escaped ("<span size='larger'>%s</span>",
-                                               back->title);
-        /* Can't seem to use markup on GtkAction tooltip */
-        for (cur = proxies; cur != NULL; cur = cur->next)
-            gtk_widget_set_tooltip_markup (GTK_WIDGET (cur->data), tooltip);
-    }
-    else {
-        for (cur = proxies; cur != NULL; cur = cur->next)
-            gtk_widget_set_tooltip_text (GTK_WIDGET (cur->data), "");
-    }
-
-    spec = g_object_class_find_property ((GObjectClass *) YELP_VIEW_GET_CLASS (view),
-                                         "yelp-uri");
-    g_signal_emit_by_name (view, "notify::yelp-uri", spec);
-
-    g_free (priv->page_id);
-    priv->page_id = NULL;
-    if (priv->uri != NULL)
-        priv->page_id = yelp_uri_get_page_id (priv->uri);
-    spec = g_object_class_find_property ((GObjectClass *) YELP_VIEW_GET_CLASS (view),
-                                         "page-id");
-    g_signal_emit_by_name (view, "notify::page-id", spec);
-
-    g_free (priv->root_title);
-    g_free (priv->page_title);
-    g_free (priv->page_desc);
-    g_free (priv->page_icon);
-    priv->root_title = NULL;
-    priv->page_title = NULL;
-    priv->page_desc = NULL;
-    priv->page_icon = NULL;
-
-    spec = g_object_class_find_property ((GObjectClass *) YELP_VIEW_GET_CLASS (view),
-                                         "root-title");
-    g_signal_emit_by_name (view, "notify::root-title", spec);
-
-    spec = g_object_class_find_property ((GObjectClass *) YELP_VIEW_GET_CLASS (view),
-                                         "page-title");
-    g_signal_emit_by_name (view, "notify::page-title", spec);
-
-    spec = g_object_class_find_property ((GObjectClass *) YELP_VIEW_GET_CLASS (view),
-                                         "page-desc");
-    g_signal_emit_by_name (view, "notify::page-desc", spec);
-
-    spec = g_object_class_find_property ((GObjectClass *) YELP_VIEW_GET_CLASS (view),
-                                         "page-icon");
-    g_signal_emit_by_name (view, "notify::page-icon", spec);
-
-    if (error == NULL)
-        view_load_page (view);
-    else {
-        view_show_error_page (view, error);
-        g_error_free (error);
-    }
-}
-
-static void
-document_callback (YelpDocument       *document,
-                   YelpDocumentSignal  signal,
-                   YelpView           *view,
-                   GError             *error)
-{
-    YelpViewPrivate *priv = GET_PRIV (view);
-
-    debug_print (DB_FUNCTION, "entering\n");
-
-    if (signal == YELP_DOCUMENT_SIGNAL_INFO) {
-        gchar *prev_id, *next_id, *real_id;
-        GtkAction *action;
-        YelpBackEntry *back = NULL;
-        GParamSpec *spec;
-
-        real_id = yelp_document_get_page_id (document, priv->page_id);
-        if (priv->page_id && real_id && g_str_equal (real_id, priv->page_id)) {
-            g_free (real_id);
-        }
-        else {
-            GParamSpec *spec;
-            g_free (priv->page_id);
-            priv->page_id = real_id;
-            spec = g_object_class_find_property ((GObjectClass *) YELP_VIEW_GET_CLASS (view),
-                                                 "page-id");
-            g_signal_emit_by_name (view, "notify::page-id", spec);
-        }
-
-        g_free (priv->root_title);
-        g_free (priv->page_title);
-        g_free (priv->page_desc);
-        g_free (priv->page_icon);
-
-        priv->root_title = yelp_document_get_root_title (document, priv->page_id);
-        priv->page_title = yelp_document_get_page_title (document, priv->page_id);
-        priv->page_desc = yelp_document_get_page_desc (document, priv->page_id);
-        priv->page_icon = yelp_document_get_page_icon (document, priv->page_id);
-
-        if (priv->back_cur)
-            back = priv->back_cur->data;
-        if (back) {
-            g_free (back->title);
-            back->title = g_strdup (priv->page_title);
-            g_free (back->desc);
-            back->desc = g_strdup (priv->page_desc);
-        }
-
-        prev_id = yelp_document_get_prev_id (document, priv->page_id);
-        action = gtk_action_group_get_action (priv->action_group, "YelpViewGoPrevious");
-        gtk_action_set_sensitive (action, prev_id != NULL);
-        g_free (prev_id);
-
-        next_id = yelp_document_get_next_id (document, priv->page_id);
-        action = gtk_action_group_get_action (priv->action_group, "YelpViewGoNext");
-        gtk_action_set_sensitive (action, next_id != NULL);
-        g_free (next_id);
-
-        spec = g_object_class_find_property ((GObjectClass *) YELP_VIEW_GET_CLASS (view),
-                                             "root-title");
-        g_signal_emit_by_name (view, "notify::root-title", spec);
-
-        spec = g_object_class_find_property ((GObjectClass *) YELP_VIEW_GET_CLASS (view),
-                                             "page-title");
-        g_signal_emit_by_name (view, "notify::page-title", spec);
-
-        spec = g_object_class_find_property ((GObjectClass *) YELP_VIEW_GET_CLASS (view),
-                                             "page-desc");
-        g_signal_emit_by_name (view, "notify::page-desc", spec);
-
-        spec = g_object_class_find_property ((GObjectClass *) YELP_VIEW_GET_CLASS (view),
-                                             "page-icon");
-        g_signal_emit_by_name (view, "notify::page-icon", spec);
-    }
-    else if (signal == YELP_DOCUMENT_SIGNAL_CONTENTS) {
-        YelpUriDocumentType doctype;
-	const gchar *contents;
-        gchar *mime_type, *page_id, *frag_id, *full_uri;
-        page_id = yelp_uri_get_page_id (priv->uri);
-        debug_print (DB_ARG, "    document.uri.page_id=\"%s\"\n", page_id);
-        mime_type = yelp_document_get_mime_type (document, page_id);
-        contents = yelp_document_read_contents (document, page_id);
-        frag_id = yelp_uri_get_frag_id (priv->uri);
-        g_free (priv->bogus_uri);
-        /* We don't have actual page and frag IDs for DocBook. We just map IDs
-           of block elements.  The result is that we get xref:someid#someid.
-           If someid is really the page ID, we just drop the frag reference.
-           Otherwise, normal page views scroll past the link trail.
-         */
-        if (frag_id != NULL) {
-            if (YELP_IS_DOCBOOK_DOCUMENT (document)) {
-                gchar *real_id = yelp_document_get_page_id (document, page_id);
-                if (g_str_equal (real_id, frag_id)) {
-                    g_free (frag_id);
-                    frag_id = NULL;
-                }
-                g_free (real_id);
-            }
-        }
-        /* We have to give WebKit a URI in a scheme it understands, otherwise we
-           won't get the resource-request-starting signal.  So we can't use the
-           canonical URI, because it might be something like ghelp.  We also have
-           to give it something unique, because WebKit ignores our load_string
-           call if the URI isn't different.  We could try to construct something
-           based on actual file locations, but in fact it doesn't matter.  So
-           we just make a bogus URI that's easy to process later.
-         */
-        doctype = yelp_uri_get_document_type (priv->uri);
-        full_uri = yelp_uri_get_canonical_uri (priv->uri);
-        if (g_str_has_prefix (full_uri, "file:/") &&
-            (doctype == YELP_URI_DOCUMENT_TYPE_TEXT ||
-             doctype == YELP_URI_DOCUMENT_TYPE_HTML ||
-             doctype == YELP_URI_DOCUMENT_TYPE_XHTML )) {
-            priv->bogus_uri = full_uri;
-        }
-        else {
-            g_free (full_uri);
-            if (frag_id != NULL)
-                priv->bogus_uri = g_strdup_printf ("%s%p#%s", BOGUS_URI, priv->uri, frag_id);
-            else
-                priv->bogus_uri = g_strdup_printf ("%s%p", BOGUS_URI, priv->uri);
-        }
-        g_signal_handler_block (view, priv->navigation_requested);
-        webkit_web_view_load_string (WEBKIT_WEB_VIEW (view),
-                                     contents,
-                                     mime_type,
-                                     "UTF-8",
-                                     priv->bogus_uri);
-        g_signal_handler_unblock (view, priv->navigation_requested);
-        g_object_set (view, "state", YELP_VIEW_STATE_LOADED, NULL);
-
-        /* If we need to set the GtkAdjustment or trigger the page title
-         * from what WebKit thinks it is (see comment below), we need to
-         * let the main loop run through.
-         */
-        if (priv->vadjust > 0 || priv->hadjust > 0 ||  priv->page_title == NULL)
-            while (g_main_context_pending (NULL)) {
-                WebKitLoadStatus status;
-                status = webkit_web_view_get_load_status (WEBKIT_WEB_VIEW (view));
-                g_main_context_iteration (NULL, FALSE);
-                /* Sometimes some runaway JavaScript causes there to always
-                 * be pending sources. Break out if the document is loaded.
-                 */
-                if (status == WEBKIT_LOAD_FINISHED ||
-                    status == WEBKIT_LOAD_FAILED)
-                    break;
-            }
-
-        /* Setting adjustments only work after the page is loaded. These
-         * are set by view_history_action, and they're reset to 0 after
-         * each load here.
-         */
-        if (priv->vadjust > 0) {
-            if (priv->vadjustment)
-                gtk_adjustment_set_value (priv->vadjustment, priv->vadjust);
-            priv->vadjust = 0;
-        }
-        if (priv->hadjust > 0) {
-            if (priv->hadjustment)
-                gtk_adjustment_set_value (priv->hadjustment, priv->hadjust);
-            priv->hadjust = 0;
-        }
-
-        /* If the document didn't give us a page title, get it from WebKit.
-         * We let the main loop run through so that WebKit gets the title
-         * set so that we can send notify::page-title before loaded. It
-         * simplifies things if YelpView consumers can assume the title
-         * is set before loaded is triggered.
-         */
-        if (priv->page_title == NULL) {
-            GParamSpec *spec;
-            priv->page_title = g_strdup (webkit_web_view_get_title (WEBKIT_WEB_VIEW (view)));
-            spec = g_object_class_find_property ((GObjectClass *) YELP_VIEW_GET_CLASS (view),
-                                                 "page-title");
-            g_signal_emit_by_name (view, "notify::page-title", spec);
-        }
-
-        g_free (frag_id);
-        g_free (page_id);
-        g_free (mime_type);
-	yelp_document_finish_read (document, contents);
-        g_signal_emit (view, signals[LOADED], 0);
-    }
-    else if (signal == YELP_DOCUMENT_SIGNAL_ERROR) {
-        view_show_error_page (view, error);
-    }
-}

=== removed directory '.pc/git_signal_handler.patch/src'
=== removed file '.pc/git_signal_handler.patch/src/yelp-window.c'
--- .pc/git_signal_handler.patch/src/yelp-window.c	2014-02-27 13:28:05 +0000
+++ .pc/git_signal_handler.patch/src/yelp-window.c	1970-01-01 00:00:00 +0000
@@ -1,1402 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Copyright (C) 2010 Shaun McCance <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Shaun McCance <[e-mail]>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <math.h>
-
-#include <gdk/gdkkeysyms.h>
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-#include "yelp-location-entry.h"
-#include "yelp-settings.h"
-#include "yelp-uri.h"
-#include "yelp-view.h"
-
-#include "yelp-application.h"
-#include "yelp-window.h"
-
-static void          yelp_window_init             (YelpWindow         *window);
-static void          yelp_window_class_init       (YelpWindowClass    *klass);
-static void          yelp_window_dispose          (GObject            *object);
-static void          yelp_window_finalize         (GObject            *object);
-static void          yelp_window_get_property     (GObject            *object,
-                                                   guint               prop_id,
-                                                   GValue             *value,
-                                                   GParamSpec         *pspec);
-static void          yelp_window_set_property     (GObject            *object,
-                                                   guint               prop_id,
-                                                   const GValue       *value,
-                                                   GParamSpec         *pspec);
-
-static void          window_construct             (YelpWindow         *window);
-static void          window_new                   (GtkAction          *action,
-                                                   YelpWindow         *window);
-static gboolean      window_map_event             (YelpWindow         *window,
-                                                   GdkEvent           *event,
-                                                   gpointer            user_data);
-static gboolean      window_configure_event       (YelpWindow         *window,
-                                                   GdkEventConfigure  *event,
-                                                   gpointer            user_data);
-static void          window_drag_received         (YelpWindow         *window,
-                                                   GdkDragContext     *context,
-                                                   gint                x,
-                                                   gint                y,
-                                                   GtkSelectionData   *data,
-                                                   guint               info,
-                                                   guint               time,
-                                                   gpointer            userdata);
-static gboolean      window_resize_signal         (YelpWindow         *window);
-static void          window_close                 (GtkAction          *action,
-                                                   YelpWindow         *window);
-static void          window_go_all                (GtkAction          *action,
-                                                   YelpWindow         *window);
-static void          window_add_bookmark          (GtkAction          *action,
-                                                   YelpWindow         *window);
-static void          window_remove_bookmark       (GtkAction          *action,
-                                                   YelpWindow         *window);
-static void          window_load_bookmark         (GtkAction          *action,
-                                                   YelpWindow         *window);
-static void          window_find_in_page          (GtkAction          *action,
-                                                   YelpWindow         *window);
-static void          window_start_search          (GtkAction          *action,
-                                                   YelpWindow         *window);
-static void          window_open_location         (GtkAction          *action,
-                                                   YelpWindow         *window);
-static void          window_read_later            (GtkAction          *action,
-                                                   YelpWindow         *window);
-static gboolean      read_later_clicked           (GtkLinkButton      *button,
-                                                   YelpWindow         *window);
-static void          app_read_later_changed       (YelpApplication    *app,
-                                                   const gchar        *doc_uri,
-                                                   YelpWindow         *window);
-static void          app_bookmarks_changed        (YelpApplication    *app,
-                                                   const gchar        *doc_uri,
-                                                   YelpWindow         *window);
-static void          window_set_bookmarks         (YelpWindow         *window,
-                                                   const gchar        *doc_uri);
-static void          window_set_bookmark_action   (YelpWindow         *window);
-static gboolean      find_entry_focus_out         (GtkEntry           *entry,
-                                                   GdkEventFocus      *event,
-                                                   YelpWindow         *window);
-static gboolean      find_entry_key_press         (GtkEntry           *entry,
-                                                   GdkEventKey        *event,
-                                                   YelpWindow         *window);
-static void          find_entry_changed           (GtkEntry           *entry,
-                                                   YelpWindow         *window);
-
-static gboolean      entry_focus_in               (GtkEntry           *entry,
-                                                   GdkEventFocus      *event,
-                                                   YelpWindow         *window);
-static gboolean      entry_focus_out              (YelpLocationEntry  *entry,
-                                                   GdkEventFocus      *event,
-                                                   YelpWindow         *window);
-
-static void          view_new_window              (YelpView           *view,
-                                                   YelpUri            *uri,
-                                                   YelpWindow         *window);
-static void          view_loaded                  (YelpView           *view,
-                                                   YelpWindow         *window);
-static void          view_uri_selected            (YelpView           *view,
-                                                   GParamSpec         *pspec,
-                                                   YelpWindow         *window);
-static void          view_root_title              (YelpView           *view,
-                                                   GParamSpec         *pspec,
-                                                   YelpWindow         *window);
-static gboolean      view_is_xref_uri             (YelpView           *view,
-                                                   GtkAction          *action,
-                                                   const gchar        *uri,
-                                                   YelpWindow         *window);
-
-static void          hidden_entry_activate        (GtkEntry           *entry,
-                                                   YelpWindow         *window);
-static void          hidden_entry_hide            (YelpWindow         *window);
-static gboolean      hidden_key_press             (GtkWidget          *widget,
-                                                   GdkEventKey        *event,
-                                                   YelpWindow         *window);
-
-enum {
-    PROP_0,
-    PROP_APPLICATION
-};
-
-enum {
-    RESIZE_EVENT,
-    LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-G_DEFINE_TYPE (YelpWindow, yelp_window, GTK_TYPE_WINDOW);
-#define GET_PRIV(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), YELP_TYPE_WINDOW, YelpWindowPrivate))
-
-static const gchar *YELP_UI =
-    "<ui>"
-    "<menubar>"
-    "<menu action='PageMenu'>"
-    "<menuitem action='NewWindow'/>"
-    "<menuitem action='Find'/>"
-    "<separator/>"
-    "<menuitem action='YelpViewPrint'/>"
-    "<separator/>"
-    "<menuitem action='CloseWindow'/>"
-    "</menu>"
-    "<menu action='ViewMenu'>"
-    "<menuitem action='LargerText'/>"
-    "<menuitem action='SmallerText'/>"
-    "<separator/>"
-    "<menuitem action='ShowTextCursor'/>"
-    "</menu>"
-    "<menu action='GoMenu'>"
-    "<menuitem action='YelpViewGoBack'/>"
-    "<menuitem action='YelpViewGoForward'/>"
-    "<separator/>"
-    "<menuitem action='YelpViewGoPrevious'/>"
-    "<menuitem action='YelpViewGoNext'/>"
-    "<separator/>"
-    "<menuitem action='GoAll'/>"
-    "</menu>"
-    "<menu action='BookmarksMenu'>"
-    "<menuitem action='AddBookmark'/>"
-    "<menuitem action='RemoveBookmark'/>"
-    "<separator/>"
-    "<placeholder name='Bookmarks'/>"
-    "</menu>"
-    "</menubar>"
-    "<accelerator action='Find'/>"
-    "<accelerator action='Search'/>"
-    "<accelerator action='OpenLocation'/>"
-    "</ui>";
-
-typedef struct _YelpWindowPrivate YelpWindowPrivate;
-struct _YelpWindowPrivate {
-    GtkListStore *history;
-    GtkUIManager *ui_manager;
-    GtkActionGroup *action_group;
-    YelpApplication *application;
-
-    gulong        bookmarks_changed;
-    gulong        read_later_changed;
-
-    /* no refs on these, owned by containers */
-    YelpView *view;
-    GtkWidget *vbox_view;
-    GtkWidget *vbox_full;
-    GtkWidget *hbox;
-    YelpLocationEntry *entry;
-    GtkWidget *hidden_entry;
-    GtkWidget *find_entry;
-    GtkWidget *find_label;
-    GtkWidget *read_later_vbox;
-
-    /* refs because we dynamically add & remove */
-    GtkWidget *find_bar;
-    GtkWidget *align_location;
-    GtkWidget *align_hidden;
-    GtkWidget *read_later;
-
-    gchar *doc_uri;
-
-    GtkActionGroup *bookmark_actions;
-    guint bookmarks_merge_id;
-
-    guint resize_signal;
-    gint width;
-    gint height;
-
-    guint entry_color_animate;
-    gfloat entry_color_step;
-
-    gboolean configured;
-};
-
-static const GtkActionEntry entries[] = {
-    { "PageMenu",      NULL, N_("_Page")      },
-    { "ViewMenu",      NULL, N_("_View")      },
-    { "GoMenu",        NULL, N_("_Go")        },
-    { "BookmarksMenu", NULL, N_("_Bookmarks")        },
-
-    { "NewWindow", NULL,
-      N_("_New Window"),
-      "<Control>N",
-      NULL,
-      G_CALLBACK (window_new) },
-    { "CloseWindow", NULL,
-      N_("_Close"),
-      "<Control>W",
-      NULL,
-      G_CALLBACK (window_close) },
-    { "GoAll", NULL,
-      N_("_All Documents"),
-      NULL, NULL,
-      G_CALLBACK (window_go_all) },
-    { "AddBookmark", NULL,
-      N_("_Add Bookmark"),
-      "<Control>D",
-      NULL,
-      G_CALLBACK (window_add_bookmark) },
-    { "RemoveBookmark", NULL,
-      N_("_Remove Bookmark"),
-      NULL, NULL,
-      G_CALLBACK (window_remove_bookmark) },
-    { "Find", NULL,
-      N_("Find in Page..."),
-      "<Control>F",
-      NULL,
-      G_CALLBACK (window_find_in_page) },
-    { "Search", NULL,
-      N_("Search..."),
-      "<Control>S",
-      NULL,
-      G_CALLBACK (window_start_search) },
-    { "OpenLocation", NULL,
-      N_("Open Location"),
-      "<Control>L",
-      NULL,
-      G_CALLBACK (window_open_location) }
-};
-
-static void
-yelp_window_init (YelpWindow *window)
-{
-    g_signal_connect (window, "configure-event", G_CALLBACK (window_configure_event), NULL);
-    g_signal_connect (window, "map-event", G_CALLBACK (window_map_event), NULL);
-}
-
-static void
-yelp_window_class_init (YelpWindowClass *klass)
-{
-    GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-    object_class->dispose = yelp_window_dispose;
-    object_class->finalize = yelp_window_finalize;
-    object_class->get_property = yelp_window_get_property;
-    object_class->set_property = yelp_window_set_property;
-
-    g_object_class_install_property (object_class,
-                                     PROP_APPLICATION,
-                                     g_param_spec_object ("application",
-							  _("Application"),
-							  _("A YelpApplication instance that controls this window"),
-                                                          YELP_TYPE_APPLICATION,
-                                                          G_PARAM_CONSTRUCT_ONLY |
-							  G_PARAM_READWRITE | G_PARAM_STATIC_NAME |
-							  G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
-
-    signals[RESIZE_EVENT] =
-        g_signal_new ("resized",
-                      G_OBJECT_CLASS_TYPE (klass),
-                      G_SIGNAL_RUN_LAST,
-                      0, NULL, NULL,
-                      g_cclosure_marshal_VOID__VOID,
-                      G_TYPE_NONE, 0);
-
-    g_type_class_add_private (klass, sizeof (YelpWindowPrivate));
-}
-
-static void
-yelp_window_dispose (GObject *object)
-{
-    YelpWindowPrivate *priv = GET_PRIV (object);
-
-    if (priv->history) {
-        g_object_unref (priv->history);
-        priv->history = NULL;
-    }
-
-    if (priv->action_group) {
-        g_object_unref (priv->action_group);
-        priv->action_group = NULL;
-    }
-
-    if (priv->bookmark_actions) {
-        g_object_unref (priv->bookmark_actions);
-        priv->bookmark_actions = NULL;
-    }
-
-    if (priv->read_later_changed) {
-        g_source_remove (priv->read_later_changed);
-        priv->read_later_changed = 0;
-    }
-
-    if (priv->bookmarks_changed) {
-        g_source_remove (priv->bookmarks_changed);
-        priv->bookmarks_changed = 0;
-    }
-
-    if (priv->align_location) {
-        g_object_unref (priv->align_location);
-        priv->align_location = NULL;
-    }
-
-    if (priv->align_hidden) {
-        g_object_unref (priv->align_hidden);
-        priv->align_hidden = NULL;
-    }
-
-    if (priv->find_bar) {
-        g_object_unref (priv->find_bar);
-        priv->find_bar = NULL;
-    }
-
-    if (priv->entry_color_animate != 0) {
-        g_source_remove (priv->entry_color_animate);
-        priv->entry_color_animate = 0;
-    }
-
-    G_OBJECT_CLASS (yelp_window_parent_class)->dispose (object);
-}
-
-static void
-yelp_window_finalize (GObject *object)
-{
-    YelpWindowPrivate *priv = GET_PRIV (object);
-    g_free (priv->doc_uri);
-    G_OBJECT_CLASS (yelp_window_parent_class)->finalize (object);
-}
-
-static void
-yelp_window_get_property (GObject    *object,
-                          guint       prop_id,
-                          GValue     *value,
-                          GParamSpec *pspec)
-{
-    YelpWindowPrivate *priv = GET_PRIV (object);
-    switch (prop_id) {
-    case PROP_APPLICATION:
-        g_value_set_object (value, priv->application);
-        break;
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
-    }
-}
-
-static void
-yelp_window_set_property (GObject     *object,
-                          guint        prop_id,
-                          const GValue *value,
-                          GParamSpec   *pspec)
-{
-    YelpWindowPrivate *priv = GET_PRIV (object);
-    switch (prop_id) {
-    case PROP_APPLICATION:
-        priv->application = g_value_get_object (value);
-        window_construct ((YelpWindow *) object);
-        break;
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
-    }
-}
-
-static void
-window_construct (YelpWindow *window)
-{
-    GtkWidget *scroll;
-    GtkActionGroup *view_actions;
-    GtkAction *action;
-    GtkWidget *vbox, *button, *label;
-    gchar *color, *text;
-    YelpWindowPrivate *priv = GET_PRIV (window);
-
-    gtk_window_set_icon_name (GTK_WINDOW (window), "help-browser");
-
-    priv->view = (YelpView *) yelp_view_new ();
-
-    action = gtk_action_new ("ReadLinkLater", _("Read Link _Later"), NULL, NULL);
-    g_signal_connect (action, "activate", G_CALLBACK (window_read_later), window);
-    yelp_view_add_link_action (priv->view, action,
-                               (YelpViewActionValidFunc) view_is_xref_uri,
-                               window);
-    priv->read_later_changed =
-        g_signal_connect (priv->application, "read-later-changed",
-                          G_CALLBACK (app_read_later_changed), window);
-
-    priv->vbox_full = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
-    gtk_container_add (GTK_CONTAINER (window), priv->vbox_full);
-
-    priv->vbox_view = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-    gtk_box_pack_start (GTK_BOX (priv->vbox_full), priv->vbox_view, TRUE, TRUE, 0);
-
-    priv->action_group = gtk_action_group_new ("YelpWindowActions");
-    gtk_action_group_set_translation_domain (priv->action_group, GETTEXT_PACKAGE);
-    gtk_action_group_add_actions (priv->action_group,
-				  entries, G_N_ELEMENTS (entries),
-				  window);
-
-    priv->bookmark_actions = gtk_action_group_new ("BookmarkActions");
-    gtk_action_group_set_translate_func (priv->bookmark_actions, NULL, NULL, NULL);
-
-    priv->ui_manager = gtk_ui_manager_new ();
-    gtk_ui_manager_insert_action_group (priv->ui_manager, priv->action_group, 0);
-    gtk_ui_manager_insert_action_group (priv->ui_manager, priv->bookmark_actions, 1);
-    gtk_ui_manager_insert_action_group (priv->ui_manager,
-                                        yelp_application_get_action_group (priv->application),
-                                        2);
-    view_actions = yelp_view_get_action_group (priv->view);
-    gtk_ui_manager_insert_action_group (priv->ui_manager, view_actions, 3);
-    gtk_window_add_accel_group (GTK_WINDOW (window),
-                                gtk_ui_manager_get_accel_group (priv->ui_manager));
-    gtk_ui_manager_add_ui_from_string (priv->ui_manager, YELP_UI, -1, NULL);
-    gtk_box_pack_start (GTK_BOX (priv->vbox_view),
-                        gtk_ui_manager_get_widget (priv->ui_manager, "/ui/menubar"),
-                        FALSE, FALSE, 0);
-
-    priv->bookmarks_merge_id = gtk_ui_manager_new_merge_id (priv->ui_manager);
-    priv->bookmarks_changed =
-        g_signal_connect (priv->application, "bookmarks-changed",
-                          G_CALLBACK (app_bookmarks_changed), window);
-
-    priv->hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-    g_object_set (priv->hbox, "border-width", 2, NULL);
-    gtk_box_pack_start (GTK_BOX (priv->vbox_view), priv->hbox, FALSE, FALSE, 0);
-
-    action = gtk_action_group_get_action (view_actions, "YelpViewGoBack");
-    button = gtk_action_create_tool_item (action);
-    gtk_box_pack_start (GTK_BOX (priv->hbox),
-                        button,
-                        FALSE, FALSE, 0);
-    action = gtk_action_group_get_action (view_actions, "YelpViewGoForward");
-    button = gtk_action_create_tool_item (action);
-    gtk_box_pack_start (GTK_BOX (priv->hbox),
-                        button,
-                        FALSE, FALSE, 0);
-
-    priv->entry = (YelpLocationEntry *) yelp_location_entry_new (priv->view,
-                                                                 YELP_BOOKMARKS (priv->application));
-    g_signal_connect (gtk_bin_get_child (GTK_BIN (priv->entry)), "focus-in-event",
-                      G_CALLBACK (entry_focus_in), window);
-    g_signal_connect (priv->entry, "focus-out-event",
-                      G_CALLBACK (entry_focus_out), window);
-
-    priv->align_location = g_object_ref_sink (gtk_alignment_new (0.0, 0.5, 1.0, 0.0));
-    gtk_box_pack_start (GTK_BOX (priv->hbox),
-                        GTK_WIDGET (priv->align_location),
-                        TRUE, TRUE, 0);
-    gtk_container_add (GTK_CONTAINER (priv->align_location), GTK_WIDGET (priv->entry));
-
-    priv->hidden_entry = gtk_entry_new ();
-    priv->align_hidden = g_object_ref_sink (gtk_alignment_new (0.0, 0.5, 1.0, 0.0));
-    gtk_container_add (GTK_CONTAINER (priv->align_hidden), GTK_WIDGET (priv->hidden_entry));
-
-    g_signal_connect (priv->hidden_entry, "activate",
-                      G_CALLBACK (hidden_entry_activate), window);
-    g_signal_connect_swapped (priv->hidden_entry, "focus-out-event",
-                              G_CALLBACK (hidden_entry_hide), window);
-    g_signal_connect (priv->hidden_entry, "key-press-event",
-                      G_CALLBACK (hidden_key_press), window);
-
-    scroll = gtk_scrolled_window_new (NULL, NULL);
-    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll),
-                                    GTK_POLICY_AUTOMATIC,
-                                    GTK_POLICY_AUTOMATIC);
-    gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scroll),
-                                         GTK_SHADOW_IN);
-    gtk_box_pack_start (GTK_BOX (priv->vbox_view), scroll, TRUE, TRUE, 0);
-
-    priv->find_bar = g_object_ref_sink (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6));
-    g_object_set (priv->find_bar,
-                  "border-width", 2,
-                  "margin-right", 16,
-                  NULL);
-
-    label = gtk_label_new (_("Find:"));
-    gtk_box_pack_start (GTK_BOX (priv->find_bar), label, FALSE, FALSE, 6);
-
-    priv->find_entry = gtk_entry_new ();
-    g_signal_connect (priv->find_entry, "changed",
-                      G_CALLBACK (find_entry_changed), window);
-    g_signal_connect (priv->find_entry, "key-press-event",
-                      G_CALLBACK (find_entry_key_press), window);
-    g_signal_connect (priv->find_entry, "focus-out-event",
-                      G_CALLBACK (find_entry_focus_out), window);
-    g_object_set (priv->find_entry, "width-request", 300, NULL);
-    gtk_box_pack_start (GTK_BOX (priv->find_bar), priv->find_entry, FALSE, FALSE, 0);
-
-    priv->find_label = gtk_label_new ("");
-    g_object_set (priv->find_label, "xalign", 0.0, NULL);
-    gtk_box_pack_start (GTK_BOX (priv->find_bar), priv->find_label, FALSE, FALSE, 0);
-
-    priv->read_later = g_object_ref_sink (gtk_info_bar_new ());
-    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-    color = yelp_settings_get_color (yelp_settings_get_default (),
-                                     YELP_SETTINGS_COLOR_TEXT_LIGHT);
-    text = g_markup_printf_escaped ("<span weight='bold' color='%s'>%s</span>",
-                                    color, _("Read Later"));
-    button = gtk_label_new (text);
-    g_object_set (button, "use-markup", TRUE, "xalign", 0.0, NULL);
-    g_free (color);
-    g_free (text);
-    gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (priv->read_later))),
-                        vbox,
-                        FALSE, FALSE, 0);
-    priv->read_later_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-    gtk_box_pack_start (GTK_BOX (vbox), priv->read_later_vbox, FALSE, FALSE, 0);
-
-    g_signal_connect (priv->view, "new-view-requested", G_CALLBACK (view_new_window), window);
-    g_signal_connect (priv->view, "loaded", G_CALLBACK (view_loaded), window);
-    g_signal_connect (priv->view, "notify::yelp-uri", G_CALLBACK (view_uri_selected), window);
-    g_signal_connect_swapped (priv->view, "notify::page-id",
-                              G_CALLBACK (window_set_bookmark_action), window);
-    window_set_bookmark_action (window);
-    g_signal_connect (priv->view, "notify::root-title", G_CALLBACK (view_root_title), window);
-    gtk_container_add (GTK_CONTAINER (scroll), GTK_WIDGET (priv->view));
-    gtk_widget_grab_focus (GTK_WIDGET (priv->view));
-
-    gtk_drag_dest_set (GTK_WIDGET (window),
-                       GTK_DEST_DEFAULT_ALL,
-                       NULL, 0,
-                       GDK_ACTION_COPY);
-    gtk_drag_dest_add_uri_targets (GTK_WIDGET (window));
-    g_signal_connect (window, "drag-data-received",
-                      G_CALLBACK (window_drag_received), NULL);
-}
-
-/******************************************************************************/
-
-YelpWindow *
-yelp_window_new (YelpApplication *app)
-{
-    YelpWindow *window;
-
-    window = (YelpWindow *) g_object_new (YELP_TYPE_WINDOW, "application", app, NULL);
-
-    return window;
-}
-
-void
-yelp_window_load_uri (YelpWindow  *window,
-                      YelpUri     *uri)
-{
-    YelpWindowPrivate *priv = GET_PRIV (window);
-
-    yelp_view_load_uri (priv->view, uri);
-}
-
-YelpUri *
-yelp_window_get_uri (YelpWindow *window)
-{
-    YelpUri *uri;
-    YelpWindowPrivate *priv = GET_PRIV (window);
-    g_object_get (G_OBJECT (priv->view), "yelp-uri", &uri, NULL);
-    return uri;
-}
-
-void
-yelp_window_get_geometry (YelpWindow  *window,
-                          gint        *width,
-                          gint        *height)
-{
-    YelpWindowPrivate *priv = GET_PRIV (window);
-    *width = priv->width;
-    *height = priv->height;
-}
-
-/******************************************************************************/
-
-static void
-window_new (GtkAction *action, YelpWindow *window)
-{
-    YelpUri *yuri;
-    gchar *uri = NULL;
-    YelpWindowPrivate *priv = GET_PRIV (window);
-
-    g_object_get (priv->view, "yelp-uri", &yuri, NULL);
-    uri = yelp_uri_get_document_uri (yuri);
-
-    yelp_application_new_window (priv->application, uri);
-
-    g_free (uri);
-    g_object_unref (yuri);
-}
-
-static void
-window_drag_received (YelpWindow         *window,
-                      GdkDragContext     *context,
-                      gint                x,
-                      gint                y,
-                      GtkSelectionData   *data,
-                      guint               info,
-                      guint               time,
-                      gpointer            userdata)
-{
-    gchar **uris = gtk_selection_data_get_uris (data);
-    if (uris && uris[0]) {
-        YelpUri *uri = yelp_uri_new (uris[0]);
-        yelp_window_load_uri (window, uri);
-        g_object_unref (uri);
-        g_strfreev (uris);
-        gtk_drag_finish (context, TRUE, FALSE, time);
-    }
-    gtk_drag_finish (context, FALSE, FALSE, time);
-}
-
-static gboolean
-window_map_event (YelpWindow  *window,
-                  GdkEvent    *event,
-                  gpointer     user_data)
-{
-    YelpWindowPrivate *priv = GET_PRIV (window);
-    priv->configured = TRUE;
-    return FALSE;
-}
-
-static gboolean
-window_configure_event (YelpWindow         *window,
-                        GdkEventConfigure  *event,
-                        gpointer            user_data)
-{
-    YelpWindowPrivate *priv = GET_PRIV (window);
-    gboolean skip = TRUE;
-    if (priv->width != event->width) {
-        skip = FALSE;
-        priv->width = event->width;
-    }
-    if (priv->height != event->height) {
-        skip = FALSE;
-        priv->height = event->height;
-    }
-    /* Skip the configure-event signals that GTK+ sends as it's mapping
-     * the window, and also skip if the event didn't change the size of
-     * the window (i.e. it was just a move).
-     */
-    if (!priv->configured || skip)
-        return FALSE;
-
-    if (priv->resize_signal > 0)
-        g_source_remove (priv->resize_signal);
-    priv->resize_signal = g_timeout_add (200,
-                                         (GSourceFunc) window_resize_signal,
-                                         window);
-    g_object_set (priv->find_entry, "width-request", 2 * priv->width / 3, NULL);
-    return FALSE;
-}
-
-static gboolean
-window_resize_signal (YelpWindow *window)
-{
-    YelpWindowPrivate *priv = GET_PRIV (window);
-    g_signal_emit (window, signals[RESIZE_EVENT], 0);
-    priv->resize_signal = 0;
-    return FALSE;
-}
-
-static void
-window_close (GtkAction *action, YelpWindow *window)
-{
-    gboolean ret;
-    g_signal_emit_by_name (window, "delete-event", NULL, &ret);
-    gtk_widget_destroy (GTK_WIDGET (window));
-}
-
-static void
-window_go_all (GtkAction  *action,
-               YelpWindow *window)
-{
-    YelpWindowPrivate *priv = GET_PRIV (window);
-    yelp_view_load (priv->view, "help-list:");
-}
-
-static void
-window_add_bookmark (GtkAction  *action,
-                     YelpWindow *window)
-{
-    YelpUri *uri;
-    gchar *doc_uri, *page_id, *icon, *title;
-    YelpWindowPrivate *priv = GET_PRIV (window);
-
-    g_object_get (priv->view,
-                  "yelp-uri", &uri,
-                  "page-id", &page_id,
-                  "page-icon", &icon,
-                  "page-title", &title,
-                  NULL);
-    doc_uri = yelp_uri_get_document_uri (uri);
-    yelp_application_add_bookmark (YELP_BOOKMARKS (priv->application),
-                                   doc_uri, page_id, icon, title);
-    g_free (doc_uri);
-    g_free (page_id);
-    g_free (icon);
-    g_free (title);
-    g_object_unref (uri);
-}
-
-static void
-window_remove_bookmark (GtkAction  *action,
-                        YelpWindow *window)
-{
-    YelpUri *uri;
-    gchar *doc_uri, *page_id;
-    YelpWindowPrivate *priv = GET_PRIV (window);
-
-    g_object_get (priv->view,
-                  "yelp-uri", &uri,
-                  "page-id", &page_id,
-                  NULL);
-    doc_uri = yelp_uri_get_document_uri (uri);
-    yelp_application_remove_bookmark (YELP_BOOKMARKS (priv->application),
-                                      doc_uri, page_id);
-    g_free (doc_uri);
-    g_free (page_id);
-    g_object_unref (uri);
-}
-static void
-window_load_bookmark (GtkAction  *action,
-                      YelpWindow *window)
-{
-    YelpUri *base, *uri;
-    gchar *xref;
-    YelpWindowPrivate *priv = GET_PRIV (window);
-
-    /* Bookmark action names are prefixed with 'LoadBookmark-' */
-    xref = g_strconcat ("xref:", gtk_action_get_name (action) + 13, NULL);
-    g_object_get (priv->view, "yelp-uri", &base, NULL);
-    uri = yelp_uri_new_relative (base, xref);
-
-    yelp_view_load_uri (priv->view, uri);
-
-    g_object_unref (base);
-    g_object_unref (uri);
-    g_free (xref);
-}
-
-static void
-app_bookmarks_changed (YelpApplication *app,
-                       const gchar     *doc_uri,
-                       YelpWindow      *window)
-{
-    YelpUri *uri;
-    gchar *this_doc_uri;
-    YelpWindowPrivate *priv = GET_PRIV (window);
-
-    g_object_get (priv->view, "yelp-uri", &uri, NULL);
-    this_doc_uri = yelp_uri_get_document_uri (uri);
-
-    if (g_str_equal (this_doc_uri, doc_uri)) {
-        window_set_bookmarks (window, doc_uri);
-    }
-
-    g_free (this_doc_uri);
-    g_object_unref (uri);
-}
-
-typedef struct _YelpMenuEntry YelpMenuEntry;
-struct _YelpMenuEntry {
-    gchar *page_id;
-    gchar *icon;
-    gchar *title;
-};
-
-static gint
-entry_compare (YelpMenuEntry *a, YelpMenuEntry *b)
-{
-    gint ret = yelp_settings_cmp_icons (a->icon, b->icon);
-    if (ret != 0)
-        return ret;
-
-    if (a->title && b->title)
-        return g_utf8_collate (a->title, b->title);
-    else if (b->title == NULL)
-        return -1;
-    else if (a->title == NULL)
-        return 1;
-
-    return 0;
-}
-
-static void
-window_set_bookmarks (YelpWindow  *window,
-                      const gchar *doc_uri)
-{
-    GVariant *value;
-    GVariantIter *iter;
-    gchar *page_id, *icon, *title;
-    YelpWindowPrivate *priv = GET_PRIV (window);
-    GSList *entries = NULL;
-
-    window_set_bookmark_action (window);
-
-    gtk_ui_manager_remove_ui (priv->ui_manager, priv->bookmarks_merge_id);
-
-    value = yelp_application_get_bookmarks (priv->application, doc_uri);
-    g_variant_get (value, "a(sss)", &iter);
-    while (g_variant_iter_loop (iter, "(&s&s&s)", &page_id, &icon, &title)) {
-        YelpMenuEntry *entry = g_new0 (YelpMenuEntry, 1);
-        entry->page_id = page_id;
-        entry->icon = g_strdup (icon);
-        entry->title = title;
-        entries = g_slist_insert_sorted (entries, entry, (GCompareFunc) entry_compare);
-    }
-    for ( ; entries != NULL; entries = g_slist_delete_link (entries, entries)) {
-        GSList *cur;
-        GtkAction *bookmark;
-        YelpMenuEntry *entry = (YelpMenuEntry *) entries->data;
-        gchar *action_id = g_strconcat ("LoadBookmark-", entry->page_id, NULL);
-
-        bookmark = gtk_action_group_get_action (priv->bookmark_actions, action_id);
-        if (bookmark) {
-            /* The action might have been set by a different document using
-             * the same page ID. We can just reuse the action, since it's
-             * just a page ID relative to the current URI, but we need to
-             * reset the title and icon.
-             */
-            g_object_set (bookmark,
-                          "label", entry->title,
-                          "icon-name", entry->icon,
-                          NULL);
-        } else {
-            bookmark = gtk_action_new (action_id, entry->title, NULL, NULL);
-            g_signal_connect (bookmark, "activate",
-                              G_CALLBACK (window_load_bookmark), window);
-            gtk_action_set_icon_name (bookmark, entry->icon);
-            gtk_action_group_add_action (priv->bookmark_actions, bookmark);
-        }
-        gtk_ui_manager_add_ui (priv->ui_manager,
-                               priv->bookmarks_merge_id,
-                               "ui/menubar/BookmarksMenu/Bookmarks",
-                               action_id, action_id,
-                               GTK_UI_MANAGER_MENUITEM,
-                               FALSE);
-        gtk_ui_manager_ensure_update (priv->ui_manager);
-        for (cur = gtk_action_get_proxies (bookmark); cur != NULL; cur = cur->next) {
-            if (GTK_IS_IMAGE_MENU_ITEM (cur->data))
-                g_object_set (cur->data, "always-show-image", TRUE, NULL);
-        }
-        g_free (action_id);
-        g_free (entry->icon);
-        g_free (entry);
-    }
-
-    g_variant_iter_free (iter);
-    g_variant_unref (value);
-}
-
-static void
-window_set_bookmark_action (YelpWindow *window)
-{
-    YelpUri *uri = NULL;
-    gchar *doc_uri = NULL, *page_id = NULL;
-    GtkAction *action_add, *action_del;
-    gboolean bookmarked;
-    YelpWindowPrivate *priv = GET_PRIV (window);
-
-    action_add = gtk_action_group_get_action (priv->action_group, "AddBookmark");
-    action_del = gtk_action_group_get_action (priv->action_group, "RemoveBookmark");
-
-    g_object_get (priv->view,
-                  "yelp-uri", &uri,
-                  "page-id", &page_id,
-                  NULL);
-    if (page_id == NULL || uri == NULL) {
-        gtk_action_set_sensitive (action_add, FALSE);
-        gtk_action_set_sensitive (action_del, FALSE);
-        goto done;
-    }
-    doc_uri = yelp_uri_get_document_uri (uri);
-    bookmarked = yelp_application_is_bookmarked (YELP_BOOKMARKS (priv->application),
-                                                 doc_uri, page_id);
-    gtk_action_set_sensitive (action_add, !bookmarked);
-    gtk_action_set_sensitive (action_del, bookmarked);
-
-  done:
-    g_free (page_id);
-    g_free (doc_uri);
-    if (uri)
-        g_object_unref (uri);
-}
-
-static void
-window_start_search (GtkAction *action, YelpWindow *window)
-{
-    YelpWindowPrivate *priv = GET_PRIV (window);
-
-    yelp_location_entry_start_search (priv->entry);
-}
-
-static void
-window_open_location (GtkAction *action, YelpWindow *window)
-{
-    YelpUri *yuri = NULL;
-    gchar *uri = NULL;
-    GdkColor yellow;
-    gchar *color;
-    YelpWindowPrivate *priv = GET_PRIV (window);
-
-    gtk_container_remove (GTK_CONTAINER (priv->hbox),
-                          priv->align_location);
-    gtk_box_pack_start (GTK_BOX (priv->hbox),
-                        priv->align_hidden,
-                        TRUE, TRUE, 0);
-
-    gtk_widget_show_all (priv->align_hidden);
-    gtk_entry_set_text (GTK_ENTRY (priv->hidden_entry), "");
-    gtk_widget_grab_focus (priv->hidden_entry);
-
-    color = yelp_settings_get_color (yelp_settings_get_default (),
-                                     YELP_SETTINGS_COLOR_YELLOW_BASE);
-    if (gdk_color_parse (color, &yellow)) {
-        gtk_widget_modify_base (priv->hidden_entry,
-                                GTK_STATE_NORMAL,
-                                &yellow);
-    }
-    g_free (color);
-
-    g_object_get (priv->view, "yelp-uri", &yuri, NULL);
-    if (yuri) {
-        uri = yelp_uri_get_canonical_uri (yuri);
-        g_object_unref (yuri);
-    }
-    if (uri) {
-        gchar *c;
-        gtk_entry_set_text (GTK_ENTRY (priv->hidden_entry), uri);
-        c = strchr (uri, ':');
-        if (c)
-            gtk_editable_select_region (GTK_EDITABLE (priv->hidden_entry), c - uri + 1, -1);
-        else
-            gtk_editable_select_region (GTK_EDITABLE (priv->hidden_entry), 5, -1);
-        g_free (uri);
-    }
-}
-
-static void
-read_later_resolved (YelpUri    *uri,
-                     YelpWindow *window)
-{
-    gchar *fulluri;
-    const gchar *text = (const gchar *) g_object_get_data ((GObject *) uri, "link-text");
-    YelpWindowPrivate *priv = GET_PRIV (window);
-    YelpUri *base;
-    gchar *doc_uri;
-
-    g_object_get (priv->view, "yelp-uri", &base, NULL);
-    doc_uri = yelp_uri_get_document_uri (uri);
-    fulluri = yelp_uri_get_canonical_uri (uri);
-
-    yelp_application_add_read_later (priv->application, doc_uri, fulluri, text);
-
-    g_object_unref (base);
-    g_free (doc_uri);
-    g_free (fulluri);
-}
-
-static void
-window_read_later (GtkAction   *action,
-                   YelpWindow  *window)
-{
-    YelpWindowPrivate *priv = GET_PRIV (window);
-    YelpUri *uri;
-    gchar *text;
-
-    uri = yelp_view_get_active_link_uri (priv->view);
-    text = yelp_view_get_active_link_text (priv->view);
-
-    g_object_set_data_full ((GObject *) uri, "link-text", text, g_free);
-
-    if (!yelp_uri_is_resolved (uri)) {
-        g_signal_connect (uri, "resolved",
-                          G_CALLBACK (read_later_resolved),
-                          window);
-        yelp_uri_resolve (uri);
-    }
-    else {
-        read_later_resolved (uri, window);
-    }
-}
-
-static gboolean
-read_later_clicked (GtkLinkButton  *button,
-                    YelpWindow     *window)
-{
-    YelpWindowPrivate *priv = GET_PRIV (window);
-    YelpUri *base;
-    gchar *doc_uri;
-    gchar *fulluri;
-
-    fulluri = g_strdup (gtk_link_button_get_uri (button));
-
-    g_object_get (priv->view, "yelp-uri", &base, NULL);
-    doc_uri = yelp_uri_get_document_uri (base);
-
-    yelp_application_remove_read_later (priv->application, doc_uri, fulluri);
-
-    g_object_unref (base);
-    g_free (doc_uri);
-
-    yelp_view_load (priv->view, fulluri);
-
-    g_free (fulluri);
-    return TRUE;
-}
-
-static void
-app_read_later_changed (YelpApplication *app,
-                        const gchar     *doc_uri,
-                        YelpWindow      *window)
-{
-    GVariant *value;
-    GVariantIter *viter;
-    gchar *uri, *title; /* do not free */
-    GList *children;
-    gboolean has_children = FALSE;
-    YelpWindowPrivate *priv = GET_PRIV (window);
-
-    children = gtk_container_get_children (GTK_CONTAINER (priv->read_later_vbox));