updated cc licenses to 2.5

(bzr r637)

3 files changed, 16 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 4b9af61e4..a38a78bcc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-29  Jon Phillips  <jon@rejon.org>
+
+	* src/dialogs/rdf.cpp: Updated cc licenses to 2.5 by default.
+
+	* src/ui/dialog/document-metadata.cpp: Made metadata window
+	resizable so that one can see the licenses and enter long entries.
+
 2006-04-29  MenTaLguY  <mental@rydia.net>
 
 	* src/display/nr-arena-group.cpp, src/display/nr-arena-item.cpp,
diff --git a/src/dialogs/rdf.cpp b/src/dialogs/rdf.cpp
index 4f86264c4..df89ee648 100644
--- a/src/dialogs/rdf.cpp
+++ b/src/dialogs/rdf.cpp
@@ -5,8 +5,10 @@
  *
  * Authors:
  *   Kees Cook <kees@outflux.net>
+ *   Jon Phillips <jon@rejon.org>
  *
  * Copyright (C) 2004 Kees Cook <kees@outflux.net>
+ * Copyright (C) 2006 Jon Phillips <jon@rejon.org>
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  *
@@ -174,32 +176,32 @@ struct rdf_double_t rdf_license_freeart [] = {
 
 struct rdf_license_t rdf_licenses [] = {
     { _("CC Attribution"), 
-      "http://creativecommons.org/licenses/by/2.0/",
+      "http://creativecommons.org/licenses/by/2.5/",
       rdf_license_cc_a,
     },
 
     { _("CC Attribution-ShareAlike"), 
-      "http://creativecommons.org/licenses/by-sa/2.0/",
+      "http://creativecommons.org/licenses/by-sa/2.5/",
       rdf_license_cc_a_sa,
     },
 
     { _("CC Attribution-NoDerivs"), 
-      "http://creativecommons.org/licenses/by-nd/2.0/",
+      "http://creativecommons.org/licenses/by-nd/2.5/",
       rdf_license_cc_a_nd,
     },
 
     { _("CC Attribution-NonCommercial"), 
-      "http://creativecommons.org/licenses/by-nc/2.0/",
+      "http://creativecommons.org/licenses/by-nc/2.5/",
       rdf_license_cc_a_nc,
     },
 
     { _("CC Attribution-NonCommercial-ShareAlike"), 
-      "http://creativecommons.org/licenses/by-nc-sa/2.0/",
+      "http://creativecommons.org/licenses/by-nc-sa/2.5/",
       rdf_license_cc_a_nc_sa,
     },
 
     { _("CC Attribution-NonCommercial-NoDerivs"), 
-      "http://creativecommons.org/licenses/by-nc-nd/2.0/",
+      "http://creativecommons.org/licenses/by-nc-nd/2.5/",
       rdf_license_cc_a_nc_nd,
     },
 
diff --git a/src/ui/dialog/document-metadata.cpp b/src/ui/dialog/document-metadata.cpp
index 090cb42ca..7c845e70f 100644
--- a/src/ui/dialog/document-metadata.cpp
+++ b/src/ui/dialog/document-metadata.cpp
@@ -87,7 +87,7 @@ DocumentMetadata::DocumentMetadata()
       _prefs_path("dialogs.documentmetadata")
 {
     hide();
-    set_resizable (false);
+    set_resizable (true);
     _tt.enable();
     get_vbox()->set_spacing (4);
     get_vbox()->pack_start (_notebook, true, true);