[libgsf] openpkg: allow a NULL content type (meaning default)

[Morten Welinder <mortenw src gnome org>]

commit e92a05dd40e2f66141ca74c7bd8b30ff93087de0
Author: Morten Welinder <terra gnome org>
Date:   Sun Feb 22 13:47:54 2015 -0500

    openpkg: allow a NULL content type (meaning default)

 ChangeLog                |    6 ++++++
 NEWS                     |    1 +
 gsf/gsf-open-pkg-utils.c |    2 --
 3 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 75211d8..e767977 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-22  Morten Welinder  <terra gnome org>
+
+       * gsf/gsf-open-pkg-utils.c
+       (gsf_outfile_open_pkg_set_content_type): Allow a NULL content type
+       for when defaults cover the file.
+
 2015-02-09  Morten Welinder  <terra gnome org>
 
        * gsf/gsf-open-pkg-utils.c (gsf_open_pkg_write_content_override):
diff --git a/NEWS b/NEWS
index 72a207f..7b023c2 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ libgsf 1.14.32
 Morten:
        * Fix obscure problem with xml parser.
        * Add vml to openpkg utils.
+       * Allow NULL content type for openpkg.
        * Plug leak.
 
 --------------------------------------------------------------------------
diff --git a/gsf/gsf-open-pkg-utils.c b/gsf/gsf-open-pkg-utils.c
index 7cbb687..56f0323 100644
--- a/gsf/gsf-open-pkg-utils.c
+++ b/gsf/gsf-open-pkg-utils.c
@@ -815,8 +815,6 @@ void
 gsf_outfile_open_pkg_set_content_type (GsfOutfileOpenPkg *open_pkg,
                                       char const *content_type)
 {
-       g_return_if_fail (content_type != NULL);
-
        if (open_pkg->content_type != content_type) {
                g_free (open_pkg->content_type);
                open_pkg->content_type = g_strdup (content_type);