diff -Nru yelp-3.36.0/aclocal.m4 yelp-3.36.2/aclocal.m4 --- yelp-3.36.0/aclocal.m4 2020-03-07 00:03:58.000000000 +0000 +++ yelp-3.36.2/aclocal.m4 2020-11-21 19:05:16.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.2 -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -540,7 +540,7 @@ [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) ])dnl PKG_HAVE_DEFINE_WITH_MODULES -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -555,7 +555,7 @@ [am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.16.1], [], +m4_if([$1], [1.16.2], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -571,14 +571,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.16.1])dnl +[AM_AUTOMAKE_VERSION([1.16.2])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -630,7 +630,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -661,7 +661,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -852,7 +852,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -891,7 +891,9 @@ done if test $am_rc -ne 0; then AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE="gmake" (or whatever is + necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking).]) fi @@ -918,7 +920,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1115,7 +1117,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1136,7 +1138,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1158,7 +1160,7 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1193,7 +1195,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1236,7 +1238,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1275,7 +1277,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1304,7 +1306,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1351,7 +1353,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1370,7 +1372,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1451,7 +1453,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1511,7 +1513,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1539,7 +1541,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1558,7 +1560,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru yelp-3.36.0/build-aux/compile yelp-3.36.2/build-aux/compile --- yelp-3.36.0/build-aux/compile 2020-03-07 00:04:00.000000000 +0000 +++ yelp-3.36.2/build-aux/compile 2020-11-21 19:05:17.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) diff -Nru yelp-3.36.0/build-aux/depcomp yelp-3.36.2/build-aux/depcomp --- yelp-3.36.0/build-aux/depcomp 2020-03-07 00:04:00.000000000 +0000 +++ yelp-3.36.2/build-aux/depcomp 2020-11-21 19:05:17.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -Nru yelp-3.36.0/build-aux/install-sh yelp-3.36.2/build-aux/install-sh --- yelp-3.36.0/build-aux/install-sh 2020-03-07 00:04:00.000000000 +0000 +++ yelp-3.36.2/build-aux/install-sh 2020-11-21 19:05:17.000000000 +0000 @@ -451,7 +451,18 @@ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + (umask $cp_umask && + { test -z "$stripcmd" || { + # Create $dsttmp read-write so that cp doesn't create it read-only, + # which would cause strip to fail. + if test -z "$doit"; then + : >"$dsttmp" # No need to fork-exec 'touch'. + else + $doit touch "$dsttmp" + fi + } + } && + $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # diff -Nru yelp-3.36.0/build-aux/missing yelp-3.36.2/build-aux/missing --- yelp-3.36.0/build-aux/missing 2020-03-07 00:04:00.000000000 +0000 +++ yelp-3.36.2/build-aux/missing 2020-11-21 19:05:17.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify diff -Nru yelp-3.36.0/configure yelp-3.36.2/configure --- yelp-3.36.0/configure 2020-03-07 00:03:59.000000000 +0000 +++ yelp-3.36.2/configure 2020-11-21 19:05:16.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Yelp 3.36.0. +# Generated by GNU Autoconf 2.69 for Yelp 3.36.2. # # Report bugs to . # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='Yelp' PACKAGE_TARNAME='yelp' -PACKAGE_VERSION='3.36.0' -PACKAGE_STRING='Yelp 3.36.0' +PACKAGE_VERSION='3.36.2' +PACKAGE_STRING='Yelp 3.36.2' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=yelp' PACKAGE_URL='' @@ -1420,7 +1420,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Yelp 3.36.0 to adapt to many kinds of systems. +\`configure' configures Yelp 3.36.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1490,7 +1490,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Yelp 3.36.0:";; + short | recursive ) echo "Configuration of Yelp 3.36.2:";; esac cat <<\_ACEOF @@ -1648,7 +1648,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Yelp configure 3.36.0 +Yelp configure 3.36.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1926,7 +1926,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Yelp $as_me 3.36.0, which was +It was created by Yelp $as_me 3.36.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2796,7 +2796,7 @@ # Define the identity of the package. PACKAGE='yelp' - VERSION='3.36.0' + VERSION='3.36.2' cat >>confdefs.h <<_ACEOF @@ -18567,7 +18567,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Yelp $as_me 3.36.0, which was +This file was extended by Yelp $as_me 3.36.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18633,7 +18633,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Yelp config.status 3.36.0 +Yelp config.status 3.36.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -19743,7 +19743,9 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE=\"gmake\" (or whatever is + necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking). See \`config.log' for more details" "$LINENO" 5; } diff -Nru yelp-3.36.0/configure.ac yelp-3.36.2/configure.ac --- yelp-3.36.0/configure.ac 2020-03-06 23:55:56.000000000 +0000 +++ yelp-3.36.2/configure.ac 2020-11-21 19:02:45.000000000 +0000 @@ -1,5 +1,5 @@ AC_PREREQ([2.63]) -AC_INIT([Yelp],[3.36.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=yelp],[yelp]) +AC_INIT([Yelp],[3.36.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=yelp],[yelp]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_SRCDIR([src/yelp.c]) diff -Nru yelp-3.36.0/data/domains/yelp.xml yelp-3.36.2/data/domains/yelp.xml --- yelp-3.36.0/data/domains/yelp.xml 2017-09-25 21:06:28.000000000 +0000 +++ yelp-3.36.2/data/domains/yelp.xml 2020-09-25 19:34:37.000000000 +0000 @@ -17,6 +17,7 @@ Instalacija Instal·la Instal·la + دامەزرێنە Instalovat Installér installieren @@ -26,7 +27,7 @@ Instalar Paigalda Instalatu -نصب Install +نصب Asenna Installer Instale @@ -36,11 +37,13 @@ સ્થાપિત કરો התקנת संस्थापित करें +Instaliraj telepítése Pasang Setja upp Installa をインストールします +Орнату ដំឡើង ಅನ್ನು ಅನುಸ್ಥಾಪಿಸು 설치 @@ -49,12 +52,14 @@ Instalēt ഇന്‍സ്റ്റോള്‍ इंस्टॉल करा +Pasang Installer + स्थापना गर्नुहोस् installeren Installar ସ୍ଥାପନ କରନ୍ତୁ ਇੰਸਟਾਲ -Zainstaluj +Zainstaluj „” Instalar Instalar Instalează diff -Nru yelp-3.36.0/debian/changelog yelp-3.36.2/debian/changelog --- yelp-3.36.0/debian/changelog 2020-04-07 20:15:37.000000000 +0000 +++ yelp-3.36.2/debian/changelog 2021-04-06 13:20:45.000000000 +0000 @@ -1,3 +1,9 @@ +yelp (3.36.2-0ubuntu1) focal; urgency=medium + + * New stable version (lp: #1922729) + + -- Sebastien Bacher Tue, 06 Apr 2021 15:20:45 +0200 + yelp (3.36.0-1) unstable; urgency=medium * Upload to unstable diff -Nru yelp-3.36.0/debian/patches/disable_package_search.patch yelp-3.36.2/debian/patches/disable_package_search.patch --- yelp-3.36.0/debian/patches/disable_package_search.patch 2020-04-07 20:15:37.000000000 +0000 +++ yelp-3.36.2/debian/patches/disable_package_search.patch 2021-04-06 13:20:45.000000000 +0000 @@ -14,11 +14,11 @@ libyelp/yelp-view.c | 4 ---- 1 file changed, 4 deletions(-) -diff --git a/libyelp/yelp-view.c b/libyelp/yelp-view.c -index 183506e..f9da4fb 100644 ---- a/libyelp/yelp-view.c -+++ b/libyelp/yelp-view.c -@@ -1987,10 +1987,6 @@ view_show_error_page (YelpView *view, +Index: yelp-3.36.2/libyelp/yelp-view.c +=================================================================== +--- yelp-3.36.2.orig/libyelp/yelp-view.c ++++ yelp-3.36.2/libyelp/yelp-view.c +@@ -1988,10 +1988,6 @@ view_show_error_page (YelpView *view, scheme = "ghelp"; pkg = struri + 6; } diff -Nru yelp-3.36.0/docs/libyelp/html/api-index-full.html yelp-3.36.2/docs/libyelp/html/api-index-full.html --- yelp-3.36.0/docs/libyelp/html/api-index-full.html 2020-03-07 00:06:44.000000000 +0000 +++ yelp-3.36.2/docs/libyelp/html/api-index-full.html 2020-11-21 19:05:21.000000000 +0000 @@ -7,7 +7,7 @@ - + @@ -90,10 +90,6 @@
-YelpDocumentPriv, struct in YelpDocument -
-
-
YelpDocumentSignal, enum in YelpDocument
@@ -351,10 +347,6 @@
-YelpSettingsPriv, struct in YelpSettings -
-
-
yelp_settings_cmp_icons, function in YelpSettings
@@ -443,10 +435,6 @@
-YelpSimpleDocumentPriv, struct in YelpSimpleDocument -
-
-
yelp_simple_document_new, function in YelpSimpleDocument
@@ -679,6 +667,6 @@
-
Generated by GTK-Doc V1.29
+
Generated by GTK-Doc V1.33.0 \ No newline at end of file diff -Nru yelp-3.36.0/docs/libyelp/html/ch01.html yelp-3.36.2/docs/libyelp/html/ch01.html --- yelp-3.36.0/docs/libyelp/html/ch01.html 2020-03-07 00:06:44.000000000 +0000 +++ yelp-3.36.2/docs/libyelp/html/ch01.html 2020-11-21 19:05:21.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -50,6 +50,6 @@ Widgets
-
Generated by GTK-Doc V1.29
+
Generated by GTK-Doc V1.33.0 \ No newline at end of file diff -Nru yelp-3.36.0/docs/libyelp/html/ch01s02.html yelp-3.36.2/docs/libyelp/html/ch01s02.html --- yelp-3.36.0/docs/libyelp/html/ch01s02.html 2020-03-07 00:06:44.000000000 +0000 +++ yelp-3.36.2/docs/libyelp/html/ch01s02.html 2020-11-21 19:05:21.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -22,6 +22,6 @@

Document Processing

-
Generated by GTK-Doc V1.29
+
Generated by GTK-Doc V1.33.0 \ No newline at end of file diff -Nru yelp-3.36.0/docs/libyelp/html/index.html yelp-3.36.2/docs/libyelp/html/index.html --- yelp-3.36.0/docs/libyelp/html/index.html 2020-03-07 00:06:44.000000000 +0000 +++ yelp-3.36.2/docs/libyelp/html/index.html 2020-11-21 19:05:21.000000000 +0000 @@ -6,7 +6,7 @@ - + @@ -14,7 +14,7 @@
-

for libyelp 3.36.0 +

for libyelp 3.36.2

@@ -50,6 +50,6 @@
-
Generated by GTK-Doc V1.29
+
Generated by GTK-Doc V1.33.0 \ No newline at end of file diff -Nru yelp-3.36.0/docs/libyelp/html/libyelp.devhelp2 yelp-3.36.2/docs/libyelp/html/libyelp.devhelp2 --- yelp-3.36.0/docs/libyelp/html/libyelp.devhelp2 2020-03-07 00:06:44.000000000 +0000 +++ yelp-3.36.2/docs/libyelp/html/libyelp.devhelp2 2020-11-21 19:05:21.000000000 +0000 @@ -72,11 +72,9 @@ - - @@ -119,7 +117,6 @@ - diff -Nru yelp-3.36.0/docs/libyelp/html/libyelp-yelp-error.html yelp-3.36.2/docs/libyelp/html/libyelp-yelp-error.html --- yelp-3.36.0/docs/libyelp/html/libyelp-yelp-error.html 2020-03-07 00:06:44.000000000 +0000 +++ yelp-3.36.2/docs/libyelp/html/libyelp-yelp-error.html 2020-11-21 19:05:21.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -35,8 +35,8 @@

Functions

--++
@@ -52,8 +52,8 @@

Types and Values

--++ @@ -124,6 +124,6 @@
-
Generated by GTK-Doc V1.29
+
Generated by GTK-Doc V1.33.0 \ No newline at end of file diff -Nru yelp-3.36.0/docs/libyelp/html/object-tree.html yelp-3.36.2/docs/libyelp/html/object-tree.html --- yelp-3.36.0/docs/libyelp/html/object-tree.html 2020-03-07 00:06:44.000000000 +0000 +++ yelp-3.36.2/docs/libyelp/html/object-tree.html 2020-11-21 19:05:21.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -50,6 +50,6 @@
-
Generated by GTK-Doc V1.29
+
Generated by GTK-Doc V1.33.0 \ No newline at end of file diff -Nru yelp-3.36.0/docs/libyelp/html/style.css yelp-3.36.2/docs/libyelp/html/style.css --- yelp-3.36.0/docs/libyelp/html/style.css 2020-03-07 00:06:44.000000000 +0000 +++ yelp-3.36.2/docs/libyelp/html/style.css 2020-11-21 19:05:21.000000000 +0000 @@ -61,18 +61,6 @@ color: #729fcf; } -div.informaltable table -{ - border-collapse: separate; - border-spacing: 1em 0.3em; - border: none; -} - -div.informaltable table td, div.informaltable table th -{ - vertical-align: top; -} - .function_type, .variable_type, .property_type, @@ -127,6 +115,7 @@ margin: 0.25em; } +div.informaltable table[border="1"], div.table table { border-collapse: collapse; @@ -135,6 +124,8 @@ border: solid 1px #babdb6; } +div.informaltable table[border="1"] td, +div.informaltable table th, div.table table td, div.table table th { /* tango:aluminium 3 */ @@ -143,6 +134,7 @@ vertical-align: top; } +div.informaltable table[border="1"] th, div.table table th { /* tango:aluminium 2 */ @@ -293,29 +285,11 @@ font-weight: normal; } -acronym,abbr +acronym,abbr { border-bottom: 1px dotted gray; } -/* code listings */ - -.listing_code .programlisting .normal, -.listing_code .programlisting .normal a, -.listing_code .programlisting .number, -.listing_code .programlisting .cbracket, -.listing_code .programlisting .symbol { color: #555753; } -.listing_code .programlisting .comment, -.listing_code .programlisting .linenum { color: #babdb6; } /* tango: aluminium 3 */ -.listing_code .programlisting .function, -.listing_code .programlisting .function a, -.listing_code .programlisting .preproc { color: #204a87; } /* tango: sky blue 3 */ -.listing_code .programlisting .string { color: #ad7fa8; } /* tango: plum */ -.listing_code .programlisting .keyword, -.listing_code .programlisting .usertype, -.listing_code .programlisting .type, -.listing_code .programlisting .type a { color: #4e9a06; } /* tango: chameleon 3 */ - .listing_frame { /* tango:sky blue 1 */ border: solid 1px #729fcf; @@ -481,3 +455,71 @@ } } +.hll { background-color: #ffffcc } +.c { color: #408080; font-style: italic } /* Comment */ +.err { border: 1px solid #FF0000 } /* Error */ +.k { color: #008000; font-weight: bold } /* Keyword */ +.o { color: #666666 } /* Operator */ +.ch { color: #408080; font-style: italic } /* Comment.Hashbang */ +.cm { color: #408080; font-style: italic } /* Comment.Multiline */ +.cp { color: #BC7A00 } /* Comment.Preproc */ +.cpf { color: #408080; font-style: italic } /* Comment.PreprocFile */ +.c1 { color: #408080; font-style: italic } /* Comment.Single */ +.cs { color: #408080; font-style: italic } /* Comment.Special */ +.gd { color: #A00000 } /* Generic.Deleted */ +.ge { font-style: italic } /* Generic.Emph */ +.gr { color: #FF0000 } /* Generic.Error */ +.gh { color: #000080; font-weight: bold } /* Generic.Heading */ +.gi { color: #00A000 } /* Generic.Inserted */ +.go { color: #888888 } /* Generic.Output */ +.gp { color: #000080; font-weight: bold } /* Generic.Prompt */ +.gs { font-weight: bold } /* Generic.Strong */ +.gu { color: #800080; font-weight: bold } /* Generic.Subheading */ +.gt { color: #0044DD } /* Generic.Traceback */ +.kc { color: #008000; font-weight: bold } /* Keyword.Constant */ +.kd { color: #008000; font-weight: bold } /* Keyword.Declaration */ +.kn { color: #008000; font-weight: bold } /* Keyword.Namespace */ +.kp { color: #008000 } /* Keyword.Pseudo */ +.kr { color: #008000; font-weight: bold } /* Keyword.Reserved */ +.kt { color: #B00040 } /* Keyword.Type */ +.m { color: #666666 } /* Literal.Number */ +.s { color: #BA2121 } /* Literal.String */ +.na { color: #7D9029 } /* Name.Attribute */ +.nb { color: #008000 } /* Name.Builtin */ +.nc { color: #0000FF; font-weight: bold } /* Name.Class */ +.no { color: #880000 } /* Name.Constant */ +.nd { color: #AA22FF } /* Name.Decorator */ +.ni { color: #999999; font-weight: bold } /* Name.Entity */ +.ne { color: #D2413A; font-weight: bold } /* Name.Exception */ +.nf { color: #0000FF } /* Name.Function */ +.nl { color: #A0A000 } /* Name.Label */ +.nn { color: #0000FF; font-weight: bold } /* Name.Namespace */ +.nt { color: #008000; font-weight: bold } /* Name.Tag */ +.nv { color: #19177C } /* Name.Variable */ +.ow { color: #AA22FF; font-weight: bold } /* Operator.Word */ +.w { color: #bbbbbb } /* Text.Whitespace */ +.mb { color: #666666 } /* Literal.Number.Bin */ +.mf { color: #666666 } /* Literal.Number.Float */ +.mh { color: #666666 } /* Literal.Number.Hex */ +.mi { color: #666666 } /* Literal.Number.Integer */ +.mo { color: #666666 } /* Literal.Number.Oct */ +.sa { color: #BA2121 } /* Literal.String.Affix */ +.sb { color: #BA2121 } /* Literal.String.Backtick */ +.sc { color: #BA2121 } /* Literal.String.Char */ +.dl { color: #BA2121 } /* Literal.String.Delimiter */ +.sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */ +.s2 { color: #BA2121 } /* Literal.String.Double */ +.se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */ +.sh { color: #BA2121 } /* Literal.String.Heredoc */ +.si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */ +.sx { color: #008000 } /* Literal.String.Other */ +.sr { color: #BB6688 } /* Literal.String.Regex */ +.s1 { color: #BA2121 } /* Literal.String.Single */ +.ss { color: #19177C } /* Literal.String.Symbol */ +.bp { color: #008000 } /* Name.Builtin.Pseudo */ +.fm { color: #0000FF } /* Name.Function.Magic */ +.vc { color: #19177C } /* Name.Variable.Class */ +.vg { color: #19177C } /* Name.Variable.Global */ +.vi { color: #19177C } /* Name.Variable.Instance */ +.vm { color: #19177C } /* Name.Variable.Magic */ +.il { color: #666666 } /* Literal.Number.Integer.Long */ \ No newline at end of file diff -Nru yelp-3.36.0/docs/libyelp/html/YelpDocument.html yelp-3.36.2/docs/libyelp/html/YelpDocument.html --- yelp-3.36.0/docs/libyelp/html/YelpDocument.html 2020-03-07 00:06:44.000000000 +0000 +++ yelp-3.36.2/docs/libyelp/html/YelpDocument.html 2020-11-21 19:05:21.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -37,8 +37,8 @@

Functions

--++ @@ -320,7 +320,7 @@ - + @@ -334,19 +334,13 @@

Types and Values

YelpUri * document-uriRead / Write / Construct OnlyRead / Write / Construct Only
gboolean
--++ - - + - - - - - - +
enum YelpDocumentSignal
 YelpDocumentPriv
@@ -640,11 +634,6 @@
-
-
-

YelpDocumentPriv

-
typedef struct _YelpDocumentPriv YelpDocumentPriv;
-

Property Details

@@ -652,19 +641,21 @@

The “document-uri” property

  “document-uri”             YelpUri *

The URI which identifies the document.

-

Flags: Read / Write / Construct Only

+

Owner: YelpDocument

+

Flags: Read / Write / Construct Only

The “indexed” property

  “indexed”                  gboolean

Whether the document content has been indexed.

+

Owner: YelpDocument

Flags: Read / Write / Construct

Default value: FALSE

-
Generated by GTK-Doc V1.29
+
Generated by GTK-Doc V1.33.0 \ No newline at end of file diff -Nru yelp-3.36.0/docs/libyelp/html/YelpSettings.html yelp-3.36.2/docs/libyelp/html/YelpSettings.html --- yelp-3.36.0/docs/libyelp/html/YelpSettings.html 2020-03-07 00:06:44.000000000 +0000 +++ yelp-3.36.2/docs/libyelp/html/YelpSettings.html 2020-11-21 19:05:21.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -38,8 +38,8 @@

Functions

--++ @@ -234,7 +234,7 @@ - + @@ -262,9 +262,9 @@

Signals

Read / Write
gintint font-adjustment Read / Write
---+++ @@ -289,8 +289,8 @@

Types and Values

--++ @@ -305,10 +305,6 @@ - - - -
enum YelpSettingsIcon
 YelpSettingsPriv
@@ -642,11 +638,6 @@ -
-
-

YelpSettingsPriv

-
typedef struct _YelpSettingsPriv YelpSettingsPriv;
-

Property Details

@@ -654,14 +645,16 @@

The “editor-mode” property

  “editor-mode”              gboolean

Enable features useful to editors.

+

Owner: YelpSettings

Flags: Read / Write

Default value: FALSE

The “font-adjustment” property

-
  “font-adjustment”          gint
+
  “font-adjustment”          int

A size adjustment to add to font sizes.

+

Owner: YelpSettings

Flags: Read / Write

Allowed values: [-3,10]

Default value: 0

@@ -671,6 +664,7 @@

The “gtk-icon-theme” property

  “gtk-icon-theme”           GtkIconTheme *

A GtkIconTheme object to get icons from.

+

Owner: YelpSettings

Flags: Read / Write

@@ -678,6 +672,7 @@

The “gtk-settings” property

  “gtk-settings”             GtkSettings *

A GtkSettings object to get settings from.

+

Owner: YelpSettings

Flags: Read / Write

@@ -685,6 +680,7 @@

The “show-text-cursor” property

  “show-text-cursor”         gboolean

Show the text cursor or caret for accessible navigation.

+

Owner: YelpSettings

Flags: Read / Write

Default value: FALSE

@@ -717,6 +713,6 @@
-
Generated by GTK-Doc V1.29
+
Generated by GTK-Doc V1.33.0 \ No newline at end of file diff -Nru yelp-3.36.0/docs/libyelp/html/YelpSimpleDocument.html yelp-3.36.2/docs/libyelp/html/YelpSimpleDocument.html --- yelp-3.36.0/docs/libyelp/html/YelpSimpleDocument.html 2020-03-07 00:06:44.000000000 +0000 +++ yelp-3.36.2/docs/libyelp/html/YelpSimpleDocument.html 2020-11-21 19:05:21.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -36,8 +36,8 @@

Functions

--++
@@ -50,19 +50,6 @@
-

Types and Values

-
---- - - - - -
 YelpSimpleDocumentPriv
-
-

Object Hierarchy

    GObject
     ╰── YelpDocument
@@ -80,15 +67,8 @@
 yelp_simple_document_new (YelpUri *uri);
-
-

Types and Values

-
-

YelpSimpleDocumentPriv

-
typedef struct _YelpSimpleDocumentPriv YelpSimpleDocumentPriv;
-
-
-
Generated by GTK-Doc V1.29
+
Generated by GTK-Doc V1.33.0 \ No newline at end of file diff -Nru yelp-3.36.0/docs/libyelp/html/YelpUri.html yelp-3.36.2/docs/libyelp/html/YelpUri.html --- yelp-3.36.0/docs/libyelp/html/YelpUri.html 2020-03-07 00:06:44.000000000 +0000 +++ yelp-3.36.2/docs/libyelp/html/YelpUri.html 2020-11-21 19:05:21.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -37,8 +37,8 @@

Functions

--++ @@ -168,9 +168,9 @@

Signals

---+++ @@ -183,8 +183,8 @@

Types and Values

void
--++ @@ -387,6 +387,6 @@
-
Generated by GTK-Doc V1.29
+
Generated by GTK-Doc V1.33.0 \ No newline at end of file diff -Nru yelp-3.36.0/docs/libyelp/html/YelpView.html yelp-3.36.2/docs/libyelp/html/YelpView.html --- yelp-3.36.0/docs/libyelp/html/YelpView.html 2020-03-07 00:06:44.000000000 +0000 +++ yelp-3.36.2/docs/libyelp/html/YelpView.html 2020-11-21 19:05:21.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -38,8 +38,8 @@

Functions

enum
--++ @@ -136,31 +136,31 @@ +char * +char * +char * +char * +char * @@ -182,9 +182,9 @@

Signals
-gchar * page-desc Read
-gchar * page-icon Read
-gchar * page-id Read
-gchar * page-title Read
-gchar * root-title Read
---+++ @@ -209,8 +209,8 @@

Types and Values

--++ @@ -347,40 +347,45 @@

Property Details

The “page-desc” property

-
  “page-desc”                gchar *
+
  “page-desc”                char *

The description of the page being viewed.

+

Owner: YelpView

Flags: Read

Default value: NULL

The “page-icon” property

-
  “page-icon”                gchar *
+
  “page-icon”                char *

The icon of the page being viewed.

+

Owner: YelpView

Flags: Read

Default value: NULL

The “page-id” property

-
  “page-id”                  gchar *
+
  “page-id”                  char *

The ID of the root page of the page being viewed.

+

Owner: YelpView

Flags: Read

Default value: NULL

The “page-title” property

-
  “page-title”               gchar *
+
  “page-title”               char *

The title of the page being viewed.

+

Owner: YelpView

Flags: Read

Default value: NULL

The “root-title” property

-
  “root-title”               gchar *
+
  “root-title”               char *

The title of the root page of the page being viewed.

+

Owner: YelpView

Flags: Read

Default value: NULL

@@ -389,6 +394,7 @@

The “state” property

  “state”                    YelpViewState

The loading state of the view.

+

Owner: YelpView

Flags: Read / Write

Default value: YELP_VIEW_STATE_BLANK

@@ -397,6 +403,7 @@

The “yelp-uri” property

  “yelp-uri”                 YelpUri *

A YelpUri with the current location.

+

Owner: YelpView

Flags: Read / Write

@@ -430,6 +437,6 @@
-
Generated by GTK-Doc V1.29
+
Generated by GTK-Doc V1.33.0 \ No newline at end of file diff -Nru yelp-3.36.0/docs/libyelp/Makefile.in yelp-3.36.2/docs/libyelp/Makefile.in --- yelp-3.36.0/docs/libyelp/Makefile.in 2020-03-07 00:06:44.000000000 +0000 +++ yelp-3.36.2/docs/libyelp/Makefile.in 2020-11-21 19:05:20.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru yelp-3.36.0/libyelp/yelp-docbook-document.c yelp-3.36.2/libyelp/yelp-docbook-document.c --- yelp-3.36.0/libyelp/yelp-docbook-document.c 2019-01-23 07:39:01.000000000 +0000 +++ yelp-3.36.2/libyelp/yelp-docbook-document.c 2020-11-10 16:44:19.000000000 +0000 @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* - * Copyright (C) 2003-2009 Shaun McCance + * Copyright (C) 2003-2020 Shaun McCance * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -94,9 +94,6 @@ static void transform_finalized (YelpDocbookDocument *docbook, gpointer transform); -G_DEFINE_TYPE (YelpDocbookDocument, yelp_docbook_document, YELP_TYPE_DOCUMENT) -#define GET_PRIV(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), YELP_TYPE_DOCBOOK_DOCUMENT, YelpDocbookDocumentPrivate)) - typedef struct _YelpDocbookDocumentPrivate YelpDocbookDocumentPrivate; struct _YelpDocbookDocumentPrivate { DocbookState state; @@ -129,6 +126,8 @@ GHashTable *autoids; }; +G_DEFINE_TYPE_WITH_PRIVATE (YelpDocbookDocument, yelp_docbook_document, YELP_TYPE_DOCUMENT) + /******************************************************************************/ static void @@ -155,14 +154,12 @@ document_class->index = docbook_index; document_class->request_page = docbook_request_page; - - g_type_class_add_private (klass, sizeof (YelpDocbookDocumentPrivate)); } static void yelp_docbook_document_init (YelpDocbookDocument *docbook) { - YelpDocbookDocumentPrivate *priv = GET_PRIV (docbook); + YelpDocbookDocumentPrivate *priv = yelp_docbook_document_get_instance_private (docbook); priv->state = DOCBOOK_STATE_BLANK; priv->autoids = NULL; @@ -174,7 +171,8 @@ yelp_docbook_document_dispose (GObject *object) { gint i; - YelpDocbookDocumentPrivate *priv = GET_PRIV (object); + YelpDocbookDocumentPrivate *priv = + yelp_docbook_document_get_instance_private (YELP_DOCBOOK_DOCUMENT (object)); if (priv->monitors != NULL) { for (i = 0; priv->monitors[i]; i++) { @@ -190,7 +188,8 @@ static void yelp_docbook_document_finalize (GObject *object) { - YelpDocbookDocumentPrivate *priv = GET_PRIV (object); + YelpDocbookDocumentPrivate *priv = + yelp_docbook_document_get_instance_private (YELP_DOCBOOK_DOCUMENT (object)); if (priv->xmldoc) xmlFreeDoc (priv->xmldoc); @@ -221,7 +220,7 @@ docbook = (YelpDocbookDocument *) g_object_new (YELP_TYPE_DOCBOOK_DOCUMENT, "document-uri", uri, NULL); - priv = GET_PRIV (docbook); + priv = yelp_docbook_document_get_instance_private (docbook); path = yelp_uri_get_search_path (uri); priv->monitors = g_new0 (GFileMonitor*, g_strv_length (path) + 1); @@ -250,7 +249,8 @@ gpointer user_data, GDestroyNotify notify) { - YelpDocbookDocumentPrivate *priv = GET_PRIV (document); + YelpDocbookDocumentPrivate *priv = + yelp_docbook_document_get_instance_private (YELP_DOCBOOK_DOCUMENT (document)); gchar *docuri; GError *error; gboolean handled; @@ -311,7 +311,7 @@ static void docbook_process (YelpDocbookDocument *docbook) { - YelpDocbookDocumentPrivate *priv = GET_PRIV (docbook); + YelpDocbookDocumentPrivate *priv = yelp_docbook_document_get_instance_private (docbook); YelpDocument *document = YELP_DOCUMENT (docbook); GFile *file = NULL; gchar *filepath = NULL; @@ -469,7 +469,7 @@ static void docbook_disconnect (YelpDocbookDocument *docbook) { - YelpDocbookDocumentPrivate *priv = GET_PRIV (docbook); + YelpDocbookDocumentPrivate *priv = yelp_docbook_document_get_instance_private (docbook); if (priv->chunk_ready) { g_signal_handler_disconnect (priv->transform, priv->chunk_ready); priv->chunk_ready = 0; @@ -491,7 +491,7 @@ static gboolean docbook_reload (YelpDocbookDocument *docbook) { - YelpDocbookDocumentPrivate *priv = GET_PRIV (docbook); + YelpDocbookDocumentPrivate *priv = yelp_docbook_document_get_instance_private (docbook); if (priv->index_running || priv->process_running || priv->transform_running) return TRUE; @@ -521,7 +521,7 @@ GFileMonitorEvent event_type, YelpDocbookDocument *docbook) { - YelpDocbookDocumentPrivate *priv = GET_PRIV (docbook); + YelpDocbookDocumentPrivate *priv = yelp_docbook_document_get_instance_private (docbook); if (g_get_monotonic_time() - priv->reload_time < 1000) return; @@ -546,7 +546,7 @@ xmlChar *keywords = NULL; xmlNodePtr cur, old_cur; gboolean chunkQ; - YelpDocbookDocumentPrivate *priv = GET_PRIV (docbook); + YelpDocbookDocumentPrivate *priv = yelp_docbook_document_get_instance_private (docbook); YelpDocument *document = YELP_DOCUMENT (docbook); debug_print (DB_FUNCTION, "entering\n"); @@ -853,7 +853,7 @@ gchar *chunk_id, YelpDocbookDocument *docbook) { - YelpDocbookDocumentPrivate *priv = GET_PRIV (docbook); + YelpDocbookDocumentPrivate *priv = yelp_docbook_document_get_instance_private (docbook); gchar *content; debug_print (DB_FUNCTION, "entering\n"); @@ -880,7 +880,7 @@ transform_finished (YelpTransform *transform, YelpDocbookDocument *docbook) { - YelpDocbookDocumentPrivate *priv = GET_PRIV (docbook); + YelpDocbookDocumentPrivate *priv = yelp_docbook_document_get_instance_private (docbook); YelpDocument *document = YELP_DOCUMENT (docbook); gchar *docuri; GError *error; @@ -916,7 +916,7 @@ transform_error (YelpTransform *transform, YelpDocbookDocument *docbook) { - YelpDocbookDocumentPrivate *priv = GET_PRIV (docbook); + YelpDocbookDocumentPrivate *priv = yelp_docbook_document_get_instance_private (docbook); GError *error; debug_print (DB_FUNCTION, "entering\n"); @@ -938,7 +938,7 @@ transform_finalized (YelpDocbookDocument *docbook, gpointer transform) { - YelpDocbookDocumentPrivate *priv = GET_PRIV (docbook); + YelpDocbookDocumentPrivate *priv = yelp_docbook_document_get_instance_private (docbook); debug_print (DB_FUNCTION, "entering\n"); @@ -1007,7 +1007,7 @@ gchar *title = NULL; gchar *keywords; GSList *chunks = NULL; - YelpDocbookDocumentPrivate *priv = GET_PRIV (index->docbook); + YelpDocbookDocumentPrivate *priv = yelp_docbook_document_get_instance_private (index->docbook); id = xmlGetProp (index->cur, BAD_CAST "id"); if (!id) @@ -1092,7 +1092,7 @@ GFile *file = NULL; gchar *filename = NULL; YelpUri *uri; - YelpDocbookDocumentPrivate *priv = GET_PRIV (docbook); + YelpDocbookDocumentPrivate *priv = yelp_docbook_document_get_instance_private (docbook); uri = yelp_document_get_uri (YELP_DOCUMENT (docbook)); file = yelp_uri_get_file (uri); @@ -1153,7 +1153,7 @@ if (done) return; - priv = GET_PRIV (document); + priv = yelp_docbook_document_get_instance_private (YELP_DOCBOOK_DOCUMENT (document)); g_object_ref (document); priv->index = g_thread_new ("docbook-index", (GThreadFunc)(GCallback) docbook_index_threaded, diff -Nru yelp-3.36.0/libyelp/yelp-document.c yelp-3.36.2/libyelp/yelp-document.c --- yelp-3.36.0/libyelp/yelp-document.c 2019-01-16 14:33:04.000000000 +0000 +++ yelp-3.36.2/libyelp/yelp-document.c 2020-11-10 16:44:19.000000000 +0000 @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* - * Copyright (C) 2003-2009 Shaun McCance + * Copyright (C) 2003-2020 Shaun McCance * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -64,7 +64,7 @@ GDestroyNotify destroy; }; -struct _YelpDocumentPriv { +struct _YelpDocumentPrivate { GMutex mutex; GSList *reqs_all; /* Holds canonical refs, only free from here */ @@ -97,9 +97,7 @@ GError *idle_error; }; -G_DEFINE_TYPE (YelpDocument, yelp_document, G_TYPE_OBJECT) - -#define GET_PRIV(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), YELP_TYPE_DOCUMENT, YelpDocumentPriv)) +G_DEFINE_TYPE_WITH_PRIVATE (YelpDocument, yelp_document, G_TYPE_OBJECT) static void yelp_document_dispose (GObject *object); static void yelp_document_finalize (GObject *object); @@ -292,16 +290,14 @@ YELP_TYPE_URI, G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - - g_type_class_add_private (klass, sizeof (YelpDocumentPriv)); } static void yelp_document_init (YelpDocument *document) { - YelpDocumentPriv *priv; + YelpDocumentPrivate *priv; - document->priv = priv = GET_PRIV (document); + document->priv = priv = yelp_document_get_instance_private (document); g_mutex_init (&priv->mutex); @@ -1263,7 +1259,7 @@ static gboolean yelp_document_error_pending_idle (YelpDocument *document) { - YelpDocumentPriv *priv = GET_PRIV (document); + YelpDocumentPrivate *priv = yelp_document_get_instance_private (document); GSList *cur; Request *request; @@ -1291,7 +1287,7 @@ yelp_document_error_pending (YelpDocument *document, const GError *error) { - YelpDocumentPriv *priv = GET_PRIV (document); + YelpDocumentPrivate *priv = yelp_document_get_instance_private (document); g_assert (document != NULL && YELP_IS_DOCUMENT (document)); @@ -1433,7 +1429,7 @@ request_idle_contents (Request *request) { YelpDocument *document; - YelpDocumentPriv *priv; + YelpDocumentPrivate *priv; YelpDocumentCallback callback = NULL; gpointer user_data; @@ -1445,7 +1441,7 @@ } document = g_object_ref (request->document); - priv = GET_PRIV (document); + priv = yelp_document_get_instance_private (document); g_mutex_lock (&document->priv->mutex); @@ -1499,7 +1495,7 @@ request_idle_error (Request *request) { YelpDocument *document; - YelpDocumentPriv *priv; + YelpDocumentPrivate *priv; YelpDocumentCallback callback = NULL; GError *error = NULL; gpointer user_data; @@ -1512,7 +1508,7 @@ } document = g_object_ref (request->document); - priv = GET_PRIV (document); + priv = yelp_document_get_instance_private (document); g_mutex_lock (&priv->mutex); diff -Nru yelp-3.36.0/libyelp/yelp-document.h yelp-3.36.2/libyelp/yelp-document.h --- yelp-3.36.0/libyelp/yelp-document.h 2019-01-16 14:33:04.000000000 +0000 +++ yelp-3.36.2/libyelp/yelp-document.h 2020-10-26 23:37:34.000000000 +0000 @@ -35,9 +35,9 @@ #define YELP_IS_DOCUMENT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), YELP_TYPE_DOCUMENT)) #define YELP_DOCUMENT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), YELP_TYPE_DOCUMENT, YelpDocumentClass)) -typedef struct _YelpDocument YelpDocument; -typedef struct _YelpDocumentClass YelpDocumentClass; -typedef struct _YelpDocumentPriv YelpDocumentPriv; +typedef struct _YelpDocument YelpDocument; +typedef struct _YelpDocumentClass YelpDocumentClass; +typedef struct _YelpDocumentPrivate YelpDocumentPrivate; typedef enum { YELP_DOCUMENT_SIGNAL_CONTENTS, @@ -51,8 +51,8 @@ GError *error); struct _YelpDocument { - GObject parent; - YelpDocumentPriv *priv; + GObject parent; + YelpDocumentPrivate *priv; }; struct _YelpDocumentClass { diff -Nru yelp-3.36.0/libyelp/yelp-help-list.c yelp-3.36.2/libyelp/yelp-help-list.c --- yelp-3.36.0/libyelp/yelp-help-list.c 2018-05-22 14:45:59.000000000 +0000 +++ yelp-3.36.2/libyelp/yelp-help-list.c 2020-10-26 23:37:34.000000000 +0000 @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* - * Copyright (C) 2010 Shaun McCance + * Copyright (C) 2010-2020 Shaun McCance * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -85,9 +85,6 @@ return g_utf8_collate (as, bs); } -G_DEFINE_TYPE (YelpHelpList, yelp_help_list, YELP_TYPE_DOCUMENT) -#define GET_PRIV(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), YELP_TYPE_HELP_LIST, YelpHelpListPrivate)) - typedef struct _YelpHelpListPrivate YelpHelpListPrivate; struct _YelpHelpListPrivate { GMutex mutex; @@ -105,6 +102,8 @@ xmlXPathCompExprPtr get_mallard_desc; }; +G_DEFINE_TYPE_WITH_PRIVATE (YelpHelpList, yelp_help_list, YELP_TYPE_DOCUMENT) + static void yelp_help_list_class_init (YelpHelpListClass *klass) { @@ -115,14 +114,12 @@ object_class->finalize = yelp_help_list_finalize; document_class->request_page = help_list_request_page; - - g_type_class_add_private (klass, sizeof (YelpHelpListPrivate)); } static void yelp_help_list_init (YelpHelpList *list) { - YelpHelpListPrivate *priv = GET_PRIV (list); + YelpHelpListPrivate *priv = yelp_help_list_get_instance_private (list); g_mutex_init (&priv->mutex); priv->entries = g_hash_table_new_full (g_str_hash, g_str_equal, @@ -152,7 +149,7 @@ static void yelp_help_list_finalize (GObject *object) { - YelpHelpListPrivate *priv = GET_PRIV (object); + YelpHelpListPrivate *priv = yelp_help_list_get_instance_private (YELP_HELP_LIST (object)); g_hash_table_destroy (priv->entries); g_mutex_clear (&priv->mutex); @@ -184,7 +181,7 @@ GDestroyNotify notify) { gboolean handled; - YelpHelpListPrivate *priv = GET_PRIV (document); + YelpHelpListPrivate *priv = yelp_help_list_get_instance_private (YELP_HELP_LIST (document)); if (page_id == NULL) page_id = "index"; @@ -223,7 +220,7 @@ { const gchar * const *sdatadirs = g_get_system_data_dirs (); const gchar * const *langs = g_get_language_names (); - YelpHelpListPrivate *priv = GET_PRIV (list); + YelpHelpListPrivate *priv = yelp_help_list_get_instance_private (list); /* The strings are still owned by GLib; we just own the array. */ gchar **datadirs; gint datadir_i, lang_i; @@ -445,7 +442,7 @@ { gchar **colors, *tmp; GList *cur; - YelpHelpListPrivate *priv = GET_PRIV (list); + YelpHelpListPrivate *priv = yelp_help_list_get_instance_private (list); GtkTextDirection direction = gtk_widget_get_default_direction (); GString *string = g_string_new ("
enum