diff options
| author | Carlos Garcia Campos <carlosgc@gnome.org> | 2007-07-19 17:48:25 (GMT) |
|---|---|---|
| committer | Carlos Garcia Campos <carlosgc@src.gnome.org> | 2007-07-19 17:48:25 (GMT) |
| commit | f00d7c5897477b0b2bfa7ff7229c443ebb81a855 (patch) | |
| tree | 4913b9eead1d537684df450d8ca55ef7fe0b190e | |
| parent | 0606618980b8d31db5779ae35f5c4cf61a313da4 (diff) | |
Fix build with current poppler cvs head.
2007-07-19 Carlos Garcia Campos <carlosgc@gnome.org>
* backend/pdf/ev-poppler.cc: (ev_form_field_from_poppler_field):
* libdocument/ev-form-field.h:
* shell/ev-view.c: (ev_view_form_field_text_create_widget):
Fix build with current poppler cvs head.
svn path=/trunk/; revision=2574
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | backend/pdf/ev-poppler.cc | 4 | ||||
| -rw-r--r-- | libdocument/ev-form-field.h | 2 | ||||
| -rw-r--r-- | shell/ev-view.c | 6 |
4 files changed, 12 insertions, 8 deletions
@@ -1,3 +1,11 @@ +2007-07-19 Carlos Garcia Campos <carlosgc@gnome.org> + + * backend/pdf/ev-poppler.cc: (ev_form_field_from_poppler_field): + * libdocument/ev-form-field.h: + * shell/ev-view.c: (ev_view_form_field_text_create_widget): + + Fix build with current poppler cvs head. + 2007-07-11 Carlos Garcia Campos <carlosgc@gnome.org> * cut-n-paste/zoom-control/ephy-zoom-control.c: diff --git a/backend/pdf/ev-poppler.cc b/backend/pdf/ev-poppler.cc index 3b3fe2b..1c9f4ea 100644 --- a/backend/pdf/ev-poppler.cc +++ b/backend/pdf/ev-poppler.cc @@ -1829,9 +1829,6 @@ ev_form_field_from_poppler_field (PopplerFormField *poppler_field) case POPPLER_FORM_TEXT_MULTILINE: ev_text_type = EV_FORM_FIELD_TEXT_MULTILINE; break; - case POPPLER_FORM_TEXT_PASSWORD: - ev_text_type = EV_FORM_FIELD_TEXT_PASSWORD; - break; case POPPLER_FORM_TEXT_FILE_SELECT: ev_text_type = EV_FORM_FIELD_TEXT_FILE_SELECT; break; @@ -1843,6 +1840,7 @@ ev_form_field_from_poppler_field (PopplerFormField *poppler_field) field_text->do_spell_check = poppler_form_field_text_do_spell_check (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); field_text->text = poppler_form_field_text_get_text (poppler_field); diff --git a/libdocument/ev-form-field.h b/libdocument/ev-form-field.h index 1405999..0b09af9 100644 --- a/libdocument/ev-form-field.h +++ b/libdocument/ev-form-field.h @@ -81,7 +81,6 @@ typedef enum { EV_FORM_FIELD_TEXT_NORMAL, EV_FORM_FIELD_TEXT_MULTILINE, - EV_FORM_FIELD_TEXT_PASSWORD, EV_FORM_FIELD_TEXT_FILE_SELECT } EvFormFieldTextType; @@ -125,6 +124,7 @@ struct _EvFormFieldText gboolean do_scroll : 1; gboolean comb : 1; gboolean is_rich_text : 1; + gboolean is_password; gint max_len; gchar *text; diff --git a/shell/ev-view.c b/shell/ev-view.c index 2486bcd..d02d885 100644 --- a/shell/ev-view.c +++ b/shell/ev-view.c @@ -1774,12 +1774,10 @@ ev_view_form_field_text_create_widget (EvView *view, case EV_FORM_FIELD_TEXT_FILE_SELECT: /* TODO */ case EV_FORM_FIELD_TEXT_NORMAL: - case EV_FORM_FIELD_TEXT_PASSWORD: text = gtk_entry_new (); gtk_entry_set_has_frame (GTK_ENTRY (text), FALSE); gtk_entry_set_max_length (GTK_ENTRY (text), field_text->max_len); - gtk_entry_set_visibility (GTK_ENTRY (text), - !(field_text->type == EV_FORM_FIELD_TEXT_PASSWORD)); + gtk_entry_set_visibility (GTK_ENTRY (text), !field_text->is_password); if (txt) { gtk_entry_set_text (GTK_ENTRY (text), txt); @@ -1798,7 +1796,7 @@ ev_view_form_field_text_create_widget (EvView *view, text = gtk_text_view_new (); buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text)); - + if (txt) { gtk_text_buffer_set_text (buffer, txt, -1); g_free (txt); |