Skip to content
Commits on Source (4)
commit db9e013651face7cd064259a857f8b6ea1572686
Author: Kjell Cato Heskjestad <cato@heskjestad.xyz>
Date: Wed Jul 24 12:30:20 2019 +0200
I18n: Update translation nb (100%).
36 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit c3d4a1e49643bb1605e6adc8c5b6cc0667380ed2
Author: Jiri Grönroos <jiri.gronroos@iki.fi>
Date: Sun Jul 21 18:30:18 2019 +0200
I18n: Update translation fi (100%).
36 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 96329fa5739f8b202063d8d579736fd62fdce6e7
Author: Jiri Grönroos <jiri.gronroos@iki.fi>
Date: Wed Jul 17 00:30:19 2019 +0200
I18n: Update translation fi (100%).
36 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 71ad5acc82386c4223d1f3aacec9fc2011ec1278
Author: Real School <translator_students@realschool.am>
Date: Mon Jul 8 12:30:19 2019 +0200
I18n: Add new translation hy (100%).
36 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 6ed1ee270fc8ec923e73adee610fef5d9e0b0ab0
Author: Andre Miranda <andreldm@xfce.org>
Date: Sat Jul 6 13:43:38 2019 -0300
Update gitignore
commit 6f452937366bb1599fb0ae986958786d52946f15
Author: Andre Miranda <andreldm@xfce.org>
Date: Sat Jul 6 13:42:20 2019 -0300
Fix use after free crash (Bug #15679)
commit edeb8a179b6ded9c19219f6af7fe75e43f752b32
Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Mon Jul 1 00:31:20 2019 +0200
Back to development
commit 5b722c9fc7312f1e0b348b8877233a51a2f6461c
Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Mon Jul 1 00:30:11 2019 +0200
Updates for release
commit 88e970ae2f1def4346ea9e36c7594272679d234b
Author: Real School <translator_students@realschool.am>
Date: Thu Jun 20 12:30:18 2019 +0200
......
......@@ -419,7 +419,6 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
......
0.6.4
======
- Update gitignore
- Fix use after free crash (Bug #15679)
- Translation Updates:
Finnish, Norwegian, Armenian
0.6.3
=====
- Fix g_type_class_add_private deprecation in recent GLib
......
......@@ -844,9 +844,9 @@ AC_DEFUN([AM_NLS],
AC_SUBST([USE_NLS])
])
dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
dnl serial 11 (pkg-config-0.29.1)
dnl
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
# serial 11 (pkg-config-0.29.1)
dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
dnl
......@@ -1120,6 +1120,74 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
AS_VAR_IF([$1], [""], [$5], [$4])dnl
])dnl PKG_CHECK_VAR
dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
dnl [DESCRIPTION], [DEFAULT])
dnl ------------------------------------------
dnl
dnl Prepare a "--with-" configure option using the lowercase
dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and
dnl PKG_CHECK_MODULES in a single macro.
AC_DEFUN([PKG_WITH_MODULES],
[
m4_pushdef([with_arg], m4_tolower([$1]))
m4_pushdef([description],
[m4_default([$5], [build with ]with_arg[ support])])
m4_pushdef([def_arg], [m4_default([$6], [auto])])
m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes])
m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no])
m4_case(def_arg,
[yes],[m4_pushdef([with_without], [--without-]with_arg)],
[m4_pushdef([with_without],[--with-]with_arg)])
AC_ARG_WITH(with_arg,
AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),,
[AS_TR_SH([with_]with_arg)=def_arg])
AS_CASE([$AS_TR_SH([with_]with_arg)],
[yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)],
[auto],[PKG_CHECK_MODULES([$1],[$2],
[m4_n([def_action_if_found]) $3],
[m4_n([def_action_if_not_found]) $4])])
m4_popdef([with_arg])
m4_popdef([description])
m4_popdef([def_arg])
])dnl PKG_WITH_MODULES
dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
dnl [DESCRIPTION], [DEFAULT])
dnl -----------------------------------------------
dnl
dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES
dnl check._[VARIABLE-PREFIX] is exported as make variable.
AC_DEFUN([PKG_HAVE_WITH_MODULES],
[
PKG_WITH_MODULES([$1],[$2],,,[$3],[$4])
AM_CONDITIONAL([HAVE_][$1],
[test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"])
])dnl PKG_HAVE_WITH_MODULES
dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
dnl [DESCRIPTION], [DEFAULT])
dnl ------------------------------------------------------
dnl
dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make
dnl and preprocessor variable.
AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES],
[
PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4])
AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
[AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
])dnl PKG_HAVE_DEFINE_WITH_MODULES
# Copyright (C) 2002-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
......@@ -2347,7 +2415,7 @@ AC_DEFUN([XDT_PROG_PKG_CONFIG],
echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
echo "*** from the freedesktop.org software repository at"
echo "***"
echo "*** http://www.freedesktop.org/software/pkgconfig"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "***"
exit 1;
fi
......@@ -2360,7 +2428,7 @@ AC_DEFUN([XDT_PROG_PKG_CONFIG],
echo "*** You can download pkg-config from the freedesktop.org"
echo "*** software repository at"
echo "***"
echo "*** http://www.freedesktop.org/software/pkgconfig"
echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "***"
exit 1
])
......@@ -2707,7 +2775,7 @@ AC_HELP_STRING([--disable-debug], [Include no debugging support]),
-Wno-unused-parameter -Wold-style-definition \
-Wdeclaration-after-statement \
-Wmissing-declarations \
-Wmissing-noreturn -Wshadow -Wpointer-arith \
-Wmissing-noreturn -Wpointer-arith \
-Wcast-align -Wformat -Wformat-security -Wformat-y2k \
-Winit-self -Wmissing-include-dirs -Wundef \
-Wnested-externs"
......@@ -2728,7 +2796,7 @@ AC_HELP_STRING([--disable-debug], [Include no debugging support]),
CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG"
AC_MSG_RESULT([full])
else
xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -g"
xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -g -Wshadow"
AC_MSG_RESULT([yes])
fi
......
......@@ -2,7 +2,7 @@
# Attempt to guess a canonical system name.
# Copyright 1992-2018 Free Software Foundation, Inc.
timestamp='2018-02-24'
timestamp='2018-03-08'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
......@@ -1046,11 +1046,7 @@ EOF
echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
exit ;;
x86_64:Linux:*:*)
if objdump -f /bin/sh | grep -q elf32-x86-64; then
echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
else
echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
fi
exit ;;
xtensa*:Linux:*:*)
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
......@@ -1473,7 +1469,7 @@ EOF
exit 1
# Local variables:
# eval: (add-hook 'write-file-functions 'time-stamp)
# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
......
......@@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2018 Free Software Foundation, Inc.
timestamp='2018-02-22'
timestamp='2018-03-08'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
......@@ -1376,7 +1376,7 @@ case $os in
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* | -hcos* \
| -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
......@@ -1794,7 +1794,7 @@ echo "$basic_machine$os"
exit
# Local variables:
# eval: (add-hook 'write-file-functions 'time-stamp)
# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
......
This diff is collapsed.
......@@ -30,8 +30,8 @@ m4_define([garcon_verinfo], [0:0:0])
m4_define([garcon_version_api_major], [1])
m4_define([garcon_version_major], [0])
m4_define([garcon_version_minor], [6])
m4_define([garcon_version_micro], [3])
m4_define([garcon_version_build], [88e970a])
m4_define([garcon_version_micro], [4])
m4_define([garcon_version_build], [db9e013])
m4_define([garcon_version_tag], [])
m4_define([garcon_version], [garcon_version_major().garcon_version_minor().garcon_version_micro()ifelse(garcon_version_tag(), [git], [garcon_version_tag()-garcon_version_build()], [garcon_version_tag()])])
......@@ -54,7 +54,7 @@ Copyright (c) 2012-2018 The Xfce development team
AC_INIT([garcon], [garcon_version], [https://bugzilla.xfce.org/])
AC_PREREQ([2.50])
AC_CONFIG_MACRO_DIRS([m4])
AC_REVISION([88e970a])
AC_REVISION([db9e013])
AC_CANONICAL_TARGET()
dnl ***************************
......@@ -122,7 +122,7 @@ dnl AC_CHECK_FUNCS([])
dnl ******************************
dnl *** Check for i18n support ***
dnl ******************************
XDT_I18N([am ar ast be bg bn ca cs cy da de el en_AU en_GB eo es et eu fi fr gl he hi hr hu hy_AM id ie is it ja kk ko lt lv ms nb nl nn oc pa pl pt_BR pt ro ru sk sl sq sr sv te th tr ug uk uz@Latn uz zh_CN zh_HK zh_TW ])
XDT_I18N([am ar ast be bg bn ca cs cy da de el en_AU en_GB eo es et eu fi fr gl he hi hr hu hy_AM hy id ie is it ja kk ko lt lv ms nb nl nn oc pa pl pt_BR pt ro ru sk sl sq sr sv te th tr ug uk uz@Latn uz zh_CN zh_HK zh_TW ])
dnl ***********************************
dnl *** Check for required packages ***
......
......@@ -396,7 +396,6 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
......
......@@ -366,7 +366,6 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
......
garcon (0.6.4-1) UNRELEASED; urgency=medium
* New upstream version 0.6.4
* d/rules:
- Pass '--enable-gtk-doc' during configure to fix consecutive builds.
-- Unit 193 <unit193@ubuntu.com> Wed, 14 Aug 2019 18:33:38 -0400
garcon (0.6.3-1) unstable; urgency=medium
[ Unit 193 ]
......
......@@ -6,5 +6,8 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
%:
dh $@
override_dh_auto_configure:
dh_auto_configure -- --enable-gtk-doc
override_dh_missing:
dh_missing --fail-missing -X .la
......@@ -381,7 +381,6 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
......
......@@ -361,7 +361,6 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
......
......@@ -3,12 +3,12 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>GarconMenu: garcon Reference Manual</title>
<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
<link rel="home" href="index.html" title="garcon Reference Manual">
<link rel="up" href="garcon-menus.html" title="Part II. Menus and Menu Items">
<link rel="prev" href="garcon-menus.html" title="Part II. Menus and Menu Items">
<link rel="next" href="GarconMenuDirectory.html" title="GarconMenuDirectory">
<meta name="generator" content="GTK-Doc V1.28 (XML mode)">
<meta name="generator" content="GTK-Doc V1.30 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
......@@ -269,14 +269,14 @@ returned <a class="link" href="GarconMenu.html" title="GarconMenu"><span class="
6
7
8</pre></td>
<td class="listing_code"><pre class="programlisting">GarconMenu <span class="gtkdoc opt">*</span>menu <span class="gtkdoc opt">=</span> <span class="function"><a href="GarconMenu.html#garcon-menu-new">garcon_menu_new</a></span> <span class="gtkdoc opt">(</span>filename<span class="gtkdoc opt">);</span>
<td class="listing_code"><pre class="programlisting"><span class="n">GarconMenu</span> <span class="o">*</span><span class="n">menu</span> <span class="o">=</span> <span class="n">garcon_menu_new</span> <span class="p">(</span><span class="n">filename</span><span class="p">);</span>
<span class="keyword">if</span> <span class="gtkdoc opt">(</span><span class="function"><a href="GarconMenu.html#garcon-menu-load">garcon_menu_load</a></span> <span class="gtkdoc opt">(</span>menu<span class="gtkdoc opt">, &amp;</span>error<span class="gtkdoc opt">))</span>
<span class="gtkdoc opt">...</span>
<span class="keyword">else</span>
<span class="gtkdoc opt">...</span>
<span class="k">if</span> <span class="p">(</span><span class="n">garcon_menu_load</span> <span class="p">(</span><span class="n">menu</span><span class="p">,</span> <span class="o">&amp;</span><span class="n">error</span><span class="p">))</span>
<span class="p">...</span>
<span class="k">else</span>
<span class="p">...</span>
<span class="function"><a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#g-object-unref">g_object_unref</a></span> <span class="gtkdoc opt">(</span>menu<span class="gtkdoc opt">);</span></pre></td>
<span class="n">g_object_unref</span> <span class="p">(</span><span class="n">menu</span><span class="p">);</span></pre></td>
</tr>
</tbody>
</table>
......@@ -604,7 +604,7 @@ sorted by their display names in ascending order.</p>
<tbody>
<tr>
<td class="listing_lines" align="right"><pre>1</pre></td>
<td class="listing_code"><pre class="programlisting"><span class="function"><a href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#g-list-free">g_list_free</a></span> <span class="gtkdoc opt">(</span>list<span class="gtkdoc opt">);</span></pre></td>
<td class="listing_code"><pre class="programlisting"><span class="n">g_list_free</span> <span class="p">(</span><span class="n">list</span><span class="p">);</span></pre></td>
</tr>
</tbody>
</table>
......@@ -703,6 +703,6 @@ user_function (<a class="link" href="GarconMenu.html" title="GarconMenu"><span c
</div>
</div>
<div class="footer">
<hr>Generated by GTK-Doc V1.28</div>
<hr>Generated by GTK-Doc V1.30</div>
</body>
</html>
\ No newline at end of file
......@@ -3,12 +3,12 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>GarconMenuDirectory: garcon Reference Manual</title>
<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
<link rel="home" href="index.html" title="garcon Reference Manual">
<link rel="up" href="garcon-menus.html" title="Part II. Menus and Menu Items">
<link rel="prev" href="GarconMenu.html" title="GarconMenu">
<link rel="next" href="GarconMenuElement.html" title="GarconMenuElement">
<meta name="generator" content="GTK-Doc V1.28 (XML mode)">
<meta name="generator" content="GTK-Doc V1.30 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
......@@ -678,6 +678,6 @@ garcon_menu_directory_equal (<em class="parameter"><code><a class="link" href="G
</div>
</div>
<div class="footer">
<hr>Generated by GTK-Doc V1.28</div>
<hr>Generated by GTK-Doc V1.30</div>
</body>
</html>
\ No newline at end of file
......@@ -3,12 +3,12 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>GarconMenuElement: garcon Reference Manual</title>
<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
<link rel="home" href="index.html" title="garcon Reference Manual">
<link rel="up" href="garcon-menus.html" title="Part II. Menus and Menu Items">
<link rel="prev" href="GarconMenuDirectory.html" title="GarconMenuDirectory">
<link rel="next" href="GarconMenuItem.html" title="GarconMenuItem">
<meta name="generator" content="GTK-Doc V1.28 (XML mode)">
<meta name="generator" content="GTK-Doc V1.30 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
......@@ -163,6 +163,6 @@ garcon_menu_element_equal (<em class="parameter"><code><a class="link" href="Gar
</div>
</div>
<div class="footer">
<hr>Generated by GTK-Doc V1.28</div>
<hr>Generated by GTK-Doc V1.30</div>
</body>
</html>
\ No newline at end of file
......@@ -3,12 +3,12 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>GarconMenuItem: garcon Reference Manual</title>
<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
<link rel="home" href="index.html" title="garcon Reference Manual">
<link rel="up" href="garcon-menus.html" title="Part II. Menus and Menu Items">
<link rel="prev" href="GarconMenuElement.html" title="GarconMenuElement">
<link rel="next" href="GarconMenuItemCache.html" title="GarconMenuItemCache">
<meta name="generator" content="GTK-Doc V1.28 (XML mode)">
<meta name="generator" content="GTK-Doc V1.30 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
......@@ -964,6 +964,6 @@ user_function (<a class="link" href="GarconMenuItem.html" title="GarconMenuItem"
</div>
</div>
<div class="footer">
<hr>Generated by GTK-Doc V1.28</div>
<hr>Generated by GTK-Doc V1.30</div>
</body>
</html>
\ No newline at end of file
......@@ -3,12 +3,12 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>GarconMenuItemCache: garcon Reference Manual</title>
<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
<link rel="home" href="index.html" title="garcon Reference Manual">
<link rel="up" href="garcon-menus.html" title="Part II. Menus and Menu Items">
<link rel="prev" href="GarconMenuItem.html" title="GarconMenuItem">
<link rel="next" href="garcon-garcon-menu-item-pool.html" title="garcon-menu-item-pool">
<meta name="generator" content="GTK-Doc V1.28 (XML mode)">
<meta name="generator" content="GTK-Doc V1.30 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
......@@ -141,6 +141,6 @@ garcon_menu_item_cache_invalidate_file
</div>
</div>
<div class="footer">
<hr>Generated by GTK-Doc V1.28</div>
<hr>Generated by GTK-Doc V1.30</div>
</body>
</html>
\ No newline at end of file
......@@ -3,12 +3,12 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>GarconMenuMerger: garcon Reference Manual</title>
<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
<link rel="home" href="index.html" title="garcon Reference Manual">
<link rel="up" href="garcon-parsing.html" title="Part III. Parsing and Modifying the Menu Tree">
<link rel="prev" href="garcon-parsing.html" title="Part III. Parsing and Modifying the Menu Tree">
<link rel="next" href="garcon-garcon-menu-node.html" title="garcon-menu-node">
<meta name="generator" content="GTK-Doc V1.28 (XML mode)">
<meta name="generator" content="GTK-Doc V1.30 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
......@@ -117,6 +117,6 @@ garcon_menu_merger_run (<em class="parameter"><code><a class="link" href="Garcon
</div>
</div>
<div class="footer">
<hr>Generated by GTK-Doc V1.28</div>
<hr>Generated by GTK-Doc V1.30</div>
</body>
</html>
\ No newline at end of file