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=a316f35f7b33b049c67aeacef5f2bae0c30c9a1e;hb=2eecd9167f17b9b0506675a9dc05dff487779afa;hp=5b45b31d898ed404ea0292e818e7934f9bdc3a32;hpb=d2222e0879e7bd247bec339105bc2c057907b9b5;p=evince.git diff --git a/shell/ev-page-action.c b/shell/ev-page-action.c index 5b45b31d..a316f35f 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)); - 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); @@ -306,6 +307,9 @@ build_new_tree_cb (GtkTreeModel *model, -1); } + if (link) + g_object_unref (link); + return FALSE; } @@ -345,6 +349,11 @@ match_selected_cb (GtkEntryCompletion *completion, -1); g_signal_emit (proxy, widget_signals[WIDGET_ACTIVATE_LINK], 0, link); + + if (link) + g_object_unref (link); + + gtk_tree_iter_free (iter); return TRUE; } @@ -368,6 +377,11 @@ display_completion_text (GtkCellLayout *cell_layout, -1); g_object_set (renderer, "text", ev_link_get_title (link), NULL); + + if (link) + g_object_unref (link); + + gtk_tree_iter_free (iter); } static gboolean @@ -389,8 +403,12 @@ match_completion (GtkEntryCompletion *completion, -1); - if (link) + if (link) { text = ev_link_get_title (link); + g_object_unref (link); + } + + gtk_tree_iter_free (iter); if (text && key ) { gchar *normalized_text; @@ -461,6 +479,9 @@ 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); } } @@ -632,7 +653,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,