Fix build with poppler 0.5.9.

[evince.git] / shell / ev-navigation-action.c

diff --git a/shell/ev-navigation-action.c b/shell/ev-navigation-action.c
index dc98ce759cdb009e259fab1a0e16b952321657e4..dd4e38e83bf1e0d3c23749d71c85e0006b1eee58 100644 (file)
--- a/shell/ev-navigation-action.c
+++ b/shell/ev-navigation-action.c
@@ -61,7 +61,7 @@ ev_navigation_action_set_history (EvNavigationAction *action,
        action->priv->history = history;
 
        g_object_add_weak_pointer (G_OBJECT (action->priv->history),
-                                  (gpointer *) &action->priv->history);
+                                  (gpointer) &action->priv->history);
 }
 
 static void
@@ -72,7 +72,6 @@ activate_menu_item_cb (GtkWidget *widget, EvNavigationAction *action)
        g_return_if_fail (EV_IS_HISTORY (action->priv->history));
 
        index = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "index"));
-       ev_history_set_current_index (action->priv->history, index);
        
        if (action->priv->history) {
                EvLink *link;
@@ -93,11 +92,8 @@ new_history_menu_item (EvNavigationAction *action,
        const char *title;
 
        title = ev_link_get_title (link);
-       
-       if (!title)
-               title = _("External link");
-
        item = gtk_image_menu_item_new_with_label (title);
+       gtk_label_set_use_markup (GTK_LABEL (gtk_bin_get_child (GTK_BIN (item))), TRUE);
        g_object_set_data (G_OBJECT (item), "index",
                           GINT_TO_POINTER (index));
 
@@ -143,8 +139,8 @@ build_menu (EvNavigationAction *action)
                return GTK_WIDGET (menu);
        }
 
-       start = MAX (ev_history_get_current_index (action->priv->history) - 5, 0);
-       end = MIN (ev_history_get_n_links (history), start + 7);
+       start = 0;
+       end = ev_history_get_n_links (history);
 
        for (i = start; i < end; i++) {
                link = ev_history_get_link_nth (history, i);
@@ -170,12 +166,14 @@ connect_proxy (GtkAction *action, GtkWidget *proxy)
 {
        GtkWidget *menu;
 
-       /* set dummy menu so the arrow gets sensitive */
-       menu = gtk_menu_new ();
-       ev_navigation_action_widget_set_menu (EV_NAVIGATION_ACTION_WIDGET (proxy), menu);
+       if (GTK_IS_TOOL_ITEM (proxy)) {
+               /* set dummy menu so the arrow gets sensitive */
+               menu = gtk_menu_new ();
+               ev_navigation_action_widget_set_menu (EV_NAVIGATION_ACTION_WIDGET (proxy), menu);
 
-       g_signal_connect (proxy, "show-menu",
-                         G_CALLBACK (menu_activated_cb), action);
+               g_signal_connect (proxy, "show-menu",
+                                 G_CALLBACK (menu_activated_cb), action);
+       }
 
        GTK_ACTION_CLASS (ev_navigation_action_parent_class)->connect_proxy (action, proxy);
 }
@@ -191,6 +189,23 @@ create_tool_item (GtkAction *action)
        return GTK_WIDGET (proxy);
 }
 
+static GtkWidget *
+create_menu_item (GtkAction *action)
+{
+       GtkWidget *menu;
+       GtkWidget *menu_item;
+
+       menu = build_menu (EV_NAVIGATION_ACTION (action));
+
+        menu_item = GTK_ACTION_CLASS (ev_navigation_action_parent_class)->create_menu_item (action);
+
+       gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), menu);
+
+       gtk_widget_show (menu_item);
+       
+       return menu_item;
+}
+
 static void
 ev_navigation_action_init (EvNavigationAction *action)
 {
@@ -204,7 +219,7 @@ ev_navigation_action_finalize (GObject *object)
 
        if (action->priv->history) {
                g_object_add_weak_pointer (G_OBJECT (action->priv->history),
-                                          (gpointer *) &action->priv->history);
+                                          (gpointer) &action->priv->history);
        }
 
        G_OBJECT_CLASS (ev_navigation_action_parent_class)->finalize (object);
@@ -221,6 +236,7 @@ ev_navigation_action_class_init (EvNavigationActionClass *class)
        action_class->toolbar_item_type = GTK_TYPE_TOOL_ITEM;
        action_class->create_tool_item = create_tool_item;
        action_class->connect_proxy = connect_proxy;
+       action_class->create_menu_item = create_menu_item;
 
        widget_signals[WIDGET_ACTIVATE_LINK] = g_signal_new ("activate_link",
                                               G_OBJECT_CLASS_TYPE (object_class),