[libgsf] Bump glib dependency to 2.36
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgsf] Bump glib dependency to 2.36
- Date: Tue, 28 Jan 2020 20:36:55 +0000 (UTC)
commit 391c6be2525e9793c2a6dc537c59c550234a8960
Author: Marc-André Lureau <marcandre lureau redhat com>
Date: Wed Jan 15 21:47:46 2020 +0400
Bump glib dependency to 2.36
2.36 was released 7 years ago, available in Debian old stable and
RHEL/CentOS 7.
Signed-off-by: Marc-André Lureau <marcandre lureau redhat com>
configure.ac | 7 +++----
doc/gsf-sections.txt | 5 -----
gsf/gsf-fwd.h | 6 ------
gsf/gsf-impl-utils.h | 1 +
gsf/gsf-infile-tar.c | 2 +-
gsf/gsf-infile-zip.c | 6 +++---
gsf/gsf-input-gzip.c | 6 +++---
gsf/gsf-input.c | 14 +++++++-------
gsf/gsf-libxml.c | 12 ++----------
gsf/gsf-msole-utils.c | 5 -----
gsf/gsf-msole-utils.h | 4 ++--
gsf/gsf-open-pkg-utils.c | 6 +++---
gsf/gsf-open-pkg-utils.h | 4 ++--
gsf/gsf-opendoc-utils.c | 2 +-
gsf/gsf-opendoc-utils.h | 12 ++++++------
gsf/gsf-outfile-msole.c | 6 +++---
gsf/gsf-outfile-zip.c | 10 +++++-----
gsf/gsf-output-csv.c | 14 +++++++-------
gsf/gsf-output-gzip.c | 6 +++---
gsf/gsf-output-iconv.c | 8 ++++----
gsf/gsf-output.c | 12 ++++++------
gsf/gsf-timestamp.h | 6 +++---
gsf/gsf-utils.c | 4 ----
gsf/gsf-zip-impl.h | 6 +++---
tests/test-msole-dup.c | 2 --
25 files changed, 68 insertions(+), 98 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a67cfa8..3a1faf9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,9 +71,9 @@ ifelse([
])
dnl Modules required for libgsf
libgsf_reqs="
- gobject-2.0 >= 2.34.0
- glib-2.0 >= 2.26.0
- gio-2.0 >= 2.26.0
+ gobject-2.0 >= 2.36.0
+ glib-2.0 >= 2.36.0
+ gio-2.0 >= 2.36.0
libxml-2.0 >= 2.4.16
"
@@ -315,7 +315,6 @@ SAVE_CFLAGS=$CFLAGS
SAVE_LIBS=$LIBS
CFLAGS="$CFLAGS $LIBGSF_CFLAGS"
LIBS="$LIBGSF_LIBS $LIBS"
-AC_CHECK_FUNCS(g_value_get_schar g_value_set_schar)
AC_MSG_CHECKING([for g_chown])
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <glib/gstdio.h>]], [[(void)g_chown("/xxx",-1,-1);]])],
[AC_DEFINE(HAVE_G_CHOWN, 1, [Define if g_chown is available as macro or function])
diff --git a/doc/gsf-sections.txt b/doc/gsf-sections.txt
index 09ed393..b2b21dd 100644
--- a/doc/gsf-sections.txt
+++ b/doc/gsf-sections.txt
@@ -716,7 +716,6 @@ GSF_DYNAMIC_CLASS_FULL
GSF_DYNAMIC_CLASS_ABSTRACT
GSF_DYNAMIC_INTERFACE
GSF_DYNAMIC_INTERFACE_FULL
-GSF_PARAM_STATIC
<SUBSECTION Errors>
GSF_ERROR
GsfError
@@ -791,10 +790,6 @@ gsf_property_settings_collect
gsf_property_settings_collect_valist
gsf_property_settings_free
-<SUBSECTION Private>
-GSF_DEPRECATED_FOR
-</SECTION>
-
<SECTION>
<FILE>metadata</FILE>
GsfDocMetaData
diff --git a/gsf/gsf-fwd.h b/gsf/gsf-fwd.h
index 0cfc4e3..949bb5b 100644
--- a/gsf/gsf-fwd.h
+++ b/gsf/gsf-fwd.h
@@ -110,12 +110,6 @@ typedef struct GsfXMLOutClass_ GsfXMLOutClass;
typedef struct _GsfBlob GsfBlob;
-#if GLIB_CHECK_VERSION(2,32,0)
-#define GSF_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f)
-#else
-#define GSF_DEPRECATED_FOR(f)
-#endif
-
G_END_DECLS
#endif /* GSF_H */
diff --git a/gsf/gsf-impl-utils.h b/gsf/gsf-impl-utils.h
index ebd7d72..0e92e0b 100644
--- a/gsf/gsf-impl-utils.h
+++ b/gsf/gsf-impl-utils.h
@@ -27,6 +27,7 @@
G_BEGIN_DECLS
+/* kept for compatibility reasons */
#define GSF_PARAM_STATIC G_PARAM_STATIC_STRINGS
/*************************************************************************/
diff --git a/gsf/gsf-infile-tar.c b/gsf/gsf-infile-tar.c
index 7141185..cf9dbe7 100644
--- a/gsf/gsf-infile-tar.c
+++ b/gsf/gsf-infile-tar.c
@@ -562,7 +562,7 @@ gsf_infile_tar_class_init (GObjectClass *gobject_class)
_("Source"),
_("The archive being interpreted"),
GSF_INPUT_TYPE,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
}
diff --git a/gsf/gsf-infile-zip.c b/gsf/gsf-infile-zip.c
index 41cbd7c..b7342ec 100644
--- a/gsf/gsf-infile-zip.c
+++ b/gsf/gsf-infile-zip.c
@@ -942,7 +942,7 @@ gsf_infile_zip_class_init (GObjectClass *gobject_class)
_("Source"),
_("The archive being interpreted"),
GSF_INPUT_TYPE,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
@@ -959,7 +959,7 @@ gsf_infile_zip_class_init (GObjectClass *gobject_class)
_("The level of compression used, zero meaning none"),
0, 10,
0,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READABLE));
g_object_class_install_property
@@ -969,7 +969,7 @@ gsf_infile_zip_class_init (GObjectClass *gobject_class)
"",
"Internal use only",
GSF_INFILE_ZIP_TYPE,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_WRITABLE |
G_PARAM_CONSTRUCT_ONLY));
}
diff --git a/gsf/gsf-input-gzip.c b/gsf/gsf-input-gzip.c
index 8b67c05..bf0b0fc 100644
--- a/gsf/gsf-input-gzip.c
+++ b/gsf/gsf-input-gzip.c
@@ -503,7 +503,7 @@ gsf_input_gzip_class_init (GObjectClass *gobject_class)
_("Raw"),
_("Whether to read compressed data with no header and no trailer"),
FALSE,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
@@ -514,7 +514,7 @@ gsf_input_gzip_class_init (GObjectClass *gobject_class)
_("Source"),
_("Where the compressed data comes from"),
GSF_INPUT_TYPE,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
/**
@@ -531,7 +531,7 @@ gsf_input_gzip_class_init (GObjectClass *gobject_class)
_("Size after decompression"),
_("The source's uncompressed size"),
-1, G_MAXINT64, -1,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
diff --git a/gsf/gsf-input.c b/gsf/gsf-input.c
index 7723ff6..020981d 100644
--- a/gsf/gsf-input.c
+++ b/gsf/gsf-input.c
@@ -128,7 +128,7 @@ gsf_input_class_init (GObjectClass *gobject_class)
_("Name"),
_("The input's name"),
NULL,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READABLE));
/**
@@ -143,7 +143,7 @@ gsf_input_class_init (GObjectClass *gobject_class)
_("Size"),
_("The input's size"),
0, G_MAXINT64, 0,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READABLE));
/**
@@ -158,7 +158,7 @@ gsf_input_class_init (GObjectClass *gobject_class)
_("EOF"),
_("End of file"),
FALSE,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READABLE));
/**
@@ -173,7 +173,7 @@ gsf_input_class_init (GObjectClass *gobject_class)
_("Remaining"),
_("Amount of data remaining"),
0, G_MAXINT64, 0,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READABLE));
/**
@@ -188,7 +188,7 @@ gsf_input_class_init (GObjectClass *gobject_class)
_("Position"),
_("The input's current position"),
0, G_MAXINT64, 0,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READABLE));
/**
@@ -206,7 +206,7 @@ gsf_input_class_init (GObjectClass *gobject_class)
_("Modification time"),
_("An optional GDateTime representing the time the input was last changed"),
G_TYPE_DATE_TIME,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READABLE));
/**
@@ -220,7 +220,7 @@ gsf_input_class_init (GObjectClass *gobject_class)
_("Container"),
_("The parent GsfInfile"),
GSF_INFILE_TYPE,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READABLE));
}
diff --git a/gsf/gsf-libxml.c b/gsf/gsf-libxml.c
index a9ef089..75e899f 100644
--- a/gsf/gsf-libxml.c
+++ b/gsf/gsf-libxml.c
@@ -30,14 +30,6 @@
#undef DEBUG_PUSH_POP
-/* Dead kittens. */
-#ifndef HAVE_G_VALUE_SET_SCHAR
-#define g_value_set_schar(v_,sc_) g_value_set_char((v_),(char)(sc_))
-#endif
-#ifndef HAVE_G_VALUE_GET_SCHAR
-#define g_value_get_schar(v_) (signed char)g_value_get_char((v_))
-#endif
-
static GObjectClass *parent_class;
static gint
@@ -1580,7 +1572,7 @@ gsf_xml_out_class_init (GsfXMLOutClass *klass)
g_param_spec_boolean ("pretty-print",
_("Pretty print"),
_("Should the output auto-indent elements to make reading easier?"),
- TRUE, GSF_PARAM_STATIC | G_PARAM_READWRITE));
+ TRUE, G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE));
g_object_class_install_property
(gobject_class, PROP_SINK,
@@ -1588,7 +1580,7 @@ gsf_xml_out_class_init (GsfXMLOutClass *klass)
_("Sink"),
_("The destination for writes"),
GSF_OUTPUT_TYPE,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
}
diff --git a/gsf/gsf-msole-utils.c b/gsf/gsf-msole-utils.c
index b13cae4..aeca25b 100644
--- a/gsf/gsf-msole-utils.c
+++ b/gsf/gsf-msole-utils.c
@@ -31,11 +31,6 @@
#include <time.h>
#include <glib/gi18n-lib.h>
-/* Dead kittens. */
-#ifndef HAVE_G_VALUE_SET_SCHAR
-#define g_value_set_schar(v_,sc_) g_value_set_char((v_),(char)(sc_))
-#endif
-
#define NO_DEBUG_OLE_PROPS
#ifndef NO_DEBUG_OLE_PROPS
#define d(code) do { code } while (0)
diff --git a/gsf/gsf-msole-utils.h b/gsf/gsf-msole-utils.h
index 57675b5..4ad266f 100644
--- a/gsf/gsf-msole-utils.h
+++ b/gsf/gsf-msole-utils.h
@@ -33,10 +33,10 @@ gboolean gsf_doc_meta_data_write_to_msole (GsfDocMetaData const *meta_data,
gboolean doc_not_component);
#ifndef GSF_DISABLE_DEPRECATED
-GSF_DEPRECATED_FOR (gsf_doc_meta_data_read_from_msole)
+G_DEPRECATED_FOR (gsf_doc_meta_data_read_from_msole)
GError *gsf_msole_metadata_read (GsfInput *in,
GsfDocMetaData *accum);
-GSF_DEPRECATED_FOR (gsf_doc_meta_data_write_to_msole)
+G_DEPRECATED_FOR (gsf_doc_meta_data_write_to_msole)
gboolean gsf_msole_metadata_write (GsfOutput *out,
GsfDocMetaData const *meta_data,
gboolean doc_not_component);
diff --git a/gsf/gsf-open-pkg-utils.c b/gsf/gsf-open-pkg-utils.c
index 9e42daf..c98ff5e 100644
--- a/gsf/gsf-open-pkg-utils.c
+++ b/gsf/gsf-open-pkg-utils.c
@@ -769,21 +769,21 @@ gsf_outfile_open_pkg_class_init (GObjectClass *gobject_class)
_("Sink"),
_("The GsfOutput that stores the Open Package content"),
GSF_OUTFILE_TYPE,
- GSF_PARAM_STATIC | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+ G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property (gobject_class, PROP_CONTENT_TYPE,
g_param_spec_string ("content-type",
_("Content type"),
_("The content type stored in the root [Content_Types].xml file"),
"",
- GSF_PARAM_STATIC | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+ G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property (gobject_class, PROP_IS_DIR,
g_param_spec_boolean ("is-dir",
_("Is Directory"),
_("Can the outfile have children"),
FALSE,
- GSF_PARAM_STATIC | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+ G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
}
GSF_CLASS (GsfOutfileOpenPkg, gsf_outfile_open_pkg,
diff --git a/gsf/gsf-open-pkg-utils.h b/gsf/gsf-open-pkg-utils.h
index 801b09c..6ce0111 100644
--- a/gsf/gsf-open-pkg-utils.h
+++ b/gsf/gsf-open-pkg-utils.h
@@ -55,9 +55,9 @@ GError *gsf_open_pkg_parse_rel_by_id (GsfXMLIn *xin, char const *id,
/* DEPRECATED in 1.14.6 */
#ifndef GSF_DISABLE_DEPRECATED
-GSF_DEPRECATED_FOR (gsf_open_pkg_open_rel_by_id)
+G_DEPRECATED_FOR (gsf_open_pkg_open_rel_by_id)
GsfInput *gsf_open_pkg_get_rel_by_type (GsfInput *opkg, char const *type);
-GSF_DEPRECATED_FOR (gsf_open_pkg_open_rel_by_id)
+G_DEPRECATED_FOR (gsf_open_pkg_open_rel_by_id)
GsfInput *gsf_open_pkg_get_rel_by_id (GsfInput *opkg, char const *id);
#endif
diff --git a/gsf/gsf-opendoc-utils.c b/gsf/gsf-opendoc-utils.c
index abf4ce3..b46ccd3 100644
--- a/gsf/gsf-opendoc-utils.c
+++ b/gsf/gsf-opendoc-utils.c
@@ -902,7 +902,7 @@ gsf_odf_out_class_init (GsfODFOutClass *klass)
0,
G_MAXINT,
100,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
}
diff --git a/gsf/gsf-opendoc-utils.h b/gsf/gsf-opendoc-utils.h
index 7bd4551..d4c2aec 100644
--- a/gsf/gsf-opendoc-utils.h
+++ b/gsf/gsf-opendoc-utils.h
@@ -143,17 +143,17 @@ gboolean gsf_doc_meta_data_write_to_odf (GsfDocMetaData const *md, gpointer out
/* For 1.15.x s/opendoc/odf/ and s/ooo/odf/ */
#ifndef GSF_DISABLE_DEPRECATED
extern GsfXMLInNS gsf_ooo_ns[]; /* use get_gsf_ooo_ns instead */
-GSF_DEPRECATED_FOR (gsf_odf_get_ns)
+G_DEPRECATED_FOR (gsf_odf_get_ns)
GsfXMLInNS *get_gsf_ooo_ns (void);
-GSF_DEPRECATED_FOR (gsf_odf_get_version_string)
+G_DEPRECATED_FOR (gsf_odf_get_version_string)
char const *get_gsf_odf_version_string (void);
-GSF_DEPRECATED_FOR (gsf_odf_get_version)
+G_DEPRECATED_FOR (gsf_odf_get_version)
short get_gsf_odf_version (void);
-GSF_DEPRECATED_FOR (gsf_doc_meta_data_read_from_odf)
+G_DEPRECATED_FOR (gsf_doc_meta_data_read_from_odf)
GError *gsf_opendoc_metadata_read (GsfInput *input, GsfDocMetaData *md);
-GSF_DEPRECATED_FOR (gsf_doc_meta_data_odf_subtree)
+G_DEPRECATED_FOR (gsf_doc_meta_data_odf_subtree)
void gsf_opendoc_metadata_subtree (GsfXMLIn *doc, GsfDocMetaData *md);
-GSF_DEPRECATED_FOR (gsf_doc_meta_data_write_to_odf)
+G_DEPRECATED_FOR (gsf_doc_meta_data_write_to_odf)
gboolean gsf_opendoc_metadata_write (gpointer output, GsfDocMetaData const *md);
#endif
diff --git a/gsf/gsf-outfile-msole.c b/gsf/gsf-outfile-msole.c
index 5a15a40..6490e74 100644
--- a/gsf/gsf-outfile-msole.c
+++ b/gsf/gsf-outfile-msole.c
@@ -803,7 +803,7 @@ gsf_outfile_msole_class_init (GObjectClass *gobject_class)
_("Sink"),
_("The destination for writes"),
GSF_OUTPUT_TYPE,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
@@ -815,7 +815,7 @@ gsf_outfile_msole_class_init (GObjectClass *gobject_class)
_("The size of the OLE's small blocks"),
8u, ZERO_PAD_BUF_SIZE,
OLE_DEFAULT_SB_SIZE,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
@@ -827,7 +827,7 @@ gsf_outfile_msole_class_init (GObjectClass *gobject_class)
_("The size of the OLE's big blocks"),
DIRENT_SIZE, ZERO_PAD_BUF_SIZE,
OLE_DEFAULT_BB_SIZE,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
diff --git a/gsf/gsf-outfile-zip.c b/gsf/gsf-outfile-zip.c
index e1e101f..0359849 100644
--- a/gsf/gsf-outfile-zip.c
+++ b/gsf/gsf-outfile-zip.c
@@ -1076,7 +1076,7 @@ gsf_outfile_zip_class_init (GObjectClass *gobject_class)
_("Sink"),
_("Where the archive is written"),
GSF_OUTPUT_TYPE,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property
@@ -1086,7 +1086,7 @@ gsf_outfile_zip_class_init (GObjectClass *gobject_class)
_("Entry Name"),
_("The filename of this member in the archive without path"),
NULL,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property
@@ -1097,7 +1097,7 @@ gsf_outfile_zip_class_init (GObjectClass *gobject_class)
_("The level of compression used, zero meaning none"),
0, 10,
GSF_ZIP_DEFLATED,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property
@@ -1109,7 +1109,7 @@ gsf_outfile_zip_class_init (GObjectClass *gobject_class)
"and -1 meaning the zlib default"),
-1, 9,
Z_DEFAULT_COMPRESSION,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property
@@ -1120,7 +1120,7 @@ gsf_outfile_zip_class_init (GObjectClass *gobject_class)
_("Whether to use zip64 format, -1 meaning automatic"),
-1, 1,
ZIP_CREATE_DEFAULT_ZIP64,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
}
diff --git a/gsf/gsf-output-csv.c b/gsf/gsf-output-csv.c
index 37ec22e..71c10a8 100644
--- a/gsf/gsf-output-csv.c
+++ b/gsf/gsf-output-csv.c
@@ -333,7 +333,7 @@ gsf_output_csv_class_init (GObjectClass *gobject_class)
_("Sink"),
_("Where the formatted output is written"),
GSF_OUTPUT_TYPE,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READWRITE));
g_object_class_install_property
@@ -343,7 +343,7 @@ gsf_output_csv_class_init (GObjectClass *gobject_class)
_("Quote"),
_("The string used for quoting fields"),
"\"",
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_CONSTRUCT |
G_PARAM_READWRITE));
@@ -355,7 +355,7 @@ gsf_output_csv_class_init (GObjectClass *gobject_class)
_("When to quote fields"),
GSF_OUTPUT_CSV_QUOTING_MODE_TYPE,
GSF_OUTPUT_CSV_QUOTING_MODE_NEVER,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_CONSTRUCT |
G_PARAM_READWRITE));
@@ -366,7 +366,7 @@ gsf_output_csv_class_init (GObjectClass *gobject_class)
_("Quoting Triggers"),
_("Characters that cause field quoting"),
NULL,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READWRITE));
g_object_class_install_property
@@ -376,7 +376,7 @@ gsf_output_csv_class_init (GObjectClass *gobject_class)
_("Quoting On Whitespace"),
_("Does initial or terminal whitespace force quoting?"),
TRUE,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READWRITE));
g_object_class_install_property
@@ -386,7 +386,7 @@ gsf_output_csv_class_init (GObjectClass *gobject_class)
_("Separator"),
_("The field separator"),
",",
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_CONSTRUCT |
G_PARAM_READWRITE));
@@ -397,7 +397,7 @@ gsf_output_csv_class_init (GObjectClass *gobject_class)
_("end-of-line"),
_("The end-of-line marker"),
"\n",
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_CONSTRUCT |
G_PARAM_READWRITE));
diff --git a/gsf/gsf-output-gzip.c b/gsf/gsf-output-gzip.c
index d132fa6..8b321d1 100644
--- a/gsf/gsf-output-gzip.c
+++ b/gsf/gsf-output-gzip.c
@@ -389,7 +389,7 @@ gsf_output_gzip_class_init (GObjectClass *gobject_class)
g_param_spec_boolean ("raw", "Raw",
"Whether to write compressed data with no header/tailer.",
FALSE,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property
@@ -398,7 +398,7 @@ gsf_output_gzip_class_init (GObjectClass *gobject_class)
g_param_spec_object ("sink", "Sink",
"Where the compressed data is written.",
GSF_OUTPUT_TYPE,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property
@@ -410,7 +410,7 @@ gsf_output_gzip_class_init (GObjectClass *gobject_class)
"and -1 meaning the zlib default"),
-1, 9,
Z_DEFAULT_COMPRESSION,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READWRITE));
parent_class = g_type_class_peek_parent (gobject_class);
diff --git a/gsf/gsf-output-iconv.c b/gsf/gsf-output-iconv.c
index 35ad10d..1480279 100644
--- a/gsf/gsf-output-iconv.c
+++ b/gsf/gsf-output-iconv.c
@@ -276,7 +276,7 @@ gsf_output_iconv_class_init (GObjectClass *gobject_class)
_("Sink"),
_("Where the converted data is written"),
GSF_OUTPUT_TYPE,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
@@ -287,7 +287,7 @@ gsf_output_iconv_class_init (GObjectClass *gobject_class)
_("Input Charset"),
_("The character set to convert from"),
"UTF-8",
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property
@@ -297,7 +297,7 @@ gsf_output_iconv_class_init (GObjectClass *gobject_class)
_("Output Charset"),
_("The character set to convert to"),
"UTF-8",
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
/**
@@ -314,7 +314,7 @@ gsf_output_iconv_class_init (GObjectClass *gobject_class)
_("Fallback"),
_("The string to use for invalid characters"),
NULL,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READWRITE));
parent_class = g_type_class_peek_parent (gobject_class);
diff --git a/gsf/gsf-output.c b/gsf/gsf-output.c
index f6f98bd..a341ffb 100644
--- a/gsf/gsf-output.c
+++ b/gsf/gsf-output.c
@@ -168,7 +168,7 @@ gsf_output_class_init (GObjectClass *gobject_class)
_("Name"),
_("The output's name"),
NULL,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READWRITE));
/**
@@ -183,7 +183,7 @@ gsf_output_class_init (GObjectClass *gobject_class)
_("Size"),
_("The output's size"),
0, G_MAXINT64, 0,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READABLE));
/**
@@ -198,7 +198,7 @@ gsf_output_class_init (GObjectClass *gobject_class)
_("Is Closed"),
_("Whether the output is closed"),
FALSE,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READABLE));
/**
@@ -213,7 +213,7 @@ gsf_output_class_init (GObjectClass *gobject_class)
_("Position"),
_("The output's current position"),
0, G_MAXINT64, 0,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READABLE));
/**
@@ -232,7 +232,7 @@ gsf_output_class_init (GObjectClass *gobject_class)
_("Modification time"),
_("An optional GDateTime representing the time the output was last changed"),
G_TYPE_DATE_TIME,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_CONSTRUCT_ONLY |
G_PARAM_READWRITE));
@@ -247,7 +247,7 @@ gsf_output_class_init (GObjectClass *gobject_class)
_("Container"),
_("The parent GsfOutfile"),
GSF_OUTFILE_TYPE,
- GSF_PARAM_STATIC |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_READWRITE));
}
diff --git a/gsf/gsf-timestamp.h b/gsf/gsf-timestamp.h
index e453426..915dc1e 100644
--- a/gsf/gsf-timestamp.h
+++ b/gsf/gsf-timestamp.h
@@ -57,11 +57,11 @@ void gsf_timestamp_to_value (GsfTimestamp const *stamp, GValue *value);
/* Deprecated */
#ifndef GSF_DISABLE_DEPRECATED
-GSF_DEPRECATED_FOR(gsf_timestamp_to_value)
+G_DEPRECATED_FOR(gsf_timestamp_to_value)
void gsf_value_set_timestamp (GValue *value, GsfTimestamp const *stamp);
-GSF_DEPRECATED_FOR(gsf_timestamp_load_from_string)
+G_DEPRECATED_FOR(gsf_timestamp_load_from_string)
int gsf_timestamp_from_string (char const *spec, GsfTimestamp *stamp);
-GSF_DEPRECATED_FOR(gsf_timestamp_load_from_string)
+G_DEPRECATED_FOR(gsf_timestamp_load_from_string)
int gsf_timestamp_parse (char const *spec, GsfTimestamp *stamp);
#endif
diff --git a/gsf/gsf-utils.c b/gsf/gsf-utils.c
index 4534334..8906405 100644
--- a/gsf/gsf-utils.c
+++ b/gsf/gsf-utils.c
@@ -112,10 +112,6 @@ gsf_init (void)
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
#endif
-#if !GLIB_CHECK_VERSION(2,36,0)
- g_type_init ();
-#endif
-
#ifdef _GSF_GTYPE_THREADING_FIXED
if (NULL == static_type_module) {
static_type_module = g_object_new (gsf_dummy_type_module_get_type(), NULL);
diff --git a/gsf/gsf-zip-impl.h b/gsf/gsf-zip-impl.h
index 58088cf..f94c18f 100644
--- a/gsf/gsf-zip-impl.h
+++ b/gsf/gsf-zip-impl.h
@@ -166,12 +166,12 @@ GsfZipVDir *gsf_zip_vdir_new (char const *name, gboolean is_directory,
void gsf_zip_vdir_free (GsfZipVDir *vdir, gboolean free_dirent);
void gsf_zip_vdir_add_child (GsfZipVDir *vdir, GsfZipVDir *child);
#ifndef GSF_DISABLE_DEPRECATED
-GSF_DEPRECATED_FOR(gsf_zip_vdir_new)
+G_DEPRECATED_FOR(gsf_zip_vdir_new)
GsfZipVDir *gsf_vdir_new (char const *name, gboolean is_directory,
GsfZipDirent *dirent);
-GSF_DEPRECATED_FOR(gsf_zip_vdir_free)
+G_DEPRECATED_FOR(gsf_zip_vdir_free)
void gsf_vdir_free (GsfZipVDir *vdir, gboolean free_dirent);
-GSF_DEPRECATED_FOR(gsf_zip_vdir_add_child)
+G_DEPRECATED_FOR(gsf_zip_vdir_add_child)
void gsf_vdir_add_child (GsfZipVDir *vdir, GsfZipVDir *child);
#endif
diff --git a/tests/test-msole-dup.c b/tests/test-msole-dup.c
index 2e56864..db8ca47 100644
--- a/tests/test-msole-dup.c
+++ b/tests/test-msole-dup.c
@@ -23,8 +23,6 @@ main (int argc, char **argv)
(void)argc;
(void)argv;
- g_type_init();
-
out = gsf_output_stdio_new("teststg", NULL);
outf = gsf_outfile_msole_new(out);
outchild = gsf_outfile_new_child(outf, "small", false);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
