summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'misc-overlay/net-misc/gvpndialer/files/gvpndialer-1.1-glade.patch')
-rw-r--r--misc-overlay/net-misc/gvpndialer/files/gvpndialer-1.1-glade.patch3385
1 files changed, 3385 insertions, 0 deletions
diff --git a/misc-overlay/net-misc/gvpndialer/files/gvpndialer-1.1-glade.patch b/misc-overlay/net-misc/gvpndialer/files/gvpndialer-1.1-glade.patch
new file mode 100644
index 0000000..46299ed
--- /dev/null
+++ b/misc-overlay/net-misc/gvpndialer/files/gvpndialer-1.1-glade.patch
@@ -0,0 +1,3385 @@
+Only in gvpndialer-1.1-patched/: Makefile.in
+diff -ru gvpndialer-1.1/aclocal.m4 gvpndialer-1.1-patched/aclocal.m4
+--- gvpndialer-1.1/aclocal.m4 2005-10-02 11:24:25.000000000 -0400
++++ gvpndialer-1.1-patched/aclocal.m4 2006-10-30 22:57:10.000000000 -0500
+@@ -1,7 +1,7 @@
+-# generated automatically by aclocal 1.9.2 -*- Autoconf -*-
++# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+-# Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
++# 2005 Free Software Foundation, Inc.
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -410,81 +410,169 @@
+ AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
+ ])dnl
+
++# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
++#
++# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
++#
++# 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
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program 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 this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
+
+-dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
+-dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
+-dnl also defines GSTUFF_PKG_ERRORS on error
+-AC_DEFUN([PKG_CHECK_MODULES], [
+- succeeded=no
++# PKG_PROG_PKG_CONFIG([MIN-VERSION])
++# ----------------------------------
++AC_DEFUN([PKG_PROG_PKG_CONFIG],
++[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
++m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
++fi
++if test -n "$PKG_CONFIG"; then
++ _pkg_min_version=m4_default([$1], [0.9.0])
++ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
++ AC_MSG_RESULT([yes])
++ else
++ AC_MSG_RESULT([no])
++ PKG_CONFIG=""
++ fi
++
++fi[]dnl
++])# PKG_PROG_PKG_CONFIG
++
++# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
++#
++# Check to see whether a particular set of modules exists. Similar
++# to PKG_CHECK_MODULES(), but does not set variables or print errors.
++#
++#
++# Similar to PKG_CHECK_MODULES, make sure that the first instance of
++# this or PKG_CHECK_MODULES is called, or make sure to call
++# PKG_CHECK_EXISTS manually
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_EXISTS],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++if test -n "$PKG_CONFIG" && \
++ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
++ m4_ifval([$2], [$2], [:])
++m4_ifvaln([$3], [else
++ $3])dnl
++fi])
++
++
++# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
++# ---------------------------------------------
++m4_define([_PKG_CONFIG],
++[if test -n "$PKG_CONFIG"; then
++ if test -n "$$1"; then
++ pkg_cv_[]$1="$$1"
++ else
++ PKG_CHECK_EXISTS([$3],
++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
++ [pkg_failed=yes])
++ fi
++else
++ pkg_failed=untried
++fi[]dnl
++])# _PKG_CONFIG
+
+- if test -z "$PKG_CONFIG"; then
+- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+- fi
++# _PKG_SHORT_ERRORS_SUPPORTED
++# -----------------------------
++AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi[]dnl
++])# _PKG_SHORT_ERRORS_SUPPORTED
+
+- if test "$PKG_CONFIG" = "no" ; then
+- echo "*** The pkg-config script could not be found. Make sure it is"
+- echo "*** in your path, or set the PKG_CONFIG environment variable"
+- echo "*** to the full path to pkg-config."
+- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+- else
+- PKG_CONFIG_MIN_VERSION=0.9.0
+- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+- AC_MSG_CHECKING(for $2)
+-
+- if $PKG_CONFIG --exists "$2" ; then
+- AC_MSG_RESULT(yes)
+- succeeded=yes
+-
+- AC_MSG_CHECKING($1_CFLAGS)
+- $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
+- AC_MSG_RESULT($$1_CFLAGS)
+-
+- AC_MSG_CHECKING($1_LIBS)
+- $1_LIBS=`$PKG_CONFIG --libs "$2"`
+- AC_MSG_RESULT($$1_LIBS)
+- else
+- $1_CFLAGS=""
+- $1_LIBS=""
+- ## If we have a custom action on failure, don't print errors, but
+- ## do set a variable so people can do so.
+- $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+- ifelse([$4], ,echo $$1_PKG_ERRORS,)
+- fi
+
+- AC_SUBST($1_CFLAGS)
+- AC_SUBST($1_LIBS)
+- else
+- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+- echo "*** See http://www.freedesktop.org/software/pkgconfig"
+- fi
+- fi
++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
++# [ACTION-IF-NOT-FOUND])
++#
++#
++# Note that if there is a possibility the first call to
++# PKG_CHECK_MODULES might not happen, you should be sure to include an
++# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
++#
++#
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_MODULES],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+- if test $succeeded = yes; then
+- ifelse([$3], , :, [$3])
+- else
+- ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
+- fi
+-])
++pkg_failed=no
++AC_MSG_CHECKING([for $1])
+
++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
++_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
++and $1[]_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.])
+
+-# -*- Autoconf -*-
+-# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+-# Generated from amversion.in; do not edit by hand.
++if test $pkg_failed = yes; then
++ _PKG_SHORT_ERRORS_SUPPORTED
++ if test $_pkg_short_errors_supported = yes; then
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
++ else
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+-# 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
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++ ifelse([$4], , [AC_MSG_ERROR(dnl
++[Package requirements ($2) were not met:
+
+-# This program 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.
++$$1_PKG_ERRORS
+
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++_PKG_TEXT
++])],
++ [AC_MSG_RESULT([no])
++ $4])
++elif test $pkg_failed = untried; then
++ ifelse([$4], , [AC_MSG_FAILURE(dnl
++[The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++_PKG_TEXT
++
++To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
++ [$4])
++else
++ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
++ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
++ AC_MSG_RESULT([yes])
++ ifelse([$3], , :, [$3])
++fi[]dnl
++])# PKG_CHECK_MODULES
++
++# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+ # AM_AUTOMAKE_VERSION(VERSION)
+ # ----------------------------
+@@ -497,26 +585,15 @@
+ # Call AM_AUTOMAKE_VERSION so it can be traced.
+ # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+- [AM_AUTOMAKE_VERSION([1.9.2])])
+-
+-# AM_AUX_DIR_EXPAND
++ [AM_AUTOMAKE_VERSION([1.9.6])])
+
+-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
++# AM_AUX_DIR_EXPAND -*- Autoconf -*-
+
+-# 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
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program 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 this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+ # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+ # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
+@@ -564,25 +641,14 @@
+ ])
+
+
+-# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003
++# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005
+ # Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# 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
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program 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 this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
+-
+-# serial 3
++# serial 4
+
+ # This was merged into AC_PROG_CC in Autoconf.
+
+@@ -597,26 +663,16 @@
+ ])
+ AU_DEFUN([fp_PROG_CC_STDC])
+
+-# AM_CONDITIONAL -*- Autoconf -*-
+-
+-# Copyright (C) 1997, 2000, 2001, 2003, 2004 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
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++# AM_CONDITIONAL -*- Autoconf -*-
+
+-# This program 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 this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# serial 6
++# serial 7
+
+ # AM_CONDITIONAL(NAME, SHELL-CONDITION)
+ # -------------------------------------
+@@ -640,26 +696,15 @@
+ Usually this means the macro was only invoked conditionally.]])
+ fi])])
+
+-# serial 7 -*- Autoconf -*-
+
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+ # Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# 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
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program 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 this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
+-
++# serial 8
+
+ # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+ # written in clear, in which case automake, when reading aclocal.m4,
+@@ -668,7 +713,6 @@
+ # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+-
+ # _AM_DEPENDENCIES(NAME)
+ # ----------------------
+ # See how the compiler implements dependency checking.
+@@ -808,27 +852,16 @@
+ AC_SUBST([AMDEPBACKSLASH])
+ ])
+
+-# Generate code to set up dependency tracking. -*- Autoconf -*-
+-
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
+-# 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
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++# Generate code to set up dependency tracking. -*- Autoconf -*-
+
+-# This program 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 this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-#serial 2
++#serial 3
+
+ # _AM_OUTPUT_DEPENDENCY_COMMANDS
+ # ------------------------------
+@@ -887,54 +920,31 @@
+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+ ])
+
+-# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
+-
+-# Copyright (C) 1996, 1997, 2000, 2001, 2003 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
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program 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 this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# serial 7
++# serial 8
+
+ # AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
+ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+
+-# Do all the work for Automake. -*- Autoconf -*-
++# Do all the work for Automake. -*- Autoconf -*-
+
+-# This macro actually does too much some checks are only needed if
+-# your package does certain things. But this isn't really a big deal.
+-
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+ # Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# 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
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program 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 this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# serial 12
+
+-# serial 11
++# This macro actually does too much. Some checks are only needed if
++# your package does certain things. But this isn't really a big deal.
+
+ # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+ # AM_INIT_AUTOMAKE([OPTIONS])
+@@ -1036,51 +1046,27 @@
+ done
+ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+
++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
+ # AM_PROG_INSTALL_SH
+ # ------------------
+ # Define $install_sh.
+-
+-# Copyright (C) 2001, 2003 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
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program 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 this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
+-
+ AC_DEFUN([AM_PROG_INSTALL_SH],
+ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+ install_sh=${install_sh-"$am_aux_dir/install-sh"}
+ AC_SUBST(install_sh)])
+
+-# -*- Autoconf -*-
+-# Copyright (C) 2003 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
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program 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 this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# serial 1
++# serial 2
+
+ # Check whether the underlying file-system supports filenames
+ # with a leading dot. For instance MS-DOS doesn't.
+@@ -1095,28 +1081,17 @@
+ rmdir .tst 2>/dev/null
+ AC_SUBST([am__leading_dot])])
+
+-# Add --enable-maintainer-mode option to configure.
++# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
+ # From Jim Meyering
+
+-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004
++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
+ # Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# 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
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program 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 this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
+-
+-# serial 3
++# serial 4
+
+ AC_DEFUN([AM_MAINTAINER_MODE],
+ [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+@@ -1135,26 +1110,15 @@
+
+ AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+
+-# Check to see how 'make' treats includes. -*- Autoconf -*-
+-
+-# Copyright (C) 2001, 2002, 2003 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
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++# Check to see how 'make' treats includes. -*- Autoconf -*-
+
+-# This program 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 this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# serial 2
++# serial 3
+
+ # AM_MAKE_INCLUDE()
+ # -----------------
+@@ -1198,27 +1162,16 @@
+ rm -f confinc confmf
+ ])
+
+-# -*- Autoconf -*-
+-
++# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
+
+-# Copyright (C) 1997, 1999, 2000, 2001, 2003 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
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program 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 this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# serial 3
++# serial 4
+
+ # AM_MISSING_PROG(NAME, PROGRAM)
+ # ------------------------------
+@@ -1244,27 +1197,16 @@
+ fi
+ ])
+
++# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
+ # AM_PROG_MKDIR_P
+ # ---------------
+ # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
+-
+-# Copyright (C) 2003, 2004 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
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program 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 this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
+-
++#
+ # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
+ # created by `make install' are always world readable, even if the
+ # installer happens to have an overly restrictive umask (e.g. 077).
+@@ -1318,26 +1260,15 @@
+ fi
+ AC_SUBST([mkdir_p])])
+
+-# Helper functions for option handling. -*- Autoconf -*-
+-
+-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
++# Helper functions for option handling. -*- Autoconf -*-
+
+-# 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
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program 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 this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# serial 2
++# serial 3
+
+ # _AM_MANGLE_OPTION(NAME)
+ # -----------------------
+@@ -1362,28 +1293,16 @@
+ AC_DEFUN([_AM_IF_OPTION],
+ [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+-#
+-# Check to make sure that the build environment is sane.
+-#
++# Check to make sure that the build environment is sane. -*- Autoconf -*-
+
+-# Copyright (C) 1996, 1997, 2000, 2001, 2003 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
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program 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 this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# serial 3
++# serial 4
+
+ # AM_SANITY_CHECK
+ # ---------------
+@@ -1426,25 +1345,14 @@
+ fi
+ AC_MSG_RESULT(yes)])
+
+-# AM_PROG_INSTALL_STRIP
+-
+-# Copyright (C) 2001, 2003 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
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program 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 this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
++# AM_PROG_INSTALL_STRIP
++# ---------------------
+ # One issue with vendor `install' (even GNU) is that you can't
+ # specify the program used to strip binaries. This is especially
+ # annoying in cross-compiling environments, where the build's strip
+@@ -1467,25 +1375,13 @@
+
+ # Check how to create a tarball. -*- Autoconf -*-
+
+-# Copyright (C) 2004 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
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program 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 this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
+-
+-# serial 1
++# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
++# serial 2
+
+ # _AM_PROG_TAR(FORMAT)
+ # --------------------
+Only in gvpndialer-1.1: autom4te.cache
+Only in gvpndialer-1.1-patched/: config.guess
+Only in gvpndialer-1.1: config.h
+diff -ru gvpndialer-1.1/config.h.in gvpndialer-1.1-patched/config.h.in
+--- gvpndialer-1.1/config.h.in 2005-10-02 11:24:25.000000000 -0400
++++ gvpndialer-1.1-patched/config.h.in 2006-10-30 22:57:15.000000000 -0500
+@@ -31,8 +31,8 @@
+ /* Define to 1 if you have the <memory.h> header file. */
+ #undef HAVE_MEMORY_H
+
+-/* Define to 1 if you have the <pcre/pcre.h> header file. */
+-#undef HAVE_PCRE_PCRE_H
++/* Define to 1 if you have the <pcre.h> header file. */
++#undef HAVE_PCRE_H
+
+ /* Define to 1 if you have the <pty.h> header file. */
+ #undef HAVE_PTY_H
+Only in gvpndialer-1.1-patched/: config.h.in~
+Only in gvpndialer-1.1-patched/: config.sub
+Only in gvpndialer-1.1-patched/: configure
+Only in gvpndialer-1.1-patched/: depcomp
+diff -ru gvpndialer-1.1/gvpn_dialer.glade gvpndialer-1.1-patched/gvpn_dialer.glade
+--- gvpndialer-1.1/gvpn_dialer.glade 2005-10-02 11:24:25.000000000 -0400
++++ gvpndialer-1.1-patched/gvpn_dialer.glade 2006-10-30 23:28:25.000000000 -0500
+@@ -1,1102 +1,697 @@
+-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+-
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
++<!-- Generated with glade3
++ Version: 3.0.1
++ Date: Mon Oct 30 23:28:25 2006
++ User: jnichols
++ Host: francisco-repilado
++-->
+ <glade-interface>
+-<requires lib="gnome"/>
+-<requires lib="bonobo"/>
+-
+-<widget class="GnomeApp" id="vpnclient_main_window">
+- <property name="width_request">504</property>
+- <property name="height_request">237</property>
+- <property name="visible">True</property>
+- <property name="title" translatable="yes">GVPN Dialer</property>
+- <property name="type">GTK_WINDOW_TOPLEVEL</property>
+- <property name="window_position">GTK_WIN_POS_NONE</property>
+- <property name="modal">False</property>
+- <property name="default_width">504</property>
+- <property name="default_height">237</property>
+- <property name="resizable">False</property>
+- <property name="destroy_with_parent">False</property>
+- <property name="decorated">True</property>
+- <property name="skip_taskbar_hint">False</property>
+- <property name="skip_pager_hint">False</property>
+- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+- <property name="focus_on_map">True</property>
+- <property name="enable_layout_config">True</property>
+- <signal name="show" handler="on_vpnclient_main_window_show" last_modification_time="Fri, 03 Oct 2003 02:45:37 GMT"/>
+- <signal name="delete_event" handler="on_vpnclient_main_window_delete_event" last_modification_time="Sat, 18 Oct 2003 00:06:59 GMT"/>
+-
+- <child internal-child="dock">
+- <widget class="BonoboDock" id="bonobodock1">
+- <property name="visible">True</property>
+- <property name="allow_floating">True</property>
+-
+- <child>
+- <widget class="BonoboDockItem" id="bonobodockitem1">
+- <property name="visible">True</property>
+- <property name="shadow_type">GTK_SHADOW_NONE</property>
+-
+- <child>
+- <widget class="GtkMenuBar" id="menubar1">
+- <property name="visible">True</property>
+-
+- <child>
+- <widget class="GtkMenuItem" id="file1">
+- <property name="visible">True</property>
+- <property name="stock_item">GNOMEUIINFO_MENU_FILE_TREE</property>
+-
+- <child>
+- <widget class="GtkMenu" id="file1_menu">
+-
+- <child>
+- <widget class="GtkImageMenuItem" id="quit1">
+- <property name="visible">True</property>
+- <property name="stock_item">GNOMEUIINFO_MENU_EXIT_ITEM</property>
+- <signal name="activate" handler="on_quit1_activate" last_modification_time="Sat, 16 Aug 2003 16:18:55 GMT"/>
+- </widget>
+- </child>
+- </widget>
+- </child>
+- </widget>
+- </child>
+-
+- <child>
+- <widget class="GtkMenuItem" id="edit1">
+- <property name="visible">True</property>
+- <property name="stock_item">GNOMEUIINFO_MENU_EDIT_TREE</property>
+-
+- <child>
+- <widget class="GtkMenu" id="edit1_menu">
+-
+- <child>
+- <widget class="GtkImageMenuItem" id="preferences1">
+- <property name="visible">True</property>
+- <property name="stock_item">GNOMEUIINFO_MENU_PREFERENCES_ITEM</property>
+- <signal name="activate" handler="on_preferences1_activate" last_modification_time="Sat, 16 Aug 2003 16:18:55 GMT"/>
+- </widget>
+- </child>
+- </widget>
+- </child>
+- </widget>
+- </child>
+-
+- <child>
+- <widget class="GtkMenuItem" id="view1">
+- <property name="visible">True</property>
+- <property name="stock_item">GNOMEUIINFO_MENU_VIEW_TREE</property>
+-
+- <child>
+- <widget class="GtkMenu" id="view1_menu">
+-
+- <child>
+- <widget class="GtkImageMenuItem" id="status2">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">_Status</property>
+- <property name="use_underline">True</property>
+- <signal name="activate" handler="on_status2_activate" object="vpnclient_main_window" last_modification_time="Sun, 26 Sep 2004 21:02:12 GMT"/>
+-
+- <child internal-child="image">
+- <widget class="GtkImage" id="image3">
+- <property name="visible">True</property>
+- <property name="pixbuf">Status-Dock.png</property>
+- <property name="xalign">0.5</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- </widget>
+- </child>
+- </widget>
+- </child>
+- </widget>
+- </child>
+- </widget>
+- </child>
+-
+- <child>
+- <widget class="GtkMenuItem" id="help1">
+- <property name="visible">True</property>
+- <property name="stock_item">GNOMEUIINFO_MENU_HELP_TREE</property>
+-
+- <child>
+- <widget class="GtkMenu" id="help1_menu">
+-
+- <child>
+- <widget class="GtkImageMenuItem" id="about1">
+- <property name="visible">True</property>
+- <property name="stock_item">GNOMEUIINFO_MENU_ABOUT_ITEM</property>
+- <signal name="activate" handler="on_about1_activate" last_modification_time="Sat, 16 Aug 2003 16:18:55 GMT"/>
+- </widget>
+- </child>
+- </widget>
+- </child>
+- </widget>
+- </child>
+- </widget>
+- </child>
+- </widget>
+- <packing>
+- <property name="placement">BONOBO_DOCK_TOP</property>
+- <property name="band">0</property>
+- <property name="position">0</property>
+- <property name="offset">0</property>
+- <property name="behavior">BONOBO_DOCK_ITEM_BEH_EXCLUSIVE|BONOBO_DOCK_ITEM_BEH_NEVER_VERTICAL|BONOBO_DOCK_ITEM_BEH_LOCKED</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="BonoboDockItem" id="bonobodockitem2">
+- <property name="visible">True</property>
+- <property name="shadow_type">GTK_SHADOW_OUT</property>
+-
+- <child>
+- <widget class="GtkToolbar" id="toolbar1">
+- <property name="border_width">2</property>
+- <property name="visible">True</property>
+- <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+- <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
+- <property name="tooltips">True</property>
+- <property name="show_arrow">True</property>
+-
+- <child>
+- <widget class="GtkToolButton" id="execute_vpn_button">
+- <property name="border_width">7</property>
+- <property name="width_request">82</property>
+- <property name="height_request">65</property>
+- <property name="visible">True</property>
+- <property name="tooltip" translatable="yes">Start VPN Connection</property>
+- <property name="label" translatable="yes">Connect</property>
+- <property name="use_underline">True</property>
+- <property name="icon">stock_exec_24.png</property>
+- <property name="visible_horizontal">True</property>
+- <property name="visible_vertical">True</property>
+- <property name="is_important">False</property>
+- <signal name="clicked" handler="on_execute_vpn_button_clicked" last_modification_time="Sat, 11 Oct 2003 15:28:20 GMT"/>
+- </widget>
+- <packing>
+- <property name="expand">False</property>
+- <property name="homogeneous">True</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkToolButton" id="disconnect_button">
+- <property name="border_width">8</property>
+- <property name="width_request">99</property>
+- <property name="height_request">61</property>
+- <property name="visible">True</property>
+- <property name="tooltip" translatable="yes">Start VPN Connection</property>
+- <property name="label" translatable="yes">Disconnect</property>
+- <property name="use_underline">True</property>
+- <property name="icon">stock_stop_24.png</property>
+- <property name="visible_horizontal">True</property>
+- <property name="visible_vertical">True</property>
+- <property name="is_important">False</property>
+- <signal name="clicked" handler="on_disconnect_button_clicked" last_modification_time="Sat, 11 Oct 2003 16:22:32 GMT"/>
+- </widget>
+- <packing>
+- <property name="expand">False</property>
+- <property name="homogeneous">True</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkSeparatorToolItem" id="separatortoolitem1">
+- <property name="visible">True</property>
+- <property name="draw">True</property>
+- <property name="visible_horizontal">True</property>
+- <property name="visible_vertical">True</property>
+- </widget>
+- <packing>
+- <property name="expand">False</property>
+- <property name="homogeneous">False</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkToolButton" id="status_button">
+- <property name="border_width">7</property>
+- <property name="visible">True</property>
+- <property name="tooltip" translatable="yes">Get VPN Stats</property>
+- <property name="label" translatable="yes">_Status</property>
+- <property name="use_underline">True</property>
+- <property name="icon">Status-Dock.png</property>
+- <property name="visible_horizontal">True</property>
+- <property name="visible_vertical">True</property>
+- <property name="is_important">False</property>
+- <signal name="clicked" handler="on_status_button_clicked" last_modification_time="Sat, 11 Oct 2003 15:30:25 GMT"/>
+- </widget>
+- <packing>
+- <property name="expand">False</property>
+- <property name="homogeneous">True</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkSeparatorToolItem" id="separatortoolitem2">
+- <property name="visible">True</property>
+- <property name="draw">True</property>
+- <property name="visible_horizontal">True</property>
+- <property name="visible_vertical">True</property>
+- </widget>
+- <packing>
+- <property name="expand">False</property>
+- <property name="homogeneous">False</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkToolButton" id="quit_button">
+- <property name="border_width">7</property>
+- <property name="visible">True</property>
+- <property name="tooltip" translatable="yes">Quit GVPN Dialer</property>
+- <property name="stock_id">gtk-quit</property>
+- <property name="visible_horizontal">True</property>
+- <property name="visible_vertical">True</property>
+- <property name="is_important">False</property>
+- <signal name="clicked" handler="on_quit_button_clicked" last_modification_time="Sat, 11 Oct 2003 15:29:51 GMT"/>
+- </widget>
+- <packing>
+- <property name="expand">False</property>
+- <property name="homogeneous">True</property>
+- </packing>
+- </child>
+- </widget>
+- </child>
+- </widget>
+- <packing>
+- <property name="placement">BONOBO_DOCK_TOP</property>
+- <property name="band">1</property>
+- <property name="position">0</property>
+- <property name="offset">0</property>
+- <property name="behavior">BONOBO_DOCK_ITEM_BEH_EXCLUSIVE|BONOBO_DOCK_ITEM_BEH_LOCKED</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkVBox" id="vbox2">
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">0</property>
+-
+- <child>
+- <widget class="GtkTable" id="table3">
+- <property name="border_width">20</property>
+- <property name="width_request">482</property>
+- <property name="height_request">89</property>
+- <property name="visible">True</property>
+- <property name="n_rows">2</property>
+- <property name="n_columns">2</property>
+- <property name="homogeneous">False</property>
+- <property name="row_spacing">8</property>
+- <property name="column_spacing">19</property>
+-
+- <child>
+- <widget class="GtkLabel" id="label10">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">VPN Connection Profile</property>
+- <property name="use_underline">False</property>
+- <property name="use_markup">False</property>
+- <property name="justify">GTK_JUSTIFY_CENTER</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="left_attach">0</property>
+- <property name="right_attach">1</property>
+- <property name="top_attach">0</property>
+- <property name="bottom_attach">1</property>
+- <property name="x_options">fill</property>
+- <property name="y_options"></property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkEntry" id="hostname_entry">
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="editable">False</property>
+- <property name="visibility">True</property>
+- <property name="max_length">30</property>
+- <property name="text" translatable="yes"></property>
+- <property name="has_frame">True</property>
+- <property name="invisible_char">*</property>
+- <property name="activates_default">False</property>
+- </widget>
+- <packing>
+- <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+- <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="y_options"></property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkCombo" id="profile_entry">
+- <property name="visible">True</property>
+- <property name="value_in_list">False</property>
+- <property name="allow_empty">True</property>
+- <property name="case_sensitive">False</property>
+- <property name="enable_arrow_keys">True</property>
+- <property name="enable_arrows_always">False</property>
+-
+- <child internal-child="entry">
+- <widget class="GtkEntry" id="vpn_profile_entry_box">
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="editable">False</property>
+- <property name="visibility">True</property>
+- <property name="max_length">20</property>
+- <property name="text" translatable="yes"></property>
+- <property name="has_frame">True</property>
+- <property name="invisible_char">*</property>
+- <property name="activates_default">False</property>
+- <signal name="changed" handler="on_vpn_profile_entry_box_changed" last_modification_time="Sat, 11 Oct 2003 14:43:42 GMT"/>
+- </widget>
+- </child>
+-
+- <child internal-child="list">
+- <widget class="GtkList" id="vpn_profile_combolist">
+- <property name="visible">True</property>
+- <property name="selection_mode">GTK_SELECTION_BROWSE</property>
+- </widget>
+- </child>
+- </widget>
+- <packing>
+- <property name="left_attach">0</property>
+- <property name="right_attach">1</property>
+- <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="y_options"></property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkLabel" id="label11">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">Hostname</property>
+- <property name="use_underline">False</property>
+- <property name="use_markup">False</property>
+- <property name="justify">GTK_JUSTIFY_CENTER</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+- <property name="top_attach">0</property>
+- <property name="bottom_attach">1</property>
+- <property name="x_padding">89</property>
+- <property name="x_options">fill</property>
+- <property name="y_options"></property>
+- </packing>
+- </child>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">False</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkHSeparator" id="hseparator2">
+- <property name="visible">True</property>
+- </widget>
+- <packing>
+- <property name="padding">8</property>
+- <property name="expand">False</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkHBox" id="hbox1">
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">0</property>
+-
+- <child>
+- <widget class="GtkImage" id="statusimage">
+- <property name="width_request">31</property>
+- <property name="height_request">21</property>
+- <property name="visible">True</property>
+- <property name="stock">gtk-dialog-info</property>
+- <property name="icon_size">4</property>
+- <property name="xalign">0.5</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">False</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GnomeAppBar" id="statusbar">
+- <property name="border_width">2</property>
+- <property name="visible">True</property>
+- <property name="has_progress">False</property>
+- <property name="has_status">True</property>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">False</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+- </widget>
+- </child>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+-</widget>
+-
+-<widget class="GtkWindow" id="login_window">
+- <property name="visible">True</property>
+- <property name="title" translatable="yes">Login Window</property>
+- <property name="type">GTK_WINDOW_TOPLEVEL</property>
+- <property name="window_position">GTK_WIN_POS_NONE</property>
+- <property name="modal">False</property>
+- <property name="default_width">350</property>
+- <property name="default_height">190</property>
+- <property name="resizable">False</property>
+- <property name="destroy_with_parent">False</property>
+- <property name="decorated">True</property>
+- <property name="skip_taskbar_hint">False</property>
+- <property name="skip_pager_hint">False</property>
+- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+- <property name="focus_on_map">True</property>
+- <signal name="delete_event" handler="on_login_window_delete_event" last_modification_time="Sat, 18 Oct 2003 00:07:16 GMT"/>
+-
+- <child>
+- <widget class="GtkVBox" id="vbox5">
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">0</property>
+-
+- <child>
+- <widget class="GtkLabel" id="invalid_user_pass">
+- <property name="width_request">40</property>
+- <property name="height_request">24</property>
+- <property name="visible">True</property>
+- <property name="label" translatable="yes"> </property>
+- <property name="use_underline">False</property>
+- <property name="use_markup">False</property>
+- <property name="justify">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">0.5</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkTable" id="table1">
+- <property name="border_width">13</property>
+- <property name="width_request">339</property>
+- <property name="height_request">87</property>
+- <property name="visible">True</property>
+- <property name="n_rows">2</property>
+- <property name="n_columns">2</property>
+- <property name="homogeneous">False</property>
+- <property name="row_spacing">15</property>
+- <property name="column_spacing">2</property>
+-
+- <child>
+- <widget class="GtkLabel" id="label4">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">Enter Username:</property>
+- <property name="use_underline">False</property>
+- <property name="use_markup">False</property>
+- <property name="justify">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="left_attach">0</property>
+- <property name="right_attach">1</property>
+- <property name="top_attach">0</property>
+- <property name="bottom_attach">1</property>
+- <property name="x_options">fill</property>
+- <property name="y_options"></property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkLabel" id="label5">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">Enter Password:</property>
+- <property name="use_underline">False</property>
+- <property name="use_markup">False</property>
+- <property name="justify">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="left_attach">0</property>
+- <property name="right_attach">1</property>
+- <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="x_options">fill</property>
+- <property name="y_options"></property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkEntry" id="enter_username">
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="editable">True</property>
+- <property name="visibility">True</property>
+- <property name="max_length">30</property>
+- <property name="text" translatable="yes"></property>
+- <property name="has_frame">True</property>
+- <property name="invisible_char">*</property>
+- <property name="activates_default">False</property>
+- <signal name="activate" handler="on_enter_username_activate" last_modification_time="Sun, 25 Jul 2004 03:38:57 GMT"/>
+- </widget>
+- <packing>
+- <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+- <property name="top_attach">0</property>
+- <property name="bottom_attach">1</property>
+- <property name="y_options"></property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkEntry" id="enter_password">
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="editable">True</property>
+- <property name="visibility">False</property>
+- <property name="max_length">30</property>
+- <property name="text" translatable="yes"></property>
+- <property name="has_frame">True</property>
+- <property name="invisible_char">*</property>
+- <property name="activates_default">False</property>
+- <signal name="activate" handler="on_enter_password_activate" last_modification_time="Sun, 25 Jul 2004 03:38:28 GMT"/>
+- </widget>
+- <packing>
+- <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+- <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="y_options"></property>
+- </packing>
+- </child>
+- </widget>
+- <packing>
+- <property name="padding">6</property>
+- <property name="expand">False</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkHButtonBox" id="hbuttonbox1">
+- <property name="border_width">14</property>
+- <property name="visible">True</property>
+- <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
+- <property name="spacing">0</property>
+-
+- <child>
+- <widget class="GtkButton" id="cancel_button">
+- <property name="visible">True</property>
+- <property name="can_default">True</property>
+- <property name="can_focus">True</property>
+- <property name="label">gtk-cancel</property>
+- <property name="use_stock">True</property>
+- <property name="relief">GTK_RELIEF_NORMAL</property>
+- <property name="focus_on_click">True</property>
+- <signal name="clicked" handler="on_cancel_button_clicked" last_modification_time="Fri, 03 Oct 2003 02:34:44 GMT"/>
+- </widget>
+- </child>
+-
+- <child>
+- <widget class="GtkButton" id="submit_button">
+- <property name="visible">True</property>
+- <property name="can_default">True</property>
+- <property name="can_focus">True</property>
+- <property name="label">gtk-ok</property>
+- <property name="use_stock">True</property>
+- <property name="relief">GTK_RELIEF_NORMAL</property>
+- <property name="focus_on_click">True</property>
+- <signal name="clicked" handler="on_submit_button_clicked" last_modification_time="Fri, 03 Oct 2003 02:28:55 GMT"/>
+- <signal name="activate" handler="on_submit_button_activate" last_modification_time="Sun, 25 Jul 2004 03:39:39 GMT"/>
+- </widget>
+- </child>
+- </widget>
+- <packing>
+- <property name="padding">3</property>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- </packing>
+- </child>
+- </widget>
+- </child>
+-</widget>
+-
+-<widget class="GtkWindow" id="preference_window">
+- <property name="border_width">7</property>
+- <property name="width_request">400</property>
+- <property name="height_request">300</property>
+- <property name="visible">True</property>
+- <property name="title" translatable="yes">Preferences</property>
+- <property name="type">GTK_WINDOW_TOPLEVEL</property>
+- <property name="window_position">GTK_WIN_POS_NONE</property>
+- <property name="modal">False</property>
+- <property name="resizable">False</property>
+- <property name="destroy_with_parent">False</property>
+- <property name="decorated">True</property>
+- <property name="skip_taskbar_hint">False</property>
+- <property name="skip_pager_hint">False</property>
+- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+- <property name="focus_on_map">True</property>
+- <signal name="delete_event" handler="on_preference_window_delete_event" last_modification_time="Sat, 18 Oct 2003 00:07:28 GMT"/>
+-
+- <child>
+- <widget class="GtkNotebook" id="notebook1">
+- <property name="width_request">302</property>
+- <property name="height_request">89</property>
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="show_tabs">True</property>
+- <property name="show_border">True</property>
+- <property name="tab_pos">GTK_POS_TOP</property>
+- <property name="scrollable">False</property>
+- <property name="enable_popup">False</property>
+-
+- <child>
+- <widget class="GtkVBox" id="vbox6">
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">0</property>
+-
+- <child>
+- <widget class="GtkFrame" id="frame1">
+- <property name="width_request">300</property>
+- <property name="height_request">48</property>
+- <property name="visible">True</property>
+- <property name="label_xalign">0</property>
+- <property name="label_yalign">0.5</property>
+- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+-
+- <child>
+- <widget class="GtkTable" id="table2">
+- <property name="border_width">12</property>
+- <property name="visible">True</property>
+- <property name="n_rows">4</property>
+- <property name="n_columns">2</property>
+- <property name="homogeneous">False</property>
+- <property name="row_spacing">8</property>
+- <property name="column_spacing">5</property>
+-
+- <child>
+- <widget class="GtkLabel" id="label8">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">Path to vpnclient:</property>
+- <property name="use_underline">False</property>
+- <property name="use_markup">False</property>
+- <property name="justify">GTK_JUSTIFY_RIGHT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="left_attach">0</property>
+- <property name="right_attach">1</property>
+- <property name="top_attach">0</property>
+- <property name="bottom_attach">1</property>
+- <property name="x_options">fill</property>
+- <property name="y_options"></property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkEntry" id="vpnclient_path_entry">
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="editable">True</property>
+- <property name="visibility">True</property>
+- <property name="max_length">0</property>
+- <property name="text" translatable="yes"></property>
+- <property name="has_frame">True</property>
+- <property name="invisible_char">*</property>
+- <property name="activates_default">False</property>
+- </widget>
+- <packing>
+- <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+- <property name="top_attach">0</property>
+- <property name="bottom_attach">1</property>
+- <property name="y_options"></property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkLabel" id="label9">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">VPN Profile Path:</property>
+- <property name="use_underline">False</property>
+- <property name="use_markup">False</property>
+- <property name="justify">GTK_JUSTIFY_RIGHT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="left_attach">0</property>
+- <property name="right_attach">1</property>
+- <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="x_options">fill</property>
+- <property name="y_options"></property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkEntry" id="vpn_profile_path_entry">
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="editable">True</property>
+- <property name="visibility">True</property>
+- <property name="max_length">0</property>
+- <property name="text" translatable="yes"></property>
+- <property name="has_frame">True</property>
+- <property name="invisible_char">*</property>
+- <property name="activates_default">False</property>
+- </widget>
+- <packing>
+- <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+- <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="y_options"></property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkLabel" id="label16">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">Default User:</property>
+- <property name="use_underline">False</property>
+- <property name="use_markup">False</property>
+- <property name="justify">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="left_attach">0</property>
+- <property name="right_attach">1</property>
+- <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+- <property name="x_options">fill</property>
+- <property name="y_options"></property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkEntry" id="vpnclient_default_user_entry">
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="editable">True</property>
+- <property name="visibility">True</property>
+- <property name="max_length">0</property>
+- <property name="text" translatable="yes"></property>
+- <property name="has_frame">True</property>
+- <property name="invisible_char">*</property>
+- <property name="activates_default">False</property>
+- </widget>
+- <packing>
+- <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+- <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+- <property name="y_options"></property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkCheckButton" id="vpnclient_start_hidden_cb">
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="label" translatable="yes">Start Hidden</property>
+- <property name="use_underline">True</property>
+- <property name="relief">GTK_RELIEF_NORMAL</property>
+- <property name="focus_on_click">True</property>
+- <property name="active">False</property>
+- <property name="inconsistent">False</property>
+- <property name="draw_indicator">True</property>
+- </widget>
+- <packing>
+- <property name="left_attach">0</property>
+- <property name="right_attach">2</property>
+- <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+- <property name="x_options">fill</property>
+- <property name="y_options"></property>
+- </packing>
+- </child>
+- </widget>
+- </child>
+-
+- <child>
+- <widget class="GtkLabel" id="label7">
+- <property name="width_request">92</property>
+- <property name="height_request">17</property>
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">Basic Options:</property>
+- <property name="use_underline">False</property>
+- <property name="use_markup">False</property>
+- <property name="justify">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">0.5</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="type">label_item</property>
+- </packing>
+- </child>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkHButtonBox" id="hbuttonbox2">
+- <property name="border_width">7</property>
+- <property name="width_request">107</property>
+- <property name="height_request">62</property>
+- <property name="visible">True</property>
+- <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
+- <property name="spacing">14</property>
+-
+- <child>
+- <widget class="GtkButton" id="preference_cancel_button">
+- <property name="visible">True</property>
+- <property name="can_default">True</property>
+- <property name="can_focus">True</property>
+- <property name="label">gtk-cancel</property>
+- <property name="use_stock">True</property>
+- <property name="relief">GTK_RELIEF_NORMAL</property>
+- <property name="focus_on_click">True</property>
+- <signal name="clicked" handler="on_preference_cancel_button_clicked" last_modification_time="Fri, 03 Oct 2003 02:34:14 GMT"/>
+- </widget>
+- </child>
+-
+- <child>
+- <widget class="GtkButton" id="preference_apply_button">
+- <property name="visible">True</property>
+- <property name="can_default">True</property>
+- <property name="can_focus">True</property>
+- <property name="label">gtk-apply</property>
+- <property name="use_stock">True</property>
+- <property name="relief">GTK_RELIEF_NORMAL</property>
+- <property name="focus_on_click">True</property>
+- <signal name="clicked" handler="on_preference_apply_button_clicked" last_modification_time="Fri, 03 Oct 2003 02:30:49 GMT"/>
+- </widget>
+- </child>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- </packing>
+- </child>
+- </widget>
+- <packing>
+- <property name="tab_expand">False</property>
+- <property name="tab_fill">True</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkLabel" id="general_label">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">General</property>
+- <property name="use_underline">False</property>
+- <property name="use_markup">False</property>
+- <property name="justify">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">0.5</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="type">tab</property>
+- </packing>
+- </child>
+- </widget>
+- </child>
+-</widget>
+-
+-<widget class="GtkWindow" id="status_window">
+- <property name="border_width">7</property>
+- <property name="width_request">433</property>
+- <property name="visible">True</property>
+- <property name="title" translatable="yes">Status Window</property>
+- <property name="type">GTK_WINDOW_TOPLEVEL</property>
+- <property name="window_position">GTK_WIN_POS_NONE</property>
+- <property name="modal">False</property>
+- <property name="default_width">433</property>
+- <property name="default_height">431</property>
+- <property name="resizable">False</property>
+- <property name="destroy_with_parent">False</property>
+- <property name="icon">Status-Dock.png</property>
+- <property name="decorated">True</property>
+- <property name="skip_taskbar_hint">False</property>
+- <property name="skip_pager_hint">False</property>
+- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+- <property name="focus_on_map">True</property>
+- <signal name="delete_event" handler="on_status_window_delete_event" last_modification_time="Sat, 18 Oct 2003 00:07:38 GMT"/>
+- <signal name="show" handler="on_status_window_show" last_modification_time="Sun, 01 Aug 2004 22:44:07 GMT"/>
+-
+- <child>
+- <widget class="GtkNotebook" id="notebook2">
+- <property name="border_width">6</property>
+- <property name="width_request">143</property>
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="show_tabs">True</property>
+- <property name="show_border">True</property>
+- <property name="tab_pos">GTK_POS_TOP</property>
+- <property name="scrollable">True</property>
+- <property name="enable_popup">True</property>
+-
+- <child>
+- <widget class="GtkVBox" id="vbox7">
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">0</property>
+-
+- <child>
+- <widget class="GtkFrame" id="frame4">
+- <property name="width_request">172</property>
+- <property name="height_request">126</property>
+- <property name="visible">True</property>
+- <property name="label_xalign">0</property>
+- <property name="label_yalign">0.5</property>
+- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+-
+- <child>
+- <widget class="GtkTextView" id="trafficstats_text">
+- <property name="border_width">1</property>
+- <property name="width_request">168</property>
+- <property name="visible">True</property>
+- <property name="editable">False</property>
+- <property name="overwrite">False</property>
+- <property name="accepts_tab">False</property>
+- <property name="justification">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap_mode">GTK_WRAP_NONE</property>
+- <property name="cursor_visible">False</property>
+- <property name="pixels_above_lines">0</property>
+- <property name="pixels_below_lines">0</property>
+- <property name="pixels_inside_wrap">0</property>
+- <property name="left_margin">0</property>
+- <property name="right_margin">0</property>
+- <property name="indent">0</property>
+- <property name="text" translatable="yes">Time connected: 0 day(s), 00:00.16
++ <requires lib="bonobo"/>
++ <requires lib="gnome"/>
++ <widget class="GnomeApp" id="vpnclient_main_window">
++ <property name="width_request">504</property>
++ <property name="height_request">237</property>
++ <property name="visible">True</property>
++ <property name="title">GVPN Dialer</property>
++ <property name="resizable">False</property>
++ <property name="default_width">504</property>
++ <property name="default_height">237</property>
++ <property name="enable_layout_config">True</property>
++ <signal name="show" handler="on_vpnclient_main_window_show"/>
++ <signal name="delete_event" handler="on_vpnclient_main_window_delete_event"/>
++ <child internal-child="dock">
++ <widget class="BonoboDock" id="bonobodock1">
++ <property name="visible">True</property>
++ <property name="allow_floating">True</property>
++ <child>
++ <widget class="GtkVBox" id="vbox2">
++ <property name="visible">True</property>
++ <child>
++ <widget class="GtkTable" id="table3">
++ <property name="width_request">482</property>
++ <property name="height_request">89</property>
++ <property name="visible">True</property>
++ <property name="border_width">20</property>
++ <property name="n_rows">2</property>
++ <property name="n_columns">2</property>
++ <property name="column_spacing">19</property>
++ <property name="row_spacing">8</property>
++ <child>
++ <widget class="GtkLabel" id="label10">
++ <property name="visible">True</property>
++ <property name="xalign">0.000000</property>
++ <property name="label" translatable="yes">VPN Connection Profile</property>
++ <property name="justify">GTK_JUSTIFY_CENTER</property>
++ </widget>
++ <packing>
++ <property name="x_options">GTK_FILL</property>
++ <property name="y_options"></property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkEntry" id="hostname_entry">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="editable">False</property>
++ <property name="max_length">30</property>
++ </widget>
++ <packing>
++ <property name="left_attach">1</property>
++ <property name="right_attach">2</property>
++ <property name="top_attach">1</property>
++ <property name="bottom_attach">2</property>
++ <property name="y_options"></property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkCombo" id="profile_entry">
++ <property name="visible">True</property>
++ <property name="enable_arrows_always">False</property>
++ <child internal-child="entry">
++ <widget class="GtkEntry" id="vpn_profile_entry_box">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="editable">False</property>
++ <property name="max_length">20</property>
++ <signal name="changed" handler="on_vpn_profile_entry_box_changed"/>
++ </widget>
++ </child>
++ <child internal-child="list">
++ <widget class="GtkList" id="vpn_profile_combolist">
++ <property name="visible">True</property>
++ <property name="selection_mode">GTK_SELECTION_BROWSE</property>
++ </widget>
++ </child>
++ </widget>
++ <packing>
++ <property name="top_attach">1</property>
++ <property name="bottom_attach">2</property>
++ <property name="y_options"></property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkLabel" id="label11">
++ <property name="visible">True</property>
++ <property name="xalign">0.000000</property>
++ <property name="label" translatable="yes">Hostname</property>
++ <property name="justify">GTK_JUSTIFY_CENTER</property>
++ </widget>
++ <packing>
++ <property name="left_attach">1</property>
++ <property name="right_attach">2</property>
++ <property name="x_options">GTK_FILL</property>
++ <property name="y_options"></property>
++ <property name="x_padding">89</property>
++ </packing>
++ </child>
++ </widget>
++ <packing>
++ <property name="expand">False</property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkHSeparator" id="hseparator2">
++ <property name="visible">True</property>
++ </widget>
++ <packing>
++ <property name="expand">False</property>
++ <property name="padding">8</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkHBox" id="hbox1">
++ <property name="visible">True</property>
++ <child>
++ <widget class="GtkImage" id="statusimage">
++ <property name="width_request">31</property>
++ <property name="height_request">21</property>
++ <property name="visible">True</property>
++ <property name="stock">gtk-dialog-info</property>
++ </widget>
++ <packing>
++ <property name="expand">False</property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GnomeAppBar" id="statusbar">
++ <property name="visible">True</property>
++ <property name="border_width">2</property>
++ <property name="has_status">True</property>
++ </widget>
++ <packing>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </widget>
++ <packing>
++ <property name="expand">False</property>
++ <property name="position">2</property>
++ </packing>
++ </child>
++ </widget>
++ </child>
++ <child>
++ <widget class="BonoboDockItem" id="bonobodockitem1">
++ <property name="visible">True</property>
++ <child>
++ <widget class="GtkMenuBar" id="menubar1">
++ <property name="visible">True</property>
++ <child>
++ <widget class="GtkMenuItem" id="file1">
++ <property name="visible">True</property>
++ <property name="label">_File</property>
++ <property name="use_underline">True</property>
++ <child>
++ <widget class="GtkMenu" id="file1_menu">
++ <child>
++ <widget class="GtkImageMenuItem" id="quit1">
++ <property name="visible">True</property>
++ <property name="label">gtk-quit</property>
++ <property name="use_underline">True</property>
++ <property name="use_stock">True</property>
++ <signal name="activate" handler="on_quit1_activate"/>
++ </widget>
++ </child>
++ </widget>
++ </child>
++ </widget>
++ </child>
++ <child>
++ <widget class="GtkMenuItem" id="edit1">
++ <property name="visible">True</property>
++ <property name="label">_Edit</property>
++ <property name="use_underline">True</property>
++ <child>
++ <widget class="GtkMenu" id="edit1_menu">
++ <child>
++ <widget class="GtkImageMenuItem" id="preferences1">
++ <property name="visible">True</property>
++ <property name="label">gtk-preferences</property>
++ <property name="use_underline">True</property>
++ <property name="use_stock">True</property>
++ <signal name="activate" handler="on_preferences1_activate"/>
++ </widget>
++ </child>
++ </widget>
++ </child>
++ </widget>
++ </child>
++ <child>
++ <widget class="GtkMenuItem" id="view1">
++ <property name="visible">True</property>
++ <property name="label">_View</property>
++ <property name="use_underline">True</property>
++ <child>
++ <widget class="GtkMenu" id="view1_menu">
++ <child>
++ <widget class="GtkImageMenuItem" id="status2">
++ <property name="visible">True</property>
++ <property name="label">_Status</property>
++ <property name="use_underline">True</property>
++ <signal name="activate" handler="on_status2_activate" object="vpnclient_main_window"/>
++ <child internal-child="image">
++ <widget class="GtkImage" id="image3">
++ <property name="visible">True</property>
++ <property name="pixbuf">Status-Dock.png</property>
++ </widget>
++ </child>
++ </widget>
++ </child>
++ </widget>
++ </child>
++ </widget>
++ </child>
++ <child>
++ <widget class="GtkMenuItem" id="help1">
++ <property name="visible">True</property>
++ <property name="label">_Help</property>
++ <property name="use_underline">True</property>
++ <child>
++ <widget class="GtkMenu" id="help1_menu">
++ <child>
++ <widget class="GtkImageMenuItem" id="about1">
++ <property name="visible">True</property>
++ <property name="label">gtk-about</property>
++ <property name="use_underline">True</property>
++ <property name="use_stock">True</property>
++ <signal name="activate" handler="on_about1_activate"/>
++ </widget>
++ </child>
++ </widget>
++ </child>
++ </widget>
++ </child>
++ </widget>
++ </child>
++ </widget>
++ <packing>
++ <property name="behavior">BONOBO_DOCK_ITEM_BEH_EXCLUSIVE | BONOBO_DOCK_ITEM_BEH_NEVER_VERTICAL | BONOBO_DOCK_ITEM_BEH_LOCKED</property>
++ </packing>
++ </child>
++ <child>
++ <widget class="BonoboDockItem" id="bonobodockitem2">
++ <property name="visible">True</property>
++ <child>
++ <widget class="GtkToolbar" id="toolbar1">
++ <property name="visible">True</property>
++ <property name="border_width">2</property>
++ <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
++ <child>
++ <widget class="GtkToolButton" id="execute_vpn_button">
++ <property name="width_request">82</property>
++ <property name="height_request">65</property>
++ <property name="visible">True</property>
++ <property name="border_width">7</property>
++ <property name="label">Connect</property>
++ <property name="use_underline">True</property>
++ <property name="stock_id">gtk-connect</property>
++ <property name="tooltip">Start VPN Connection</property>
++ <signal name="clicked" handler="on_execute_vpn_button_clicked"/>
++ </widget>
++ </child>
++ <child>
++ <widget class="GtkToolButton" id="disconnect_button">
++ <property name="width_request">99</property>
++ <property name="height_request">61</property>
++ <property name="visible">True</property>
++ <property name="border_width">8</property>
++ <property name="label">Disconnect</property>
++ <property name="use_underline">True</property>
++ <property name="stock_id">gtk-disconnect</property>
++ <property name="tooltip">Start VPN Connection</property>
++ <signal name="clicked" handler="on_disconnect_button_clicked"/>
++ </widget>
++ </child>
++ <child>
++ <widget class="GtkSeparatorToolItem" id="separatortoolitem1">
++ <property name="visible">True</property>
++ </widget>
++ </child>
++ <child>
++ <widget class="GtkToolButton" id="status_button">
++ <property name="visible">True</property>
++ <property name="border_width">7</property>
++ <property name="label">Status</property>
++ <property name="use_underline">True</property>
++ <property name="stock_id">gtk-dialog-info</property>
++ <property name="tooltip">Get VPN Stats</property>
++ <signal name="clicked" handler="on_status_button_clicked"/>
++ </widget>
++ </child>
++ <child>
++ <widget class="GtkSeparatorToolItem" id="separatortoolitem2">
++ <property name="visible">True</property>
++ </widget>
++ </child>
++ <child>
++ <widget class="GtkToolButton" id="quit_button">
++ <property name="visible">True</property>
++ <property name="border_width">7</property>
++ <property name="stock_id">gtk-quit</property>
++ <property name="tooltip">Quit GVPN Dialer</property>
++ <signal name="clicked" handler="on_quit_button_clicked"/>
++ </widget>
++ </child>
++ </widget>
++ </child>
++ </widget>
++ <packing>
++ <property name="band">1</property>
++ <property name="behavior">BONOBO_DOCK_ITEM_BEH_EXCLUSIVE | BONOBO_DOCK_ITEM_BEH_LOCKED</property>
++ </packing>
++ </child>
++ </widget>
++ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
++ </packing>
++ </child>
++ </widget>
++ <widget class="GtkWindow" id="login_window">
++ <property name="visible">True</property>
++ <property name="title">Login Window</property>
++ <property name="resizable">False</property>
++ <property name="default_width">350</property>
++ <property name="default_height">190</property>
++ <signal name="delete_event" handler="on_login_window_delete_event"/>
++ <child>
++ <widget class="GtkVBox" id="vbox5">
++ <property name="visible">True</property>
++ <child>
++ <widget class="GtkLabel" id="invalid_user_pass">
++ <property name="width_request">40</property>
++ <property name="height_request">24</property>
++ <property name="visible">True</property>
++ <property name="label" translatable="yes"> </property>
++ </widget>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkTable" id="table1">
++ <property name="width_request">339</property>
++ <property name="height_request">87</property>
++ <property name="visible">True</property>
++ <property name="border_width">13</property>
++ <property name="n_rows">2</property>
++ <property name="n_columns">2</property>
++ <property name="column_spacing">2</property>
++ <property name="row_spacing">15</property>
++ <child>
++ <widget class="GtkLabel" id="label4">
++ <property name="visible">True</property>
++ <property name="xalign">0.000000</property>
++ <property name="label" translatable="yes">Enter Username:</property>
++ </widget>
++ <packing>
++ <property name="x_options">GTK_FILL</property>
++ <property name="y_options"></property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkLabel" id="label5">
++ <property name="visible">True</property>
++ <property name="xalign">0.000000</property>
++ <property name="label" translatable="yes">Enter Password:</property>
++ </widget>
++ <packing>
++ <property name="top_attach">1</property>
++ <property name="bottom_attach">2</property>
++ <property name="x_options">GTK_FILL</property>
++ <property name="y_options"></property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkEntry" id="enter_username">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="max_length">30</property>
++ <signal name="activate" handler="on_enter_username_activate"/>
++ </widget>
++ <packing>
++ <property name="left_attach">1</property>
++ <property name="right_attach">2</property>
++ <property name="y_options"></property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkEntry" id="enter_password">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="max_length">30</property>
++ <property name="visibility">False</property>
++ <signal name="activate" handler="on_enter_password_activate"/>
++ </widget>
++ <packing>
++ <property name="left_attach">1</property>
++ <property name="right_attach">2</property>
++ <property name="top_attach">1</property>
++ <property name="bottom_attach">2</property>
++ <property name="y_options"></property>
++ </packing>
++ </child>
++ </widget>
++ <packing>
++ <property name="expand">False</property>
++ <property name="padding">6</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkHButtonBox" id="hbuttonbox1">
++ <property name="visible">True</property>
++ <property name="border_width">14</property>
++ <child>
++ <widget class="GtkButton" id="cancel_button">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="can_default">True</property>
++ <property name="label">gtk-cancel</property>
++ <property name="use_stock">True</property>
++ <signal name="clicked" handler="on_cancel_button_clicked"/>
++ </widget>
++ </child>
++ <child>
++ <widget class="GtkButton" id="submit_button">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="can_default">True</property>
++ <property name="has_default">True</property>
++ <property name="label">gtk-ok</property>
++ <property name="use_stock">True</property>
++ <signal name="clicked" handler="on_submit_button_clicked"/>
++ <signal name="activate" handler="on_submit_button_activate"/>
++ </widget>
++ <packing>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </widget>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="padding">3</property>
++ <property name="position">2</property>
++ </packing>
++ </child>
++ </widget>
++ </child>
++ </widget>
++ <widget class="GtkWindow" id="preference_window">
++ <property name="width_request">400</property>
++ <property name="height_request">300</property>
++ <property name="visible">True</property>
++ <property name="border_width">7</property>
++ <property name="title">Preferences</property>
++ <property name="resizable">False</property>
++ <signal name="delete_event" handler="on_preference_window_delete_event"/>
++ <child>
++ <widget class="GtkNotebook" id="notebook1">
++ <property name="width_request">302</property>
++ <property name="height_request">89</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <child>
++ <widget class="GtkVBox" id="vbox6">
++ <property name="visible">True</property>
++ <child>
++ <widget class="GtkFrame" id="frame1">
++ <property name="width_request">300</property>
++ <property name="height_request">48</property>
++ <property name="visible">True</property>
++ <property name="label_xalign">0.000000</property>
++ <child>
++ <widget class="GtkTable" id="table2">
++ <property name="visible">True</property>
++ <property name="border_width">12</property>
++ <property name="n_rows">4</property>
++ <property name="n_columns">2</property>
++ <property name="column_spacing">5</property>
++ <property name="row_spacing">8</property>
++ <child>
++ <widget class="GtkLabel" id="label8">
++ <property name="visible">True</property>
++ <property name="xalign">0.000000</property>
++ <property name="label" translatable="yes">Path to vpnclient:</property>
++ <property name="justify">GTK_JUSTIFY_RIGHT</property>
++ </widget>
++ <packing>
++ <property name="x_options">GTK_FILL</property>
++ <property name="y_options"></property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkEntry" id="vpnclient_path_entry">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ </widget>
++ <packing>
++ <property name="left_attach">1</property>
++ <property name="right_attach">2</property>
++ <property name="y_options"></property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkLabel" id="label9">
++ <property name="visible">True</property>
++ <property name="xalign">0.000000</property>
++ <property name="label" translatable="yes">VPN Profile Path:</property>
++ <property name="justify">GTK_JUSTIFY_RIGHT</property>
++ </widget>
++ <packing>
++ <property name="top_attach">1</property>
++ <property name="bottom_attach">2</property>
++ <property name="x_options">GTK_FILL</property>
++ <property name="y_options"></property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkEntry" id="vpn_profile_path_entry">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ </widget>
++ <packing>
++ <property name="left_attach">1</property>
++ <property name="right_attach">2</property>
++ <property name="top_attach">1</property>
++ <property name="bottom_attach">2</property>
++ <property name="y_options"></property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkLabel" id="label16">
++ <property name="visible">True</property>
++ <property name="xalign">0.000000</property>
++ <property name="label" translatable="yes">Default User:</property>
++ </widget>
++ <packing>
++ <property name="top_attach">2</property>
++ <property name="bottom_attach">3</property>
++ <property name="x_options">GTK_FILL</property>
++ <property name="y_options"></property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkEntry" id="vpnclient_default_user_entry">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ </widget>
++ <packing>
++ <property name="left_attach">1</property>
++ <property name="right_attach">2</property>
++ <property name="top_attach">2</property>
++ <property name="bottom_attach">3</property>
++ <property name="y_options"></property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkCheckButton" id="vpnclient_start_hidden_cb">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="label" translatable="yes">Start Hidden</property>
++ <property name="use_underline">True</property>
++ <property name="draw_indicator">True</property>
++ </widget>
++ <packing>
++ <property name="right_attach">2</property>
++ <property name="top_attach">3</property>
++ <property name="bottom_attach">4</property>
++ <property name="x_options">GTK_FILL</property>
++ <property name="y_options"></property>
++ </packing>
++ </child>
++ </widget>
++ </child>
++ <child>
++ <widget class="GtkLabel" id="label7">
++ <property name="width_request">92</property>
++ <property name="height_request">17</property>
++ <property name="visible">True</property>
++ <property name="label" translatable="yes">Basic Options:</property>
++ </widget>
++ <packing>
++ <property name="type">label_item</property>
++ </packing>
++ </child>
++ </widget>
++ </child>
++ <child>
++ <widget class="GtkHButtonBox" id="hbuttonbox2">
++ <property name="width_request">107</property>
++ <property name="height_request">62</property>
++ <property name="visible">True</property>
++ <property name="border_width">7</property>
++ <property name="spacing">14</property>
++ <child>
++ <widget class="GtkButton" id="preference_cancel_button">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="can_default">True</property>
++ <property name="label">gtk-cancel</property>
++ <property name="use_stock">True</property>
++ <signal name="clicked" handler="on_preference_cancel_button_clicked"/>
++ </widget>
++ </child>
++ <child>
++ <widget class="GtkButton" id="preference_apply_button">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="can_default">True</property>
++ <property name="label">gtk-apply</property>
++ <property name="use_stock">True</property>
++ <signal name="clicked" handler="on_preference_apply_button_clicked"/>
++ </widget>
++ <packing>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </widget>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </widget>
++ <packing>
++ <property name="tab_expand">False</property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkLabel" id="general_label">
++ <property name="visible">True</property>
++ <property name="label" translatable="yes">General</property>
++ </widget>
++ <packing>
++ <property name="type">tab</property>
++ <property name="tab_expand">False</property>
++ <property name="tab_fill">False</property>
++ </packing>
++ </child>
++ </widget>
++ </child>
++ </widget>
++ <widget class="GtkWindow" id="status_window">
++ <property name="width_request">433</property>
++ <property name="visible">True</property>
++ <property name="border_width">7</property>
++ <property name="title">Status Window</property>
++ <property name="resizable">False</property>
++ <property name="default_width">433</property>
++ <property name="default_height">431</property>
++ <property name="icon">Status-Dock.png</property>
++ <signal name="delete_event" handler="on_status_window_delete_event"/>
++ <signal name="show" handler="on_status_window_show"/>
++ <child>
++ <widget class="GtkNotebook" id="notebook2">
++ <property name="width_request">143</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="border_width">6</property>
++ <property name="scrollable">True</property>
++ <property name="enable_popup">True</property>
++ <child>
++ <widget class="GtkVBox" id="vbox7">
++ <property name="visible">True</property>
++ <child>
++ <widget class="GtkFrame" id="frame4">
++ <property name="width_request">172</property>
++ <property name="height_request">126</property>
++ <property name="visible">True</property>
++ <property name="label_xalign">0.000000</property>
++ <child>
++ <widget class="GtkTextView" id="trafficstats_text">
++ <property name="width_request">168</property>
++ <property name="visible">True</property>
++ <property name="border_width">1</property>
++ <property name="editable">False</property>
++ <property name="cursor_visible">False</property>
++ <property name="accepts_tab">False</property>
++ <property name="text" translatable="yes">Time connected: 0 day(s), 00:00.16
+ Bytes in: 0
+ Bytes out: 0
+ Packets encrypted: 0
+@@ -1104,65 +699,33 @@
+ Packets bypassed: 20
+ Packets discarded: 1
+ </property>
+- </widget>
+- </child>
+-
+- <child>
+- <widget class="GtkLabel" id="trafficstats">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">Traffic Statistics</property>
+- <property name="use_underline">False</property>
+- <property name="use_markup">False</property>
+- <property name="justify">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">0.5</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="type">label_item</property>
+- </packing>
+- </child>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkFrame" id="frame5">
+- <property name="width_request">204</property>
+- <property name="visible">True</property>
+- <property name="label_xalign">0</property>
+- <property name="label_yalign">0.5</property>
+- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+-
+- <child>
+- <widget class="GtkTextView" id="tunnelstats_text">
+- <property name="border_width">1</property>
+- <property name="width_request">200</property>
+- <property name="visible">True</property>
+- <property name="editable">False</property>
+- <property name="overwrite">False</property>
+- <property name="accepts_tab">False</property>
+- <property name="justification">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap_mode">GTK_WRAP_NONE</property>
+- <property name="cursor_visible">False</property>
+- <property name="pixels_above_lines">0</property>
+- <property name="pixels_below_lines">0</property>
+- <property name="pixels_inside_wrap">0</property>
+- <property name="left_margin">0</property>
+- <property name="right_margin">0</property>
+- <property name="indent">0</property>
+- <property name="text" translatable="yes">Connection Entry: cisco
++ </widget>
++ </child>
++ <child>
++ <widget class="GtkLabel" id="trafficstats">
++ <property name="visible">True</property>
++ <property name="label" translatable="yes">Traffic Statistics</property>
++ </widget>
++ <packing>
++ <property name="type">label_item</property>
++ </packing>
++ </child>
++ </widget>
++ </child>
++ <child>
++ <widget class="GtkFrame" id="frame5">
++ <property name="width_request">204</property>
++ <property name="visible">True</property>
++ <property name="label_xalign">0.000000</property>
++ <child>
++ <widget class="GtkTextView" id="tunnelstats_text">
++ <property name="width_request">200</property>
++ <property name="visible">True</property>
++ <property name="border_width">1</property>
++ <property name="editable">False</property>
++ <property name="cursor_visible">False</property>
++ <property name="accepts_tab">False</property>
++ <property name="text" translatable="yes">Connection Entry: cisco
+ Client address: 10.82.241.42
+ Server address: 64.102.252.4
+ Encryption: 168-bit 3-DES
+@@ -1171,343 +734,210 @@
+ NAT passthrough is active on port UDP 10000
+ Local LAN Access is disabled
+ </property>
+- </widget>
+- </child>
+-
+- <child>
+- <widget class="GtkLabel" id="tunnelstats">
+- <property name="width_request">97</property>
+- <property name="height_request">15</property>
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">Tunnel Statistics</property>
+- <property name="use_underline">False</property>
+- <property name="use_markup">False</property>
+- <property name="justify">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">0.5</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="type">label_item</property>
+- </packing>
+- </child>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkFrame" id="frame6">
+- <property name="width_request">204</property>
+- <property name="height_request">105</property>
+- <property name="visible">True</property>
+- <property name="label_xalign">0</property>
+- <property name="label_yalign">0.5</property>
+- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+-
+- <child>
+- <widget class="GtkTextView" id="routestats_text">
+- <property name="border_width">1</property>
+- <property name="width_request">200</property>
+- <property name="height_request">89</property>
+- <property name="visible">True</property>
+- <property name="editable">False</property>
+- <property name="overwrite">False</property>
+- <property name="accepts_tab">False</property>
+- <property name="justification">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap_mode">GTK_WRAP_NONE</property>
+- <property name="cursor_visible">False</property>
+- <property name="pixels_above_lines">0</property>
+- <property name="pixels_below_lines">0</property>
+- <property name="pixels_inside_wrap">0</property>
+- <property name="left_margin">0</property>
+- <property name="right_margin">0</property>
+- <property name="indent">0</property>
+- <property name="text" translatable="yes">Configured routes.
++ </widget>
++ </child>
++ <child>
++ <widget class="GtkLabel" id="tunnelstats">
++ <property name="width_request">97</property>
++ <property name="height_request">15</property>
++ <property name="visible">True</property>
++ <property name="label" translatable="yes">Tunnel Statistics</property>
++ </widget>
++ <packing>
++ <property name="type">label_item</property>
++ </packing>
++ </child>
++ </widget>
++ <packing>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkFrame" id="frame6">
++ <property name="width_request">204</property>
++ <property name="height_request">105</property>
++ <property name="visible">True</property>
++ <property name="label_xalign">0.000000</property>
++ <child>
++ <widget class="GtkTextView" id="routestats_text">
++ <property name="width_request">200</property>
++ <property name="height_request">89</property>
++ <property name="visible">True</property>
++ <property name="border_width">1</property>
++ <property name="editable">False</property>
++ <property name="cursor_visible">False</property>
++ <property name="accepts_tab">False</property>
++ <property name="text" translatable="yes">Configured routes.
+ Secured Network Destination Netmask
+ 0.0.0.0 0.0.0.0
+
+ </property>
+- </widget>
+- </child>
+-
+- <child>
+- <widget class="GtkLabel" id="routestats">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">Route Statistics</property>
+- <property name="use_underline">False</property>
+- <property name="use_markup">False</property>
+- <property name="justify">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">0.5</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="type">label_item</property>
+- </packing>
+- </child>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkHButtonBox" id="hbuttonbox4">
+- <property name="width_request">85</property>
+- <property name="height_request">43</property>
+- <property name="visible">True</property>
+- <property name="layout_style">GTK_BUTTONBOX_END</property>
+- <property name="spacing">0</property>
+-
+- <child>
+- <widget class="GtkButton" id="close_status_window_button">
+- <property name="visible">True</property>
+- <property name="can_default">True</property>
+- <property name="can_focus">True</property>
+- <property name="label">gtk-close</property>
+- <property name="use_stock">True</property>
+- <property name="relief">GTK_RELIEF_NORMAL</property>
+- <property name="focus_on_click">True</property>
+- <signal name="clicked" handler="on_close_status_window_button_clicked" last_modification_time="Sat, 11 Oct 2003 16:29:18 GMT"/>
+- </widget>
+- </child>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+- </widget>
+- <packing>
+- <property name="tab_expand">False</property>
+- <property name="tab_fill">True</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkLabel" id="label15">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">VPN Statistics</property>
+- <property name="use_underline">False</property>
+- <property name="use_markup">False</property>
+- <property name="justify">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">0.5</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="type">tab</property>
+- </packing>
+- </child>
+- </widget>
+- </child>
+-</widget>
+-
+-<widget class="GnomeAbout" id="gvpn_dialer_about">
+- <property name="border_width">5</property>
+- <property name="visible">True</property>
+- <property name="destroy_with_parent">False</property>
+- <property name="decorated">True</property>
+- <property name="skip_taskbar_hint">False</property>
+- <property name="skip_pager_hint">False</property>
+- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+- <property name="focus_on_map">True</property>
+- <property name="copyright" translatable="yes">2004 GPL Copyright, Stanley Kamithi</property>
+- <property name="comments" translatable="yes">A GNOME2 GUI
++ </widget>
++ </child>
++ <child>
++ <widget class="GtkLabel" id="routestats">
++ <property name="visible">True</property>
++ <property name="label" translatable="yes">Route Statistics</property>
++ </widget>
++ <packing>
++ <property name="type">label_item</property>
++ </packing>
++ </child>
++ </widget>
++ <packing>
++ <property name="position">2</property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkHButtonBox" id="hbuttonbox4">
++ <property name="width_request">85</property>
++ <property name="height_request">43</property>
++ <property name="visible">True</property>
++ <property name="layout_style">GTK_BUTTONBOX_END</property>
++ <child>
++ <widget class="GtkButton" id="close_status_window_button">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="can_default">True</property>
++ <property name="label">gtk-close</property>
++ <property name="use_stock">True</property>
++ <signal name="clicked" handler="on_close_status_window_button_clicked"/>
++ </widget>
++ </child>
++ </widget>
++ <packing>
++ <property name="position">3</property>
++ </packing>
++ </child>
++ </widget>
++ <packing>
++ <property name="tab_expand">False</property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkLabel" id="label15">
++ <property name="visible">True</property>
++ <property name="label" translatable="yes">VPN Statistics</property>
++ </widget>
++ <packing>
++ <property name="type">tab</property>
++ <property name="tab_expand">False</property>
++ <property name="tab_fill">False</property>
++ </packing>
++ </child>
++ </widget>
++ </child>
++ </widget>
++ <widget class="GnomeAbout" id="gvpn_dialer_about">
++ <property name="visible">True</property>
++ <property name="border_width">5</property>
++ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
++ <property name="copyright" translatable="yes">2004 GPL Copyright, Stanley Kamithi</property>
++ <property name="comments" translatable="yes">A GNOME2 GUI
+ For the Cisco Linux
+ VPN Client</property>
+- <property name="authors">Stanley Kamithi, Raleigh, North Carolina</property>
+- <property name="translator_credits" translatable="yes">translator_credits</property>
+-</widget>
+-
+-<widget class="GtkWindow" id="group_password">
+- <property name="visible">True</property>
+- <property name="title" translatable="yes">Enter Group Password</property>
+- <property name="type">GTK_WINDOW_TOPLEVEL</property>
+- <property name="window_position">GTK_WIN_POS_NONE</property>
+- <property name="modal">False</property>
+- <property name="default_width">350</property>
+- <property name="default_height">101</property>
+- <property name="resizable">False</property>
+- <property name="destroy_with_parent">False</property>
+- <property name="decorated">True</property>
+- <property name="skip_taskbar_hint">False</property>
+- <property name="skip_pager_hint">False</property>
+- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+- <property name="focus_on_map">True</property>
+- <signal name="delete_event" handler="on_login_window_delete_event" last_modification_time="Sat, 18 Oct 2003 00:07:16 GMT"/>
+-
+- <child>
+- <widget class="GtkVBox" id="vbox8">
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">0</property>
+-
+- <child>
+- <widget class="GtkTable" id="table4">
+- <property name="border_width">15</property>
+- <property name="width_request">339</property>
+- <property name="height_request">50</property>
+- <property name="visible">True</property>
+- <property name="n_rows">1</property>
+- <property name="n_columns">2</property>
+- <property name="homogeneous">False</property>
+- <property name="row_spacing">15</property>
+- <property name="column_spacing">2</property>
+-
+- <child>
+- <widget class="GtkLabel" id="label18">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">Enter Group Password:</property>
+- <property name="use_underline">False</property>
+- <property name="use_markup">False</property>
+- <property name="justify">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="left_attach">0</property>
+- <property name="right_attach">1</property>
+- <property name="top_attach">0</property>
+- <property name="bottom_attach">1</property>
+- <property name="x_options">fill</property>
+- <property name="y_options"></property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkEntry" id="group_pw_entry">
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="editable">True</property>
+- <property name="visibility">False</property>
+- <property name="max_length">30</property>
+- <property name="text" translatable="yes"></property>
+- <property name="has_frame">True</property>
+- <property name="invisible_char">*</property>
+- <property name="activates_default">False</property>
+- <signal name="activate" handler="on_enter_group_password_activate" last_modification_time="Sun, 01 May 2005 23:09:17 GMT"/>
+- </widget>
+- <packing>
+- <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+- <property name="top_attach">0</property>
+- <property name="bottom_attach">1</property>
+- <property name="y_options"></property>
+- </packing>
+- </child>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkHButtonBox" id="hbuttonbox5">
+- <property name="border_width">9</property>
+- <property name="visible">True</property>
+- <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
+- <property name="spacing">0</property>
+-
+- <child>
+- <widget class="GtkButton" id="group_pw_cancel_button">
+- <property name="visible">True</property>
+- <property name="can_default">True</property>
+- <property name="can_focus">True</property>
+- <property name="label">gtk-cancel</property>
+- <property name="use_stock">True</property>
+- <property name="relief">GTK_RELIEF_NORMAL</property>
+- <property name="focus_on_click">True</property>
+- <signal name="clicked" handler="on_group_pw_cancel_button_clicked" last_modification_time="Sun, 01 May 2005 23:10:41 GMT"/>
+- </widget>
+- </child>
+-
+- <child>
+- <widget class="GtkButton" id="group_pw_okay_button">
+- <property name="visible">True</property>
+- <property name="can_default">True</property>
+- <property name="can_focus">True</property>
+- <property name="label">gtk-ok</property>
+- <property name="use_stock">True</property>
+- <property name="relief">GTK_RELIEF_NORMAL</property>
+- <property name="focus_on_click">True</property>
+- <signal name="clicked" handler="on_group_pw_submit_button_clicked" last_modification_time="Sun, 01 May 2005 23:10:15 GMT"/>
+- </widget>
+- </child>
+- </widget>
+- <packing>
+- <property name="padding">6</property>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkLabel" id="grouppw_warning">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes"></property>
+- <property name="use_underline">False</property>
+- <property name="use_markup">False</property>
+- <property name="justify">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">0.5</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- </packing>
+- </child>
+- </widget>
+- </child>
+-</widget>
++ <property name="authors">Stanley Kamithi, Raleigh, North Carolina
+
++</property>
++ <property name="translator_credits" translatable="yes">translator_credits</property>
++ </widget>
++ <widget class="GtkWindow" id="group_password">
++ <property name="visible">True</property>
++ <property name="title">Enter Group Password</property>
++ <property name="resizable">False</property>
++ <property name="default_width">350</property>
++ <property name="default_height">101</property>
++ <signal name="delete_event" handler="on_login_window_delete_event"/>
++ <child>
++ <widget class="GtkVBox" id="vbox8">
++ <property name="visible">True</property>
++ <child>
++ <widget class="GtkTable" id="table4">
++ <property name="width_request">339</property>
++ <property name="height_request">50</property>
++ <property name="visible">True</property>
++ <property name="border_width">15</property>
++ <property name="n_rows">1</property>
++ <property name="n_columns">2</property>
++ <property name="column_spacing">2</property>
++ <property name="row_spacing">15</property>
++ <child>
++ <widget class="GtkLabel" id="label18">
++ <property name="visible">True</property>
++ <property name="xalign">0.000000</property>
++ <property name="label" translatable="yes">Enter Group Password:</property>
++ </widget>
++ <packing>
++ <property name="x_options">GTK_FILL</property>
++ <property name="y_options"></property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkEntry" id="group_pw_entry">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="max_length">30</property>
++ <property name="visibility">False</property>
++ <signal name="activate" handler="on_enter_group_password_activate"/>
++ </widget>
++ <packing>
++ <property name="left_attach">1</property>
++ <property name="right_attach">2</property>
++ <property name="y_options"></property>
++ </packing>
++ </child>
++ </widget>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkHButtonBox" id="hbuttonbox5">
++ <property name="visible">True</property>
++ <property name="border_width">9</property>
++ <child>
++ <widget class="GtkButton" id="group_pw_cancel_button">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="can_default">True</property>
++ <property name="label">gtk-cancel</property>
++ <property name="use_stock">True</property>
++ <signal name="clicked" handler="on_group_pw_cancel_button_clicked"/>
++ </widget>
++ </child>
++ <child>
++ <widget class="GtkButton" id="group_pw_okay_button">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="can_default">True</property>
++ <property name="label">gtk-ok</property>
++ <property name="use_stock">True</property>
++ <signal name="clicked" handler="on_group_pw_submit_button_clicked"/>
++ </widget>
++ <packing>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </widget>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="padding">6</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkLabel" id="grouppw_warning">
++ <property name="visible">True</property>
++ </widget>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">2</property>
++ </packing>
++ </child>
++ </widget>
++ </child>
++ </widget>
+ </glade-interface>
+Only in gvpndialer-1.1-patched/: gvpndialer-1.1-glade.patch
+Only in gvpndialer-1.1-patched/: install-sh
+Only in gvpndialer-1.1-patched/: ltmain.sh
+Only in gvpndialer-1.1-patched/: missing
+Only in gvpndialer-1.1-patched/po: Makefile
+diff -ru gvpndialer-1.1/po/Makefile.in gvpndialer-1.1-patched/po/Makefile.in
+--- gvpndialer-1.1/po/Makefile.in 2005-10-02 11:24:25.000000000 -0400
++++ gvpndialer-1.1-patched/po/Makefile.in 2006-10-30 22:59:39.000000000 -0500
+@@ -14,7 +14,7 @@
+
+ GETTEXT_PACKAGE = gvpndialer
+ PACKAGE = gvpndialer
+-VERSION = 1.0
++VERSION = 1.1
+
+ SHELL = /bin/sh
+
+@@ -38,7 +38,7 @@
+
+ CC = gcc
+ GENCAT = @GENCAT@
+-GMSGFMT = /usr/bin/msgfmt
++GMSGFMT = /usr/bin/gmsgfmt
+ MSGFMT = /usr/bin/msgfmt
+ XGETTEXT = /usr/bin/xgettext
+ MSGMERGE = msgmerge
+Only in gvpndialer-1.1/src: .deps
+Only in gvpndialer-1.1-patched/src: .interface.c.swp
+Only in gvpndialer-1.1-patched/src: .main.c.swp
+Only in gvpndialer-1.1-patched/src: Makefile.in
+diff -ru gvpndialer-1.1/src/interface.c gvpndialer-1.1-patched/src/interface.c
+--- gvpndialer-1.1/src/interface.c 2005-10-02 11:24:25.000000000 -0400
++++ gvpndialer-1.1-patched/src/interface.c 2006-10-30 23:33:35.000000000 -0500
+@@ -41,7 +41,7 @@
+ static GnomeUIInfo view1_menu_uiinfo[] =
+ {
+ {
+- GNOME_APP_UI_ITEM, "_Status",
++ GNOME_APP_UI_ITEM, "Status",
+ NULL,
+ (gpointer) on_status2_activate, NULL, NULL,
+ GNOME_APP_PIXMAP_FILENAME, "gvpndialer/Status-Dock.png",
+@@ -114,18 +114,14 @@
+ gtk_toolbar_set_style (GTK_TOOLBAR (toolbar1), GTK_TOOLBAR_BOTH);
+ tmp_toolbar_icon_size = gtk_toolbar_get_icon_size (GTK_TOOLBAR (toolbar1));
+
+- tmp_image = create_pixmap (vpnclient_main_window, "gvpndialer/stock_exec_24.png");
+- gtk_widget_show (tmp_image);
+- execute_vpn_button = (GtkWidget*) gtk_tool_button_new (tmp_image, "Connect");
++ execute_vpn_button = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-connect");
+ gtk_widget_show (execute_vpn_button);
+ gtk_container_add (GTK_CONTAINER (toolbar1), execute_vpn_button);
+ gtk_widget_set_size_request (execute_vpn_button, 82, 65);
+ gtk_container_set_border_width (GTK_CONTAINER (execute_vpn_button), 7);
+ gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (execute_vpn_button), tooltips, "Start VPN Connection", NULL);
+
+- tmp_image = create_pixmap (vpnclient_main_window, "gvpndialer/stock_stop_24.png");
+- gtk_widget_show (tmp_image);
+- disconnect_button = (GtkWidget*) gtk_tool_button_new (tmp_image, "Disconnect");
++ disconnect_button = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-disconnect");
+ gtk_widget_show (disconnect_button);
+ gtk_container_add (GTK_CONTAINER (toolbar1), disconnect_button);
+ gtk_widget_set_size_request (disconnect_button, 99, 61);
+@@ -136,9 +132,8 @@
+ gtk_widget_show (separatortoolitem1);
+ gtk_container_add (GTK_CONTAINER (toolbar1), separatortoolitem1);
+
+- tmp_image = create_pixmap (vpnclient_main_window, "gvpndialer/Status-Dock.png");
+- gtk_widget_show (tmp_image);
+- status_button = (GtkWidget*) gtk_tool_button_new (tmp_image, "_Status");
++ status_button = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-info");
++ gtk_tool_button_set_label (status_button, "Status");
+ gtk_widget_show (status_button);
+ gtk_container_add (GTK_CONTAINER (toolbar1), status_button);
+ gtk_container_set_border_width (GTK_CONTAINER (status_button), 7);
+@@ -576,12 +571,13 @@
+ gtk_window_set_title (GTK_WINDOW (status_window), "Status Window");
+ gtk_window_set_default_size (GTK_WINDOW (status_window), 433, 431);
+ gtk_window_set_resizable (GTK_WINDOW (status_window), FALSE);
+- status_window_icon_pixbuf = create_pixbuf ("gvpndialer/Status-Dock.png");
++/* status_window_icon_pixbuf = create_pixbuf ("gvpndialer/Status-Dock.png");
+ if (status_window_icon_pixbuf)
+ {
+ gtk_window_set_icon (GTK_WINDOW (status_window), status_window_icon_pixbuf);
+ gdk_pixbuf_unref (status_window_icon_pixbuf);
+ }
++*/
+
+ notebook2 = gtk_notebook_new ();
+ gtk_widget_show (notebook2);