diff options
| author | Glenn Rice <glennricster@gmail.com> | 2012-12-24 10:11:50 -0600 |
|---|---|---|
| committer | Glenn Rice <glennricster@gmail.com> | 2012-12-24 10:11:50 -0600 |
| commit | 6f7dbe45e8d35b986af05d8fcb84b4a787fc8fe2 (patch) | |
| tree | 60faef19c3291c597cdc97c7f296f5bfa125afda | |
| parent | a26a2a4e0d8a03242699e3d4f6fe1c8b8499077e (diff) | |
g_type_init is deprecated in newer version of glib so check for that.
Change the file name of poppler-glib_extra.defs to
poppler-glib_signal.defs to be consistent with upstream changes to
mm-common.
| -rw-r--r-- | codegen/extradefs/generate_extra_defs_poppler-glib.cc | 2 | ||||
| -rw-r--r-- | poppler-glib/src/filelist.am | 2 | ||||
| -rw-r--r-- | poppler-glib/src/poppler-glib.defs | 2 | ||||
| -rw-r--r-- | poppler-glib/src/poppler-glib_signal.defs (renamed from poppler-glib/src/poppler-glib_extra.defs) | 0 |
4 files changed, 4 insertions, 2 deletions
diff --git a/codegen/extradefs/generate_extra_defs_poppler-glib.cc b/codegen/extradefs/generate_extra_defs_poppler-glib.cc index 413c24a..ad12606 100644 --- a/codegen/extradefs/generate_extra_defs_poppler-glib.cc +++ b/codegen/extradefs/generate_extra_defs_poppler-glib.cc @@ -22,7 +22,9 @@ int main(int, char**) { +#if !GLIB_CHECK_VERSION(2,35,1) g_type_init(); +#endif std::cout << get_defs(POPPLER_TYPE_ACTION) diff --git a/poppler-glib/src/filelist.am b/poppler-glib/src/filelist.am index 31d9489..bd57467 100644 --- a/poppler-glib/src/filelist.am +++ b/poppler-glib/src/filelist.am @@ -3,7 +3,7 @@ files_defs = \ poppler-glib.defs \ poppler-glib_enum.defs \ - poppler-glib_extra.defs \ + poppler-glib_signal.defs \ poppler-glib_method.defs \ poppler-glib_docs.xml \ poppler-glib_docs_override.xml diff --git a/poppler-glib/src/poppler-glib.defs b/poppler-glib/src/poppler-glib.defs index 66466ec..0589bfa 100644 --- a/poppler-glib/src/poppler-glib.defs +++ b/poppler-glib/src/poppler-glib.defs @@ -1,4 +1,4 @@ ;; Include generated API definition files (include poppler-glib_enum.defs) (include poppler-glib_method.defs) -(include poppler-glib_extra.defs) +(include poppler-glib_signal.defs) diff --git a/poppler-glib/src/poppler-glib_extra.defs b/poppler-glib/src/poppler-glib_signal.defs index 1372cf9..1372cf9 100644 --- a/poppler-glib/src/poppler-glib_extra.defs +++ b/poppler-glib/src/poppler-glib_signal.defs |