X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-page-action.c;h=97abd1a7870a6dfdfc4a39074a11e4d4bb53f2d8;hb=e47828bd9933f9a44cdfb009fdfcddfcec2748dd;hp=a316f35f7b33b049c67aeacef5f2bae0c30c9a1e;hpb=89e2b545e76b82cb35715b7da470f87638e6241c;p=evince.git diff --git a/shell/ev-page-action.c b/shell/ev-page-action.c index a316f35f..97abd1a7 100644 --- a/shell/ev-page-action.c +++ b/shell/ev-page-action.c @@ -185,7 +185,7 @@ page_changed_cb (EvPageCache *page_cache, gtk_entry_set_width_chars (GTK_ENTRY (proxy->entry), CLAMP (ev_page_cache_get_max_label_chars (page_cache), - 4, 12)); + 6, 12)); page_label = ev_page_cache_get_page_label (page_cache, page); gtk_entry_set_text (GTK_ENTRY (proxy->entry), page_label); @@ -293,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); @@ -307,8 +320,7 @@ build_new_tree_cb (GtkTreeModel *model, -1); } - if (link) - g_object_unref (link); + g_object_unref (link); return FALSE; } @@ -410,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;