diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | libdocument/ev-document.c | 21 |
2 files changed, 14 insertions, 12 deletions
@@ -1,5 +1,10 @@ 2009-02-14 Christian Persch <chpe@gnome.org> + * libdocument/ev-document.c: (ev_document_info_copy): Remove + unnecessary NULL check; g_strdup() is NULL-safe. + +2009-02-14 Christian Persch <chpe@gnome.org> + * libdocument/ev-document-factory.c: (get_document_from_uri): Document that this returns either NULL and fills in error, or non-NULL. Use a local GError so we can reliably check it. diff --git a/libdocument/ev-document.c b/libdocument/ev-document.c index 63dae75..e9085be 100644 --- a/libdocument/ev-document.c +++ b/libdocument/ev-document.c @@ -239,15 +239,15 @@ ev_document_info_copy (EvDocumentInfo *info) g_return_val_if_fail (info != NULL, NULL); copy = g_new0 (EvDocumentInfo, 1); - copy->title = info->title ? g_strdup (info->title) : NULL; - copy->format = info->format ? g_strdup (info->format) : NULL; - copy->author = info->author ? g_strdup (info->author) : NULL; - copy->subject = info->subject ? g_strdup (info->subject) : NULL; - copy->keywords = info->keywords ? g_strdup (info->keywords) : NULL; - copy->security = info->security ? g_strdup (info->security) : NULL; - copy->creator = info->creator ? g_strdup (info->creator) : NULL; - copy->producer = info->producer ? g_strdup (info->producer) : NULL; - copy->linearized = info->linearized ? g_strdup (info->linearized) : NULL; + copy->title = g_strdup (info->title); + copy->format = g_strdup (info->format); + copy->author = g_strdup (info->author); + copy->subject = g_strdup (info->subject); + copy->keywords = g_strdup (info->keywords); + copy->security = g_strdup (info->security); + copy->creator = g_strdup (info->creator); + copy->producer = g_strdup (info->producer); + copy->linearized = g_strdup (info->linearized); copy->creation_date = info->creation_date; copy->modified_date = info->modified_date; @@ -298,6 +298,3 @@ ev_rect_cmp (EvRectangle *a, (ABS (a->x2 - b->x2) < EPSILON) && (ABS (a->y2 - b->y2) < EPSILON)); } - - - |