[windows] Define WIFEXITED and WEXITSTATUS on Windows

[evince.git] / libdocument / ev-document.c

diff --git a/libdocument/ev-document.c b/libdocument/ev-document.c
index 985fe8032417b963a39ca1253031abee1e7f6bed..c1262933268517a6eafd6be84bd5ea9390a36f5c 100644 (file)
--- a/libdocument/ev-document.c
+++ b/libdocument/ev-document.c
@@ -248,7 +248,6 @@ ev_document_load (EvDocument  *document,
                 */
                priv->uri = g_strdup (uri);
                priv->n_pages = _ev_document_get_n_pages (document);
-               priv->info = _ev_document_get_info (document);
 
                for (i = 0; i < priv->n_pages; i++) {
                        EvPage     *page = ev_document_get_page (document, i);
@@ -294,24 +293,18 @@ ev_document_load (EvDocument  *document,
 
                        page_label = _ev_document_get_page_label (document, page);
                        if (page_label) {
-                               if (priv->page_labels) {
-                                       priv->page_labels[i] = page_label;
-                               } else {
-                                       gchar *numeric_label;
-
-                                       numeric_label = g_strdup_printf ("%d", i + 1);
-                                       if (strcmp (numeric_label, page_label) != 0) {
-                                               priv->page_labels = g_new0 (gchar *, priv->n_pages);
-                                               priv->page_labels[i] = page_label;
-                                       }
-                                       g_free (numeric_label);
-                               }
+                               if (!priv->page_labels)
+                                       priv->page_labels = g_new0 (gchar *, priv->n_pages);
+
+                               priv->page_labels[i] = page_label;
                                priv->max_label = MAX (priv->max_label,
                                                       g_utf8_strlen (page_label, 256));
                        }
 
                        g_object_unref (page);
                }
+
+               priv->info = _ev_document_get_info (document);
        }
 
        return retval;
@@ -578,6 +571,8 @@ ev_document_info_copy (EvDocumentInfo *info)
        copy->ui_hints = info->ui_hints;
        copy->permissions = info->permissions;
        copy->n_pages = info->n_pages;
+       copy->license = ev_document_license_copy (info->license);
+
        copy->fields_mask = info->fields_mask;
 
        return copy;
@@ -598,10 +593,71 @@ ev_document_info_free (EvDocumentInfo *info)
        g_free (info->producer);
        g_free (info->linearized);
        g_free (info->security);
-       
+       ev_document_license_free (info->license);
+
        g_free (info);
 }
 
+/* EvDocumentLicense */
+EV_DEFINE_BOXED_TYPE (EvDocumentLicense, ev_document_license, ev_document_license_copy, ev_document_license_free)
+
+EvDocumentLicense *
+ev_document_license_new (void)
+{
+       return g_new0 (EvDocumentLicense, 1);
+}
+
+EvDocumentLicense *
+ev_document_license_copy (EvDocumentLicense *license)
+{
+       EvDocumentLicense *new_license;
+
+       if (!license)
+               return NULL;
+
+       new_license = ev_document_license_new ();
+
+       if (license->text)
+               new_license->text = g_strdup (license->text);
+       if (license->uri)
+               new_license->uri = g_strdup (license->uri);
+       if (license->web_statement)
+               new_license->web_statement = g_strdup (license->web_statement);
+
+       return new_license;
+}
+
+void
+ev_document_license_free (EvDocumentLicense *license)
+{
+       if (!license)
+               return;
+
+       g_free (license->text);
+       g_free (license->uri);
+       g_free (license->web_statement);
+
+       g_free (license);
+}
+
+const gchar *
+ev_document_license_get_text (EvDocumentLicense *license)
+{
+       return license->text;
+}
+
+const gchar *
+ev_document_license_get_uri (EvDocumentLicense *license)
+{
+       return license->uri;
+}
+
+const gchar *
+ev_document_license_get_web_statement (EvDocumentLicense *license)
+{
+       return license->web_statement;
+}
+
 /* EvRectangle */
 EV_DEFINE_BOXED_TYPE (EvRectangle, ev_rectangle, ev_rectangle_copy, ev_rectangle_free)