Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/backend
diff options
context:
space:
mode:
authorCarlos Garcia Campos <carlosgc@gnome.org>2007-09-03 20:58:54 (GMT)
committer Carlos Garcia Campos <carlosgc@src.gnome.org>2007-09-03 20:58:54 (GMT)
commit974a49f21845900f4ea154088a17b6b7e55a27e6 (patch)
treec2af1eada2b7c46b2232e12d8244053e0f7d3a80 /backend
parent62df36db729c222cf47774268a0fb83dabc8c65a (diff)
Bump requirements to poppler 0.6 and drop all ifdefs used. Double and
2007-09-03 Carlos Garcia Campos <carlosgc@gnome.org> * configure.ac: * backend/pdf/ev-poppler.cc: (pdf_selection_get_selected_text), (pdf_selection_get_selection_region), (pdf_selection_get_selection_map), (ev_form_field_from_poppler_field): Bump requirements to poppler 0.6 and drop all ifdefs used. Double and triple click selections are enabled again now. svn path=/trunk/; revision=2661
Diffstat (limited to 'backend')
-rw-r--r--backend/pdf/ev-poppler.cc16
1 files changed, 1 insertions, 15 deletions
diff --git a/backend/pdf/ev-poppler.cc b/backend/pdf/ev-poppler.cc
index 1fa2354..4ddea1a 100644
--- a/backend/pdf/ev-poppler.cc
+++ b/backend/pdf/ev-poppler.cc
@@ -19,10 +19,6 @@
#include "config.h"
-#ifdef HAVE_POPPLER_FORM_FIELD_BUTTON_GET_BUTTON_TYPE
-#define HAVE_FORMS
-#endif
-
#include <math.h>
#include <string.h>
#include <gtk/gtk.h>
@@ -1871,9 +1867,7 @@ pdf_selection_get_selected_text (EvSelection *selection,
r.y2 = height - points->y1;
retval = poppler_page_get_text (poppler_page,
-#if 0
(PopplerSelectionStyle)style,
-#endif
&r);
g_object_unref (poppler_page);
@@ -1896,9 +1890,7 @@ pdf_selection_get_selection_region (EvSelection *selection,
retval = poppler_page_get_selection_region ((PopplerPage *)rc->data,
rc->scale,
-#if 0
(PopplerSelectionStyle)style,
-#endif
(PopplerRectangle *) points);
return retval;
}
@@ -1920,9 +1912,7 @@ pdf_selection_get_selection_map (EvSelection *selection,
points.y1 = 0.0;
poppler_page_get_size (poppler_page, &(points.x2), &(points.y2));
retval = poppler_page_get_selection_region (poppler_page, 1.0,
-#if 0
POPPLER_SELECTION_GLYPH,
-#endif
&points);
g_object_unref (poppler_page);
@@ -1989,7 +1979,6 @@ pdf_document_get_crop_box (EvDocument *document,
rect->y2 = poppler_rect.y2;
}
-#ifdef HAVE_FORMS
static EvFormField *
ev_form_field_from_poppler_field (PopplerFormField *poppler_field)
{
@@ -2026,10 +2015,7 @@ ev_form_field_from_poppler_field (PopplerFormField *poppler_field)
field_text->do_scroll = poppler_form_field_text_do_scroll (poppler_field);
field_text->is_rich_text = poppler_form_field_text_is_rich_text (poppler_field);
field_text->is_password = poppler_form_field_text_is_password (poppler_field);
-
-#ifdef HAVE_POPPLER_FORM_FIELD_TEXT_GET_MAX_LEN
field_text->max_len = poppler_form_field_text_get_max_len (poppler_field);
-#endif
field_text->text = poppler_form_field_text_get_text (poppler_field);
}
@@ -2358,4 +2344,4 @@ pdf_document_document_forms_iface_init (EvDocumentFormsIface *iface)
iface->form_field_choice_set_text = pdf_document_forms_form_field_choice_set_text;
iface->form_field_choice_get_text = pdf_document_forms_form_field_choice_get_text;
}
-#endif /* HAVE_FORMS */
+