X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-navigation-action.c;h=a2dc6364088159c91a2337aa9bb779eee92d872f;hb=761de5f5ba44cc94c98adf2b68809ea453d6bdfa;hp=c4f6191773e10d59ba2ac46cf3a335a1afbabc82;hpb=e98242e3e677e78840e8a417801c2831602831ce;p=evince.git

diff --git a/shell/ev-navigation-action.c b/shell/ev-navigation-action.c
index c4f61917..a2dc6364 100644
--- a/shell/ev-navigation-action.c
+++ b/shell/ev-navigation-action.c
@@ -20,17 +20,12 @@
 
 #include "config.h"
 
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
 #include "ev-navigation-action.h"
 #include "ev-navigation-action-widget.h"
 
-#include <gtk/gtklabel.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkmenushell.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenutoolbutton.h>
-#include <glib/gi18n.h>
 
 enum
 {
@@ -54,6 +49,16 @@ G_DEFINE_TYPE (EvNavigationAction, ev_navigation_action, GTK_TYPE_ACTION)
 
 #define EV_NAVIGATION_ACTION_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_NAVIGATION_ACTION, EvNavigationActionPrivate))
 
+static void
+ev_navigation_action_history_changed (EvHistory *history,
+				      gpointer data)
+{
+	EvNavigationAction *action = EV_NAVIGATION_ACTION (data);
+	
+	gtk_action_set_sensitive (GTK_ACTION (action),
+				  ev_history_get_n_links (history) > 0);
+}
+
 void
 ev_navigation_action_set_history (EvNavigationAction *action,
 				  EvHistory	     *history)
@@ -61,7 +66,11 @@ 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);
+	
+	g_signal_connect_object (history, "changed",
+				 G_CALLBACK (ev_navigation_action_history_changed),
+				 action, 0);
 }
 
 static void
@@ -110,18 +119,6 @@ new_history_menu_item (EvNavigationAction *action,
 	return item;
 }
 
-static GtkWidget *
-new_empty_history_menu_item (EvNavigationAction *action)
-{
-	GtkWidget *item;
-	
-	item = gtk_image_menu_item_new_with_label (_("Empty"));
-	gtk_widget_set_sensitive (item, FALSE);
-	gtk_widget_show (item);
-	
-	return item;
-}
-
 static GtkWidget *
 build_menu (EvNavigationAction *action)
 {
@@ -131,14 +128,12 @@ build_menu (EvNavigationAction *action)
 	EvHistory *history = action->priv->history;
 	int start, end, i;
 
-	menu = GTK_MENU_SHELL (gtk_menu_new ());
-
 	if (history == NULL || ev_history_get_n_links (history) <= 0) {
-		item = new_empty_history_menu_item (action);
-		gtk_menu_shell_append (menu, item);		
-		return GTK_WIDGET (menu);
+		return NULL;
 	}
 
+	menu = GTK_MENU_SHELL (gtk_menu_new ());
+
 	start = 0;
 	end = ev_history_get_n_links (history);
 
@@ -166,7 +161,7 @@ connect_proxy (GtkAction *action, GtkWidget *proxy)
 {
 	GtkWidget *menu;
 
-	if (EV_IS_NAVIGATION_ACTION (proxy)) {
+	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);
@@ -218,8 +213,9 @@ ev_navigation_action_finalize (GObject *object)
 	EvNavigationAction *action = EV_NAVIGATION_ACTION (object);
 
 	if (action->priv->history) {
-		g_object_add_weak_pointer (G_OBJECT (action->priv->history),
-					   (gpointer *) &action->priv->history);
+		g_object_remove_weak_pointer (G_OBJECT (action->priv->history),
+				  	     (gpointer) &action->priv->history);
+		action->priv->history = NULL;
 	}
 
 	G_OBJECT_CLASS (ev_navigation_action_parent_class)->finalize (object);