Mercurial > hg > xemacs-beta
changeset 4709:db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
are missing. This is done with Bill Perry's stated permission, in private
email to me.
| author | Jerry James <james@xemacs.org> |
|---|---|
| date | Mon, 05 Oct 2009 11:08:59 -0600 |
| parents | 1cecc3e9f0a0 |
| children | 3a87551bfeb5 |
| files | lisp/ChangeLog lisp/gnome.el lisp/gtk-compose.el lisp/gtk-marshal.el lisp/gtk-package.el lisp/gtk-widget-accessors.el lisp/gtk.el src/ChangeLog src/glade.c src/gtk-glue.c src/gtk-xemacs.c src/gtk-xemacs.h src/ui-byhand.c src/ui-gtk.c src/ui-gtk.h src/unexfx2800.c tests/ChangeLog tests/gtk/event-stream-tests.el tests/gtk/gnome-test.el tests/gtk/gtk-embedded-test.el tests/gtk/gtk-extra-test.el tests/gtk/statusbar-test.el tests/gtk/toolbar-test.el tests/gtk/xemacs-toolbar.el |
| diffstat | 24 files changed, 369 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Oct 05 10:11:59 2009 -0600 +++ b/lisp/ChangeLog Mon Oct 05 11:08:59 2009 -0600 @@ -1,3 +1,13 @@ +2009-10-05 Jerry James <james@xemacs.org> + + * gnome.el: Add GPL v2 or later notice with explicit permission of + Bill Perry (private email). + * gtk-compose.el: Ditto. + * gtk-marshal.el: Ditto. + * gtk-package.el: Ditto. + * gtk-widget-accessors.el: Ditto. + * gtk.el: Ditto. + 2009-10-05 Jerry James <james@xemacs.org> * glyphs.el (make-image-specifier): Remove ancient comment about
--- a/lisp/gnome.el Mon Oct 05 10:11:59 2009 -0600 +++ b/lisp/gnome.el Mon Oct 05 11:08:59 2009 -0600 @@ -1,3 +1,20 @@ +;; This file is part of XEmacs. +;; +;; XEmacs is free software; you can redistribute it and/or modify it +;; under the terms of the GNU General Public License as published by the +;; Free Software Foundation; either version 2, or (at your option) any +;; later version. +;; +;; XEmacs is distributed in the hope that it will be useful, but WITHOUT +;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +;; for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with XEmacs; see the file COPYING. If not, write to +;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, +;; Boston, MA 02111-1301, USA. */ + (globally-declare-fboundp '(gtk-type-from-name gtk-import-function-internal
--- a/lisp/gtk-compose.el Mon Oct 05 10:11:59 2009 -0600 +++ b/lisp/gtk-compose.el Mon Oct 05 11:08:59 2009 -0600 @@ -1,3 +1,20 @@ +;; This file is part of XEmacs. +;; +;; XEmacs is free software; you can redistribute it and/or modify it +;; under the terms of the GNU General Public License as published by the +;; Free Software Foundation; either version 2, or (at your option) any +;; later version. +;; +;; XEmacs is distributed in the hope that it will be useful, but WITHOUT +;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +;; for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with XEmacs; see the file COPYING. If not, write to +;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, +;; Boston, MA 02111-1301, USA. */ + (require 'x-compose) (provide 'gtk-compose)
--- a/lisp/gtk-marshal.el Mon Oct 05 10:11:59 2009 -0600 +++ b/lisp/gtk-marshal.el Mon Oct 05 11:08:59 2009 -0600 @@ -1,3 +1,19 @@ +;; This file is part of XEmacs. +;; +;; XEmacs is free software; you can redistribute it and/or modify it +;; under the terms of the GNU General Public License as published by the +;; Free Software Foundation; either version 2, or (at your option) any +;; later version. +;; +;; XEmacs is distributed in the hope that it will be useful, but WITHOUT +;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +;; for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with XEmacs; see the file COPYING. If not, write to +;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, +;; Boston, MA 02111-1301, USA. */ ;; ;; To regenerate ../src/emacs-marshals.c just load this file. ;;
--- a/lisp/gtk-package.el Mon Oct 05 10:11:59 2009 -0600 +++ b/lisp/gtk-package.el Mon Oct 05 11:08:59 2009 -0600 @@ -1,3 +1,20 @@ +;; This file is part of XEmacs. +;; +;; XEmacs is free software; you can redistribute it and/or modify it +;; under the terms of the GNU General Public License as published by the +;; Free Software Foundation; either version 2, or (at your option) any +;; later version. +;; +;; XEmacs is distributed in the hope that it will be useful, but WITHOUT +;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +;; for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with XEmacs; see the file COPYING. If not, write to +;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, +;; Boston, MA 02111-1301, USA. */ +;; ;; A GTK version of package-ui.el (globally-declare-fboundp
--- a/lisp/gtk-widget-accessors.el Mon Oct 05 10:11:59 2009 -0600 +++ b/lisp/gtk-widget-accessors.el Mon Oct 05 11:08:59 2009 -0600 @@ -1,3 +1,20 @@ +;; This file is part of XEmacs. +;; +;; XEmacs is free software; you can redistribute it and/or modify it +;; under the terms of the GNU General Public License as published by the +;; Free Software Foundation; either version 2, or (at your option) any +;; later version. +;; +;; XEmacs is distributed in the hope that it will be useful, but WITHOUT +;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +;; for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with XEmacs; see the file COPYING. If not, write to +;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, +;; Boston, MA 02111-1301, USA. */ + (globally-declare-fboundp '(gtk-fundamental-type))
--- a/lisp/gtk.el Mon Oct 05 10:11:59 2009 -0600 +++ b/lisp/gtk.el Mon Oct 05 11:08:59 2009 -0600 @@ -1,3 +1,20 @@ +;; This file is part of XEmacs. +;; +;; XEmacs is free software; you can redistribute it and/or modify it +;; under the terms of the GNU General Public License as published by the +;; Free Software Foundation; either version 2, or (at your option) any +;; later version. +;; +;; XEmacs is distributed in the hope that it will be useful, but WITHOUT +;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +;; for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with XEmacs; see the file COPYING. If not, write to +;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, +;; Boston, MA 02111-1301, USA. */ + (globally-declare-fboundp '(gtk-import-function-internal gtk-call-function
--- a/src/ChangeLog Mon Oct 05 10:11:59 2009 -0600 +++ b/src/ChangeLog Mon Oct 05 11:08:59 2009 -0600 @@ -1,3 +1,15 @@ +2009-10-05 Jerry James <james@xemacs.org> + + * glade.c: Add GPL v2 or later notice with explicit permission of + Bill Perry (private email). + * gtk-glue.c: Ditto. + * gtk-xemacs.c: Ditto. + * gtk-xemacs.h: Ditto. + * ui-byhand.c: Ditto. + * ui-gtk.c: Ditto. + * ui-gtk.h: Ditto. + * unexfx2800.c: Fix malformed comment. + 2009-10-05 Jerry James <james@xemacs.org> * Makefile.in.in: Remove internal GIF object files from link.
--- a/src/glade.c Mon Oct 05 10:11:59 2009 -0600 +++ b/src/glade.c Mon Oct 05 11:08:59 2009 -0600 @@ -7,6 +7,22 @@ ** Copyright (C) 1999 John Harper <john@dcs.warwick.ac.uk> ** Copyright (c) 2000 Free Software Foundation ** +** This file is part of XEmacs. +** +** XEmacs is free software; you can redistribute it and/or modify it +** under the terms of the GNU General Public License as published by the +** Free Software Foundation; either version 2, or (at your option) any +** later version. +** +** XEmacs is distributed in the hope that it will be useful, but WITHOUT +** ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +** FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +** for more details. +** +** You should have received a copy of the GNU General Public License +** along with XEmacs; see the file COPYING. If not, write to +** the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, +** Boston, MA 02111-1301, USA. */ */ #if defined(HAVE_GLADE_H) || defined(HAVE_GLADE_GLADE_H)
--- a/src/gtk-glue.c Mon Oct 05 10:11:59 2009 -0600 +++ b/src/gtk-glue.c Mon Oct 05 11:08:59 2009 -0600 @@ -1,3 +1,21 @@ +/* +This file is part of XEmacs. + +XEmacs is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2, or (at your option) any +later version. + +XEmacs is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with XEmacs; see the file COPYING. If not, write to +the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, +Boston, MA 02111-1301, USA. */ + GtkType GTK_TYPE_ARRAY = 0; GtkType GTK_TYPE_STRING_ARRAY = 0; GtkType GTK_TYPE_FLOAT_ARRAY = 0;
--- a/src/gtk-xemacs.c Mon Oct 05 10:11:59 2009 -0600 +++ b/src/gtk-xemacs.c Mon Oct 05 11:08:59 2009 -0600 @@ -5,6 +5,22 @@ ** Created by: William M. Perry ** Copyright (c) 2000 William M. Perry <wmperry@gnu.org> ** +** This file is part of XEmacs. +** +** XEmacs is free software; you can redistribute it and/or modify it +** under the terms of the GNU General Public License as published by the +** Free Software Foundation; either version 2, or (at your option) any +** later version. +** +** XEmacs is distributed in the hope that it will be useful, but WITHOUT +** ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +** FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +** for more details. +** +** You should have received a copy of the GNU General Public License +** along with XEmacs; see the file COPYING. If not, write to +** the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, +** Boston, MA 02111-1301, USA. */ */ #include <config.h>
--- a/src/gtk-xemacs.h Mon Oct 05 10:11:59 2009 -0600 +++ b/src/gtk-xemacs.h Mon Oct 05 11:08:59 2009 -0600 @@ -5,6 +5,22 @@ ** Created by: William M. Perry ** Copyright (c) 2000 William M. Perry <wmperry@gnu.org> ** +** This file is part of XEmacs. +** +** XEmacs is free software; you can redistribute it and/or modify it +** under the terms of the GNU General Public License as published by the +** Free Software Foundation; either version 2, or (at your option) any +** later version. +** +** XEmacs is distributed in the hope that it will be useful, but WITHOUT +** ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +** FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +** for more details. +** +** You should have received a copy of the GNU General Public License +** along with XEmacs; see the file COPYING. If not, write to +** the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, +** Boston, MA 02111-1301, USA. */ */ #ifndef __GTK_XEMACS_H__
--- a/src/ui-byhand.c Mon Oct 05 10:11:59 2009 -0600 +++ b/src/ui-byhand.c Mon Oct 05 11:08:59 2009 -0600 @@ -7,6 +7,23 @@ So we have to code a few functions by hand. Ick. William M. Perry 5/8/00 + +This file is part of XEmacs. + +XEmacs is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2, or (at your option) any +later version. + +XEmacs is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with XEmacs; see the file COPYING. If not, write to +the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, +Boston, MA 02111-1301, USA. */ #include "gui.h"
--- a/src/ui-gtk.c Mon Oct 05 10:11:59 2009 -0600 +++ b/src/ui-gtk.c Mon Oct 05 11:08:59 2009 -0600 @@ -5,6 +5,22 @@ ** Created by: William M. Perry <wmperry@gnu.org> ** Copyright (c) 2000 William M. Perry <wmperry@gnu.org> ** +** This file is part of XEmacs. +** +** XEmacs is free software; you can redistribute it and/or modify it +** under the terms of the GNU General Public License as published by the +** Free Software Foundation; either version 2, or (at your option) any +** later version. +** +** XEmacs is distributed in the hope that it will be useful, but WITHOUT +** ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +** FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +** for more details. +** +** You should have received a copy of the GNU General Public License +** along with XEmacs; see the file COPYING. If not, write to +** the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, +** Boston, MA 02111-1301, USA. */ */ #include <config.h>
--- a/src/ui-gtk.h Mon Oct 05 10:11:59 2009 -0600 +++ b/src/ui-gtk.h Mon Oct 05 11:08:59 2009 -0600 @@ -5,6 +5,22 @@ ** Created by: William M. Perry ** Copyright (c) 2000 Aventail Corporation ** +** This file is part of XEmacs. +** +** XEmacs is free software; you can redistribute it and/or modify it +** under the terms of the GNU General Public License as published by the +** Free Software Foundation; either version 2, or (at your option) any +** later version. +** +** XEmacs is distributed in the hope that it will be useful, but WITHOUT +** ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +** FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +** for more details. +** +** You should have received a copy of the GNU General Public License +** along with XEmacs; see the file COPYING. If not, write to +** the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, +** Boston, MA 02111-1301, USA. */ */ #ifndef __UI_GTK_H__
--- a/src/unexfx2800.c Mon Oct 05 10:11:59 2009 -0600 +++ b/src/unexfx2800.c Mon Oct 05 11:08:59 2009 -0600 @@ -1,4 +1,4 @@ -/* Unexec for the Alliant FX/2800. */ +/* Unexec for the Alliant FX/2800. This file is part of XEmacs.
--- a/tests/ChangeLog Mon Oct 05 10:11:59 2009 -0600 +++ b/tests/ChangeLog Mon Oct 05 11:08:59 2009 -0600 @@ -1,3 +1,14 @@ +2009-10-05 Jerry James <jamesjer@xemacs.org> + + * gtk/event-stream-tests.el: Add GPL v2 or later notice with + explicit permission of Bill Perry (private email). + * gtk/gnome-test.el: Ditto. + * gtk/gtk-embedded-test.el: Ditto. + * gtk/gtk-extra-test.el: Ditto. + * gtk/statusbar-test.el: Ditto. + * gtk/toolbar-test.el: Ditto. + * gtk/xemacs-toolbar.el: Ditto. + 2009-09-19 Aidan Kehoe <kehoea@parhasard.net> * automated/mule-tests.el:
--- a/tests/gtk/event-stream-tests.el Mon Oct 05 10:11:59 2009 -0600 +++ b/tests/gtk/event-stream-tests.el Mon Oct 05 11:08:59 2009 -0600 @@ -1,3 +1,20 @@ +;; This file is part of XEmacs. +;; +;; XEmacs is free software; you can redistribute it and/or modify it +;; under the terms of the GNU General Public License as published by the +;; Free Software Foundation; either version 2, or (at your option) any +;; later version. +;; +;; XEmacs is distributed in the hope that it will be useful, but WITHOUT +;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +;; for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with XEmacs; see the file COPYING. If not, write to +;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, +;; Boston, MA 02111-1301, USA. */ + ;also do this: make two frames, one viewing "*scratch*", the other "foo". ;in *scratch*, type (sit-for 20)^J ;wait a couple of seconds, move cursor to foo, type "a"
--- a/tests/gtk/gnome-test.el Mon Oct 05 10:11:59 2009 -0600 +++ b/tests/gtk/gnome-test.el Mon Oct 05 11:08:59 2009 -0600 @@ -1,3 +1,20 @@ +;; This file is part of XEmacs. +;; +;; XEmacs is free software; you can redistribute it and/or modify it +;; under the terms of the GNU General Public License as published by the +;; Free Software Foundation; either version 2, or (at your option) any +;; later version. +;; +;; XEmacs is distributed in the hope that it will be useful, but WITHOUT +;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +;; for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with XEmacs; see the file COPYING. If not, write to +;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, +;; Boston, MA 02111-1301, USA. */ + (require 'gnome) (gtk-define-test
--- a/tests/gtk/gtk-embedded-test.el Mon Oct 05 10:11:59 2009 -0600 +++ b/tests/gtk/gtk-embedded-test.el Mon Oct 05 11:08:59 2009 -0600 @@ -1,3 +1,20 @@ +;; This file is part of XEmacs. +;; +;; XEmacs is free software; you can redistribute it and/or modify it +;; under the terms of the GNU General Public License as published by the +;; Free Software Foundation; either version 2, or (at your option) any +;; later version. +;; +;; XEmacs is distributed in the hope that it will be useful, but WITHOUT +;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +;; for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with XEmacs; see the file COPYING. If not, write to +;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, +;; Boston, MA 02111-1301, USA. */ + (gtk-define-test "Embedded XEmacs frame" xemacs-frame t (setq window (gtk-window-new 'toplevel))
--- a/tests/gtk/gtk-extra-test.el Mon Oct 05 10:11:59 2009 -0600 +++ b/tests/gtk/gtk-extra-test.el Mon Oct 05 11:08:59 2009 -0600 @@ -1,3 +1,20 @@ +;; This file is part of XEmacs. +;; +;; XEmacs is free software; you can redistribute it and/or modify it +;; under the terms of the GNU General Public License as published by the +;; Free Software Foundation; either version 2, or (at your option) any +;; later version. +;; +;; XEmacs is distributed in the hope that it will be useful, but WITHOUT +;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +;; for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with XEmacs; see the file COPYING. If not, write to +;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, +;; Boston, MA 02111-1301, USA. */ + (require 'gtk-extra) (gtk-define-test
--- a/tests/gtk/statusbar-test.el Mon Oct 05 10:11:59 2009 -0600 +++ b/tests/gtk/statusbar-test.el Mon Oct 05 11:08:59 2009 -0600 @@ -1,3 +1,20 @@ +;; This file is part of XEmacs. +;; +;; XEmacs is free software; you can redistribute it and/or modify it +;; under the terms of the GNU General Public License as published by the +;; Free Software Foundation; either version 2, or (at your option) any +;; later version. +;; +;; XEmacs is distributed in the hope that it will be useful, but WITHOUT +;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +;; for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with XEmacs; see the file COPYING. If not, write to +;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, +;; Boston, MA 02111-1301, USA. */ + (defvar statusbar-hashtable (make-hashtable 29)) (defvar statusbar-gnome-p nil)
--- a/tests/gtk/toolbar-test.el Mon Oct 05 10:11:59 2009 -0600 +++ b/tests/gtk/toolbar-test.el Mon Oct 05 11:08:59 2009 -0600 @@ -1,3 +1,20 @@ +;; This file is part of XEmacs. +;; +;; XEmacs is free software; you can redistribute it and/or modify it +;; under the terms of the GNU General Public License as published by the +;; Free Software Foundation; either version 2, or (at your option) any +;; later version. +;; +;; XEmacs is distributed in the hope that it will be useful, but WITHOUT +;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +;; for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with XEmacs; see the file COPYING. If not, write to +;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, +;; Boston, MA 02111-1301, USA. */ + (require 'gtk-widgets) (require 'gnome-widgets)
--- a/tests/gtk/xemacs-toolbar.el Mon Oct 05 10:11:59 2009 -0600 +++ b/tests/gtk/xemacs-toolbar.el Mon Oct 05 11:08:59 2009 -0600 @@ -1,3 +1,20 @@ +;; This file is part of XEmacs. +;; +;; XEmacs is free software; you can redistribute it and/or modify it +;; under the terms of the GNU General Public License as published by the +;; Free Software Foundation; either version 2, or (at your option) any +;; later version. +;; +;; XEmacs is distributed in the hope that it will be useful, but WITHOUT +;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +;; for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with XEmacs; see the file COPYING. If not, write to +;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, +;; Boston, MA 02111-1301, USA. */ + (defvar gtk-torture-test-toolbar-open-active-p t) (defvar gtk-torture-test-toolbar