X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-sidebar-links.c;h=58dac08ca9f835ed39c9688dc128c00bf8a3f80d;hb=1b553f2b8c0b409ff4a5c93d4341df6e4bfb4b61;hp=45719114a615d1c52de54dd019a20bf9f9466d8c;hpb=3be2b7d94dc4475256b89f8033ef5cca17513530;p=evince.git

diff --git a/shell/ev-sidebar-links.c b/shell/ev-sidebar-links.c
index 45719114..58dac08c 100644
--- a/shell/ev-sidebar-links.c
+++ b/shell/ev-sidebar-links.c
@@ -52,6 +52,7 @@ struct _EvSidebarLinksPrivate {
 enum {
 	PROP_0,
 	PROP_MODEL,
+	PROP_WIDGET,
 };
 
 
@@ -128,6 +129,9 @@ ev_sidebar_links_get_property (GObject    *object,
 	case PROP_MODEL:
 		g_value_set_object (value, ev_sidebar_links->priv->model);
 		break;
+	case PROP_WIDGET:
+		g_value_set_object (value, ev_sidebar_links->priv->tree_view);
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -139,12 +143,6 @@ ev_sidebar_links_dispose (GObject *object)
 {
 	EvSidebarLinks *sidebar = EV_SIDEBAR_LINKS (object);
 
-	if (sidebar->priv->document) {
-		g_object_unref (sidebar->priv->document);
-		sidebar->priv->document = NULL;
-		sidebar->priv->page_cache = NULL;
-	}
-
 	if (sidebar->priv->job) {
 		g_signal_handlers_disconnect_by_func (sidebar->priv->job,
 						      job_finished_callback, sidebar);
@@ -153,6 +151,18 @@ ev_sidebar_links_dispose (GObject *object)
 		sidebar->priv->job = NULL;
 	}
 
+	if (sidebar->priv->model) {
+		g_object_unref (sidebar->priv->model);
+		sidebar->priv->model = NULL;
+	}
+
+	if (sidebar->priv->document) {
+		g_object_unref (sidebar->priv->document);
+		sidebar->priv->document = NULL;
+		sidebar->priv->page_cache = NULL;
+	}
+
+
 	G_OBJECT_CLASS (ev_sidebar_links_parent_class)->dispose (object);
 }
 
@@ -174,6 +184,9 @@ ev_sidebar_links_class_init (EvSidebarLinksClass *ev_sidebar_links_class)
 							      "Current Model",
 							      GTK_TYPE_TREE_MODEL,
 							      G_PARAM_READWRITE));
+	g_object_class_override_property (g_object_class,
+					  PROP_WIDGET,
+					  "main-widget");
 
 	g_type_class_add_private (g_object_class, sizeof (EvSidebarLinksPrivate));
 }
@@ -207,6 +220,8 @@ selection_changed_callback (GtkTreeSelection   *selection,
 		ev_page_cache_set_link (ev_sidebar_links->priv->page_cache, link);
 		g_signal_handler_unblock (ev_sidebar_links->priv->page_cache,
 					  ev_sidebar_links->priv->page_changed_id);
+
+		g_object_unref (link);
 	}
 }
 
@@ -255,11 +270,17 @@ print_section_cb (GtkWidget *menuitem, EvSidebarLinks *sidebar)
 				    -1);
 		first_page = ev_link_get_page (link) + 1;
 
+		if (link)
+			g_object_unref (link);
+
 		if (gtk_tree_model_iter_next (model, &iter)) {
 			gtk_tree_model_get (model, &iter,
 					    EV_DOCUMENT_LINKS_COLUMN_LINK, &link,
 					    -1);
 			last_page = ev_link_get_page (link);
+
+			if (link)
+		    		g_object_unref (link);
 		} else {
 			last_page = -1;
 		}
@@ -432,6 +453,9 @@ links_page_num_func (GtkTreeViewColumn *tree_column,
 			      "visible", FALSE,
 			      NULL);
 	}
+
+	if (link)
+		g_object_unref (link);
 }
 
 /* Public Functions */
@@ -469,10 +493,14 @@ update_page_callback_foreach (GtkTreeModel *model,
 			selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (sidebar_links->priv->tree_view));
 
 			gtk_tree_selection_select_path (selection, path);
-
+	
+			g_object_unref (link);
 			return TRUE;
 		}
 	}
+
+	if (link)
+		g_object_unref (link);
 	
 	return FALSE;
 }
@@ -522,13 +550,11 @@ static void
 expand_open_links (GtkTreeView *tree_view, GtkTreeModel *model, GtkTreeIter *parent)
 {
 	GtkTreeIter iter;
-	EvLink *link;
 	gboolean expand;
 
 	if (gtk_tree_model_iter_children (model, &iter, parent)) {
 		do {
 			gtk_tree_model_get (model, &iter,
-					    EV_DOCUMENT_LINKS_COLUMN_LINK, &link,
 					    EV_DOCUMENT_LINKS_COLUMN_EXPAND, &expand,
 					    -1);
 			if (expand) {
@@ -552,11 +578,12 @@ job_finished_callback (EvJobLinks     *job,
 	GtkTreeSelection *selection;
 
 	priv = sidebar_links->priv;
-
-	priv->model = g_object_ref (job->model);
+	
+	priv->model = job->model;
 	g_object_notify (G_OBJECT (sidebar_links), "model");
 
 	gtk_tree_view_set_model (GTK_TREE_VIEW (priv->tree_view), job->model);
+	
 	g_object_unref (job);
 	priv->job = NULL;
 
@@ -630,12 +657,6 @@ ev_sidebar_links_get_label (EvSidebarPage *sidebar_page)
     return _("Index");
 }
 
-GtkWidget *
-ev_sidebar_links_get_treeview (EvSidebarLinks *sidebar)
-{
-	return sidebar->priv->tree_view;
-}
-
 static void
 ev_sidebar_links_page_iface_init (EvSidebarPageIface *iface)
 {