X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-view.c;h=b51082f24dfde8aada92f9c383fe296bb24cfd49;hb=594edf9b1277d5ec88892c2ea02c2bdc2f2e8b0e;hp=95352c1d2abbeb0fdcd1a61d4e84ed58849c4851;hpb=b263c1dfebc5946bfa1b6e1fb0d679d1c42a7dbe;p=evince.git

diff --git a/shell/ev-view.c b/shell/ev-view.c
index 95352c1d..b51082f2 100644
--- a/shell/ev-view.c
+++ b/shell/ev-view.c
@@ -210,8 +210,8 @@ ev_view_finalize (GObject *object)
 
 	LOG ("Finalize");
 
-
-	ev_view_set_scroll_adjustments (view, NULL, NULL);
+	g_free (view->status);
+	g_free (view->find_status);
 
 	G_OBJECT_CLASS (ev_view_parent_class)->finalize (object);
 }
@@ -975,6 +975,31 @@ ev_view_motion_notify_event (GtkWidget      *widget,
 	return TRUE;
 }
 
+/* FIXME: standardize this sometime */
+static void
+go_to_link (EvView *view, EvLink *link)
+{
+	EvLinkType type;
+	const char *uri;
+	int page;
+
+	type = ev_link_get_link_type (link);
+
+	switch (type) {
+		case EV_LINK_TYPE_TITLE:
+			break;
+		case EV_LINK_TYPE_PAGE:
+			page = ev_link_get_page (link);
+			ev_page_cache_set_current_page (view->page_cache, page);
+			break;
+		case EV_LINK_TYPE_EXTERNAL_URI:
+			uri = ev_link_get_uri (link);
+			gnome_vfs_url_show (uri);
+			break;
+	}
+}
+
+
 static gboolean
 ev_view_button_release_event (GtkWidget      *widget,
 			      GdkEventButton *event)
@@ -990,7 +1015,7 @@ ev_view_button_release_event (GtkWidget      *widget,
 
 		link = get_link_at_location (view, event->x, event->y);
 		if (link) {
-			ev_view_go_to_link (view, link);
+			go_to_link (view, link);
 		}
 	}
 
@@ -1285,12 +1310,25 @@ ev_view_class_init (EvViewClass *class)
 	add_scroll_binding_shifted (binding_set, GDK_BackSpace, EV_SCROLL_PAGE_BACKWARD, EV_SCROLL_PAGE_FORWARD, FALSE);
 }
 
+void
+ev_view_set_spacing (EvView     *view,
+		     int         spacing)
+{
+	g_return_if_fail (EV_IS_VIEW (view));
+
+	view->spacing = spacing;
+
+	if (view->document) {
+		gtk_widget_queue_resize (GTK_WIDGET (view));
+	}
+}
+
 static void
 ev_view_init (EvView *view)
 {
 	GTK_WIDGET_SET_FLAGS (view, GTK_CAN_FOCUS);
 
-	view->spacing = 10;
+	view->spacing = 0;
 	view->scale = 1.0;
 	view->current_page = 0;
 	view->pressed_button = -1;
@@ -1540,41 +1578,6 @@ ev_view_set_document (EvView     *view,
 	}
 }
 
-int
-ev_view_get_page        (EvView     *view)
-{
-	return view->current_page;
-}
-
-static void
-go_to_link (EvView *view, EvLink *link)
-{
-	EvLinkType type;
-	const char *uri;
-	int page;
-
-	type = ev_link_get_link_type (link);
-
-	switch (type) {
-		case EV_LINK_TYPE_TITLE:
-			break;
-		case EV_LINK_TYPE_PAGE:
-			page = ev_link_get_page (link);
-			ev_page_cache_set_current_page (view->page_cache, page);
-			break;
-		case EV_LINK_TYPE_EXTERNAL_URI:
-			uri = ev_link_get_uri (link);
-			gnome_vfs_url_show (uri);
-			break;
-	}
-}
-
-void
-ev_view_go_to_link (EvView *view, EvLink *link)
-{
-	go_to_link (view, link);
-}
-
 static void
 ev_view_zoom (EvView   *view,
 	      double    factor,