X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=libdocument%2Fev-document.c;h=b770f1092f34ee2dd73992dbd5fc798dbf0d0e84;hb=5f554d8e362a35e05840068e1b3ea935be5d3c47;hp=38c12f2fd92f15688bd52a16e25571cde2a3ded7;hpb=c218c0fc841709a869f41e538ccf38df4d48d175;p=evince.git

diff --git a/libdocument/ev-document.c b/libdocument/ev-document.c
index 38c12f2f..b770f109 100644
--- a/libdocument/ev-document.c
+++ b/libdocument/ev-document.c
@@ -262,6 +262,8 @@ ev_document_load (EvDocument  *document,
 			if (i == 0) {
 				priv->uniform_width = page_width;
 				priv->uniform_height = page_height;
+				priv->max_width = priv->uniform_width;
+				priv->max_height = priv->uniform_height;
 			} else if (priv->uniform &&
 				   (priv->uniform_width != page_width ||
 				    priv->uniform_height != page_height)) {
@@ -310,11 +312,6 @@ ev_document_load (EvDocument  *document,
 
 			g_object_unref (page);
 		}
-
-		if (priv->uniform) {
-			priv->max_width = priv->uniform_width;
-			priv->max_height = priv->uniform_height;
-		}
 	}
 
 	return retval;
@@ -581,6 +578,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;
@@ -601,10 +600,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)