diff options
| author | Alexei Sorokin <[email protected]> | 2017-03-05 21:17:23 +0300 |
|---|---|---|
| committer | Alexei Sorokin <[email protected]> | 2017-03-05 21:17:23 +0300 |
| commit | f56979b9fe55ea7e26ef5de0ebdf9f00d0c585d9 (patch) | |
| tree | e776a7fddb929e6b0f4d61b1754c85c5ea7640b6 | |
| parent | 00fad2c0d0fcdade570a08f046e85a4558f1fc0c (diff) | |
| download | atril-f56979b9fe55ea7e26ef5de0ebdf9f00d0c585d9.tar.bz2 atril-f56979b9fe55ea7e26ef5de0ebdf9f00d0c585d9.tar.xz | |
Revert "sometimes info->linearized is not a string" and
"crash on g_free the address 0 or 1"
These hacks are no longer of need after 1a0f225
| -rw-r--r-- | libdocument/ev-document.c | 6 | ||||
| -rw-r--r-- | properties/ev-properties-view.c | 17 |
2 files changed, 3 insertions, 20 deletions
diff --git a/libdocument/ev-document.c b/libdocument/ev-document.c index b3a6c62a..e7f59ded 100644 --- a/libdocument/ev-document.c +++ b/libdocument/ev-document.c @@ -821,11 +821,7 @@ ev_document_info_free (EvDocumentInfo *info) g_free (info->keywords); g_free (info->creator); g_free (info->producer); - - if (info->linearized != 0 && info->linearized != 1) - { - g_free(info->linearized); - } + g_free (info->linearized); g_free (info->security); ev_document_license_free (info->license); diff --git a/properties/ev-properties-view.c b/properties/ev-properties-view.c index f4fab251..2209c8ba 100644 --- a/properties/ev-properties-view.c +++ b/properties/ev-properties-view.c @@ -360,21 +360,8 @@ ev_properties_view_set_info (EvPropertiesView *properties, const EvDocumentInfo set_property (properties, GTK_GRID (grid), N_PAGES_PROPERTY, text, &row); g_free (text); } - if (info->fields_mask & EV_DOCUMENT_INFO_LINEARIZED) - { - /* nice hack bro */ - if (info->linearized == 1) - { - set_property (properties, GTK_GRID (grid), LINEARIZED_PROPERTY, _("Yes"), &row); - } - else if (info->linearized == 0) - { - set_property (properties, GTK_GRID (grid), LINEARIZED_PROPERTY, _("No"), &row); - } - else - { - set_property (properties, GTK_GRID (grid), LINEARIZED_PROPERTY, info->linearized, &row); - } + if (info->fields_mask & EV_DOCUMENT_INFO_LINEARIZED) { + set_property (properties, GTK_GRID (grid), LINEARIZED_PROPERTY, info->linearized, &row); } if (info->fields_mask & EV_DOCUMENT_INFO_SECURITY) { set_property (properties, GTK_GRID (grid), SECURITY_PROPERTY, info->security, &row); |