X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fev-page-action.c;h=97abd1a7870a6dfdfc4a39074a11e4d4bb53f2d8;hb=d47bc2205d248b34dbfcdd349473f54d45d5ec70;hp=7975c8a41577b1e83e106d4cf350bf9445c37507;hpb=bb5ea194600d5ae09b18a147420f4fc42c0808df;p=evince.git

diff --git a/shell/ev-page-action.c b/shell/ev-page-action.c
index 7975c8a4..97abd1a7 100644
--- a/shell/ev-page-action.c
+++ b/shell/ev-page-action.c
@@ -181,12 +181,13 @@ page_changed_cb (EvPageCache        *page_cache,
 	g_assert (proxy);
 	
 	if (page_cache != NULL && page >= 0) {
-	
+		gchar *page_label;
+
 		gtk_entry_set_width_chars (GTK_ENTRY (proxy->entry), 
 					   CLAMP (ev_page_cache_get_max_label_chars (page_cache), 
-					   4, 12));	
+					   6, 12));	
 		
-		gchar *page_label = ev_page_cache_get_page_label (page_cache, page);
+		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);
 		g_free (page_label);
@@ -292,12 +293,25 @@ build_new_tree_cb (GtkTreeModel *model,
 {
 	GtkTreeModel *filter_model = GTK_TREE_MODEL (data);
 	EvLink *link;
+	EvLinkAction *action;
+	EvLinkActionType type;
 
 	gtk_tree_model_get (model, iter,
 			    EV_DOCUMENT_LINKS_COLUMN_LINK, &link,
 			    -1);
 
-	if (link && ev_link_get_link_type (link) == EV_LINK_TYPE_PAGE) {
+	if (!link)
+		return FALSE;
+
+	action = ev_link_get_action (link);
+	if (!action) {
+		g_object_unref (link);
+		return FALSE;
+	}
+	
+	type = ev_link_action_get_action_type (action);
+
+	if (type == EV_LINK_ACTION_TYPE_GOTO_DEST) {
 		GtkTreeIter filter_iter;
 
 		gtk_list_store_append (GTK_LIST_STORE (filter_model), &filter_iter);
@@ -306,8 +320,7 @@ build_new_tree_cb (GtkTreeModel *model,
 				    -1);
 	}
 	
-	if (link)
-		g_object_unref (link);
+	g_object_unref (link);
 	
 	return FALSE;
 }
@@ -409,7 +422,7 @@ match_completion (GtkEntryCompletion *completion,
 
 	gtk_tree_iter_free (iter);
 
-	if (text && key ) {
+	if (text && key) {
 		gchar *normalized_text;
 		gchar *normalized_key;
 		gchar *case_normalized_text;
@@ -478,7 +491,8 @@ update_model (EvPageAction *page, GParamSpec *pspec, EvPageActionWidget *proxy)
 						    (GtkCellLayoutDataFunc) display_completion_text,
 						    proxy, NULL);
 		gtk_entry_set_completion (GTK_ENTRY (proxy->entry), completion);
-
+		
+		g_object_unref (completion);
 		g_object_unref (model);
 	}
 }
@@ -651,7 +665,7 @@ ev_page_action_class_init (EvPageActionClass *class)
 	signals[ACTIVATE_LABEL] = g_signal_new ("activate_label",
 					        G_OBJECT_CLASS_TYPE (object_class),
 					        G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-					        G_STRUCT_OFFSET (EvPageActionClass, activate_link),
+					        G_STRUCT_OFFSET (EvPageActionClass, activate_label),
 					        NULL, NULL,
 					        ev_marshal_BOOLEAN__STRING,
 					        G_TYPE_BOOLEAN, 1,