Keep a weak reference on proxy->page_cache so that we dont try to

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

diff --git a/shell/ev-page-action.c b/shell/ev-page-action.c
index 057b501fefe3429b64b2d49bdd4a2299aebb6ec4..57b9bfceb886b3a1002c753b51ba083fbc0c8977 100644 (file)
--- a/shell/ev-page-action.c
+++ b/shell/ev-page-action.c
@@ -39,6 +39,7 @@ struct _EvPageActionWidget
        GtkToolItem parent;
 
        GtkWidget *entry;
+       GtkWidget *label;
        EvPageCache *page_cache;
        guint signal_id;
        GtkTreeModel *filter_model;
@@ -62,6 +63,9 @@ static GType ev_page_action_widget_get_type   (void);
 static void  ev_page_action_widget_init       (EvPageActionWidget      *action_widget);
 static void  ev_page_action_widget_class_init (EvPageActionWidgetClass *action_widget);
 
+#define EV_TYPE_PAGE_ACTION_WIDGET (ev_page_action_widget_get_type ())
+#define EV_PAGE_ACTION_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EV_TYPE_PAGE_ACTION_WIDGET, EvPageActionWidget))
+
 G_DEFINE_TYPE (EvPageActionWidget, ev_page_action_widget, GTK_TYPE_TOOL_ITEM)
 
 static void
@@ -71,11 +75,37 @@ ev_page_action_widget_init (EvPageActionWidget *action_widget)
 }
 
 static void
-ev_page_action_widget_class_init (EvPageActionWidgetClass *action_widget)
+ev_page_action_widget_set_page_cache (EvPageActionWidget *action_widget,
+                                     EvPageCache        *page_cache)
 {
+       if (action_widget->page_cache != NULL) {
+               g_object_remove_weak_pointer (G_OBJECT (action_widget->page_cache),
+                                             (gpointer *)&action_widget->page_cache);
+               action_widget->page_cache = NULL;
+       }
+
+       if (page_cache != NULL) {
+               action_widget->page_cache = page_cache;
+               g_object_add_weak_pointer (G_OBJECT (page_cache),
+                                          (gpointer *)&action_widget->page_cache);
+       }
 }
 
+static void
+ev_page_action_widget_finalize (GObject *object)
+{
+       EvPageActionWidget *action_widget = EV_PAGE_ACTION_WIDGET (object);
+
+       ev_page_action_widget_set_page_cache (action_widget, NULL);
+}
+
+static void
+ev_page_action_widget_class_init (EvPageActionWidgetClass *class)
+{
+       GObjectClass *object_class = G_OBJECT_CLASS (class);
 
+       object_class->finalize = ev_page_action_widget_finalize;
+}
 
 static void ev_page_action_init       (EvPageAction *action);
 static void ev_page_action_class_init (EvPageActionClass *class);
@@ -93,6 +123,24 @@ enum {
 /* user data to set on the widget. */
 #define EPA_FILTER_MODEL_DATA "epa-filter-model"
 
+static void
+update_pages_label (EvPageActionWidget *proxy,
+                   gint                page,
+                   EvPageCache        *page_cache)
+{
+       char *label_text;
+       gint n_pages;
+
+       n_pages = page_cache ? ev_page_cache_get_n_pages (page_cache) : 0;
+       if (ev_page_cache_has_nonnumeric_page_labels (page_cache)) {
+               label_text = g_strdup_printf (_("(%d of %d)"), page + 1, n_pages);
+       } else {
+               label_text = g_strdup_printf (_("of %d"), n_pages);
+       }
+       gtk_label_set_text (GTK_LABEL (proxy->label), label_text);
+       g_free (label_text);
+}
+
 static void
 page_changed_cb (EvPageCache        *page_cache,
                 gint                page,
@@ -100,7 +148,7 @@ page_changed_cb (EvPageCache        *page_cache,
 {
        g_assert (proxy);
        
-       if (page_cache != NULL) {
+       if (page_cache != NULL && page >= 0) {
                gchar *page_label = ev_page_cache_get_page_label (page_cache, page);
                gtk_entry_set_text (GTK_ENTRY (proxy->entry), page_label);
                gtk_editable_set_position (GTK_EDITABLE (proxy->entry), -1);
@@ -108,6 +156,8 @@ page_changed_cb (EvPageCache        *page_cache,
        } else {
                gtk_entry_set_text (GTK_ENTRY (proxy->entry), "");
        }
+
+       update_pages_label (proxy, page, page_cache);
 }
 
 static void
@@ -136,20 +186,29 @@ static GtkWidget *
 create_tool_item (GtkAction *action)
 {
        EvPageActionWidget *proxy;
+       GtkWidget *hbox;
 
        proxy = g_object_new (ev_page_action_widget_get_type (), NULL);
        gtk_container_set_border_width (GTK_CONTAINER (proxy), 6); 
        gtk_widget_show (GTK_WIDGET (proxy));
 
+       hbox = gtk_hbox_new (FALSE, 0);
+       gtk_box_set_spacing (GTK_BOX (hbox), 6);
+
        proxy->entry = gtk_entry_new ();
        gtk_entry_set_width_chars (GTK_ENTRY (proxy->entry), 5);
+       gtk_box_pack_start (GTK_BOX (hbox), proxy->entry, FALSE, FALSE, 0);
        gtk_widget_show (proxy->entry);
-
        g_signal_connect (proxy->entry, "activate",
                          G_CALLBACK (activate_cb),
                          action);
 
-       gtk_container_add (GTK_CONTAINER (proxy), proxy->entry);
+       proxy->label = gtk_label_new (NULL);
+       gtk_box_pack_start (GTK_BOX (hbox), proxy->label, FALSE, FALSE, 0);
+       gtk_widget_show (proxy->label);
+
+       gtk_container_add (GTK_CONTAINER (proxy), hbox);
+       gtk_widget_show (hbox);
 
        return GTK_WIDGET (proxy);
 }
@@ -167,10 +226,10 @@ update_page_cache (EvPageAction *page, GParamSpec *pspec, EvPageActionWidget *pr
                g_signal_handler_disconnect (proxy->page_cache, proxy->signal_id);
        
        if (page_cache != NULL) {
-               signal_id = g_signal_connect (page_cache,
-                                             "page-changed",
-                                             G_CALLBACK (page_changed_cb),
-                                             proxy);
+               signal_id = g_signal_connect_object (page_cache,
+                                                    "page-changed",
+                                                    G_CALLBACK (page_changed_cb),
+                                                    proxy, 0);
                /* Set the initial value */
                page_changed_cb (page_cache,
                                 ev_page_cache_get_current_page (page_cache),
@@ -180,7 +239,7 @@ update_page_cache (EvPageAction *page, GParamSpec *pspec, EvPageActionWidget *pr
                signal_id = 0;
                page_changed_cb (NULL, 0, proxy);
        }
-       proxy->page_cache = page_cache;
+       ev_page_action_widget_set_page_cache (proxy, page_cache);
        proxy->signal_id = signal_id;
 }
 
@@ -371,8 +430,9 @@ connect_proxy (GtkAction *action, GtkWidget *proxy)
                                         G_CALLBACK (update_page_cache),
                                         proxy, 0);
                /* We only go through this whole rigmarole if we can set
-                * GtkEntryCompletion::popup-set-width  */
-               if (gtk_check_version (2, 7, 0) != NULL) {
+                * GtkEntryCompletion::popup-set-width, which appeared in
+                * GTK+-2.7.0 */
+               if (gtk_check_version (2, 7, 0) == NULL) {
                        g_signal_connect_object (action, "notify::model",
                                                 G_CALLBACK (update_model),
                                                 proxy, 0);