[dualscreen] fix crash on ctrl+w and fix control window closing

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

diff --git a/shell/ev-navigation-action.c b/shell/ev-navigation-action.c
index c87940a64236a5477bf8c35c5fd7d37d4b581a26..b34c37892b781ff12573546366c854665cd28af7 100644 (file)
--- a/shell/ev-navigation-action.c
+++ b/shell/ev-navigation-action.c
@@ -14,23 +14,18 @@
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
 
 #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
@@ -93,11 +102,11 @@ new_history_menu_item (EvNavigationAction *action,
 
        title = ev_link_get_title (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);
+       label = GTK_LABEL (gtk_bin_get_child (GTK_BIN (item)));
+       gtk_label_set_use_markup (label, TRUE);
        g_object_set_data (G_OBJECT (item), "index",
                           GINT_TO_POINTER (index));
 
-       label = GTK_LABEL (GTK_BIN (item)->child);
        gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END);
        gtk_label_set_max_width_chars (label, MAX_LABEL_LENGTH);
 
@@ -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,12 +161,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);
 }
@@ -187,6 +184,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)
 {
@@ -199,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);
@@ -217,6 +232,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),