]> git.sur5r.net Git - bacula/bacula/commitdiff
Remove gnome-console
authorKern Sibbald <kern@sibbald.com>
Sat, 26 Sep 2009 17:21:12 +0000 (19:21 +0200)
committerKern Sibbald <kern@sibbald.com>
Sat, 26 Sep 2009 17:21:12 +0000 (19:21 +0200)
24 files changed:
bacula/Makefile.in
bacula/autoconf/configure.in
bacula/configure
bacula/src/Makefile.in
bacula/src/console2.glade [deleted file]
bacula/src/console2.gladep [deleted file]
bacula/src/gnome2-console/Makefile.in [deleted file]
bacula/src/gnome2-console/authenticate.c [deleted file]
bacula/src/gnome2-console/bgnome-console.conf.in [deleted file]
bacula/src/gnome2-console/callbacks.c [deleted file]
bacula/src/gnome2-console/callbacks.h [deleted file]
bacula/src/gnome2-console/console.c [deleted file]
bacula/src/gnome2-console/console.h [deleted file]
bacula/src/gnome2-console/console_conf.c [deleted file]
bacula/src/gnome2-console/console_conf.h [deleted file]
bacula/src/gnome2-console/interface.c [deleted file]
bacula/src/gnome2-console/interface.h [deleted file]
bacula/src/gnome2-console/restore.c [deleted file]
bacula/src/gnome2-console/restore.h [deleted file]
bacula/src/gnome2-console/support.c [deleted file]
bacula/src/gnome2-console/support.h [deleted file]
bacula/src/gnome2-console/test-gnome-console.conf [deleted file]
bacula/src/version.h
bacula/technotes

index 1d4b15ad9ad94672d210e1c4f08874610cd84523..38b154338d731ec77a1f06ca5afa89d763018085 100755 (executable)
@@ -20,7 +20,7 @@ dummy:
 
 # --client-only directories
 fd_subdirs = src scripts src/lib src/findlib src/filed \
-       @READLINE_SRC@ @BAT_DIR@ @GNOME_DIR@ @TRAY_MONITOR_DIR@ @WX_DIR@ \
+       @READLINE_SRC@ @BAT_DIR@ @TRAY_MONITOR_DIR@ @WX_DIR@ \
        src/console src/plugins/fd
 
 # Non-client-only directores
index 95800836907edbedf6f0849a226f32096f1129c4..9f4b443c255cab1d3d9eccd4212fa078a1374ffe 100644 (file)
@@ -349,24 +349,10 @@ AC_ARG_ENABLE(gnome,
 
 GNOME_DIR=
 if test x$support_gnome = xyes; then
-   abc=`$PKGCONFIG --exists libgnomeui-2.0`
-   pkg=$?
-   if test $pkg = 0; then
-      GNOME_INCLUDEDIR=`$PKGCONFIG --cflags-only-I libgnomeui-2.0`
-      GNOMEUI_LIBS=`$PKGCONFIG --libs-only-l libgnomeui-2.0`
-      GNOME_LIBDIR=`$PKGCONFIG --libs libgnomeui-2.0`
-      GNOME_LIBS=`$PKGCONFIG --libs-only-l libgnomeui-2.0`
-      AC_SUBST(GNOME_INCLUDEDIR)
-      AC_SUBST(GNOMEUI_LIBS)
-      AC_SUBST(GNOME_LIBDIR)
-      AC_SUBST(GNOME_LIBS)
-      GNOME_DIR=src/gnome2-console
-      gnome_version="Version 2.x"
-   else
-      AC_MSG_ERROR(Unable to find Gnome 2 installation)
-   fi
+   AC_MSG_ERROR(bgnome-console no longer supported)
+   AC_MSG_ERROR(--enable-gnome option no longer supported)
 fi
-AC_SUBST(GNOME_DIR)
+AC_SUBST(GNOME_DIR)
 
 dnl -------------------------------------------
 dnl bat (default off)
@@ -2887,8 +2873,6 @@ AC_OUTPUT([autoconf/Make.common \
           src/host.h \
           src/console/Makefile \
           src/console/bconsole.conf \
-          src/gnome2-console/Makefile \
-          src/gnome2-console/bgnome-console.conf \
           src/qt-console/bat.conf \
           src/qt-console/bat.pro \
           src/qt-console/bat.pro.mingw32 \
index d8c9ad041ed7623743b9ecc950c57ea0ecb4ee77..c98057102bf7daf0c43243cab84877193edef4c0 100755 (executable)
@@ -946,11 +946,6 @@ INSTOBJEXT
 GENCAT
 INTLOBJS
 INTL_LIBTOOL_SUFFIX_PREFIX
-GNOME_INCLUDEDIR
-GNOMEUI_LIBS
-GNOME_LIBDIR
-GNOME_LIBS
-GNOME_DIR
 BAT_DIR
 QWT_INC
 QWT_LDFLAGS
@@ -5996,13 +5991,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:5999: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:5994: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6002: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:5997: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6005: output\"" >&5)
+  (eval echo "\"\$as_me:6000: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -7223,7 +7218,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7226 "configure"' > conftest.$ac_ext
+  echo '#line 7221 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9438,11 +9433,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9441: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9436: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9445: \$? = $ac_status" >&5
+   echo "$as_me:9440: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9777,11 +9772,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9780: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9775: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9784: \$? = $ac_status" >&5
+   echo "$as_me:9779: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9882,11 +9877,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9885: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9880: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9889: \$? = $ac_status" >&5
+   echo "$as_me:9884: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9937,11 +9932,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9940: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9935: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9944: \$? = $ac_status" >&5
+   echo "$as_me:9939: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12693,7 +12688,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12696 "configure"
+#line 12691 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12789,7 +12784,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12792 "configure"
+#line 12787 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14801,11 +14796,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14804: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14799: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14808: \$? = $ac_status" >&5
+   echo "$as_me:14803: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14900,11 +14895,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14903: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14898: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14907: \$? = $ac_status" >&5
+   echo "$as_me:14902: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14952,11 +14947,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14955: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14950: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14959: \$? = $ac_status" >&5
+   echo "$as_me:14954: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
 
 GNOME_DIR=
 if test x$support_gnome = xyes; then
-   abc=`$PKGCONFIG --exists libgnomeui-2.0`
-   pkg=$?
-   if test $pkg = 0; then
-      GNOME_INCLUDEDIR=`$PKGCONFIG --cflags-only-I libgnomeui-2.0`
-      GNOMEUI_LIBS=`$PKGCONFIG --libs-only-l libgnomeui-2.0`
-      GNOME_LIBDIR=`$PKGCONFIG --libs libgnomeui-2.0`
-      GNOME_LIBS=`$PKGCONFIG --libs-only-l libgnomeui-2.0`
-
-
-
-
-      GNOME_DIR=src/gnome2-console
-      gnome_version="Version 2.x"
-   else
-      { { echo "$as_me:$LINENO: error: Unable to find Gnome 2 installation" >&5
-echo "$as_me: error: Unable to find Gnome 2 installation" >&2;}
+   { { echo "$as_me:$LINENO: error: bgnome-console no longer supported" >&5
+echo "$as_me: error: bgnome-console no longer supported" >&2;}
+   { (exit 1); exit 1; }; }
+   { { echo "$as_me:$LINENO: error: --enable-gnome option no longer supported" >&5
+echo "$as_me: error: --enable-gnome option no longer supported" >&2;}
    { (exit 1); exit 1; }; }
-   fi
 fi
-
+# AC_SUBST(GNOME_DIR)
 
 # Check whether --enable-bat was given.
 if test "${enable_bat+set}" = set; then
@@ -43117,7 +43100,7 @@ if test "x${subsysdir}" = "x${sbindir}" ; then
    exit 1
 fi
 
-ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/bgnome-console.console_apps scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/bacula-tray-monitor.desktop scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/wxconsole.console_apps scripts/wxconsole.desktop.consolehelper scripts/wxconsole.desktop.xsu scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper scripts/bat.console_apps src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome2-console/Makefile src/gnome2-console/bgnome-console.conf src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/bat.pro.mingw32 src/qt-console/install_conf_file src/wx-console/Makefile src/wx-console/bwx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile src/plugins/fd/Makefile src/plugins/sd/Makefile src/plugins/dir/Makefile src/win32/Makefile.inc po/Makefile.in updatedb/update_mysql_tables_9_to_10 updatedb/update_sqlite3_tables_9_to_10 updatedb/update_postgresql_tables_9_to_10 updatedb/update_sqlite_tables_9_to_10 updatedb/update_mysql_tables_10_to_11 updatedb/update_sqlite3_tables_10_to_11 updatedb/update_postgresql_tables_10_to_11 updatedb/update_sqlite_tables_10_to_11 $PFILES"
+ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/bgnome-console.console_apps scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/bacula-tray-monitor.desktop scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/wxconsole.console_apps scripts/wxconsole.desktop.consolehelper scripts/wxconsole.desktop.xsu scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper scripts/bat.console_apps src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/bat.pro.mingw32 src/qt-console/install_conf_file src/wx-console/Makefile src/wx-console/bwx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile src/plugins/fd/Makefile src/plugins/sd/Makefile src/plugins/dir/Makefile src/win32/Makefile.inc po/Makefile.in updatedb/update_mysql_tables_9_to_10 updatedb/update_sqlite3_tables_9_to_10 updatedb/update_postgresql_tables_9_to_10 updatedb/update_sqlite_tables_9_to_10 updatedb/update_mysql_tables_10_to_11 updatedb/update_sqlite3_tables_10_to_11 updatedb/update_postgresql_tables_10_to_11 updatedb/update_sqlite_tables_10_to_11 $PFILES"
 
 ac_config_commands="$ac_config_commands default"
 
@@ -44085,8 +44068,6 @@ do
     "src/host.h") CONFIG_FILES="$CONFIG_FILES src/host.h" ;;
     "src/console/Makefile") CONFIG_FILES="$CONFIG_FILES src/console/Makefile" ;;
     "src/console/bconsole.conf") CONFIG_FILES="$CONFIG_FILES src/console/bconsole.conf" ;;
-    "src/gnome2-console/Makefile") CONFIG_FILES="$CONFIG_FILES src/gnome2-console/Makefile" ;;
-    "src/gnome2-console/bgnome-console.conf") CONFIG_FILES="$CONFIG_FILES src/gnome2-console/bgnome-console.conf" ;;
     "src/qt-console/bat.conf") CONFIG_FILES="$CONFIG_FILES src/qt-console/bat.conf" ;;
     "src/qt-console/bat.pro") CONFIG_FILES="$CONFIG_FILES src/qt-console/bat.pro" ;;
     "src/qt-console/bat.pro.mingw32") CONFIG_FILES="$CONFIG_FILES src/qt-console/bat.pro.mingw32" ;;
@@ -44456,13 +44437,13 @@ INSTOBJEXT!$INSTOBJEXT$ac_delim
 GENCAT!$GENCAT$ac_delim
 INTLOBJS!$INTLOBJS$ac_delim
 INTL_LIBTOOL_SUFFIX_PREFIX!$INTL_LIBTOOL_SUFFIX_PREFIX$ac_delim
-GNOME_INCLUDEDIR!$GNOME_INCLUDEDIR$ac_delim
-GNOMEUI_LIBS!$GNOMEUI_LIBS$ac_delim
-GNOME_LIBDIR!$GNOME_LIBDIR$ac_delim
-GNOME_LIBS!$GNOME_LIBS$ac_delim
-GNOME_DIR!$GNOME_DIR$ac_delim
 BAT_DIR!$BAT_DIR$ac_delim
 QWT_INC!$QWT_INC$ac_delim
+QWT_LDFLAGS!$QWT_LDFLAGS$ac_delim
+QWT_LIB!$QWT_LIB$ac_delim
+QWT!$QWT$ac_delim
+WXCONS_CPPFLAGS!$WXCONS_CPPFLAGS$ac_delim
+WXCONS_LDFLAGS!$WXCONS_LDFLAGS$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -44504,11 +44485,6 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
-QWT_LDFLAGS!$QWT_LDFLAGS$ac_delim
-QWT_LIB!$QWT_LIB$ac_delim
-QWT!$QWT$ac_delim
-WXCONS_CPPFLAGS!$WXCONS_CPPFLAGS$ac_delim
-WXCONS_LDFLAGS!$WXCONS_LDFLAGS$ac_delim
 WX_DIR!$WX_DIR$ac_delim
 TRAY_MONITOR_CPPFLAGS!$TRAY_MONITOR_CPPFLAGS$ac_delim
 TRAY_MONITOR_LDFLAGS!$TRAY_MONITOR_LDFLAGS$ac_delim
@@ -44603,7 +44579,7 @@ DISTVER!$DISTVER$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 92; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -44622,7 +44598,7 @@ fi
 
 cat >>$CONFIG_STATUS <<_ACEOF
 cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
 _ACEOF
 sed '
 s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
@@ -44635,6 +44611,8 @@ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
 ' >>$CONFIG_STATUS <conf$$subs.sed
 rm -f conf$$subs.sed
 cat >>$CONFIG_STATUS <<_ACEOF
+:end
+s/|#_!!_#|//g
 CEOF$ac_eof
 _ACEOF
 
@@ -44882,7 +44860,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed 's/|#_!!_#|//g' >$tmp/out
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
index a750d1be2a497eefd4cfe11dcc9f09e748847669..a729de860bf6394aa6f7e201563131f2190b12eb 100644 (file)
@@ -42,7 +42,6 @@ clean:
        @$(RMF) AUTHORS ChangeLog Makefile.am NEWS README acconfig.h autogen.sh 
        @$(RMF) configure.in stamp.h stamp-h.in
        @$(RMF) -r po
-       (cd gnome2-console && $(MAKE) clean)
 
 realclean: clean
        @$(RMF) tags
diff --git a/bacula/src/console2.glade b/bacula/src/console2.glade
deleted file mode 100644 (file)
index 5970806..0000000
+++ /dev/null
@@ -1,4836 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-<requires lib="gnome"/>
-
-<widget class="GtkWindow" id="console">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Bacula Console</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_CENTER</property>
-  <property name="modal">False</property>
-  <property name="default_width">700</property>
-  <property name="default_height">600</property>
-  <property name="resizable">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_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-  <signal name="delete_event" handler="on_console_delete_event" last_modification_time="Tue, 16 Mar 2004 12:30:54 GMT"/>
-
-  <child>
-    <widget class="GtkVBox" id="vbox6">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child>
-        <widget class="GtkHandleBox" id="handlebox1">
-          <property name="border_width">1</property>
-          <property name="visible">True</property>
-          <property name="shadow_type">GTK_SHADOW_OUT</property>
-          <property name="handle_position">GTK_POS_LEFT</property>
-          <property name="snap_edge">GTK_POS_TOP</property>
-
-          <child>
-            <widget class="GtkMenuBar" id="menubar1">
-              <property name="visible">True</property>
-              <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>
-              <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
-
-              <child>
-                <widget class="GtkMenuItem" id="file1">
-                  <property name="visible">True</property>
-                  <property name="label" translatable="yes">_File</property>
-                  <property name="use_underline">True</property>
-
-                  <child>
-                    <widget class="GtkMenu" id="file1_menu">
-                      <property name="visible">True</property>
-
-                      <child>
-                        <widget class="GtkMenuItem" id="connect1">
-                          <property name="visible">True</property>
-                          <property name="tooltip" translatable="yes">Connect to Director</property>
-                          <property name="label" translatable="yes">_Connect</property>
-                          <property name="use_underline">True</property>
-                          <signal name="activate" handler="on_connect_activate"/>
-                        </widget>
-                      </child>
-
-                      <child>
-                        <widget class="GtkMenuItem" id="disconnect1">
-                          <property name="visible">True</property>
-                          <property name="tooltip" translatable="yes">Disconnect from Director</property>
-                          <property name="label" translatable="yes">_Disconnect</property>
-                          <property name="use_underline">True</property>
-                          <signal name="activate" handler="on_disconnect_activate"/>
-                        </widget>
-                      </child>
-
-                      <child>
-                        <widget class="GtkMenuItem" id="menuitem4">
-                          <property name="visible">True</property>
-                        </widget>
-                      </child>
-
-                      <child>
-                        <widget class="GtkImageMenuItem" id="exit1">
-                          <property name="visible">True</property>
-                          <property name="label" translatable="yes">gtk-quit</property>
-                          <property name="use_underline">True</property>
-                          <accessibility>
-                            <atkproperty name="AtkObject::accessible_name" translatable="yes">Exit</atkproperty>
-                          </accessibility>
-                          <signal name="activate" handler="on_exit_activate"/>
-                        </widget>
-                      </child>
-                    </widget>
-                  </child>
-                </widget>
-              </child>
-
-              <child>
-                <widget class="GtkMenuItem" id="edit1">
-                  <property name="visible">True</property>
-                  <property name="label" translatable="yes">_Edit</property>
-                  <property name="use_underline">True</property>
-
-                  <child>
-                    <widget class="GtkMenu" id="edit1_menu">
-                      <property name="visible">True</property>
-
-                      <child>
-                        <widget class="GtkImageMenuItem" id="cut1">
-                          <property name="visible">True</property>
-                          <property name="label" translatable="yes">gtk-cut</property>
-                          <property name="use_underline">True</property>
-                          <accessibility>
-                            <atkproperty name="AtkObject::accessible_name" translatable="yes">Cut</atkproperty>
-                          </accessibility>
-                          <signal name="activate" handler="on_cut1_activate"/>
-                        </widget>
-                      </child>
-
-                      <child>
-                        <widget class="GtkImageMenuItem" id="copy1">
-                          <property name="visible">True</property>
-                          <property name="label" translatable="yes">gtk-copy</property>
-                          <property name="use_underline">True</property>
-                          <accessibility>
-                            <atkproperty name="AtkObject::accessible_name" translatable="yes">Copy</atkproperty>
-                          </accessibility>
-                          <signal name="activate" handler="on_copy1_activate"/>
-                        </widget>
-                      </child>
-
-                      <child>
-                        <widget class="GtkImageMenuItem" id="paste1">
-                          <property name="visible">True</property>
-                          <property name="label" translatable="yes">gtk-paste</property>
-                          <property name="use_underline">True</property>
-                          <accessibility>
-                            <atkproperty name="AtkObject::accessible_name" translatable="yes">Paste</atkproperty>
-                          </accessibility>
-                          <signal name="activate" handler="on_paste1_activate"/>
-                        </widget>
-                      </child>
-
-                      <child>
-                        <widget class="GtkImageMenuItem" id="clear1">
-                          <property name="visible">True</property>
-                          <property name="label" translatable="yes">gtk-clear</property>
-                          <property name="use_underline">True</property>
-                          <accessibility>
-                            <atkproperty name="AtkObject::accessible_name" translatable="yes">Clear</atkproperty>
-                          </accessibility>
-                          <signal name="activate" handler="on_clear1_activate"/>
-                        </widget>
-                      </child>
-
-                      <child>
-                        <widget class="GtkMenuItem" id="separator1">
-                          <property name="visible">True</property>
-                        </widget>
-                      </child>
-                    </widget>
-                  </child>
-                </widget>
-              </child>
-
-              <child>
-                <widget class="GtkMenuItem" id="item1">
-                  <property name="visible">True</property>
-                  <property name="tooltip" translatable="yes">Display Messages</property>
-                  <property name="label" translatable="yes">_View</property>
-                  <property name="use_underline">True</property>
-
-                  <child>
-                    <widget class="GtkMenu" id="item1_menu">
-                      <property name="visible">True</property>
-
-                      <child>
-                        <widget class="GtkMenuItem" id="msgs">
-                          <property name="visible">True</property>
-                          <property name="label" translatable="yes">_Display Messages</property>
-                          <property name="use_underline">True</property>
-                          <signal name="activate" handler="on_msgs_activate"/>
-                        </widget>
-                      </child>
-                    </widget>
-                  </child>
-                </widget>
-              </child>
-
-              <child>
-                <widget class="GtkMenuItem" id="settings1">
-                  <property name="visible">True</property>
-                  <property name="label" translatable="yes">_Settings</property>
-                  <property name="use_underline">True</property>
-
-                  <child>
-                    <widget class="GtkMenu" id="settings1_menu">
-                      <property name="visible">True</property>
-
-                      <child>
-                        <widget class="GtkImageMenuItem" id="preferences1">
-                          <property name="visible">True</property>
-                          <property name="label" translatable="yes">gtk-preferences</property>
-                          <property name="use_underline">True</property>
-                          <accessibility>
-                            <atkproperty name="AtkObject::accessible_name" translatable="yes">Preferences</atkproperty>
-                          </accessibility>
-                          <signal name="activate" handler="on_preferences1_activate"/>
-                        </widget>
-                      </child>
-                    </widget>
-                  </child>
-                </widget>
-              </child>
-
-              <child>
-                <widget class="GtkMenuItem" id="help1">
-                  <property name="visible">True</property>
-                  <property name="label" translatable="yes">_Help</property>
-                  <property name="use_underline">True</property>
-
-                  <child>
-                    <widget class="GtkMenu" id="help1_menu">
-                      <property name="visible">True</property>
-
-                      <child>
-                        <widget class="GtkImageMenuItem" id="about1">
-                          <property name="visible">True</property>
-                          <property name="label" translatable="yes">gnome-stock-about</property>
-                          <property name="use_underline">True</property>
-                          <accessibility>
-                            <atkproperty name="AtkObject::accessible_name" translatable="yes">About</atkproperty>
-                          </accessibility>
-                          <signal name="activate" handler="on_about_activate"/>
-                        </widget>
-                      </child>
-                    </widget>
-                  </child>
-                </widget>
-              </child>
-            </widget>
-          </child>
-        </widget>
-        <packing>
-          <property name="padding">0</property>
-          <property name="expand">False</property>
-          <property name="fill">True</property>
-        </packing>
-      </child>
-
-      <child>
-        <widget class="GtkHandleBox" id="handlebox2">
-          <property name="border_width">1</property>
-          <property name="visible">True</property>
-          <property name="shadow_type">GTK_SHADOW_OUT</property>
-          <property name="handle_position">GTK_POS_LEFT</property>
-          <property name="snap_edge">GTK_POS_TOP</property>
-
-          <child>
-            <widget class="GtkToolbar" id="toolbar2">
-              <property name="border_width">1</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="connect_button1">
-                  <property name="visible">True</property>
-                  <property name="tooltip" translatable="yes">Connect to Director</property>
-                  <property name="label" translatable="yes">Connect</property>
-                  <property name="use_underline">True</property>
-                  <property name="stock_id">gtk-disconnect</property>
-                  <property name="visible_horizontal">True</property>
-                  <property name="visible_vertical">True</property>
-                  <property name="is_important">False</property>
-                  <signal name="clicked" handler="on_connect_button_clicked"/>
-                </widget>
-                <packing>
-                  <property name="expand">False</property>
-                  <property name="homogeneous">True</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkToolButton" id="run_button1">
-                  <property name="visible">True</property>
-                  <property name="tooltip" translatable="yes">Run a Job</property>
-                  <property name="label" translatable="yes">Run</property>
-                  <property name="use_underline">True</property>
-                  <property name="stock_id">gtk-execute</property>
-                  <property name="visible_horizontal">True</property>
-                  <property name="visible_vertical">True</property>
-                  <property name="is_important">False</property>
-                  <signal name="clicked" handler="on_run_button_clicked"/>
-                </widget>
-                <packing>
-                  <property name="expand">False</property>
-                  <property name="homogeneous">True</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkToolButton" id="dir_button">
-                  <property name="visible">True</property>
-                  <property name="label" translatable="yes">Dir Status</property>
-                  <property name="use_underline">True</property>
-                  <property name="stock_id">gnome-stock-text-bulleted-list</property>
-                  <property name="visible_horizontal">True</property>
-                  <property name="visible_vertical">True</property>
-                  <property name="is_important">False</property>
-                  <signal name="clicked" handler="on_dir_button_clicked" last_modification_time="Sun, 23 Apr 2006 07:52:39 GMT"/>
-                </widget>
-                <packing>
-                  <property name="expand">False</property>
-                  <property name="homogeneous">True</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkToolButton" id="restore_button">
-                  <property name="visible">True</property>
-                  <property name="label" translatable="yes">Restore</property>
-                  <property name="use_underline">True</property>
-                  <property name="stock_id">gtk-revert-to-saved</property>
-                  <property name="visible_horizontal">True</property>
-                  <property name="visible_vertical">True</property>
-                  <property name="is_important">False</property>
-                  <signal name="clicked" handler="on_restore_button_clicked"/>
-                </widget>
-                <packing>
-                  <property name="expand">False</property>
-                  <property name="homogeneous">True</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkToolButton" id="label_button">
-                  <property name="visible">True</property>
-                  <property name="label" translatable="yes">Label</property>
-                  <property name="use_underline">True</property>
-                  <property name="stock_id">gtk-save-as</property>
-                  <property name="visible_horizontal">True</property>
-                  <property name="visible_vertical">True</property>
-                  <property name="is_important">False</property>
-                  <signal name="clicked" handler="on_label_button_clicked"/>
-                </widget>
-                <packing>
-                  <property name="expand">False</property>
-                  <property name="homogeneous">True</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkToolButton" id="msgs_button">
-                  <property name="visible">True</property>
-                  <property name="tooltip" translatable="yes">Display Messages</property>
-                  <property name="label" translatable="yes">Msgs</property>
-                  <property name="use_underline">True</property>
-                  <property name="stock_id">gtk-find</property>
-                  <property name="visible_horizontal">True</property>
-                  <property name="visible_vertical">True</property>
-                  <property name="is_important">False</property>
-                  <signal name="clicked" handler="on_msgs_button_clicked"/>
-                </widget>
-                <packing>
-                  <property name="expand">False</property>
-                  <property name="homogeneous">True</property>
-                </packing>
-              </child>
-            </widget>
-          </child>
-        </widget>
-        <packing>
-          <property name="padding">0</property>
-          <property name="expand">False</property>
-          <property name="fill">True</property>
-        </packing>
-      </child>
-
-      <child>
-        <widget class="GtkVBox" id="vbox7">
-          <property name="visible">True</property>
-          <property name="homogeneous">False</property>
-          <property name="spacing">0</property>
-
-          <child>
-            <widget class="GtkScrolledWindow" id="scroll1">
-              <property name="visible">True</property>
-              <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-              <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-              <property name="shadow_type">GTK_SHADOW_IN</property>
-              <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-              <child>
-                <widget class="GtkTextView" id="text1">
-                  <property name="visible">True</property>
-                  <property name="editable">False</property>
-                  <property name="overwrite">False</property>
-                  <property name="accepts_tab">True</property>
-                  <property name="justification">GTK_JUSTIFY_LEFT</property>
-                  <property name="wrap_mode">GTK_WRAP_WORD</property>
-                  <property name="cursor_visible">True</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"></property>
-                </widget>
-              </child>
-            </widget>
-            <packing>
-              <property name="padding">0</property>
-              <property name="expand">True</property>
-              <property name="fill">True</property>
-            </packing>
-          </child>
-
-          <child>
-            <widget class="GtkHBox" id="hbox18">
-              <property name="visible">True</property>
-              <property name="homogeneous">False</property>
-              <property name="spacing">0</property>
-
-              <child>
-                <widget class="GtkLabel" id="label38">
-                  <property name="visible">True</property>
-                  <property name="label" translatable="yes"> Command: </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.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">True</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkEntry" id="entry1">
-                  <property name="visible">True</property>
-                  <property name="tooltip" translatable="yes">Enter Commands Here</property>
-                  <property name="can_default">True</property>
-                  <property name="has_default">True</property>
-                  <property name="can_focus">True</property>
-                  <property name="has_focus">True</property>
-                  <property name="editable">True</property>
-                  <property name="visibility">True</property>
-                  <property name="max_length">150</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="key_press_event" handler="on_entry1_key_press_event"/>
-                  <signal name="key_release_event" handler="on_entry1_key_release_event"/>
-                </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>
-
-          <child>
-            <widget class="GtkHBox" id="hbox19">
-              <property name="visible">True</property>
-              <property name="homogeneous">False</property>
-              <property name="spacing">0</property>
-
-              <child>
-                <widget class="GtkFrame" id="frame1">
-                  <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="GtkLabel" id="label39">
-                      <property name="visible">True</property>
-                      <property name="label" translatable="yes"> Status: </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.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>
-                  </child>
-                </widget>
-                <packing>
-                  <property name="padding">0</property>
-                  <property name="expand">False</property>
-                  <property name="fill">True</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkFrame" id="frame2">
-                  <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="GtkLabel" id="status1">
-                      <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</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>
-                  </child>
-                </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">False</property>
-            </packing>
-          </child>
-        </widget>
-        <packing>
-          <property name="padding">0</property>
-          <property name="expand">True</property>
-          <property name="fill">True</property>
-        </packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkDialog" id="about1">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">About Bacula Console</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">True</property>
-  <property name="resizable">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="urgency_hint">False</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox5">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child internal-child="action_area">
-        <widget class="GtkHButtonBox" id="dialog-action_area5">
-          <property name="visible">True</property>
-          <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-          <child>
-            <widget class="GtkHBox" id="hbox20">
-              <property name="visible">True</property>
-              <property name="homogeneous">False</property>
-              <property name="spacing">0</property>
-
-              <child>
-                <widget class="GtkLabel" id="label44">
-                  <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_CENTER</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">True</property>
-                  <property name="fill">False</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkButton" id="about_button">
-                  <property name="border_width">1</property>
-                  <property name="width_request">400</property>
-                  <property name="height_request">640</property>
-                  <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_about_button_clicked"/>
-                </widget>
-                <packing>
-                  <property name="padding">0</property>
-                  <property name="expand">False</property>
-                  <property name="fill">False</property>
-                </packing>
-              </child>
-            </widget>
-          </child>
-        </widget>
-        <packing>
-          <property name="padding">0</property>
-          <property name="expand">False</property>
-          <property name="fill">True</property>
-          <property name="pack_type">GTK_PACK_END</property>
-        </packing>
-      </child>
-
-      <child>
-        <widget class="GtkVBox" id="vbox8">
-          <property name="visible">True</property>
-          <property name="homogeneous">False</property>
-          <property name="spacing">0</property>
-
-          <child>
-            <widget class="GtkVBox" id="vbox9">
-              <property name="visible">True</property>
-              <property name="homogeneous">False</property>
-              <property name="spacing">0</property>
-
-              <child>
-                <widget class="GtkLabel" id="about_head">
-                  <property name="visible">True</property>
-                  <property name="label" translatable="yes">Bacula Console
-</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.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="GtkHSeparator" id="hseparator1">
-                  <property name="visible">True</property>
-                </widget>
-                <packing>
-                  <property name="padding">0</property>
-                  <property name="expand">False</property>
-                  <property name="fill">False</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkLabel" id="copyright">
-                  <property name="visible">True</property>
-                  <property name="label" translatable="yes">Copyright (C) 2000-2006, Free Software Foundation Europe e.V.</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.10000000149</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">True</property>
-                  <property name="fill">False</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkLabel" id="authors">
-                  <property name="visible">True</property>
-                  <property name="label" translatable="yes">Author: Kern Sibbald</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.0400000996888</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">True</property>
-                  <property name="fill">False</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkLabel" id="theme">
-                  <property name="visible">True</property>
-                  <property name="label" translatable="yes">It comes by night and sucks the essence from your computers</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.15000000596</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">True</property>
-                  <property name="fill">False</property>
-                </packing>
-              </child>
-            </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">True</property>
-          <property name="fill">True</property>
-        </packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkDialog" id="SelectDirectorDialog">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Select Director</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">True</property>
-  <property name="resizable">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="urgency_hint">False</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox6">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child internal-child="action_area">
-        <widget class="GtkHButtonBox" id="dialog-action_area2">
-          <property name="visible">True</property>
-          <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-          <child>
-            <widget class="GtkHBox" id="hbox21">
-              <property name="visible">True</property>
-              <property name="homogeneous">False</property>
-              <property name="spacing">0</property>
-
-              <child>
-                <widget class="GtkButton" id="button11">
-                  <property name="visible">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_select_director_OK_clicked"/>
-                </widget>
-                <packing>
-                  <property name="padding">0</property>
-                  <property name="expand">False</property>
-                  <property name="fill">False</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkLabel" id="label46">
-                  <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_CENTER</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">2</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="GtkButton" id="button13">
-                  <property name="visible">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_select_director_cancel_clicked"/>
-                </widget>
-                <packing>
-                  <property name="padding">0</property>
-                  <property name="expand">False</property>
-                  <property name="fill">False</property>
-                </packing>
-              </child>
-            </widget>
-          </child>
-        </widget>
-        <packing>
-          <property name="padding">0</property>
-          <property name="expand">False</property>
-          <property name="fill">True</property>
-          <property name="pack_type">GTK_PACK_END</property>
-        </packing>
-      </child>
-
-      <child>
-        <widget class="GtkVBox" id="vbox10">
-          <property name="visible">True</property>
-          <property name="homogeneous">False</property>
-          <property name="spacing">0</property>
-
-          <child>
-            <widget class="GtkLabel" id="label48">
-              <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_CENTER</property>
-              <property name="wrap">False</property>
-              <property name="selectable">False</property>
-              <property name="xalign">0.479999989271</property>
-              <property name="yalign">0.460000008345</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="GtkLabel" id="label47">
-              <property name="visible">True</property>
-              <property name="label" translatable="yes">Select Director</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.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="GtkCombo" id="combo1">
-              <property name="border_width">6</property>
-              <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="dirselect">
-                  <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>
-              </child>
-
-              <child internal-child="list">
-                <widget class="GtkList" id="convertwidget3">
-                  <property name="visible">True</property>
-                  <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
-                  <child>
-                    <widget class="GtkListItem" id="convertwidget4">
-                      <property name="visible">True</property>
-
-                      <child>
-                        <widget class="GtkLabel" id="convertwidget5">
-                          <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</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>
-                      </child>
-                    </widget>
-                  </child>
-                </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="padding">0</property>
-          <property name="expand">True</property>
-          <property name="fill">True</property>
-        </packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkDialog" id="RunDialog">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Run a Job</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">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="urgency_hint">False</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox7">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child internal-child="action_area">
-        <widget class="GtkHButtonBox" id="dialog-action_area6">
-          <property name="visible">True</property>
-          <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-          <child>
-            <widget class="GtkHButtonBox" id="hbuttonbox1">
-              <property name="visible">True</property>
-              <property name="layout_style">GTK_BUTTONBOX_END</property>
-              <property name="spacing">8</property>
-
-              <child>
-                <widget class="GtkButton" id="run_ok">
-                  <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_run_ok_clicked"/>
-                </widget>
-              </child>
-
-              <child>
-                <widget class="GtkButton" id="run_cancel">
-                  <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_run_cancel_clicked"/>
-                </widget>
-              </child>
-            </widget>
-          </child>
-        </widget>
-        <packing>
-          <property name="padding">0</property>
-          <property name="expand">False</property>
-          <property name="fill">True</property>
-          <property name="pack_type">GTK_PACK_END</property>
-        </packing>
-      </child>
-
-      <child>
-        <widget class="GtkVBox" id="vbox11">
-          <property name="visible">True</property>
-          <property name="homogeneous">False</property>
-          <property name="spacing">0</property>
-
-          <child>
-            <widget class="GtkVBox" id="vbox12">
-              <property name="visible">True</property>
-              <property name="homogeneous">False</property>
-              <property name="spacing">0</property>
-
-              <child>
-                <widget class="GtkLabel" id="label62">
-                  <property name="visible">True</property>
-                  <property name="label" translatable="yes">Run a Job</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.5</property>
-                  <property name="yalign">0.5</property>
-                  <property name="xpad">0</property>
-                  <property name="ypad">9</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">2</property>
-                  <property name="expand">False</property>
-                  <property name="fill">False</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkAlignment" id="alignment1">
-                  <property name="visible">True</property>
-                  <property name="xalign">0.5</property>
-                  <property name="yalign">0.5</property>
-                  <property name="xscale">1</property>
-                  <property name="yscale">1</property>
-                  <property name="top_padding">0</property>
-                  <property name="bottom_padding">0</property>
-                  <property name="left_padding">0</property>
-                  <property name="right_padding">0</property>
-
-                  <child>
-                    <widget class="GtkHBox" id="hbox28">
-                      <property name="border_width">1</property>
-                      <property name="visible">True</property>
-                      <property name="homogeneous">False</property>
-                      <property name="spacing">0</property>
-
-                      <child>
-                        <widget class="GtkHBox" id="hbox29">
-                          <property name="visible">True</property>
-                          <property name="homogeneous">False</property>
-                          <property name="spacing">0</property>
-
-                          <child>
-                            <widget class="GtkLabel" id="label63">
-                              <property name="width_request">85</property>
-                              <property name="height_request">16</property>
-                              <property name="visible">True</property>
-                              <property name="label" translatable="yes">Job:</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.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="GtkCombo" id="combo_job">
-                              <property name="width_request">198</property>
-                              <property name="visible">True</property>
-                              <property name="value_in_list">True</property>
-                              <property name="allow_empty">False</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="entry_job">
-                                  <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">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>
-                                  <signal name="changed" handler="on_entry_job_changed"/>
-                                </widget>
-                              </child>
-
-                              <child internal-child="list">
-                                <widget class="GtkList" id="convertwidget6">
-                                  <property name="visible">True</property>
-                                  <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
-                                  <child>
-                                    <widget class="GtkListItem" id="convertwidget7">
-                                      <property name="visible">True</property>
-
-                                      <child>
-                                        <widget class="GtkLabel" id="convertwidget8">
-                                          <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</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>
-                                      </child>
-                                    </widget>
-                                  </child>
-                                </widget>
-                              </child>
-                            </widget>
-                            <packing>
-                              <property name="padding">1</property>
-                              <property name="expand">True</property>
-                              <property name="fill">True</property>
-                            </packing>
-                          </child>
-
-                          <child>
-                            <widget class="GtkLabel" id="label64">
-                              <property name="visible">True</property>
-                              <property name="label" translatable="yes">   Type:</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.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="GtkCombo" id="combo_type">
-                              <property name="width_request">141</property>
-                              <property name="height_request">24</property>
-                              <property name="visible">True</property>
-                              <property name="value_in_list">True</property>
-                              <property name="allow_empty">False</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="entry_type">
-                                  <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">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>
-                              </child>
-
-                              <child internal-child="list">
-                                <widget class="GtkList" id="convertwidget9">
-                                  <property name="visible">True</property>
-                                  <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
-                                  <child>
-                                    <widget class="GtkListItem" id="convertwidget10">
-                                      <property name="visible">True</property>
-
-                                      <child>
-                                        <widget class="GtkLabel" id="convertwidget11">
-                                          <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</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>
-                                      </child>
-                                    </widget>
-                                  </child>
-                                </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="padding">0</property>
-                          <property name="expand">True</property>
-                          <property name="fill">True</property>
-                        </packing>
-                      </child>
-
-                      <child>
-                        <widget class="GtkLabel" id="label114">
-                          <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">30</property>
-                          <property name="expand">False</property>
-                          <property name="fill">False</property>
-                        </packing>
-                      </child>
-                    </widget>
-                  </child>
-                </widget>
-                <packing>
-                  <property name="padding">2</property>
-                  <property name="expand">False</property>
-                  <property name="fill">False</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkHBox" id="hbox30">
-                  <property name="border_width">1</property>
-                  <property name="visible">True</property>
-                  <property name="homogeneous">False</property>
-                  <property name="spacing">0</property>
-
-                  <child>
-                    <widget class="GtkLabel" id="label66">
-                      <property name="width_request">85</property>
-                      <property name="height_request">16</property>
-                      <property name="visible">True</property>
-                      <property name="label" translatable="yes">Client:</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.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="GtkCombo" id="combo_client">
-                      <property name="visible">True</property>
-                      <property name="value_in_list">True</property>
-                      <property name="allow_empty">False</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="entry_client">
-                          <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">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>
-                      </child>
-
-                      <child internal-child="list">
-                        <widget class="GtkList" id="convertwidget12">
-                          <property name="visible">True</property>
-                          <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
-                          <child>
-                            <widget class="GtkListItem" id="convertwidget13">
-                              <property name="visible">True</property>
-
-                              <child>
-                                <widget class="GtkLabel" id="convertwidget14">
-                                  <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</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>
-                              </child>
-                            </widget>
-                          </child>
-                        </widget>
-                      </child>
-                    </widget>
-                    <packing>
-                      <property name="padding">1</property>
-                      <property name="expand">True</property>
-                      <property name="fill">True</property>
-                    </packing>
-                  </child>
-
-                  <child>
-                    <widget class="GtkLabel" id="label67">
-                      <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_CENTER</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">123</property>
-                      <property name="expand">False</property>
-                      <property name="fill">False</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="GtkHBox" id="hbox31">
-                  <property name="border_width">1</property>
-                  <property name="visible">True</property>
-                  <property name="homogeneous">False</property>
-                  <property name="spacing">0</property>
-
-                  <child>
-                    <widget class="GtkLabel" id="label68">
-                      <property name="width_request">85</property>
-                      <property name="height_request">16</property>
-                      <property name="visible">True</property>
-                      <property name="label" translatable="yes">FileSet: </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.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="GtkCombo" id="combo_fileset">
-                      <property name="visible">True</property>
-                      <property name="value_in_list">True</property>
-                      <property name="allow_empty">False</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="entry_fileset">
-                          <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">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>
-                      </child>
-
-                      <child internal-child="list">
-                        <widget class="GtkList" id="convertwidget15">
-                          <property name="visible">True</property>
-                          <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
-                          <child>
-                            <widget class="GtkListItem" id="convertwidget16">
-                              <property name="visible">True</property>
-
-                              <child>
-                                <widget class="GtkLabel" id="convertwidget17">
-                                  <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</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>
-                              </child>
-                            </widget>
-                          </child>
-                        </widget>
-                      </child>
-                    </widget>
-                    <packing>
-                      <property name="padding">0</property>
-                      <property name="expand">True</property>
-                      <property name="fill">True</property>
-                    </packing>
-                  </child>
-
-                  <child>
-                    <widget class="GtkLabel" id="label156">
-                      <property name="width_request">13</property>
-                      <property name="height_request">16</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="GtkLabel" id="label155">
-                      <property name="width_request">103</property>
-                      <property name="visible">True</property>
-                      <property name="label" translatable="yes">Priority:</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">True</property>
-                      <property name="fill">True</property>
-                    </packing>
-                  </child>
-
-                  <child>
-                    <widget class="GtkSpinButton" id="spinbutton1">
-                      <property name="width_request">85</property>
-                      <property name="height_request">24</property>
-                      <property name="visible">True</property>
-                      <property name="can_focus">True</property>
-                      <property name="climb_rate">1</property>
-                      <property name="digits">0</property>
-                      <property name="numeric">False</property>
-                      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                      <property name="snap_to_ticks">False</property>
-                      <property name="wrap">False</property>
-                      <property name="adjustment">10 0 100 1 10 10</property>
-                    </widget>
-                    <packing>
-                      <property name="padding">4</property>
-                      <property name="expand">True</property>
-                      <property name="fill">True</property>
-                    </packing>
-                  </child>
-                </widget>
-                <packing>
-                  <property name="padding">2</property>
-                  <property name="expand">True</property>
-                  <property name="fill">True</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkHBox" id="hbox32">
-                  <property name="border_width">1</property>
-                  <property name="visible">True</property>
-                  <property name="homogeneous">False</property>
-                  <property name="spacing">0</property>
-
-                  <child>
-                    <widget class="GtkLabel" id="label70">
-                      <property name="width_request">85</property>
-                      <property name="height_request">16</property>
-                      <property name="visible">True</property>
-                      <property name="label" translatable="yes">Level:</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.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="GtkCombo" id="combo_level">
-                      <property name="visible">True</property>
-                      <property name="value_in_list">True</property>
-                      <property name="allow_empty">False</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="entry_level">
-                          <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">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>
-                      </child>
-
-                      <child internal-child="list">
-                        <widget class="GtkList" id="convertwidget18">
-                          <property name="visible">True</property>
-                          <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
-                          <child>
-                            <widget class="GtkListItem" id="convertwidget19">
-                              <property name="visible">True</property>
-
-                              <child>
-                                <widget class="GtkLabel" id="convertwidget20">
-                                  <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</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>
-                              </child>
-                            </widget>
-                          </child>
-
-                          <child>
-                            <widget class="GtkListItem" id="convertwidget21">
-                              <property name="visible">True</property>
-
-                              <child>
-                                <widget class="GtkLabel" id="convertwidget22">
-                                  <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</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>
-                              </child>
-                            </widget>
-                          </child>
-                        </widget>
-                      </child>
-                    </widget>
-                    <packing>
-                      <property name="padding">0</property>
-                      <property name="expand">True</property>
-                      <property name="fill">True</property>
-                    </packing>
-                  </child>
-
-                  <child>
-                    <widget class="GtkLabel" id="label71">
-                      <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_CENTER</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">100</property>
-                      <property name="expand">False</property>
-                      <property name="fill">False</property>
-                    </packing>
-                  </child>
-                </widget>
-                <packing>
-                  <property name="padding">2</property>
-                  <property name="expand">True</property>
-                  <property name="fill">True</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkHBox" id="hbox33">
-                  <property name="border_width">1</property>
-                  <property name="visible">True</property>
-                  <property name="homogeneous">False</property>
-                  <property name="spacing">0</property>
-
-                  <child>
-                    <widget class="GtkLabel" id="label72">
-                      <property name="width_request">85</property>
-                      <property name="height_request">16</property>
-                      <property name="visible">True</property>
-                      <property name="label" translatable="yes">Pool:</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.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="GtkCombo" id="combo_pool">
-                      <property name="visible">True</property>
-                      <property name="value_in_list">True</property>
-                      <property name="allow_empty">False</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="entry_pool">
-                          <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">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>
-                      </child>
-
-                      <child internal-child="list">
-                        <widget class="GtkList" id="convertwidget23">
-                          <property name="visible">True</property>
-                          <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
-                          <child>
-                            <widget class="GtkListItem" id="convertwidget24">
-                              <property name="visible">True</property>
-
-                              <child>
-                                <widget class="GtkLabel" id="convertwidget25">
-                                  <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</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>
-                              </child>
-                            </widget>
-                          </child>
-
-                          <child>
-                            <widget class="GtkListItem" id="convertwidget26">
-                              <property name="visible">True</property>
-
-                              <child>
-                                <widget class="GtkLabel" id="convertwidget27">
-                                  <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</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>
-                              </child>
-                            </widget>
-                          </child>
-                        </widget>
-                      </child>
-                    </widget>
-                    <packing>
-                      <property name="padding">0</property>
-                      <property name="expand">True</property>
-                      <property name="fill">True</property>
-                    </packing>
-                  </child>
-
-                  <child>
-                    <widget class="GtkLabel" id="label73">
-                      <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_CENTER</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">120</property>
-                      <property name="expand">False</property>
-                      <property name="fill">False</property>
-                    </packing>
-                  </child>
-                </widget>
-                <packing>
-                  <property name="padding">2</property>
-                  <property name="expand">True</property>
-                  <property name="fill">True</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkHBox" id="hbox39">
-                  <property name="border_width">1</property>
-                  <property name="visible">True</property>
-                  <property name="homogeneous">False</property>
-                  <property name="spacing">0</property>
-
-                  <child>
-                    <widget class="GtkLabel" id="label96">
-                      <property name="width_request">85</property>
-                      <property name="height_request">16</property>
-                      <property name="visible">True</property>
-                      <property name="label" translatable="yes">Storage:</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.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="GtkCombo" id="combo-storage">
-                      <property name="visible">True</property>
-                      <property name="value_in_list">True</property>
-                      <property name="allow_empty">False</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="entry_storage">
-                          <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">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>
-                      </child>
-
-                      <child internal-child="list">
-                        <widget class="GtkList" id="convertwidget28">
-                          <property name="visible">True</property>
-                          <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
-                          <child>
-                            <widget class="GtkListItem" id="convertwidget29">
-                              <property name="visible">True</property>
-
-                              <child>
-                                <widget class="GtkLabel" id="convertwidget30">
-                                  <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</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>
-                              </child>
-                            </widget>
-                          </child>
-
-                          <child>
-                            <widget class="GtkListItem" id="convertwidget31">
-                              <property name="visible">True</property>
-
-                              <child>
-                                <widget class="GtkLabel" id="convertwidget32">
-                                  <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</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>
-                              </child>
-                            </widget>
-                          </child>
-                        </widget>
-                      </child>
-                    </widget>
-                    <packing>
-                      <property name="padding">0</property>
-                      <property name="expand">True</property>
-                      <property name="fill">True</property>
-                    </packing>
-                  </child>
-
-                  <child>
-                    <widget class="GtkLabel" id="label97">
-                      <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_CENTER</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">120</property>
-                      <property name="expand">False</property>
-                      <property name="fill">False</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="GtkHBox" id="hbox40">
-                  <property name="border_width">1</property>
-                  <property name="visible">True</property>
-                  <property name="homogeneous">False</property>
-                  <property name="spacing">0</property>
-
-                  <child>
-                    <widget class="GtkLabel" id="label98">
-                      <property name="width_request">85</property>
-                      <property name="height_request">16</property>
-                      <property name="visible">True</property>
-                      <property name="label" translatable="yes">Messages:</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.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="GtkCombo" id="combo_messages">
-                      <property name="visible">True</property>
-                      <property name="value_in_list">True</property>
-                      <property name="allow_empty">False</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="entry_messages">
-                          <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">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>
-                      </child>
-
-                      <child internal-child="list">
-                        <widget class="GtkList" id="convertwidget33">
-                          <property name="visible">True</property>
-                          <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
-                          <child>
-                            <widget class="GtkListItem" id="convertwidget34">
-                              <property name="visible">True</property>
-
-                              <child>
-                                <widget class="GtkLabel" id="convertwidget35">
-                                  <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</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>
-                              </child>
-                            </widget>
-                          </child>
-                        </widget>
-                      </child>
-                    </widget>
-                    <packing>
-                      <property name="padding">0</property>
-                      <property name="expand">True</property>
-                      <property name="fill">True</property>
-                    </packing>
-                  </child>
-
-                  <child>
-                    <widget class="GtkLabel" id="label99">
-                      <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_CENTER</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">120</property>
-                      <property name="expand">False</property>
-                      <property name="fill">False</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="GtkHBox" id="hbox34">
-                  <property name="border_width">1</property>
-                  <property name="visible">True</property>
-                  <property name="homogeneous">False</property>
-                  <property name="spacing">0</property>
-
-                  <child>
-                    <widget class="GtkLabel" id="label77">
-                      <property name="width_request">85</property>
-                      <property name="height_request">16</property>
-                      <property name="visible">True</property>
-                      <property name="label" translatable="yes">Where: </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.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="GtkEntry" id="entry_where">
-                      <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="padding">0</property>
-                      <property name="expand">True</property>
-                      <property name="fill">True</property>
-                    </packing>
-                  </child>
-
-                  <child>
-                    <widget class="GtkLabel" id="label78">
-                      <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_CENTER</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">120</property>
-                      <property name="expand">False</property>
-                      <property name="fill">False</property>
-                    </packing>
-                  </child>
-                </widget>
-                <packing>
-                  <property name="padding">2</property>
-                  <property name="expand">True</property>
-                  <property name="fill">True</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="GtkHBox" id="hbox41">
-              <property name="border_width">1</property>
-              <property name="visible">True</property>
-              <property name="homogeneous">False</property>
-              <property name="spacing">0</property>
-
-              <child>
-                <widget class="GtkLabel" id="label100">
-                  <property name="width_request">85</property>
-                  <property name="height_request">16</property>
-                  <property name="visible">True</property>
-                  <property name="label" translatable="yes">When:</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.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="GtkEntry" id="entry_when">
-                  <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="padding">0</property>
-                  <property name="expand">True</property>
-                  <property name="fill">True</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkLabel" id="label101">
-                  <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_CENTER</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">120</property>
-                  <property name="expand">False</property>
-                  <property name="fill">False</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="GtkHBox" id="hbox60">
-              <property name="border_width">1</property>
-              <property name="visible">True</property>
-              <property name="homogeneous">False</property>
-              <property name="spacing">0</property>
-
-              <child>
-                <widget class="GtkLabel" id="label153">
-                  <property name="width_request">85</property>
-                  <property name="height_request">16</property>
-                  <property name="visible">True</property>
-                  <property name="label" translatable="yes">Bootstrap:</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.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="GtkEntry" id="entry28">
-                  <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="padding">0</property>
-                  <property name="expand">True</property>
-                  <property name="fill">True</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkLabel" id="label154">
-                  <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_CENTER</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">36</property>
-                  <property name="expand">False</property>
-                  <property name="fill">False</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="GtkLabel" id="label84">
-              <property name="width_request">12</property>
-              <property name="height_request">19</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_CENTER</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>
-        <packing>
-          <property name="padding">0</property>
-          <property name="expand">True</property>
-          <property name="fill">True</property>
-        </packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkWindow" id="restore_file_selection">
-  <property name="width_request">640</property>
-  <property name="height_request">480</property>
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Restore File Selection</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">True</property>
-  <property name="default_width">700</property>
-  <property name="default_height">450</property>
-  <property name="resizable">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_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-  <signal name="delete_event" handler="on_restore_files_delete_event" last_modification_time="Tue, 16 Mar 2004 11:41:52 GMT"/>
-
-  <child>
-    <widget class="GtkVBox" id="vbox13">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child>
-        <widget class="GtkHandleBox" id="handlebox4">
-          <property name="visible">True</property>
-          <property name="shadow_type">GTK_SHADOW_OUT</property>
-          <property name="handle_position">GTK_POS_LEFT</property>
-          <property name="snap_edge">GTK_POS_TOP</property>
-
-          <child>
-            <widget class="GtkMenuBar" id="menubar2">
-              <property name="visible">True</property>
-              <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>
-              <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
-
-              <child>
-                <widget class="GtkImageMenuItem" id="file2">
-                  <property name="visible">True</property>
-                  <property name="stock_item">GNOMEUIINFO_MENU_FILE_TREE</property>
-
-                  <child>
-                    <widget class="GtkMenu" id="file2_menu">
-
-                      <child>
-                        <widget class="GtkImageMenuItem" id="new1">
-                          <property name="visible">True</property>
-                          <property name="stock_item">GNOMEUIINFO_MENU_NEW_ITEM</property>
-                          <property name="label" translatable="yes">_New</property>
-                          <property name="use_underline">True</property>
-                          <signal name="activate" handler="on_new1_activate" last_modification_time="Tue, 16 Mar 2004 11:04:16 GMT"/>
-                        </widget>
-                      </child>
-
-                      <child>
-                        <widget class="GtkImageMenuItem" id="open1">
-                          <property name="visible">True</property>
-                          <property name="stock_item">GNOMEUIINFO_MENU_OPEN_ITEM</property>
-                          <signal name="activate" handler="on_open1_activate" last_modification_time="Tue, 16 Mar 2004 11:04:16 GMT"/>
-                        </widget>
-                      </child>
-
-                      <child>
-                        <widget class="GtkImageMenuItem" id="save1">
-                          <property name="visible">True</property>
-                          <property name="stock_item">GNOMEUIINFO_MENU_SAVE_ITEM</property>
-                          <signal name="activate" handler="on_save1_activate" last_modification_time="Tue, 16 Mar 2004 11:04:16 GMT"/>
-                        </widget>
-                      </child>
-
-                      <child>
-                        <widget class="GtkImageMenuItem" id="save_as1">
-                          <property name="visible">True</property>
-                          <property name="stock_item">GNOMEUIINFO_MENU_SAVE_AS_ITEM</property>
-                          <signal name="activate" handler="on_save_as1_activate" last_modification_time="Tue, 16 Mar 2004 11:04:16 GMT"/>
-                        </widget>
-                      </child>
-
-                      <child>
-                        <widget class="GtkSeparatorMenuItem" id="separator4">
-                          <property name="visible">True</property>
-                        </widget>
-                      </child>
-
-                      <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="Tue, 16 Mar 2004 11:04:16 GMT"/>
-                        </widget>
-                      </child>
-                    </widget>
-                  </child>
-                </widget>
-              </child>
-
-              <child>
-                <widget class="GtkImageMenuItem" id="edit2">
-                  <property name="visible">True</property>
-                  <property name="stock_item">GNOMEUIINFO_MENU_EDIT_TREE</property>
-
-                  <child>
-                    <widget class="GtkMenu" id="edit2_menu">
-
-                      <child>
-                        <widget class="GtkImageMenuItem" id="cut2">
-                          <property name="visible">True</property>
-                          <property name="stock_item">GNOMEUIINFO_MENU_CUT_ITEM</property>
-                          <signal name="activate" handler="on_cut2_activate" last_modification_time="Tue, 16 Mar 2004 11:04:16 GMT"/>
-                        </widget>
-                      </child>
-
-                      <child>
-                        <widget class="GtkImageMenuItem" id="copy2">
-                          <property name="visible">True</property>
-                          <property name="stock_item">GNOMEUIINFO_MENU_COPY_ITEM</property>
-                          <signal name="activate" handler="on_copy2_activate" last_modification_time="Tue, 16 Mar 2004 11:04:16 GMT"/>
-                        </widget>
-                      </child>
-
-                      <child>
-                        <widget class="GtkImageMenuItem" id="paste2">
-                          <property name="visible">True</property>
-                          <property name="stock_item">GNOMEUIINFO_MENU_PASTE_ITEM</property>
-                          <signal name="activate" handler="on_paste2_activate" last_modification_time="Tue, 16 Mar 2004 11:04:16 GMT"/>
-                        </widget>
-                      </child>
-
-                      <child>
-                        <widget class="GtkImageMenuItem" id="clear2">
-                          <property name="visible">True</property>
-                          <property name="stock_item">GNOMEUIINFO_MENU_CLEAR_ITEM</property>
-                          <signal name="activate" handler="on_clear2_activate" last_modification_time="Tue, 16 Mar 2004 11:04:16 GMT"/>
-                        </widget>
-                      </child>
-
-                      <child>
-                        <widget class="GtkSeparatorMenuItem" id="separator5">
-                          <property name="visible">True</property>
-                        </widget>
-                      </child>
-
-                      <child>
-                        <widget class="GtkImageMenuItem" id="properties1">
-                          <property name="visible">True</property>
-                          <property name="stock_item">GNOMEUIINFO_MENU_PROPERTIES_ITEM</property>
-                          <signal name="activate" handler="on_properties1_activate" last_modification_time="Tue, 16 Mar 2004 11:04:16 GMT"/>
-                        </widget>
-                      </child>
-
-                      <child>
-                        <widget class="GtkSeparatorMenuItem" id="separator6">
-                          <property name="visible">True</property>
-                        </widget>
-                      </child>
-
-                      <child>
-                        <widget class="GtkImageMenuItem" id="preferences2">
-                          <property name="visible">True</property>
-                          <property name="stock_item">GNOMEUIINFO_MENU_PREFERENCES_ITEM</property>
-                          <signal name="activate" handler="on_preferences2_activate" last_modification_time="Tue, 16 Mar 2004 11:04:16 GMT"/>
-                        </widget>
-                      </child>
-                    </widget>
-                  </child>
-                </widget>
-              </child>
-
-              <child>
-                <widget class="GtkImageMenuItem" id="view1">
-                  <property name="visible">True</property>
-                  <property name="stock_item">GNOMEUIINFO_MENU_VIEW_TREE</property>
-
-                  <child>
-                    <widget class="GtkMenu" id="view1_menu">
-                    </widget>
-                  </child>
-                </widget>
-              </child>
-
-              <child>
-                <widget class="GtkImageMenuItem" id="help2">
-                  <property name="visible">True</property>
-                  <property name="stock_item">GNOMEUIINFO_MENU_HELP_TREE</property>
-
-                  <child>
-                    <widget class="GtkMenu" id="help2_menu">
-
-                      <child>
-                        <widget class="GtkImageMenuItem" id="about2">
-                          <property name="visible">True</property>
-                          <property name="stock_item">GNOMEUIINFO_MENU_ABOUT_ITEM</property>
-                          <signal name="activate" handler="on_about2_activate" last_modification_time="Tue, 16 Mar 2004 11:04:16 GMT"/>
-                        </widget>
-                      </child>
-                    </widget>
-                  </child>
-                </widget>
-              </child>
-            </widget>
-          </child>
-        </widget>
-        <packing>
-          <property name="padding">0</property>
-          <property name="expand">False</property>
-          <property name="fill">False</property>
-        </packing>
-      </child>
-
-      <child>
-        <widget class="GtkHandleBox" id="handlebox3">
-          <property name="visible">True</property>
-          <property name="shadow_type">GTK_SHADOW_OUT</property>
-          <property name="handle_position">GTK_POS_LEFT</property>
-          <property name="snap_edge">GTK_POS_TOP</property>
-
-          <child>
-            <widget class="GtkToolbar" id="toolbar3">
-              <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="restore_up_button">
-                  <property name="visible">True</property>
-                  <property name="stock_id">gtk-go-up</property>
-                  <property name="visible_horizontal">True</property>
-                  <property name="visible_vertical">True</property>
-                  <property name="is_important">False</property>
-                  <signal name="clicked" handler="on_restore_up_button_clicked" last_modification_time="Tue, 16 Mar 2004 11:44:40 GMT"/>
-                </widget>
-                <packing>
-                  <property name="expand">False</property>
-                  <property name="homogeneous">True</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkToolButton" id="restore_add_button">
-                  <property name="visible">True</property>
-                  <property name="stock_id">gtk-add</property>
-                  <property name="visible_horizontal">True</property>
-                  <property name="visible_vertical">True</property>
-                  <property name="is_important">False</property>
-                  <signal name="clicked" handler="on_restore_add_button_clicked" last_modification_time="Tue, 16 Mar 2004 11:44:49 GMT"/>
-                </widget>
-                <packing>
-                  <property name="expand">False</property>
-                  <property name="homogeneous">True</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkToolButton" id="restore_remove_button">
-                  <property name="visible">True</property>
-                  <property name="stock_id">gtk-remove</property>
-                  <property name="visible_horizontal">True</property>
-                  <property name="visible_vertical">True</property>
-                  <property name="is_important">False</property>
-                  <signal name="clicked" handler="on_restore_remove_button_clicked" last_modification_time="Tue, 16 Mar 2004 11:45:02 GMT"/>
-                </widget>
-                <packing>
-                  <property name="expand">False</property>
-                  <property name="homogeneous">True</property>
-                </packing>
-              </child>
-
-              <child>
-                <placeholder/>
-              </child>
-
-              <child>
-                <placeholder/>
-              </child>
-            </widget>
-          </child>
-        </widget>
-        <packing>
-          <property name="padding">0</property>
-          <property name="expand">False</property>
-          <property name="fill">False</property>
-        </packing>
-      </child>
-
-      <child>
-        <widget class="GtkHBox" id="hbox38">
-          <property name="visible">True</property>
-          <property name="homogeneous">False</property>
-          <property name="spacing">0</property>
-
-          <child>
-            <widget class="GtkLabel" id="label88">
-              <property name="visible">True</property>
-              <property name="label" translatable="yes">Current dir:</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.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">True</property>
-            </packing>
-          </child>
-
-          <child>
-            <widget class="GtkEntry" id="restore_dir">
-              <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="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>
-
-      <child>
-        <widget class="GtkHPaned" id="hpaned1">
-          <property name="visible">True</property>
-          <property name="can_focus">True</property>
-
-          <child>
-            <widget class="GtkScrolledWindow" id="tree">
-              <property name="width_request">164</property>
-              <property name="height_request">78</property>
-              <property name="visible">True</property>
-              <property name="can_focus">True</property>
-              <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-              <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-              <property name="shadow_type">GTK_SHADOW_NONE</property>
-              <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-              <child>
-                <placeholder/>
-              </child>
-            </widget>
-            <packing>
-              <property name="shrink">True</property>
-              <property name="resize">False</property>
-            </packing>
-          </child>
-
-          <child>
-            <widget class="GtkScrolledWindow" id="scrolled">
-              <property name="visible">True</property>
-              <property name="can_focus">True</property>
-              <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-              <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-              <property name="shadow_type">GTK_SHADOW_NONE</property>
-              <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-              <child>
-                <placeholder/>
-              </child>
-            </widget>
-            <packing>
-              <property name="shrink">True</property>
-              <property name="resize">True</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="GtkHBox" id="hbox44">
-          <property name="width_request">301</property>
-          <property name="height_request">30</property>
-          <property name="visible">True</property>
-          <property name="homogeneous">False</property>
-          <property name="spacing">0</property>
-
-          <child>
-            <widget class="GtkLabel" id="FilesSelected">
-              <property name="visible">True</property>
-              <property name="label" translatable="yes">Files Selected: </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.019999999553</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">True</property>
-              <property name="fill">True</property>
-            </packing>
-          </child>
-
-          <child>
-            <widget class="GtkButton" id="restore_select_ok">
-              <property name="width_request">72</property>
-              <property name="height_request">30</property>
-              <property name="visible">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_restore_select_ok_clicked" last_modification_time="Tue, 16 Mar 2004 11:52:07 GMT"/>
-            </widget>
-            <packing>
-              <property name="padding">0</property>
-              <property name="expand">False</property>
-              <property name="fill">True</property>
-            </packing>
-          </child>
-
-          <child>
-            <widget class="GtkLabel" id="label152">
-              <property name="width_request">34</property>
-              <property name="height_request">16</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="GtkButton" id="restore_select_cancel">
-              <property name="visible">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_restore_select_cancel_clicked" last_modification_time="Tue, 16 Mar 2004 11:52:22 GMT"/>
-            </widget>
-            <packing>
-              <property name="padding">0</property>
-              <property name="expand">False</property>
-              <property name="fill">True</property>
-            </packing>
-          </child>
-
-          <child>
-            <widget class="GtkLabel" id="label1001">
-              <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">8</property>
-              <property name="expand">False</property>
-              <property name="fill">False</property>
-            </packing>
-          </child>
-        </widget>
-        <packing>
-          <property name="padding">5</property>
-          <property name="expand">False</property>
-          <property name="fill">True</property>
-        </packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkDialog" id="label_dialog">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Label a Volume</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">True</property>
-  <property name="resizable">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="urgency_hint">False</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox9">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child internal-child="action_area">
-        <widget class="GtkHButtonBox" id="dialog-action_area8">
-          <property name="visible">True</property>
-          <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-          <child>
-            <widget class="GtkHButtonBox" id="hbuttonbox3">
-              <property name="visible">True</property>
-              <property name="layout_style">GTK_BUTTONBOX_END</property>
-              <property name="spacing">8</property>
-
-              <child>
-                <widget class="GtkButton" id="label_ok">
-                  <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_label_ok_clicked"/>
-                </widget>
-              </child>
-
-              <child>
-                <widget class="GtkButton" id="label_cancel">
-                  <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_label_cancel_clicked"/>
-                </widget>
-              </child>
-            </widget>
-          </child>
-        </widget>
-        <packing>
-          <property name="padding">0</property>
-          <property name="expand">False</property>
-          <property name="fill">True</property>
-          <property name="pack_type">GTK_PACK_END</property>
-        </packing>
-      </child>
-
-      <child>
-        <widget class="GtkVBox" id="vbox16">
-          <property name="visible">True</property>
-          <property name="homogeneous">False</property>
-          <property name="spacing">0</property>
-
-          <child>
-            <widget class="GtkLabel" id="label106">
-              <property name="visible">True</property>
-              <property name="label" translatable="yes">Label a Volume</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.5</property>
-              <property name="yalign">0.5</property>
-              <property name="xpad">0</property>
-              <property name="ypad">9</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="GtkHBox" id="hbox45">
-              <property name="border_width">5</property>
-              <property name="visible">True</property>
-              <property name="homogeneous">False</property>
-              <property name="spacing">0</property>
-
-              <child>
-                <widget class="GtkLabel" id="label107">
-                  <property name="visible">True</property>
-                  <property name="label" translatable="yes">Storage:</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.15000000596</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">True</property>
-                  <property name="fill">True</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkCombo" id="label_combo_storage">
-                  <property name="visible">True</property>
-                  <property name="value_in_list">True</property>
-                  <property name="allow_empty">False</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="entry26">
-                      <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">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>
-                  </child>
-
-                  <child internal-child="list">
-                    <widget class="GtkList" id="convertwidget38">
-                      <property name="visible">True</property>
-                      <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
-                      <child>
-                        <widget class="GtkListItem" id="convertwidget39">
-                          <property name="visible">True</property>
-
-                          <child>
-                            <widget class="GtkLabel" id="convertwidget40">
-                              <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</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>
-                          </child>
-                        </widget>
-                      </child>
-
-                      <child>
-                        <widget class="GtkListItem" id="convertwidget41">
-                          <property name="visible">True</property>
-
-                          <child>
-                            <widget class="GtkLabel" id="convertwidget42">
-                              <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</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>
-                          </child>
-                        </widget>
-                      </child>
-                    </widget>
-                  </child>
-                </widget>
-                <packing>
-                  <property name="padding">15</property>
-                  <property name="expand">True</property>
-                  <property name="fill">True</property>
-                </packing>
-              </child>
-
-              <child>
-                <placeholder/>
-              </child>
-            </widget>
-            <packing>
-              <property name="padding">0</property>
-              <property name="expand">False</property>
-              <property name="fill">True</property>
-            </packing>
-          </child>
-
-          <child>
-            <widget class="GtkHBox" id="hbox46">
-              <property name="border_width">5</property>
-              <property name="visible">True</property>
-              <property name="homogeneous">False</property>
-              <property name="spacing">0</property>
-
-              <child>
-                <widget class="GtkLabel" id="label109">
-                  <property name="visible">True</property>
-                  <property name="label" translatable="yes">Pool:</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.119999997318</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">True</property>
-                  <property name="fill">True</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkCombo" id="label_combo_pool">
-                  <property name="visible">True</property>
-                  <property name="value_in_list">True</property>
-                  <property name="allow_empty">False</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="entry27">
-                      <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">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>
-                  </child>
-
-                  <child internal-child="list">
-                    <widget class="GtkList" id="convertwidget43">
-                      <property name="visible">True</property>
-                      <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
-                      <child>
-                        <widget class="GtkListItem" id="convertwidget44">
-                          <property name="visible">True</property>
-
-                          <child>
-                            <widget class="GtkLabel" id="convertwidget45">
-                              <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</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>
-                          </child>
-                        </widget>
-                      </child>
-
-                      <child>
-                        <widget class="GtkListItem" id="convertwidget46">
-                          <property name="visible">True</property>
-
-                          <child>
-                            <widget class="GtkLabel" id="convertwidget47">
-                              <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</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>
-                          </child>
-                        </widget>
-                      </child>
-                    </widget>
-                  </child>
-                </widget>
-                <packing>
-                  <property name="padding">14</property>
-                  <property name="expand">True</property>
-                  <property name="fill">True</property>
-                </packing>
-              </child>
-
-              <child>
-                <placeholder/>
-              </child>
-            </widget>
-            <packing>
-              <property name="padding">0</property>
-              <property name="expand">False</property>
-              <property name="fill">True</property>
-            </packing>
-          </child>
-
-          <child>
-            <widget class="GtkHBox" id="hbox47">
-              <property name="border_width">5</property>
-              <property name="visible">True</property>
-              <property name="homogeneous">False</property>
-              <property name="spacing">0</property>
-
-              <child>
-                <widget class="GtkLabel" id="label111">
-                  <property name="visible">True</property>
-                  <property name="label" translatable="yes">Volume Name:</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.170000001788</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">True</property>
-                  <property name="fill">True</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkEntry" id="label_entry_volume">
-                  <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="padding">0</property>
-                  <property name="expand">True</property>
-                  <property name="fill">True</property>
-                </packing>
-              </child>
-
-              <child>
-                <placeholder/>
-              </child>
-            </widget>
-            <packing>
-              <property name="padding">0</property>
-              <property name="expand">False</property>
-              <property name="fill">True</property>
-            </packing>
-          </child>
-
-          <child>
-            <widget class="GtkHBox" id="hbox48">
-              <property name="border_width">5</property>
-              <property name="visible">True</property>
-              <property name="homogeneous">False</property>
-              <property name="spacing">0</property>
-
-              <child>
-                <widget class="GtkLabel" id="slot1">
-                  <property name="visible">True</property>
-                  <property name="label" translatable="yes">Slot:</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.0900000035763</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">True</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkSpinButton" id="label_slot">
-                  <property name="visible">True</property>
-                  <property name="can_focus">True</property>
-                  <property name="climb_rate">1</property>
-                  <property name="digits">0</property>
-                  <property name="numeric">True</property>
-                  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                  <property name="snap_to_ticks">False</property>
-                  <property name="wrap">False</property>
-                  <property name="adjustment">0 0 10000 1 10 10</property>
-                </widget>
-                <packing>
-                  <property name="padding">0</property>
-                  <property name="expand">True</property>
-                  <property name="fill">True</property>
-                </packing>
-              </child>
-
-              <child>
-                <placeholder/>
-              </child>
-            </widget>
-            <packing>
-              <property name="padding">0</property>
-              <property name="expand">True</property>
-              <property name="fill">True</property>
-            </packing>
-          </child>
-
-          <child>
-            <widget class="GtkLabel" id="label113">
-              <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_CENTER</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>
-        <packing>
-          <property name="padding">0</property>
-          <property name="expand">False</property>
-          <property name="fill">True</property>
-        </packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkDialog" id="RestoreDialog">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Restore Files Dialog</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">300</property>
-  <property name="default_height">200</property>
-  <property name="resizable">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="urgency_hint">False</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox10">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child internal-child="action_area">
-        <widget class="GtkHButtonBox" id="dialog-action_area9">
-          <property name="visible">True</property>
-          <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-          <child>
-            <widget class="GtkButton" id="helpbutton1">
-              <property name="visible">True</property>
-              <property name="can_default">True</property>
-              <property name="can_focus">True</property>
-              <property name="label">gtk-help</property>
-              <property name="use_stock">True</property>
-              <property name="relief">GTK_RELIEF_NORMAL</property>
-              <property name="focus_on_click">True</property>
-              <property name="response_id">-11</property>
-            </widget>
-          </child>
-
-          <child>
-            <widget class="GtkButton" id="select_files_button">
-              <property name="visible">True</property>
-              <property name="can_default">True</property>
-              <property name="can_focus">True</property>
-              <property name="relief">GTK_RELIEF_NORMAL</property>
-              <property name="focus_on_click">True</property>
-              <property name="response_id">0</property>
-              <signal name="clicked" handler="on_select_files_button_clicked" last_modification_time="Wed, 17 Mar 2004 18:15:26 GMT"/>
-
-              <child>
-                <widget class="GtkAlignment" id="alignment2">
-                  <property name="visible">True</property>
-                  <property name="xalign">0.5</property>
-                  <property name="yalign">0.5</property>
-                  <property name="xscale">0</property>
-                  <property name="yscale">0</property>
-                  <property name="top_padding">0</property>
-                  <property name="bottom_padding">0</property>
-                  <property name="left_padding">0</property>
-                  <property name="right_padding">0</property>
-
-                  <child>
-                    <widget class="GtkHBox" id="hbox49">
-                      <property name="visible">True</property>
-                      <property name="homogeneous">False</property>
-                      <property name="spacing">2</property>
-
-                      <child>
-                        <widget class="GtkImage" id="image1">
-                          <property name="visible">True</property>
-                          <property name="stock">gtk-apply</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">False</property>
-                        </packing>
-                      </child>
-
-                      <child>
-                        <widget class="GtkLabel" id="restore_select_button">
-                          <property name="visible">True</property>
-                          <property name="label" translatable="yes">Select Files</property>
-                          <property name="use_underline">True</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>
-              </child>
-            </widget>
-          </child>
-
-          <child>
-            <widget class="GtkButton" id="restore_cancel">
-              <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>
-              <property name="response_id">-6</property>
-              <signal name="clicked" handler="on_restore_cancel_clicked" last_modification_time="Wed, 17 Mar 2004 18:17:10 GMT"/>
-            </widget>
-          </child>
-        </widget>
-        <packing>
-          <property name="padding">0</property>
-          <property name="expand">False</property>
-          <property name="fill">True</property>
-          <property name="pack_type">GTK_PACK_END</property>
-        </packing>
-      </child>
-
-      <child>
-        <widget class="GtkVBox" id="vbox17">
-          <property name="visible">True</property>
-          <property name="homogeneous">False</property>
-          <property name="spacing">0</property>
-
-          <child>
-            <widget class="GtkVBox" id="vbox18">
-              <property name="visible">True</property>
-              <property name="homogeneous">False</property>
-              <property name="spacing">0</property>
-
-              <child>
-                <widget class="GtkLabel" id="label119">
-                  <property name="visible">True</property>
-                  <property name="label" translatable="yes">Restore Files</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.5</property>
-                  <property name="yalign">0.5</property>
-                  <property name="xpad">0</property>
-                  <property name="ypad">9</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">2</property>
-                  <property name="expand">False</property>
-                  <property name="fill">False</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkAlignment" id="alignment3">
-                  <property name="visible">True</property>
-                  <property name="xalign">0.5</property>
-                  <property name="yalign">0.5</property>
-                  <property name="xscale">1</property>
-                  <property name="yscale">1</property>
-                  <property name="top_padding">0</property>
-                  <property name="bottom_padding">0</property>
-                  <property name="left_padding">0</property>
-                  <property name="right_padding">0</property>
-
-                  <child>
-                    <widget class="GtkHBox" id="hbox50">
-                      <property name="visible">True</property>
-                      <property name="homogeneous">False</property>
-                      <property name="spacing">0</property>
-
-                      <child>
-                        <widget class="GtkHBox" id="hbox51">
-                          <property name="visible">True</property>
-                          <property name="homogeneous">False</property>
-                          <property name="spacing">0</property>
-
-                          <child>
-                            <widget class="GtkLabel" id="label120">
-                              <property name="width_request">66</property>
-                              <property name="height_request">16</property>
-                              <property name="visible">True</property>
-                              <property name="label" translatable="yes">Job:</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.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="GtkCombo" id="combo_restore_job">
-                              <property name="visible">True</property>
-                              <property name="value_in_list">True</property>
-                              <property name="allow_empty">False</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="restore_job_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">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>
-                                  <signal name="changed" handler="on_restore_job_entry_changed" last_modification_time="Wed, 17 Mar 2004 18:21:48 GMT"/>
-                                </widget>
-                              </child>
-
-                              <child internal-child="list">
-                                <widget class="GtkList" id="list1">
-                                  <property name="visible">True</property>
-                                  <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
-                                  <child>
-                                    <widget class="GtkListItem" id="listitem1">
-                                      <property name="visible">True</property>
-
-                                      <child>
-                                        <widget class="GtkLabel" id="label121">
-                                          <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</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>
-                                      </child>
-                                    </widget>
-                                  </child>
-                                </widget>
-                              </child>
-                            </widget>
-                            <packing>
-                              <property name="padding">1</property>
-                              <property name="expand">True</property>
-                              <property name="fill">True</property>
-                            </packing>
-                          </child>
-
-                          <child>
-                            <widget class="GtkLabel" id="label122">
-                              <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_CENTER</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">27</property>
-                              <property name="expand">False</property>
-                              <property name="fill">False</property>
-                            </packing>
-                          </child>
-                        </widget>
-                        <packing>
-                          <property name="padding">0</property>
-                          <property name="expand">True</property>
-                          <property name="fill">True</property>
-                        </packing>
-                      </child>
-                    </widget>
-                  </child>
-                </widget>
-                <packing>
-                  <property name="padding">2</property>
-                  <property name="expand">False</property>
-                  <property name="fill">False</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkHBox" id="hbox52">
-                  <property name="visible">True</property>
-                  <property name="homogeneous">False</property>
-                  <property name="spacing">0</property>
-
-                  <child>
-                    <widget class="GtkLabel" id="label125">
-                      <property name="width_request">66</property>
-                      <property name="height_request">16</property>
-                      <property name="visible">True</property>
-                      <property name="label" translatable="yes">Client:</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.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="GtkCombo" id="combo_restore_client">
-                      <property name="visible">True</property>
-                      <property name="value_in_list">True</property>
-                      <property name="allow_empty">False</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="restore_client_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">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>
-                      </child>
-
-                      <child internal-child="list">
-                        <widget class="GtkList" id="list3">
-                          <property name="visible">True</property>
-                          <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
-                          <child>
-                            <widget class="GtkListItem" id="listitem3">
-                              <property name="visible">True</property>
-
-                              <child>
-                                <widget class="GtkLabel" id="label126">
-                                  <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</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>
-                              </child>
-                            </widget>
-                          </child>
-                        </widget>
-                      </child>
-                    </widget>
-                    <packing>
-                      <property name="padding">1</property>
-                      <property name="expand">True</property>
-                      <property name="fill">True</property>
-                    </packing>
-                  </child>
-
-                  <child>
-                    <widget class="GtkLabel" id="label127">
-                      <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_CENTER</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">25</property>
-                      <property name="expand">False</property>
-                      <property name="fill">False</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="GtkHBox" id="hbox53">
-                  <property name="visible">True</property>
-                  <property name="homogeneous">False</property>
-                  <property name="spacing">0</property>
-
-                  <child>
-                    <widget class="GtkLabel" id="label128">
-                      <property name="width_request">66</property>
-                      <property name="height_request">16</property>
-                      <property name="visible">True</property>
-                      <property name="label" translatable="yes">FileSet: </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.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="GtkCombo" id="combo_restore_fileset">
-                      <property name="visible">True</property>
-                      <property name="value_in_list">True</property>
-                      <property name="allow_empty">False</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="restore_fileset_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">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>
-                      </child>
-
-                      <child internal-child="list">
-                        <widget class="GtkList" id="list4">
-                          <property name="visible">True</property>
-                          <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
-                          <child>
-                            <widget class="GtkListItem" id="listitem4">
-                              <property name="visible">True</property>
-
-                              <child>
-                                <widget class="GtkLabel" id="label129">
-                                  <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</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>
-                              </child>
-                            </widget>
-                          </child>
-                        </widget>
-                      </child>
-                    </widget>
-                    <packing>
-                      <property name="padding">0</property>
-                      <property name="expand">True</property>
-                      <property name="fill">True</property>
-                    </packing>
-                  </child>
-
-                  <child>
-                    <widget class="GtkLabel" id="label130">
-                      <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_CENTER</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">23</property>
-                      <property name="expand">False</property>
-                      <property name="fill">False</property>
-                    </packing>
-                  </child>
-                </widget>
-                <packing>
-                  <property name="padding">2</property>
-                  <property name="expand">True</property>
-                  <property name="fill">True</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkHBox" id="hbox55">
-                  <property name="visible">True</property>
-                  <property name="homogeneous">False</property>
-                  <property name="spacing">0</property>
-
-                  <child>
-                    <widget class="GtkLabel" id="label135">
-                      <property name="width_request">66</property>
-                      <property name="height_request">16</property>
-                      <property name="visible">True</property>
-                      <property name="label" translatable="yes">Pool:</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.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="GtkCombo" id="combo_restore_pool">
-                      <property name="visible">True</property>
-                      <property name="value_in_list">True</property>
-                      <property name="allow_empty">False</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="restore_pool_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">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>
-                      </child>
-
-                      <child internal-child="list">
-                        <widget class="GtkList" id="list6">
-                          <property name="visible">True</property>
-                          <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
-                          <child>
-                            <widget class="GtkListItem" id="listitem7">
-                              <property name="visible">True</property>
-
-                              <child>
-                                <widget class="GtkLabel" id="label136">
-                                  <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</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>
-                              </child>
-                            </widget>
-                          </child>
-
-                          <child>
-                            <widget class="GtkListItem" id="listitem8">
-                              <property name="visible">True</property>
-
-                              <child>
-                                <widget class="GtkLabel" id="label137">
-                                  <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</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>
-                              </child>
-                            </widget>
-                          </child>
-                        </widget>
-                      </child>
-                    </widget>
-                    <packing>
-                      <property name="padding">0</property>
-                      <property name="expand">True</property>
-                      <property name="fill">True</property>
-                    </packing>
-                  </child>
-
-                  <child>
-                    <widget class="GtkLabel" id="label138">
-                      <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_CENTER</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">21</property>
-                      <property name="expand">False</property>
-                      <property name="fill">False</property>
-                    </packing>
-                  </child>
-                </widget>
-                <packing>
-                  <property name="padding">2</property>
-                  <property name="expand">True</property>
-                  <property name="fill">True</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkHBox" id="hbox56">
-                  <property name="visible">True</property>
-                  <property name="homogeneous">False</property>
-                  <property name="spacing">0</property>
-
-                  <child>
-                    <widget class="GtkLabel" id="label139">
-                      <property name="width_request">66</property>
-                      <property name="height_request">16</property>
-                      <property name="visible">True</property>
-                      <property name="label" translatable="yes">Storage:</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.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="GtkCombo" id="combo_restore_storage">
-                      <property name="visible">True</property>
-                      <property name="value_in_list">True</property>
-                      <property name="allow_empty">False</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="restore_storage_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">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>
-                      </child>
-
-                      <child internal-child="list">
-                        <widget class="GtkList" id="list7">
-                          <property name="visible">True</property>
-                          <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
-                          <child>
-                            <widget class="GtkListItem" id="listitem9">
-                              <property name="visible">True</property>
-
-                              <child>
-                                <widget class="GtkLabel" id="label140">
-                                  <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</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>
-                              </child>
-                            </widget>
-                          </child>
-
-                          <child>
-                            <widget class="GtkListItem" id="listitem10">
-                              <property name="visible">True</property>
-
-                              <child>
-                                <widget class="GtkLabel" id="label141">
-                                  <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</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>
-                              </child>
-                            </widget>
-                          </child>
-                        </widget>
-                      </child>
-                    </widget>
-                    <packing>
-                      <property name="padding">0</property>
-                      <property name="expand">True</property>
-                      <property name="fill">True</property>
-                    </packing>
-                  </child>
-
-                  <child>
-                    <widget class="GtkLabel" id="label142">
-                      <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_CENTER</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">21</property>
-                      <property name="expand">False</property>
-                      <property name="fill">False</property>
-                    </packing>
-                  </child>
-                </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">True</property>
-              <property name="fill">True</property>
-            </packing>
-          </child>
-
-          <child>
-            <widget class="GtkHBox" id="hbox59">
-              <property name="visible">True</property>
-              <property name="homogeneous">False</property>
-              <property name="spacing">0</property>
-
-              <child>
-                <widget class="GtkLabel" id="label148">
-                  <property name="width_request">66</property>
-                  <property name="height_request">16</property>
-                  <property name="visible">True</property>
-                  <property name="label" translatable="yes">Before:</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.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="GtkEntry" id="restore_before_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="padding">0</property>
-                  <property name="expand">True</property>
-                  <property name="fill">True</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkLabel" id="label149">
-                  <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_CENTER</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">53</property>
-                  <property name="expand">False</property>
-                  <property name="fill">False</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="GtkLabel" id="label150">
-              <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_CENTER</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>
-        <packing>
-          <property name="padding">0</property>
-          <property name="expand">True</property>
-          <property name="fill">True</property>
-        </packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkDialog" id="progress dialog">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Progress</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">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="urgency_hint">False</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox11">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child internal-child="action_area">
-        <widget class="GtkHButtonBox" id="dialog-action_area10">
-          <property name="visible">True</property>
-          <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-          <child>
-            <widget class="GtkButton" id="closebutton1">
-              <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>
-              <property name="response_id">-7</property>
-            </widget>
-          </child>
-        </widget>
-        <packing>
-          <property name="padding">0</property>
-          <property name="expand">False</property>
-          <property name="fill">True</property>
-          <property name="pack_type">GTK_PACK_END</property>
-        </packing>
-      </child>
-
-      <child>
-        <widget class="GtkVBox" id="vbox19">
-          <property name="visible">True</property>
-          <property name="homogeneous">False</property>
-          <property name="spacing">0</property>
-
-          <child>
-            <widget class="GtkLabel" id="label1002">
-              <property name="width_request">0</property>
-              <property name="height_request">43</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="GtkLabel" id="label1003">
-              <property name="width_request">0</property>
-              <property name="height_request">36</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="GtkProgressBar" id="progressbar1">
-              <property name="width_request">150</property>
-              <property name="height_request">33</property>
-              <property name="visible">True</property>
-              <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
-              <property name="fraction">0</property>
-              <property name="pulse_step">0.10000000149</property>
-              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-            </widget>
-            <packing>
-              <property name="padding">0</property>
-              <property name="expand">True</property>
-              <property name="fill">False</property>
-            </packing>
-          </child>
-
-          <child>
-            <widget class="GtkLabel" id="label1004">
-              <property name="width_request">0</property>
-              <property name="height_request">52</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>
-        </widget>
-        <packing>
-          <property name="padding">0</property>
-          <property name="expand">True</property>
-          <property name="fill">True</property>
-        </packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/bacula/src/console2.gladep b/bacula/src/console2.gladep
deleted file mode 100644 (file)
index c5760fb..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
-
-<glade-project>
-  <name>console</name>
-  <program_name>gnome-console</program_name>
-  <source_directory>gnome2-console</source_directory>
-  <output_main_file>FALSE</output_main_file>
-  <output_support_files>FALSE</output_support_files>
-  <output_build_files>FALSE</output_build_files>
-</glade-project>
diff --git a/bacula/src/gnome2-console/Makefile.in b/bacula/src/gnome2-console/Makefile.in
deleted file mode 100644 (file)
index ffdc008..0000000
+++ /dev/null
@@ -1,148 +0,0 @@
-#
-#   Version $Id$
-#
-@MCOMMON@
-
-srcdir =       .
-VPATH =        .
-.PATH:         .
-
-# one up
-basedir = ..
-# top dir
-topdir = ../..
-# this dir relative to top dir
-thisdir = src/gnome2-console
-
-DEBUG=@DEBUG@
-
-first_rule: all
-dummy:
-
-GNOME_INCLUDEDIR = @GNOME_INCLUDEDIR@
-GNOMEUI_LIBS = @GNOMEUI_LIBS@
-GNOME_LIBDIR = @GNOME_LIBDIR@
-GNOME_LIBS = @GNOME_LIBS@
-
-
-#
-CONSSRCS = console.c console_conf.c authenticate.c support.c interface.c callbacks.c \
-          restore.c
-CONSOBJS = console.o console_conf.o authenticate.o support.o interface.o callbacks.o \
-          restore.o
-
-# these are the objects that are changed by the .configure process
-EXTRAOBJS = @OBJLIST@
-
-#CONS_INC=@CONS_INC@ $(GNOME_INCLUDEDIR)
-#CONS_LIBS=@CONS_LIBS@ $(GNOME_LIBS)
-#CONS_LDFLAGS=@CONS_LDFLAGS@ $(GNOME_LIBDIR) $(GNOMEUI_LIBS)
-
-CONS_INC=$(GNOME_INCLUDEDIR)
-CONS_LIBS=$(GNOME_LIBS) $(OPENSSL_LIBS)
-CONS_LDFLAGS=$(GNOME_LIBDIR) $(GNOMEUI_LIBS)
-
-
-.SUFFIXES:     .c .o
-.PHONY:
-.DONTCARE:
-
-# inference rules
-.c.o:
-       @echo "Compiling $<"
-       $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(CONS_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
-#-------------------------------------------------------------------------
-all: Makefile bgnome-console @STATIC_GNOME_CONS@
-       @echo "==== Make of bgnome-console is good ===="
-       @echo " "
-
-support.o:   support.c
-       rm -f support.c.orig
-       mv support.c support.c.orig
-       sed "s%parent = g_object_get_data%parent = \(GtkWidget \*\)g_object_get_data%" support.c.orig >support.c
-       $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(CONS_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
-
-bgnome-console: Makefile $(CONSOBJS) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) 
-       $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -o $@ $(CONSOBJS) \
-             $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS)
-
-static-console: static-bgnome-console
-
-static-bgnome-console: Makefile $(CONSOBJS) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) 
-       $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -o $@ $(CONSOBJS) \
-             $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS)
-       strip $@
-
-Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
-       cd $(topdir) \
-         && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-libtool-clean:
-       @$(RMF) -r .libs _libs
-
-clean: libtool-clean
-       @$(RMF) bgnome-console core core.* a.out *.o *.bak *~ *.intpro *.extpro 1 2 3
-       @$(RMF) static-bgnome-console gmon.out Makefile.am
-
-realclean: clean
-       @$(RMF) tags
-       @$(RM) -rf .deps bgnome-console.conf
-
-distclean: realclean
-       if test $(srcdir) = .; then $(MAKE) realclean; fi
-       (cd $(srcdir); $(RMF) Makefile)
-
-devclean: realclean
-       if test $(srcdir) = .; then $(MAKE) realclean; fi
-       (cd $(srcdir); $(RMF) Makefile)
-
-install: all
-       @if test -f ${DESTDIR}${sbindir}/gnome-console; then \
-          echo " "; \
-          echo "Warning!!!  ${DESTDIR}${sbindir}gnome-console found."; \
-          echo " gnome-console has been renamed bgnome-console, so gnome-console"; \
-          echo " is no longer used, and you might want to delete it."; \
-          echo " "; \
-       fi
-       $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bgnome-console $(DESTDIR)$(sbindir)/bgnome-console
-       @srcconf=bgnome-console.conf; \
-       if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
-          destconf=$$srcconf.new; \
-          echo "  ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
-       else \
-          destconf=$$srcconf; \
-       fi; \
-       echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
-       ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
-       if test -f static-bgnome-console; then \
-          $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bgnome-console $(DESTDIR)$(sbindir)/static-bgnome-console; \
-       fi 
-
-uninstall:
-       (cd $(DESTDIR)$(sbindir); $(RMF) bgnome-console static-bgnome-console)
-       (cd $(DESTDIR)$(sysconfdir); $(RMF) bgnome-console.conf bgnome-console.conf.new)
-       (cd $(DESTDIR)$(sbindir); $(RMF) gnome-console static-gnome-console)
-       (cd $(DESTDIR)$(sysconfdir); $(RMF) gnome-console.conf gnome-console.conf.new)
-
-
-
-
-# Semi-automatic generation of dependencies:
-# Use gcc -MM because X11 `makedepend' doesn't work on all systems
-# and it also includes system headers.
-# `semi'-automatic since dependencies are generated at distribution time.
-
-depend:
-       @$(MV) Makefile Makefile.bak
-       @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
-       @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
-       @$(CXX) -S -M $(CPPFLAGS) $(XINC) -I$(srcdir) -I$(basedir) $(GNOME_INCLUDEDIR) $(SQL_INC) *.c >> Makefile
-       @if test -f Makefile ; then \
-           $(RMF) Makefile.bak; \
-       else \
-          $(MV) Makefile.bak Makefile; \
-          echo -e "Something went wrong\n\a"; \
-       fi
-
-# -----------------------------------------------------------------------
-# DO NOT DELETE: nice dependency list follows
diff --git a/bacula/src/gnome2-console/authenticate.c b/bacula/src/gnome2-console/authenticate.c
deleted file mode 100644 (file)
index 382f5e8..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- *
- *   Bacula UA authentication. Provides authentication with
- *     the Director.
- *
- *     Kern Sibbald, June MMI
- *
- *     Version $Id$
- *
- *    This routine runs as a thread and must be thread reentrant.
- *
- *  Basic tasks done here:
- *
- */
-/*
-   Bacula® - The Network Backup Solution
-
-   Copyright (C) 2001-2006 Free Software Foundation Europe e.V.
-
-   The main author of Bacula is Kern Sibbald, with contributions from
-   many others, a complete list can be found in the file AUTHORS.
-   This program is Free Software; you can redistribute it and/or
-   modify it under the terms of version two of the GNU General Public
-   License as published by the Free Software Foundation and included
-   in the file LICENSE.
-
-   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., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.
-
-   Bacula® is a registered trademark of Kern Sibbald.
-   The licensor of Bacula is the Free Software Foundation Europe
-   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
-   Switzerland, email:ftf@fsfeurope.org.
-*/
-
-#include "bacula.h"
-#include "console.h"
-
-
-/* Commands sent to Director */
-static char hello[]    = "Hello %s calling\n";
-
-/* Response from Director */
-static char OKhello[]   = "1000 OK:";
-
-/* Forward referenced functions */
-
-/*
- * Authenticate Director
- */
-int authenticate_director(JCR *jcr, DIRRES *director, CONRES *cons)
-{
-   BSOCK *dir = jcr->dir_bsock;
-   int tls_local_need = BNET_TLS_NONE;
-   int tls_remote_need = BNET_TLS_NONE;
-   int compatible = true;
-   char bashed_name[MAX_NAME_LENGTH];
-   char *password;
-
-   /*
-    * Send my name to the Director then do authentication
-    */
-   if (cons) {
-      bstrncpy(bashed_name, cons->hdr.name, sizeof(bashed_name));
-      bash_spaces(bashed_name);
-      password = cons->password;
-   } else {
-      bstrncpy(bashed_name, "*UserAgent*", sizeof(bashed_name));
-      password = director->password;
-   }
-   /* Timeout Hello after 5 mins */
-   btimer_t *tid = start_bsock_timer(dir, 60 * 5);
-   bnet_fsend(dir, hello, bashed_name);
-
-   /* respond to Dir challenge */
-   if (!cram_md5_respond(dir, password, &tls_remote_need, &compatible) ||
-       /* Now challenge dir */
-       !cram_md5_challenge(dir, password, tls_local_need, compatible)) {
-      stop_bsock_timer(tid);
-      printf(_("%s: Director authorization problem.\n"), my_name);
-      set_text(_("Director authorization problem.\n"), -1);
-      set_text(_(
-       "Please see http://www.bacula.org/en/rel-manual/Bacula_Freque_Asked_Questi.html#SECTION003760000000000000000 for help.\n"),
-        -1);
-      return 0;
-   }
-
-   Dmsg1(6, ">dird: %s", dir->msg);
-   if (bnet_recv(dir) <= 0) {
-      stop_bsock_timer(tid);
-      set_textf(_("Bad response to Hello command: ERR=%s\n"),
-         bnet_strerror(dir));
-      printf(_("%s: Bad response to Hello command: ERR=%s\n"),
-         my_name, bnet_strerror(dir));
-      set_text(_("The Director is probably not running.\n"), -1);
-      return 0;
-   }
-  stop_bsock_timer(tid);
-   Dmsg1(10, "<dird: %s", dir->msg);
-   if (strncmp(dir->msg, OKhello, sizeof(OKhello)-1) != 0) {
-      set_text(_("Director rejected Hello command\n"), -1);
-      return 0;
-   } else {
-      set_text(dir->msg, dir->msglen);
-   }
-   return 1;
-}
diff --git a/bacula/src/gnome2-console/bgnome-console.conf.in b/bacula/src/gnome2-console/bgnome-console.conf.in
deleted file mode 100644 (file)
index 0061638..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Bacula User Agent (or Console) Configuration File
-#
-
-Director {
-  Name = @basename@-dir
-  DIRport = @dir_port@
-  address = @hostname@
-  Password = "@dir_password@"
-}
-
-ConsoleFont {
-  Name = Default
-  Font = "LucidaTypewriter 9"
-}
diff --git a/bacula/src/gnome2-console/callbacks.c b/bacula/src/gnome2-console/callbacks.c
deleted file mode 100644 (file)
index 7e1295a..0000000
+++ /dev/null
@@ -1,740 +0,0 @@
-/*
- *    Version $Id$
- */
-/*
-   Bacula® - The Network Backup Solution
-
-   Copyright (C) 2000-2006 Free Software Foundation Europe e.V.
-
-   The main author of Bacula is Kern Sibbald, with contributions from
-   many others, a complete list can be found in the file AUTHORS.
-   This program is Free Software; you can redistribute it and/or
-   modify it under the terms of version two of the GNU General Public
-   License as published by the Free Software Foundation and included
-   in the file LICENSE.
-
-   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., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.
-
-   Bacula® is a registered trademark of Kern Sibbald.
-   The licensor of Bacula is the Free Software Foundation Europe
-   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
-   Switzerland, email:ftf@fsfeurope.org.
-*/
-
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#include "bacula.h"
-#include "console.h"
-
-#include "callbacks.h"
-#include "interface.h"
-#include "support.h"
-
-#define KEY_Enter 65293
-#define KEY_Up    65362
-#define KEY_Down  65364
-#define KEY_Left  65361
-#define KEY_Right 65363
-
-void terminate_console(int sig);
-
-extern "C" gint compare_func(const void *data1, const void *data2);
-
-gboolean
-on_console_delete_event(GtkWidget *widget, GdkEvent *event, gpointer user_data)
-{
-   gtk_main_quit();
-   terminate_console(0);
-   return TRUE;
-}
-
-void
-on_connect_activate(GtkMenuItem *menuitem, gpointer user_data)
-{
-   if (connect_to_director(user_data)) {
-      start_director_reader(user_data);
-   }
-}
-
-
-void
-on_disconnect_activate(GtkMenuItem *menuitem, gpointer user_data)
-{
-   if (disconnect_from_director(user_data)) {
-      stop_director_reader(user_data);
-   }
-}
-
-
-void
-on_exit_activate(GtkMenuItem *menuitem, gpointer user_data)
-{
-   gtk_main_quit();
-}
-
-
-void
-on_cut1_activate(GtkMenuItem *menuitem, gpointer user_data)
-{
-
-}
-
-
-void
-on_copy1_activate(GtkMenuItem *menuitem, gpointer user_data)
-{
-
-}
-
-
-void
-on_paste1_activate(GtkMenuItem *menuitem, gpointer user_data)
-{
-
-}
-
-
-void
-on_clear1_activate(GtkMenuItem *menuitem, gpointer user_data)
-{
-
-}
-
-void
-on_preferences1_activate(GtkMenuItem *menuitem, gpointer user_data)
-{
-}
-
-
-void
-on_about_activate(GtkMenuItem *menuitem, gpointer user_data)
-{
-   gtk_widget_show(about1);
-   gtk_main();
-}
-
-
-void
-on_connect_button_clicked(GtkButton *button, gpointer user_data)
-{
-   if (connect_to_director(user_data)) {
-      start_director_reader(user_data);
-   }
-}
-
-/* Define max length of history and how many to delete when it gets there.
- * If you make HIST_DEL > HIST_MAX, you shoot yourself in the foot.
- */
-#define HIST_MAX 2500
-#define HIST_DEL  500
-
-static GList *hist = NULL;
-static GList *hc = NULL;
-static int hist_len = 0;
-
-static void add_to_history(gchar *ecmd)
-{
-   int len = strlen(ecmd);
-
-   if (len > 0) {
-      hist = g_list_append(hist, bstrdup(ecmd));
-      hist_len++;
-   }
-   if (hist_len >= HIST_MAX) {
-      int i;
-      GList *hp;
-      for (i=0; i<HIST_DEL; i++) {
-         hp = g_list_next(hist);
-         free(hp->data);
-         hist = g_list_remove(hist, hp->data);
-      }
-      hist_len -= HIST_DEL;
-   }
-   hc = NULL;
-}
-
-/*
- * Note, apparently there is a bug in GNOME where some of the
- *  key press events are lost -- at least it loses every other
- *  up arrow!
- */
-gboolean
-on_entry1_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
-{
-   if (event->keyval == KEY_Enter) {
-      char *ecmd = (char *)gtk_entry_get_text((GtkEntry *)entry1);
-      set_text(ecmd, strlen(ecmd));
-      set_text("\n", 1);
-      add_to_history(ecmd);
-      write_director(ecmd);
-      gtk_entry_set_text((GtkEntry *)entry1, "");
-   } else if (event->keyval == KEY_Up) {
-      if (!hc) {
-         if (!hist) {
-            return FALSE;
-         }
-         hc = g_list_last(hist);
-      } else {
-         hc = g_list_previous(hc);
-      }
-      if (!hc) {
-         if (!hist) {
-            return FALSE;
-         }
-         hc = g_list_first(hist);
-      }
-      gtk_entry_set_text((GtkEntry *)entry1, (gchar *)hc->data);
-   } else if (event->keyval == KEY_Down) {
-      if (!hc) {
-         if (!hist) {
-            return FALSE;
-         }
-         hc = g_list_first(hist);
-      } else {
-         hc = g_list_next(hc);
-      }
-      if (!hc) {
-         if (!hist) {
-            return FALSE;
-         }
-         hc = g_list_last(hist);
-      }
-      gtk_entry_set_text((GtkEntry *)entry1, (gchar *)hc->data);
-   }
-// gtk_entry_set_position((GtkEntry *)entry1, -1);
-// gtk_window_set_focus((GtkWindow *)app1, entry1);
-   return FALSE;
-}
-
-
-void
-on_app1_show(GtkWidget *widget, gpointer user_data)
-{
-}
-
-
-
-void
-on_msgs_button_clicked(GtkButton *button, gpointer user_data)
-{
-   write_director("messages");
-}
-
-void
-on_msgs_activate(GtkMenuItem *menuitem, gpointer user_data)
-{
-   write_director("messages");
-}
-
-void
-on_about_button_clicked(GtkButton *button, gpointer user_data)
-{
-   gtk_widget_hide(about1);
-   gtk_main_quit();
-   set_status_ready();
-}
-
-void
-on_select_director_OK_clicked(GtkButton *button, gpointer user_data)
-{
-   reply = OK;
-   gtk_widget_hide(dir_dialog);
-   gtk_main_quit();
-   set_status_ready();
-}
-
-
-void
-on_select_director_cancel_clicked(GtkButton *button, gpointer user_data)
-{
-   reply = CANCEL;
-   gtk_widget_hide(dir_dialog);
-   gtk_main_quit();
-   set_status_ready();
-}
-
-/*
- * Compare list string items
- */
-extern "C"
-gint compare_func(const void *data1, const void *data2)
-{
-   return strcmp((const char *)data1, (const char *)data2);
-}
-
-static GList *find_combo_list(char *name)
-{
-   if (strcmp(name, "job") == 0) {
-      return job_list;
-   }
-   if (strcmp(name, "pool") == 0) {
-      return pool_list;
-   }
-   if (strcmp(name, "client") == 0) {
-      return client_list;
-   }
-   if (strcmp(name, "storage") == 0) {
-      return storage_list;
-   }
-   if (strcmp(name, "fileset") == 0) {
-      return fileset_list;
-   }
-   if (strcmp(name, "messages") == 0) {
-      return messages_list;
-   }
-   if (strcmp(name, "type") == 0) {
-      return type_list;
-   }
-   if (strcmp(name, "level") == 0) {
-      return level_list;
-   }
-   return NULL;
-}
-
-/*
- * Set correct default values in the Run dialog box
- */
-static void set_run_defaults()
-{
-   GtkWidget *combo, *entry;
-   char *job, *def;
-   GList *item, *list;
-   char cmd[1000];
-   int pos;
-
-   stop_director_reader(NULL);
-
-   combo = lookup_widget(run_dialog, "combo_job");
-   job = (char *)gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(combo)->entry));
-   bsnprintf(cmd, sizeof(cmd), ".defaults job=\"%s\"", job);
-   write_director(cmd);
-   while (bnet_recv(UA_sock) > 0) {
-      def = strchr(UA_sock->msg, '=');
-      if (!def) {
-         continue;
-      }
-      *def++ = 0;
-      if (strcmp(UA_sock->msg, "job") == 0 ||
-          strcmp(UA_sock->msg, "when") == 0) {
-         continue;
-      }
-      /* Where is an entry box */
-      if (strcmp(UA_sock->msg, "where") == 0) {
-         entry = lookup_widget(run_dialog, "entry_where");
-         gtk_entry_set_text(GTK_ENTRY(entry), def);
-         continue;
-      }
-
-      /* Now handle combo boxes */
-      list = find_combo_list(UA_sock->msg);
-      if (!list) {
-         continue;
-      }
-      item = g_list_find_custom(list, def, compare_func);
-      bsnprintf(cmd, sizeof(cmd), "combo_%s", UA_sock->msg);
-      combo = lookup_widget(run_dialog, cmd);
-      if (!combo) {
-         continue;
-      }
-      pos = g_list_position(list, item);
-      gtk_list_select_item(GTK_LIST(GTK_COMBO(combo)->list), pos);
-   }
-   start_director_reader(NULL);
-}
-
-void
-on_entry_job_changed(GtkEditable *editable, gpointer user_data)
-{
-   set_run_defaults();
-}
-
-
-void
-on_run_button_clicked(GtkButton *button, gpointer user_data)
-{
-   char dt[50];
-   GtkWidget *entry;
-
-   bstrutime(dt, sizeof(dt), time(NULL));
-   entry = lookup_widget(run_dialog, "entry_when");
-   gtk_entry_set_text(GTK_ENTRY(entry), dt);
-   set_run_defaults();
-   gtk_widget_show(run_dialog);
-   gtk_main();
-}
-
-
-static char *get_combo_text(GtkWidget *dialog, const char *combo_name)
-{
-   GtkWidget *combo;
-   combo = lookup_widget(dialog, combo_name);
-   if (!combo) {
-      return NULL;
-   }
-   return (char *)gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(combo)->entry));
-}
-
-static char *get_entry_text(GtkWidget *dialog, const char *entry_name)
-{
-   GtkWidget *entry;
-   entry = lookup_widget(dialog, entry_name);
-   if (!entry) {
-      return NULL;
-   }
-   return (char *)gtk_entry_get_text(GTK_ENTRY(entry));
-}
-
-static char *get_spin_text(GtkWidget *dialog, const char *spin_name)
-{
-   GtkSpinButton *spin;
-   spin = (GtkSpinButton *)lookup_widget(dialog, spin_name);
-   if (!spin) {
-      return NULL;
-   }
-   return (char *)gtk_entry_get_text(GTK_ENTRY(&spin->entry));
-}
-
-
-
-
-void
-on_run_ok_clicked(GtkButton *button, gpointer user_data)
-{
-   char *job, *fileset, *level, *client, *pool, *when, *where, *storage, *priority;
-   
-   gtk_widget_hide(run_dialog);
-   gtk_main_quit();
-
-   job     = get_combo_text(run_dialog, "combo_job");
-   fileset = get_combo_text(run_dialog, "combo_fileset");
-   client  = get_combo_text(run_dialog, "combo_client");
-   pool    = get_combo_text(run_dialog, "combo_pool");
-   storage = get_combo_text(run_dialog, "combo_storage");
-   level   = get_combo_text(run_dialog, "combo_level");
-   priority = get_spin_text(run_dialog, "spinbutton1");
-   when    = get_entry_text(run_dialog, "entry_when");
-   where   = get_entry_text(run_dialog, "entry_where");
-
-   if (!job || !fileset || !client || !pool || !storage ||
-       !level || !priority || !when || !where) {
-      set_status_ready();
-      return;
-   }
-
-   bsnprintf(cmd, sizeof(cmd),
-             "run job=\"%s\" fileset=\"%s\" level=%s client=\"%s\" pool=\"%s\" "
-             "when=\"%s\" where=\"%s\" storage=\"%s\" priority=\"%s\"\n",
-             job, fileset, level, client, pool, when, where, storage, priority);
-   write_director(cmd);
-   set_text(cmd, strlen(cmd));
-   write_director("yes");
-   return;
-}
-
-
-void
-on_run_cancel_clicked(GtkButton *button, gpointer user_data)
-{
-   gtk_widget_hide(run_dialog);
-   gtk_main_quit();
-   set_status_ready();
-}
-
-gboolean
-on_entry1_key_release_event(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
-{
-  return FALSE;
-}
-
-void
-on_restore_button_clicked(GtkButton *button, gpointer user_data)
-{
-   gtk_widget_show(restore_dialog);
-   gtk_main();
-}
-
-void
-on_view_fileset_clicked(GtkButton *button, gpointer user_data)
-{
-}
-
-
-void
-on_restore_cancel_clicked(GtkButton *button, gpointer user_data)
-{
-   gtk_widget_hide(restore_dialog);
-   gtk_main_quit();
-   set_status_ready();
-}
-
-
-void
-on_label_button_clicked(GtkButton *button, gpointer user_data)
-{
-   gtk_widget_show(label_dialog);
-   gtk_main();
-}
-
-void
-on_label_ok_clicked(GtkButton *button, gpointer user_data)
-{
-   char *pool, *volume, *storage, *slot;
-
-   gtk_widget_hide(label_dialog);
-   gtk_main_quit();
-
-   pool    = get_combo_text(label_dialog, "label_combo_pool");
-   storage = get_combo_text(label_dialog, "label_combo_storage");
-
-   volume  = get_entry_text(label_dialog, "label_entry_volume");
-
-   slot    = get_spin_text(label_dialog, "label_slot");
-
-   if (!pool || !storage || !volume || !(*volume)) {
-      set_status_ready();
-      return;
-   }
-
-   bsnprintf(cmd, sizeof(cmd),
-             "label volume=\"%s\" pool=\"%s\" storage=\"%s\" slot=%s\n", 
-             volume, pool, storage, slot);
-   write_director(cmd);
-   set_text(cmd, strlen(cmd));
-}
-
-
-void
-on_label_cancel_clicked(GtkButton *button, gpointer user_data)
-{
-   gtk_widget_hide(label_dialog);
-   gtk_main_quit();
-   set_status_ready();
-}
-
-
-void
-on_select_files_button_clicked(GtkButton *button, gpointer user_data)
-{
-   char *job, *fileset, *client, *pool, *before, *storage;
-
-   gtk_widget_hide(restore_dialog);
-
-   job     = get_combo_text(restore_dialog, "combo_restore_job");
-   fileset = get_combo_text(restore_dialog, "combo_restore_fileset");
-   client  = get_combo_text(restore_dialog, "combo_restore_client");
-   pool    = get_combo_text(restore_dialog, "combo_restore_pool");
-   storage = get_combo_text(restore_dialog, "combo_restore_storage");
-
-   before  = get_entry_text(restore_dialog, "restore_before_entry");
-
-   if (!job || !fileset || !client || !pool || !storage || !before) {
-      set_status_ready();
-      return;
-   }
-
-   bsnprintf(cmd, sizeof(cmd),
-             "restore select current fileset=\"%s\" client=\"%s\" pool=\"%s\" "
-             "storage=\"%s\"\n", fileset, client, pool, storage);
-   write_director(cmd);
-   set_text(cmd, strlen(cmd));
-   gtk_widget_show(restore_file_selection);
-   select_restore_files();            /* put up select files dialog */
-}
-
-void
-on_restore_select_ok_clicked(GtkButton *button, gpointer user_data)
-{
-   gtk_widget_hide(restore_file_selection);
-   write_director("done");
-   gtk_main_quit();
-   set_status_ready();
-}
-
-
-void
-on_restore_select_cancel_clicked(GtkButton *button, gpointer user_data)
-{
-   gtk_widget_hide(restore_file_selection);
-   write_director("quit");
-   gtk_main_quit();
-   set_status_ready();
-}
-
-gboolean
-on_restore_files_delete_event(GtkWidget *widget, GdkEvent *event, gpointer user_data)
-{
-   gtk_widget_hide(restore_file_selection);
-   gtk_main_quit();
-   set_status_ready();
-   return FALSE;
-}
-
-
-void
-on_new1_activate                       (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-
-}
-
-
-void
-on_open1_activate                      (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-
-}
-
-
-void
-on_save1_activate                      (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-
-}
-
-
-void
-on_save_as1_activate                   (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-
-}
-
-
-void
-on_quit1_activate                      (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-
-}
-
-
-void
-on_cut2_activate                       (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-
-}
-
-
-void
-on_copy2_activate                      (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-
-}
-
-
-void
-on_paste2_activate                     (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-
-}
-
-
-void
-on_clear2_activate                     (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-
-}
-
-
-void
-on_properties1_activate                (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-
-}
-
-
-void
-on_preferences2_activate               (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-
-}
-
-
-void
-on_about2_activate                     (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-
-}
-
-/*
- * Set correct default values in the Restore dialog box
- */
-void set_restore_dialog_defaults()
-{
-   GtkWidget *combo;
-   char *job, *def;
-   GList *item, *list;
-   char cmd[1000];
-   int pos;
-
-   stop_director_reader(NULL);
-
-   combo = lookup_widget(restore_dialog, "combo_restore_job");
-   job = (char *)gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(combo)->entry));
-   bsnprintf(cmd, sizeof(cmd), ".defaults job=\"%s\"", job);
-   write_director(cmd);
-   while (bnet_recv(UA_sock) > 0) {
-      def = strchr(UA_sock->msg, '=');
-      if (!def) {
-         continue;
-      }
-      *def++ = 0;
-      if (strcmp(UA_sock->msg, "job") == 0 ||
-          strcmp(UA_sock->msg, "when") == 0 ||
-          strcmp(UA_sock->msg, "where") == 0 ||
-          strcmp(UA_sock->msg, "messages") == 0 ||
-          strcmp(UA_sock->msg, "level") == 0 ||
-          strcmp(UA_sock->msg, "type") == 0) {
-         continue;
-      }
-
-      /* Now handle combo boxes */
-      list = find_combo_list(UA_sock->msg);
-      if (!list) {
-         continue;
-      }
-      item = g_list_find_custom(list, def, compare_func);
-      bsnprintf(cmd, sizeof(cmd), "combo_restore_%s", UA_sock->msg);
-      combo = lookup_widget(restore_dialog, cmd);
-      if (!combo) {
-         continue;
-      }
-      pos = g_list_position(list, item);
-      gtk_list_select_item(GTK_LIST(GTK_COMBO(combo)->list), pos);
-   }
-   start_director_reader(NULL);
-}
-
-
-void
-on_restore_job_entry_changed(GtkEditable *editable, gpointer user_data)
-{
-   /* Set defaults that correspond to new job selection */
-   set_restore_dialog_defaults();
-}
-
-void
-on_dir_button_clicked(GtkButton *toolbutton, gpointer user_data)
-{
-   write_director("status dir");
-}
diff --git a/bacula/src/gnome2-console/callbacks.h b/bacula/src/gnome2-console/callbacks.h
deleted file mode 100644 (file)
index 2ae96df..0000000
+++ /dev/null
@@ -1,375 +0,0 @@
-
-/*   Version $Id$  */
-
-/*
-   Bacula® - The Network Backup Solution
-
-   Copyright (C) 2000-2006 Free Software Foundation Europe e.V.
-
-   The main author of Bacula is Kern Sibbald, with contributions from
-   many others, a complete list can be found in the file AUTHORS.
-   This program is Free Software; you can redistribute it and/or
-   modify it under the terms of version two of the GNU General Public
-   License as published by the Free Software Foundation and included
-   in the file LICENSE.
-
-   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., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.
-
-   Bacula® is a registered trademark of Kern Sibbald.
-   The licensor of Bacula is the Free Software Foundation Europe
-   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
-   Switzerland, email:ftf@fsfeurope.org.
-*/
-
-
-gboolean
-on_app1_delete_event                   (GtkWidget       *widget,
-                                        GdkEvent        *event,
-                                        gpointer         user_data);
-
-void
-on_new_file1_activate                  (GtkMenuItem     *menuitem,
-                                        gpointer         user_data);
-
-void
-on_open1_activate                      (GtkMenuItem     *menuitem,
-                                        gpointer         user_data);
-
-void
-on_save1_activate                      (GtkMenuItem     *menuitem,
-                                        gpointer         user_data);
-
-void
-on_save_as1_activate                   (GtkMenuItem     *menuitem,
-                                        gpointer         user_data);
-
-void
-on_exit1_activate                      (GtkMenuItem     *menuitem,
-                                        gpointer         user_data);
-
-void
-on_cut1_activate                       (GtkMenuItem     *menuitem,
-                                        gpointer         user_data);
-
-void
-on_copy1_activate                      (GtkMenuItem     *menuitem,
-                                        gpointer         user_data);
-
-void
-on_paste1_activate                     (GtkMenuItem     *menuitem,
-                                        gpointer         user_data);
-
-void
-on_clear1_activate                     (GtkMenuItem     *menuitem,
-                                        gpointer         user_data);
-
-void
-on_properties1_activate                (GtkMenuItem     *menuitem,
-                                        gpointer         user_data);
-
-void
-on_preferences1_activate               (GtkMenuItem     *menuitem,
-                                        gpointer         user_data);
-
-void
-on_about1_activate                     (GtkMenuItem     *menuitem,
-                                        gpointer         user_data);
-
-void
-on_about1_clicked                      (GnomeDialog     *gnomedialog,
-                                        gint             arg1,
-                                        gpointer         user_data);
-
-gboolean
-on_entry1_key_press_event              (GtkWidget       *widget,
-                                        GdkEventKey     *event,
-                                        gpointer         user_data);
-
-gboolean
-on_app1_key_press_event                (GtkWidget       *widget,
-                                        GdkEventKey     *event,
-                                        gpointer         user_data);
-
-void
-on_select_director_clicked             (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-on_connect_button1_clicked             (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-on_app1_realize                        (GtkWidget       *widget,
-                                        gpointer         user_data);
-
-gboolean
-on_combo_entry1_key_press_event        (GtkWidget       *widget,
-                                        GdkEventKey     *event,
-                                        gpointer         user_data);
-
-gboolean
-on_entry1_key_press_event              (GtkWidget       *widget,
-                                        GdkEventKey     *event,
-                                        gpointer         user_data);
-
-gboolean
-on_entry1_key_press_event              (GtkWidget       *widget,
-                                        GdkEventKey     *event,
-                                        gpointer         user_data);
-
-void
-on_app1_show                           (GtkWidget       *widget,
-                                        gpointer         user_data);
-
-void
-on_connect_button1_clicked             (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-on_run_button1_clicked                 (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-on_msgs_button_clicked                 (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-on_msgs_activate                       (GtkMenuItem     *menuitem,
-                                        gpointer         user_data);
-
-void
-on_run_button_clicked                  (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-on_disconnect_activate                 (GtkMenuItem     *menuitem,
-                                        gpointer         user_data);
-
-void
-on_about_activate                      (GtkMenuItem     *menuitem,
-                                        gpointer         user_data);
-
-void
-on_connect_button_clicked              (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-on_connect_activate                    (GtkMenuItem     *menuitem,
-                                        gpointer         user_data);
-
-void
-on_exit_activate                       (GtkMenuItem     *menuitem,
-                                        gpointer         user_data);
-
-void
-on_about_clicked                       (GnomeDialog     *gnomedialog,
-                                        gint             arg1,
-                                        gpointer         user_data);
-
-gboolean
-on_app2_delete_event                   (GtkWidget       *widget,
-                                        GdkEvent        *event,
-                                        gpointer         user_data);
-
-void
-on_app2_show                           (GtkWidget       *widget,
-                                        gpointer         user_data);
-
-gboolean
-on_app1_delete_event                   (GtkWidget       *widget,
-                                        GdkEvent        *event,
-                                        gpointer         user_data);
-
-void
-on_app1_show                           (GtkWidget       *widget,
-                                        gpointer         user_data);
-
-gboolean
-on_entry1_key_press_event              (GtkWidget       *widget,
-                                        GdkEventKey     *event,
-                                        gpointer         user_data);
-
-void
-on_about_button_clicked                (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-on_select_director_OK_clicked          (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-on_select_director_cancel_clicked      (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-on_run_ok_clicked                      (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-on_run_cancel_clicked                  (GtkButton       *button,
-                                        gpointer         user_data);
-
-gboolean
-on_entry1_key_release_event            (GtkWidget       *widget,
-                                        GdkEventKey     *event,
-                                        gpointer         user_data);
-
-void
-on_restore_button_clicked              (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-on_type_combo_selection_received       (GtkWidget       *widget,
-                                        GtkSelectionData *data,
-                                        guint            time,
-                                        gpointer         user_data);
-
-void
-on_view_fileset_clicked                (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-on_entry_job_changed                   (GtkEditable     *editable,
-                                        gpointer         user_data);
-
-void
-on_restore_ok_clicked                  (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-on_restore_cancel_clicked              (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-on_apply_button_clicked                (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-on_restore_file_clicked                (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-on_label_button_clicked                (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-on_label_ok_clicked                    (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-on_label_cancel_clicked                (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-on_new1_activate                       (GtkMenuItem     *menuitem,
-                                        gpointer         user_data);
-
-void
-on_open1_activate                      (GtkMenuItem     *menuitem,
-                                        gpointer         user_data);
-
-void
-on_save1_activate                      (GtkMenuItem     *menuitem,
-                                        gpointer         user_data);
-
-void
-on_save_as1_activate                   (GtkMenuItem     *menuitem,
-                                        gpointer         user_data);
-
-void
-on_quit1_activate                      (GtkMenuItem     *menuitem,
-                                        gpointer         user_data);
-
-void
-on_cut2_activate                       (GtkMenuItem     *menuitem,
-                                        gpointer         user_data);
-
-void
-on_copy2_activate                      (GtkMenuItem     *menuitem,
-                                        gpointer         user_data);
-
-void
-on_paste2_activate                     (GtkMenuItem     *menuitem,
-                                        gpointer         user_data);
-
-void
-on_clear2_activate                     (GtkMenuItem     *menuitem,
-                                        gpointer         user_data);
-
-void
-on_properties1_activate                (GtkMenuItem     *menuitem,
-                                        gpointer         user_data);
-
-void
-on_preferences2_activate               (GtkMenuItem     *menuitem,
-                                        gpointer         user_data);
-
-void
-on_about2_activate                     (GtkMenuItem     *menuitem,
-                                        gpointer         user_data);
-
-gboolean
-on_restore_files_delete_event          (GtkWidget       *widget,
-                                        GdkEvent        *event,
-                                        gpointer         user_data);
-
-void
-on_restore_up_button_clicked           (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-on_restore_add_button_clicked          (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-on_restore_remove_button_clicked       (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-on_restore_ok_clicked                  (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-on_restore_cancel_clicked              (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-on_restore_select_ok_clicked           (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-on_restore_select_cancel_clicked       (GtkButton       *button,
-                                        gpointer         user_data);
-
-gboolean
-on_console_delete_event                (GtkWidget       *widget,
-                                        GdkEvent        *event,
-                                        gpointer         user_data);
-
-void
-on_select_files_button_clicked         (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-on_restore_job_entry_changed           (GtkEditable     *editable,
-                                        gpointer         user_data);
-
-void
-on_select_files_button_clicked         (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-on_restore_cancel_clicked              (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-on_dir_button_clicked                  (GtkButton   *toolbutton,
-                                        gpointer         user_data);
diff --git a/bacula/src/gnome2-console/console.c b/bacula/src/gnome2-console/console.c
deleted file mode 100644 (file)
index 001cd74..0000000
+++ /dev/null
@@ -1,801 +0,0 @@
-/*
-   Bacula® - The Network Backup Solution
-
-   Copyright (C) 2002-2007 Free Software Foundation Europe e.V.
-
-   The main author of Bacula is Kern Sibbald, with contributions from
-   many others, a complete list can be found in the file AUTHORS.
-   This program is Free Software; you can redistribute it and/or
-   modify it under the terms of version two of the GNU General Public
-   License as published by the Free Software Foundation and included
-   in the file LICENSE.
-
-   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., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.
-
-   Bacula® is a registered trademark of Kern Sibbald.
-   The licensor of Bacula is the Free Software Foundation Europe
-   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
-   Switzerland, email:ftf@fsfeurope.org.
-*/
-/*
- *
- *   Bacula GNOME Console interface to the Director
- *
- *     Kern Sibbald, March MMII
- *
- *     Version $Id$
- */
-
-#include "bacula.h"
-#include "console.h"
-
-#include "interface.h"
-#include "support.h"
-
-/* Imported functions */
-int authenticate_director(JCR *jcr, DIRRES *director, CONRES *cons);
-void select_restore_setup();
-extern bool parse_gcons_config(CONFIG *config, const char *configfile, int exit_code);
-
-
-/* Dummy functions */
-int generate_daemon_event(JCR *jcr, const char *event) { return 1; }
-
-/* Exported variables */
-GtkWidget *console;   /* application window */
-GtkWidget *text1;            /* text window */
-GtkWidget *entry1;           /* entry box */
-GtkWidget *status1;          /* status bar */
-GtkWidget *combo1;           /* director combo */
-GtkWidget *scroll1;          /* main scroll bar */
-GtkWidget *run_dialog;       /* run dialog */
-GtkWidget *dir_dialog;       /* director selection dialog */
-GtkWidget *restore_dialog;   /* restore dialog */
-GtkWidget *restore_file_selection;
-GtkWidget *dir_select;
-GtkWidget *about1;           /* about box */
-GtkWidget *label_dialog;
-PangoFontDescription *font_desc = NULL;
-PangoFontDescription *text_font_desc = NULL;
-pthread_mutex_t cmd_mutex = PTHREAD_MUTEX_INITIALIZER;
-pthread_cond_t  cmd_wait;
-char cmd[1000];
-int reply;
-BSOCK *UA_sock = NULL;
-GList *job_list, *client_list, *fileset_list;
-GList *messages_list, *pool_list, *storage_list;
-GList *type_list, *level_list;
-
-/* Forward referenced functions */
-void terminate_console(int sig);
-
-extern "C" {
-    static gint message_handler(gpointer data);
-    static int initial_connect_to_director(gpointer data);
-}
-
-static void set_scroll_bar_to_end(void);
-
-/* Static variables */
-static char *configfile = NULL;
-static DIRRES *dir;
-static int ndir;
-static bool director_reader_running = false;
-static bool at_prompt = false;
-static bool ready = false;
-static bool quit = false;
-static guint initial;
-static int numdir = 0;
-static CONFIG *config;
-
-#define CONFIG_FILE "./bgnome-console.conf"   /* default configuration file */
-
-static void usage()
-{
-   fprintf(stderr, _(
-PROG_COPYRIGHT
-"\nVersion: %s (%s) %s %s %s\n\n"
-"Usage: bgnome-console [-s] [-c config_file] [-d debug_level] [config_file]\n"
-"       -c <file>   set configuration file to file\n"
-"       -dnn        set debug level to nn\n"
-"       -s          no signals\n"
-"       -t          test - read configuration and exit\n"
-"       -?          print this message.\n"
-"\n"), 2002, VERSION, BDATE, HOST_OS, DISTNAME, DISTVER);
-
-   exit(1);
-}
-
-/*
- * Call-back for reading a passphrase for an encrypted PEM file
- * This function uses getpass(), which uses a static buffer and is NOT thread-safe.
- */
-static int tls_pem_callback(char *buf, int size, const void *userdata)
-{
-#ifdef HAVE_TLS
-   const char *prompt = (const char *) userdata;
-   char *passwd;
-
-   passwd = getpass(prompt);
-   bstrncpy(buf, passwd, size);
-   return (strlen(buf));
-#else
-   buf[0] = 0;
-   return 0;
-#endif
-}
-
-
-/*
- * Make a quick check to see that we have all the
- * resources needed.
- */
-static int check_resources()
-{
-   bool ok = true;
-   DIRRES *director;
-
-   LockRes();
-
-   numdir = 0;
-   foreach_res(director, R_DIRECTOR) {
-      numdir++;
-      /* tls_require implies tls_enable */
-      if (director->tls_require) {
-         if (have_tls) {
-            director->tls_enable = true;
-         } else {
-            Jmsg(NULL, M_FATAL, 0, _("TLS required but not configured in Bacula.\n"));
-            ok = false;
-            continue;
-         }
-      }
-
-      if ((!director->tls_ca_certfile && !director->tls_ca_certdir) && director->tls_enable) {
-         Emsg2(M_FATAL, 0, _("Neither \"TLS CA Certificate\""
-                             " or \"TLS CA Certificate Dir\" are defined for Director \"%s\" in %s."
-                             " At least one CA certificate store is required.\n"),
-                             director->hdr.name, configfile);
-         ok = false;
-      }
-   }
-   
-   if (numdir == 0) {
-      Emsg1(M_FATAL, 0, _("No Director resource defined in %s\n"
-                          "Without that I don't how to speak to the Director :-(\n"), configfile);
-      ok = false;
-   }
-
-   CONRES *cons;
-   /* Loop over Consoles */
-   foreach_res(cons, R_CONSOLE) {
-      /* tls_require implies tls_enable */
-      if (cons->tls_require) {
-         if (have_tls) {
-            cons->tls_enable = true;
-         } else {
-            Jmsg(NULL, M_FATAL, 0, _("TLS required but not configured in Bacula.\n"));
-            ok = false;
-            continue;
-         }
-      }
-
-      if ((!cons->tls_ca_certfile && !cons->tls_ca_certdir) && cons->tls_enable) {
-         Emsg2(M_FATAL, 0, _("Neither \"TLS CA Certificate\""
-                             " or \"TLS CA Certificate Dir\" are defined for Console \"%s\" in %s.\n"),
-                             cons->hdr.name, configfile);
-         ok = false;
-      }
-   }
-
-   UnlockRes();
-
-   return ok;
-}
-
-
-/*********************************************************************
- *
- *         Main Bacula GNOME Console -- User Interface Program
- *
- */
-int main(int argc, char *argv[])
-{
-   int ch, stat;
-   int no_signals = TRUE;
-   int test_config = FALSE;
-   int gargc = 1;
-   const char *gargv[2] = {"bgnome-console", NULL};
-   CONFONTRES *con_font;
-
-#ifdef ENABLE_NLS
-   setlocale(LC_ALL, "");
-   bindtextdomain("bacula", LOCALEDIR);
-   textdomain("bacula");
-#endif
-
-   init_stack_dump();
-   my_name_is(argc, argv, "bgnome-console");
-   init_msg(NULL, NULL);
-   working_directory  = "/tmp";
-
-   struct sigaction sigignore;
-   sigignore.sa_flags = 0;
-   sigignore.sa_handler = SIG_IGN;
-   sigfillset(&sigignore.sa_mask);
-   sigaction(SIGPIPE, &sigignore, NULL);
-
-   if ((stat=pthread_cond_init(&cmd_wait, NULL)) != 0) {
-      Emsg1(M_ABORT, 0, _("Pthread cond init error = %s\n"),
-         strerror(stat));
-   }
-
-   gnome_init("bacula", VERSION, gargc, (char **)&gargv);
-
-   while ((ch = getopt(argc, argv, "bc:d:r:st?")) != -1) {
-      switch (ch) {
-      case 'c':                    /* configuration file */
-         if (configfile != NULL)
-            free(configfile);
-         configfile = bstrdup(optarg);
-         break;
-
-      case 'd':
-         debug_level = atoi(optarg);
-         if (debug_level <= 0)
-            debug_level = 1;
-         break;
-
-      case 's':                    /* turn off signals */
-         no_signals = TRUE;
-         break;
-
-      case 't':
-         test_config = TRUE;
-         break;
-
-      case '?':
-      default:
-         usage();
-      }
-   }
-   argc -= optind;
-   argv += optind;
-
-
-   if (!no_signals) {
-      init_signals(terminate_console);
-   }
-
-   if (argc) {
-      usage();
-   }
-
-   if (configfile == NULL) {
-      configfile = bstrdup(CONFIG_FILE);
-   }
-
-   config = new_config_parser();
-   parse_gcons_config(config, configfile, M_ERROR_TERM);
-
-   if (init_crypto() != 0) {
-      Emsg0(M_ERROR_TERM, 0, _("Cryptography library initialization failed.\n"));
-   }
-
-   if (!check_resources()) {
-      Emsg1(M_ERROR_TERM, 0, _("Please correct configuration file: %s\n"), configfile);
-   }
-
-   console = create_console();
-   gtk_window_set_default_size(GTK_WINDOW(console), 800, 700);
-   run_dialog = create_RunDialog();
-   label_dialog = create_label_dialog();
-   restore_dialog = create_RestoreDialog();
-   about1 = create_about1();
-
-   text1 = lookup_widget(console, "text1");
-   entry1 = lookup_widget(console, "entry1");
-   status1 = lookup_widget(console, "status1");
-   scroll1 = lookup_widget(console, "scroll1");
-
-   select_restore_setup();
-
-   gtk_widget_show(console);
-
-/*
- * Gtk2/pango have different font names. Gnome2 comes with "Monospace 10"
- */
-
-   LockRes();
-   foreach_res(con_font, R_CONSOLE_FONT) {
-       if (!con_font->fontface) {
-          Dmsg1(400, "No fontface for %s\n", con_font->hdr.name);
-          continue;
-       }
-       Dmsg1(100, "Now loading: %s\n",con_font->fontface);
-       text_font_desc = pango_font_description_from_string(con_font->fontface);
-       if (text_font_desc == NULL) {
-           Dmsg2(400, "Load of requested ConsoleFont \"%s\" (%s) failed!\n",
-                  con_font->hdr.name, con_font->fontface);
-       } else {
-           Dmsg2(400, "ConsoleFont \"%s\" (%s) loaded.\n",
-                  con_font->hdr.name, con_font->fontface);
-           break;
-       }
-   }
-   UnlockRes();
-    
-   font_desc = pango_font_description_from_string("LucidaTypewriter 9");
-   if (!text_font_desc) {
-      text_font_desc = pango_font_description_from_string("Monospace 10");
-   }
-   if (!text_font_desc) {
-      text_font_desc = pango_font_description_from_string("monospace");
-   }
-
-   gtk_widget_modify_font(console, font_desc);
-   gtk_widget_modify_font(entry1, font_desc);
-   gtk_widget_modify_font(status1, font_desc);
-   if (text_font_desc) {
-      gtk_widget_modify_font(text1, text_font_desc);
-      pango_font_description_free(text_font_desc);
-   } else {
-      gtk_widget_modify_font(text1, font_desc);
-   }
-   pango_font_description_free(font_desc);
-
-   if (test_config) {
-      terminate_console(0);
-      exit(0);
-   }
-
-   initial = gtk_timeout_add(100, initial_connect_to_director, (gpointer)NULL);
-
-   gtk_main();
-   quit = true;
-   disconnect_from_director((gpointer)NULL);
-   return 0;
-}
-
-/*
- * Every 5 seconds, ask the Director for our
- *  messages.
- */
-static gint message_handler(gpointer data)
-{
-   if (ready && UA_sock) {
-      bnet_fsend(UA_sock, ".messages");
-   }
-   return TRUE;
-}
-
-int disconnect_from_director(gpointer data)
-{
-   if (!quit) {
-      set_status(_(" Not Connected"));
-   }
-   if (UA_sock) {
-      bnet_sig(UA_sock, BNET_TERMINATE); /* send EOF */
-      bnet_close(UA_sock);
-      UA_sock = NULL;
-   }
-   return 1;
-}
-
-/*
- * Called just after the main loop is started to allow
- *  us to connect to the Director.
- */
-static int initial_connect_to_director(gpointer data)
-{
-   gtk_timeout_remove(initial);
-   if (connect_to_director(data)) {
-      start_director_reader(data);
-   }
-   gtk_timeout_add(5000, message_handler, (gpointer)NULL);
-   return TRUE;
-}
-
-static GList *get_list(char *cmd)
-{
-   GList *options;
-   char *msg;
-
-   options = NULL;
-   write_director(cmd);
-   while (bnet_recv(UA_sock) > 0) {
-      strip_trailing_junk(UA_sock->msg);
-      msg = (char *)malloc(strlen(UA_sock->msg) + 1);
-      strcpy(msg, UA_sock->msg);
-      options = g_list_append(options, msg);
-   }
-   return options;
-
-}
-
-static GList *get_and_fill_combo(GtkWidget *dialog, const char *combo_name, const char *dircmd)
-{
-   GtkWidget *combo;
-   GList *options;
-
-   combo = lookup_widget(dialog, combo_name);
-   options = get_list((char *)dircmd);
-   if (combo && options) {
-      gtk_combo_set_popdown_strings(GTK_COMBO(combo), options);
-   }
-   return options;
-}
-
-static void fill_combo(GtkWidget *dialog, const char *combo_name, GList *options)
-{
-   GtkWidget *combo;
-
-   combo = lookup_widget(dialog, combo_name);
-   if (combo && options) {
-      gtk_combo_set_popdown_strings(GTK_COMBO(combo), options);
-   }
-   return;
-}
-
-
-/*
- * Connect to Director. If there are more than one, put up
- * a modal dialog so that the user chooses one.
- */
-int connect_to_director(gpointer data)
-{
-   GList *dirs = NULL;
-   GtkWidget *combo;
-   JCR jcr;
-
-
-   if (UA_sock) {
-      return 0;
-   }
-
-   if (ndir > 1) {
-      LockRes();
-      foreach_res(dir, R_DIRECTOR) {
-         dirs = g_list_append(dirs, dir->hdr.name);
-      }
-      UnlockRes();
-      dir_dialog = create_SelectDirectorDialog();
-      combo = lookup_widget(dir_dialog, "combo1");
-      dir_select = lookup_widget(dir_dialog, "dirselect");
-      if (dirs) {
-         gtk_combo_set_popdown_strings(GTK_COMBO(combo), dirs);
-      }
-      gtk_widget_show(dir_dialog);
-      gtk_main();
-
-      if (reply == OK) {
-         gchar *ecmd = gtk_editable_get_chars((GtkEditable *)dir_select, 0, -1);
-         dir = (DIRRES *)GetResWithName(R_DIRECTOR, ecmd);
-         if (ecmd) {
-            g_free(ecmd);             /* release director name string */
-         }
-      }
-      if (dirs) {
-         g_free(dirs);
-      }
-      gtk_widget_destroy(dir_dialog);
-      dir_dialog = NULL;
-   } else {
-      /* Just take the first Director */
-      LockRes();
-      dir = (DIRRES *)GetNextRes(R_DIRECTOR, NULL);
-      UnlockRes();
-   }
-
-   if (!dir) {
-      return 0;
-   }
-
-   memset(&jcr, 0, sizeof(jcr));
-
-   set_statusf(_(" Connecting to Director %s:%d"), dir->address,dir->DIRport);
-   set_textf(_("Connecting to Director %s:%d\n\n"), dir->address,dir->DIRport);
-
-   while (gtk_events_pending()) {     /* fully paint screen */
-      gtk_main_iteration();
-   }
-
-   LockRes();
-   /* If cons==NULL, default console will be used */
-   CONRES *cons = (CONRES *)GetNextRes(R_CONSOLE, (RES *)NULL);
-   UnlockRes();
-
-   char buf[1024];
-   /* Initialize Console TLS context */
-   if (cons && (cons->tls_enable || cons->tls_require)) {
-      /* Generate passphrase prompt */
-      bsnprintf(buf, sizeof(buf), _("Passphrase for Console \"%s\" TLS private key: "), cons->hdr.name);
-
-      /* Initialize TLS context:
-       * Args: CA certfile, CA certdir, Certfile, Keyfile,
-       * Keyfile PEM Callback, Keyfile CB Userdata, DHfile, Verify Peer */
-      cons->tls_ctx = new_tls_context(cons->tls_ca_certfile,
-         cons->tls_ca_certdir, cons->tls_certfile,
-         cons->tls_keyfile, tls_pem_callback, &buf, NULL, true);
-
-      if (!cons->tls_ctx) {
-         bsnprintf(buf, sizeof(buf), _("Failed to initialize TLS context for Console \"%s\".\n"),
-            dir->hdr.name);
-         set_text(buf, strlen(buf));
-         terminate_console(0);
-         return 1;
-      }
-
-   }
-
-   /* Initialize Director TLS context */
-   if (dir->tls_enable || dir->tls_require) {
-      /* Generate passphrase prompt */
-      bsnprintf(buf, sizeof(buf), _("Passphrase for Director \"%s\" TLS private key: "), dir->hdr.name);
-
-      /* Initialize TLS context:
-       * Args: CA certfile, CA certdir, Certfile, Keyfile,
-       * Keyfile PEM Callback, Keyfile CB Userdata, DHfile, Verify Peer */
-      dir->tls_ctx = new_tls_context(dir->tls_ca_certfile,
-         dir->tls_ca_certdir, dir->tls_certfile,
-         dir->tls_keyfile, tls_pem_callback, &buf, NULL, true);
-
-      if (!dir->tls_ctx) {
-         bsnprintf(buf, sizeof(buf), _("Failed to initialize TLS context for Director \"%s\".\n"),
-            dir->hdr.name);
-         set_text(buf, strlen(buf));
-         terminate_console(0);
-         return 1;
-      }
-   }
-
-
-   UA_sock = bnet_connect(NULL, 5, 15, 0, _("Director daemon"), dir->address,
-                          NULL, dir->DIRport, 0);
-   if (UA_sock == NULL) {
-      return 0;
-   }
-
-   jcr.dir_bsock = UA_sock;
-   if (!authenticate_director(&jcr, dir, cons)) {
-      set_text(UA_sock->msg, UA_sock->msglen);
-      return 0;
-   }
-
-   set_status(_(" Initializing ..."));
-
-   bnet_fsend(UA_sock, "autodisplay on");
-
-   /* Read and display all initial messages */
-   while (bnet_recv(UA_sock) > 0) {
-      set_text(UA_sock->msg, UA_sock->msglen);
-   }
-
-   /* Paint changes */
-   while (gtk_events_pending()) {
-      gtk_main_iteration();
-   }
-
-   /* Fill the run_dialog combo boxes */
-   job_list      = get_and_fill_combo(run_dialog, "combo_job", ".jobs");
-   client_list   = get_and_fill_combo(run_dialog, "combo_client", ".clients");
-   fileset_list  = get_and_fill_combo(run_dialog, "combo_fileset", ".filesets");
-   messages_list = get_and_fill_combo(run_dialog, "combo_messages", ".msgs");
-   pool_list     = get_and_fill_combo(run_dialog, "combo_pool", ".pools");
-   storage_list  = get_and_fill_combo(run_dialog, "combo_storage", ".storage");
-   type_list     = get_and_fill_combo(run_dialog, "combo_type", ".types");
-   level_list    = get_and_fill_combo(run_dialog, "combo_level", ".levels");
-
-   /* Fill the label dialog combo boxes */
-   fill_combo(label_dialog, "label_combo_storage", storage_list);
-   fill_combo(label_dialog, "label_combo_pool", pool_list);
-
-
-   /* Fill the restore_dialog combo boxes */
-   fill_combo(restore_dialog, "combo_restore_job", job_list);
-   fill_combo(restore_dialog, "combo_restore_client", client_list);
-   fill_combo(restore_dialog, "combo_restore_fileset", fileset_list);
-   fill_combo(restore_dialog, "combo_restore_pool", pool_list);
-   fill_combo(restore_dialog, "combo_restore_storage", storage_list);
-
-   set_status(_(" Connected"));
-   return 1;
-}
-
-void write_director(const gchar *msg)
-{
-   if (UA_sock) {
-      at_prompt = false;
-      set_status(_(" Processing command ..."));
-      UA_sock->msglen = strlen(msg);
-      pm_strcpy(&UA_sock->msg, msg);
-      bnet_send(UA_sock);
-   }
-   if (strcmp(msg, ".quit") == 0 || strcmp(msg, ".exit") == 0) {
-      disconnect_from_director((gpointer)NULL);
-      gtk_main_quit();
-   }
-}
-
-extern "C"
-void read_director(gpointer data, gint fd, GdkInputCondition condition)
-{
-   int stat;
-
-   if (!UA_sock || UA_sock->m_fd != fd) {
-      return;
-   }
-   stat = UA_sock->recv();
-   if (stat >= 0) {
-      if (at_prompt) {
-         set_text("\n", 1);
-         at_prompt = false;
-      }
-      set_text(UA_sock->msg, UA_sock->msglen);
-      return;
-   }
-   if (is_bnet_stop(UA_sock)) {         /* error or term request */
-      gtk_main_quit();
-      return;
-   }
-   /* Must be a signal -- either do something or ignore it */
-   if (UA_sock->msglen == BNET_PROMPT) {
-      at_prompt = true;
-      set_status(_(" At prompt waiting for input ..."));
-   }
-   if (UA_sock->msglen == BNET_EOD) {
-      set_status_ready();
-   }
-   return;
-}
-
-static gint tag;
-
-void start_director_reader(gpointer data)
-{
-
-   if (director_reader_running || !UA_sock) {
-      return;
-   }
-   tag = gdk_input_add(UA_sock->m_fd, GDK_INPUT_READ, read_director, NULL);
-   director_reader_running = true;
-}
-
-void stop_director_reader(gpointer data)
-{
-   if (!director_reader_running) {
-      return;
-   }
-   gdk_input_remove(tag);
-   gdk_input_remove(tag);
-   gdk_input_remove(tag);
-   gdk_input_remove(tag);
-   gdk_input_remove(tag);
-   gdk_input_remove(tag);
-   gdk_input_remove(tag);
-   gdk_input_remove(tag);
-   gdk_input_remove(tag);
-   gdk_input_remove(tag);
-   gdk_input_remove(tag);
-   director_reader_running = false;
-}
-
-
-
-/* Cleanup and then exit */
-void terminate_console(int sig)
-{
-   static bool already_here = false;
-
-   if (already_here)                  /* avoid recursive temination problems */
-      exit(1);
-   already_here = true;
-   config->free_resources();
-   free(config);
-   config = NULL;
-   cleanup_crypto();
-   disconnect_from_director((gpointer)NULL);
-   gtk_main_quit();
-   exit(0);
-}
-
-
-/* Buffer approx 2000 lines -- assume 60 chars/line */
-#define MAX_TEXT_CHARS   (2000 * 60)
-static int text_chars = 0;
-
-static void truncate_text_chars()
-{
-   GtkTextBuffer *textbuf;
-   GtkTextIter iter, iter2;
-   guint len;
-   int del_chars = MAX_TEXT_CHARS / 4;
-
-   textbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text1));
-   len = gtk_text_buffer_get_char_count(textbuf);
-   gtk_text_buffer_get_iter_at_offset (textbuf, &iter, 0);
-   gtk_text_buffer_get_iter_at_offset (textbuf, &iter2, del_chars);
-   gtk_text_buffer_delete (textbuf, &iter, &iter2);
-   text_chars -= del_chars;
-   len = gtk_text_buffer_get_char_count(textbuf);
-   gtk_text_iter_set_offset(&iter, len);
-}
-
-void set_textf(const char *fmt, ...)
-{
-   va_list arg_ptr;
-   char buf[1000];
-   int len;
-   va_start(arg_ptr, fmt);
-   len = bvsnprintf(buf, sizeof(buf), fmt, arg_ptr);
-   va_end(arg_ptr);
-   set_text(buf, len);
-}
-
-void set_text(const char *buf, int len)
-{
-   GtkTextBuffer *textbuf;
-   GtkTextIter iter;
-   guint buf_len;
-
-   textbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text1));
-   buf_len = gtk_text_buffer_get_char_count(textbuf);
-   gtk_text_buffer_get_iter_at_offset(textbuf, &iter, buf_len - 1);
-   gtk_text_buffer_insert(textbuf, &iter, buf, -1);
-   text_chars += len;
-   if (text_chars > MAX_TEXT_CHARS) {
-      truncate_text_chars();
-   }
-   set_scroll_bar_to_end();
-}
-
-void set_statusf(const char *fmt, ...)
-{
-   va_list arg_ptr;
-   char buf[1000];
-   int len;
-   va_start(arg_ptr, fmt);
-   len = bvsnprintf(buf, sizeof(buf), fmt, arg_ptr);
-   va_end(arg_ptr);
-   gtk_label_set_text(GTK_LABEL(status1), buf);
-// set_scroll_bar_to_end();
-   ready = false;
-}
-
-void set_status_ready()
-{
-   gtk_label_set_text(GTK_LABEL(status1), _(" Ready"));
-   ready = true;
-// set_scroll_bar_to_end();
-}
-
-void set_status(const char *buf)
-{
-   gtk_label_set_text(GTK_LABEL(status1), buf);
-// set_scroll_bar_to_end();
-   ready = false;
-}
-
-static void set_scroll_bar_to_end(void)
-{
-   GtkTextBuffer* textbuf = NULL;
-   GtkTextIter iter;
-   guint buf_len;
-
-   textbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text1));
-   buf_len = gtk_text_buffer_get_char_count(textbuf);
-   gtk_text_buffer_get_iter_at_offset(textbuf, &iter, buf_len - 1);
-   gtk_text_iter_set_offset(&iter, buf_len);
-   gtk_text_buffer_place_cursor(textbuf, &iter);
-   gtk_text_view_scroll_to_mark(GTK_TEXT_VIEW(text1),
-              gtk_text_buffer_get_mark(textbuf, "insert"),
-              0, TRUE, 0.0, 1.0);
-}
diff --git a/bacula/src/gnome2-console/console.h b/bacula/src/gnome2-console/console.h
deleted file mode 100644 (file)
index 8a5d89d..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Bacula GNOME User Agent specific configuration and defines
- *
- *     Kern Sibbald, March 2002
- *
- *     Version $Id$
- */
-/*
-   Bacula® - The Network Backup Solution
-
-   Copyright (C) 2002-2006 Free Software Foundation Europe e.V.
-
-   The main author of Bacula is Kern Sibbald, with contributions from
-   many others, a complete list can be found in the file AUTHORS.
-   This program is Free Software; you can redistribute it and/or
-   modify it under the terms of version two of the GNU General Public
-   License as published by the Free Software Foundation and included
-   in the file LICENSE.
-
-   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., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.
-
-   Bacula® is a registered trademark of Kern Sibbald.
-   The licensor of Bacula is the Free Software Foundation Europe
-   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
-   Switzerland, email:ftf@fsfeurope.org.
-*/
-
-
-#ifndef __CONSOLE_H_
-#define __CONSOLE_H_
-
-#include "console_conf.h"
-#include "jcr.h"
-/* Super kludge for GNOME 2.0 */
-#undef _
-#undef N_
-#undef textdomain
-
-#include <gnome.h>
-
-extern GtkWidget *app1;       /* application window */
-extern GtkWidget *text1;      /* text window */
-extern GtkWidget *entry1;     /* entry box */
-extern GtkWidget *combo1;     /* Directory combo */
-extern GtkWidget *dir_dialog;
-extern GtkWidget *dir_select;
-extern GtkWidget *run_dialog;       /* run dialog */
-extern GtkWidget *label_dialog;
-extern GtkWidget *restore_dialog;   /* restore dialog */
-extern GtkWidget *restore_file_selection;   /* restore files dialog */
-extern GtkWidget *about1;
-extern GList *job_list, *client_list, *fileset_list;
-extern GList *messages_list, *pool_list, *storage_list;
-extern GList *type_list, *level_list;
-
-
-extern pthread_mutex_t cmd_mutex;
-extern pthread_cond_t  cmd_wait;
-extern char cmd[1000];
-extern int cmd_ready;
-extern int reply;
-extern BSOCK *UA_sock;
-
-
-
-#define OK     1
-#define CANCEL 0
-
-void set_textf(const char *fmt, ...);
-void set_text(const char *buf, int len);
-void set_status(const char *buf);
-void set_status_ready();
-void set_statusf(const char *fmt, ...);
-int connect_to_director(gpointer data);
-int disconnect_from_director(gpointer data);
-void start_director_reader(gpointer data);
-void stop_director_reader(gpointer data);
-void write_director(const gchar *msg);
-void set_restore_dialog_defaults();
-void select_restore_files();
-
-extern "C" void read_director(gpointer data, gint fd, GdkInputCondition condition);
-
-#endif
diff --git a/bacula/src/gnome2-console/console_conf.c b/bacula/src/gnome2-console/console_conf.c
deleted file mode 100644 (file)
index 91ad6d2..0000000
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
-   Bacula® - The Network Backup Solution
-
-   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
-
-   The main author of Bacula is Kern Sibbald, with contributions from
-   many others, a complete list can be found in the file AUTHORS.
-   This program is Free Software; you can redistribute it and/or
-   modify it under the terms of version two of the GNU General Public
-   License as published by the Free Software Foundation and included
-   in the file LICENSE.
-
-   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., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.
-
-   Bacula® is a registered trademark of Kern Sibbald.
-   The licensor of Bacula is the Free Software Foundation Europe
-   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
-   Switzerland, email:ftf@fsfeurope.org.
-*/
-/*
- *   Main configuration file parser for Bacula User Agent
- *    some parts may be split into separate files such as
- *    the schedule configuration (sch_config.c).
- *
- *   Note, the configuration file parser consists of three parts
- *
- *   1. The generic lexical scanner in lib/lex.c and lib/lex.h
- *
- *   2. The generic config  scanner in lib/parse_config.c and
- *      lib/parse_config.h.
- *      These files contain the parser code, some utility
- *      routines, and the common store routines (name, int,
- *      string).
- *
- *   3. The daemon specific file, which contains the Resource
- *      definitions as well as any specific store routines
- *      for the resource records.
- *
- *     Kern Sibbald, January MM, September MM
- *
- *     Version $Id$
- */
-
-#include "bacula.h"
-#include "console_conf.h"
-
-/* Define the first and last resource ID record
- * types. Note, these should be unique for each
- * daemon though not a requirement.
- */
-int32_t r_first = R_FIRST;
-int32_t r_last  = R_LAST;
-static RES *sres_head[R_LAST - R_FIRST + 1];
-RES **res_head = sres_head;
-
-/* Forward referenced subroutines */
-
-
-/* We build the current resource here as we are
- * scanning the resource configuration definition,
- * then move it to allocated memory when the resource
- * scan is complete.
- */
-URES res_all;
-int32_t res_all_size = sizeof(res_all);
-
-/* Definition of records permitted within each
- * resource with the routine to process the record
- * information.
- */
-static RES_ITEM dir_items[] = {
-   {"name",        store_name,     ITEM(dir_res.hdr.name), 0, ITEM_REQUIRED, 0},
-   {"description", store_str,      ITEM(dir_res.hdr.desc), 0, 0, 0},
-   {"dirport",     store_pint32,   ITEM(dir_res.DIRport),  0, ITEM_DEFAULT, 9101},
-   {"address",     store_str,      ITEM(dir_res.address),  0, ITEM_REQUIRED, 0},
-   {"password",    store_password, ITEM(dir_res.password), 0, 0, 0},
-   {"tlsenable",   store_bool,     ITEM(dir_res.tls_enable), 1, 0, 0},
-   {"tlsrequire",  store_bool,     ITEM(dir_res.tls_require), 1, 0, 0},
-   {"tlscacertificatefile", store_dir, ITEM(dir_res.tls_ca_certfile), 0, 0, 0},
-   {"tlscacertificatedir", store_dir,  ITEM(dir_res.tls_ca_certdir), 0, 0, 0},
-   {"tlscertificate", store_dir,       ITEM(dir_res.tls_certfile), 0, 0, 0},
-   {"tlskey",         store_dir,       ITEM(dir_res.tls_keyfile), 0, 0, 0},
-   {NULL, NULL, {0}, 0, 0, 0}
-};
-
-static RES_ITEM con_items[] = {
-   {"name",        store_name,     ITEM(con_res.hdr.name), 0, ITEM_REQUIRED, 0},
-   {"description", store_str,      ITEM(con_res.hdr.desc), 0, 0, 0},
-   {"password",    store_password, ITEM(con_res.password), 0, ITEM_REQUIRED, 0},
-   {"tlsenable",      store_bool,    ITEM(con_res.tls_enable), 1, 0, 0},
-   {"tlsrequire",     store_bool,    ITEM(con_res.tls_require), 1, 0, 0},
-   {"tlscacertificatefile", store_dir, ITEM(con_res.tls_ca_certfile), 0, 0, 0},
-   {"tlscacertificatedir", store_dir,  ITEM(con_res.tls_ca_certdir), 0, 0, 0},
-   {"tlscertificate", store_dir,       ITEM(con_res.tls_certfile), 0, 0, 0},
-   {"tlskey",         store_dir,       ITEM(con_res.tls_keyfile), 0, 0, 0},
-   {NULL, NULL, {0}, 0, 0, 0}
-};
-
-static RES_ITEM con_font_items[] = {
-   {"name",        store_name,     ITEM(con_font.hdr.name), 0, ITEM_REQUIRED, 0},
-   {"description", store_str,      ITEM(con_font.hdr.desc), 0, 0, 0},
-   {"font",        store_str,      ITEM(con_font.fontface), 0, 0, 0},
-   {NULL, NULL, {0}, 0, 0, 0}
-};
-
-
-/*
- * This is the master resource definition.
- * It must have one item for each of the resources.
- */
-RES_TABLE resources[] = {
-   {"director",      dir_items,   R_DIRECTOR},
-   {"console",       con_items,   R_CONSOLE},
-   {"consolefont",   con_font_items, R_CONSOLE_FONT},
-   {NULL,            NULL,        0}
-};
-
-
-/* Dump contents of resource */
-void dump_resource(int type, RES *reshdr, void sendit(void *sock, const char *fmt, ...), void *sock)
-{
-   URES *res = (URES *)reshdr;
-   bool recurse = true;
-
-   if (res == NULL) {
-      printf(_("No record for %d %s\n"), type, res_to_str(type));
-      return;
-   }
-   if (type < 0) {                    /* no recursion */
-      type = - type;
-      recurse = false;
-   }
-   switch (type) {
-   case R_DIRECTOR:
-      printf(_("Director: name=%s address=%s DIRport=%d\n"), reshdr->name,
-              res->dir_res.address, res->dir_res.DIRport);
-      break;
-   case R_CONSOLE:
-      printf(_("Console: name=%s\n"), reshdr->name);
-      break;
-   case R_CONSOLE_FONT:
-      printf(_("ConsoleFont: name=%s font face=%s\n"),
-             reshdr->name, NPRT(res->con_font.fontface));
-      break;
-   default:
-      printf(_("Unknown resource type %d\n"), type);
-   }
-   if (recurse && res->dir_res.hdr.next) {
-      dump_resource(type, res->dir_res.hdr.next, sendit, sock);
-   }
-}
-
-/*
- * Free memory of resource.
- * NB, we don't need to worry about freeing any references
- * to other resources as they will be freed when that
- * resource chain is traversed.  Mainly we worry about freeing
- * allocated strings (names).
- */
-void free_resource(RES *sres, int type)
-{
-   RES *nres;
-   URES *res = (URES *)sres;
-
-   if (res == NULL)
-      return;
-
-   /* common stuff -- free the resource name */
-   nres = (RES *)res->dir_res.hdr.next;
-   if (res->dir_res.hdr.name) {
-      free(res->dir_res.hdr.name);
-   }
-   if (res->dir_res.hdr.desc) {
-      free(res->dir_res.hdr.desc);
-   }
-
-   switch (type) {
-   case R_DIRECTOR:
-      if (res->dir_res.address) {
-         free(res->dir_res.address);
-      }
-      if (res->dir_res.tls_ctx) { 
-         free_tls_context(res->dir_res.tls_ctx);
-      }
-      if (res->dir_res.tls_ca_certfile) {
-         free(res->dir_res.tls_ca_certfile);
-      }
-      if (res->dir_res.tls_ca_certdir) {
-         free(res->dir_res.tls_ca_certdir);
-      }
-      if (res->dir_res.tls_certfile) {
-         free(res->dir_res.tls_certfile);
-      }
-      if (res->dir_res.tls_keyfile) {
-         free(res->dir_res.tls_keyfile);
-      }
-      break;
-   case R_CONSOLE:
-      if (res->con_res.password) {
-         free(res->con_res.password);
-      }
-      if (res->con_res.tls_ctx) { 
-         free_tls_context(res->con_res.tls_ctx);
-      }
-      if (res->con_res.tls_ca_certfile) {
-         free(res->con_res.tls_ca_certfile);
-      }
-      if (res->con_res.tls_ca_certdir) {
-         free(res->con_res.tls_ca_certdir);
-      }
-      if (res->con_res.tls_certfile) {
-         free(res->con_res.tls_certfile);
-      }
-      if (res->con_res.tls_keyfile) {
-         free(res->con_res.tls_keyfile);
-      }
-      break;
-   case R_CONSOLE_FONT:
-      if (res->con_font.fontface) {
-         free(res->con_font.fontface);
-      }
-      break;
-   default:
-      printf(_("Unknown resource type %d\n"), type);
-   }
-   /* Common stuff again -- free the resource, recurse to next one */
-   free(res);
-   if (nres) {
-      free_resource(nres, type);
-   }
-}
-
-/* Save the new resource by chaining it into the head list for
- * the resource. If this is pass 2, we update any resource
- * pointers (currently only in the Job resource).
- */
-void save_resource(int type, RES_ITEM *items, int pass)
-{
-   URES *res;
-   int rindex = type - r_first;
-   int i, size = 0;
-   int error = 0;
-
-   /*
-    * Ensure that all required items are present
-    */
-   for (i=0; items[i].name; i++) {
-      if (items[i].flags & ITEM_REQUIRED) {
-            if (!bit_is_set(i, res_all.dir_res.hdr.item_present)) {
-               Emsg2(M_ABORT, 0, _("%s item is required in %s resource, but not found.\n"),
-                 items[i].name, resources[rindex]);
-             }
-      }
-   }
-
-   /* During pass 2, we looked up pointers to all the resources
-    * referrenced in the current resource, , now we
-    * must copy their address from the static record to the allocated
-    * record.
-    */
-   if (pass == 2) {
-      switch (type) {
-      /* Resources not containing a resource */
-      case R_DIRECTOR:
-         break;
-
-      case R_CONSOLE:
-      case R_CONSOLE_FONT:
-         break;
-
-      default:
-         Emsg1(M_ERROR, 0, _("Unknown resource type %d\n"), type);
-         error = 1;
-         break;
-      }
-      /* Note, the resoure name was already saved during pass 1,
-       * so here, we can just release it.
-       */
-      if (res_all.dir_res.hdr.name) {
-         free(res_all.dir_res.hdr.name);
-         res_all.dir_res.hdr.name = NULL;
-      }
-      if (res_all.dir_res.hdr.desc) {
-         free(res_all.dir_res.hdr.desc);
-         res_all.dir_res.hdr.desc = NULL;
-      }
-      return;
-   }
-
-   /* The following code is only executed during pass 1 */
-   switch (type) {
-   case R_DIRECTOR:
-      size = sizeof(DIRRES);
-      break;
-   case R_CONSOLE_FONT:
-      size = sizeof(CONFONTRES);
-      break;
-   case R_CONSOLE:
-      size = sizeof(CONRES);
-      break;
-   default:
-      printf(_("Unknown resource type %d\n"), type);
-      error = 1;
-      break;
-   }
-   /* Common */
-   if (!error) {
-      res = (URES *)malloc(size);
-      memcpy(res, &res_all, size);
-      if (!res_head[rindex]) {
-         res_head[rindex] = (RES *)res; /* store first entry */
-      } else {
-         RES *next, *last;
-         /* Add new res to end of chain */
-         for (last=next=res_head[rindex]; next; next=next->next) {
-            last = next;
-            if (strcmp(next->name, res->dir_res.hdr.name) == 0) {
-               Emsg2(M_ERROR_TERM, 0,
-                  _("Attempt to define second %s resource named \"%s\" is not permitted.\n"),
-                  resources[rindex].name, res->dir_res.hdr.name);
-            }
-         }
-         last->next = (RES *)res;
-         Dmsg2(90, "Inserting %s res: %s\n", res_to_str(type),
-               res->dir_res.hdr.name);
-      }
-   }
-}
-
-bool parse_gcons_config(CONFIG *config, const char *configfile, int exit_code)
-{
-   config->init(configfile, NULL, exit_code, (void *)&res_all, res_all_size,
-      r_first, r_last, resources, res_head);
-   return config->parse_config();
-}
diff --git a/bacula/src/gnome2-console/console_conf.h b/bacula/src/gnome2-console/console_conf.h
deleted file mode 100644 (file)
index 194057f..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-   Bacula® - The Network Backup Solution
-
-   Copyright (C) 2002-2008 Free Software Foundation Europe e.V.
-
-   The main author of Bacula is Kern Sibbald, with contributions from
-   many others, a complete list can be found in the file AUTHORS.
-   This program is Free Software; you can redistribute it and/or
-   modify it under the terms of version two of the GNU General Public
-   License as published by the Free Software Foundation and included
-   in the file LICENSE.
-
-   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., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.
-
-   Bacula® is a registered trademark of Kern Sibbald.
-   The licensor of Bacula is the Free Software Foundation Europe
-   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
-   Switzerland, email:ftf@fsfeurope.org.
-*/
-/*
- * Bacula GNOME User Agent specific configuration and defines
- *
- *     Kern Sibbald, March 2002
- *
- *     Version $Id$
- */
-
-#ifndef __CONSOLE_CONF_H_
-#define __CONSOLE_CONF_H_
-
-/*
- * Resource codes -- they must be sequential for indexing
- */
-
-enum {
-   R_DIRECTOR = 1001,
-   R_CONSOLE,
-   R_CONSOLE_FONT,
-   R_FIRST = R_DIRECTOR,
-   R_LAST = R_CONSOLE_FONT            /* Keep this updated */
-};
-
-/*
- * Some resource attributes
- */
-enum {
-   R_NAME = 1020,
-   R_ADDRESS,
-   R_PASSWORD,
-   R_TYPE,
-   R_BACKUP
-};
-
-
-/* Definition of the contents of each Resource */
-struct DIRRES {
-   RES   hdr;
-   uint32_t DIRport;                  /* UA server port */
-   char *address;                     /* UA server address */
-   char *password;                    /* UA server password */
-   bool tls_enable;                   /* Enable TLS */
-   bool tls_require;                  /* Require TLS */
-   char *tls_ca_certfile;             /* TLS CA Certificate File */
-   char *tls_ca_certdir;              /* TLS CA Certificate Directory */
-   char *tls_certfile;                /* TLS Client Certificate File */
-   char *tls_keyfile;                 /* TLS Client Key File */
-
-   TLS_CONTEXT *tls_ctx;              /* Shared TLS Context */
-};
-
-struct CONFONTRES {
-   RES   hdr;
-   char *fontface;                    /* Console Font specification */
-};
-
-struct CONRES {
-   RES   hdr;
-   char *password;                    /* UA server password */
-   bool tls_enable;                   /* Enable TLS on all connections */
-   bool tls_require;                  /* Require TLS on all connections */
-   char *tls_ca_certfile;             /* TLS CA Certificate File */
-   char *tls_ca_certdir;              /* TLS CA Certificate Directory */
-   char *tls_certfile;                /* TLS Client Certificate File */
-   char *tls_keyfile;                 /* TLS Client Key File */
-
-   TLS_CONTEXT *tls_ctx;              /* Shared TLS Context */
-};
-
-
-/* Define the Union of all the above
- * resource structure definitions.
- */
-union u_res {
-   DIRRES dir_res;
-   CONRES con_res;
-   CONFONTRES con_font;
-   RES hdr;
-};
-
-typedef union u_res URES;
-
-#endif
diff --git a/bacula/src/gnome2-console/interface.c b/bacula/src/gnome2-console/interface.c
deleted file mode 100644 (file)
index c0a1e32..0000000
+++ /dev/null
@@ -1,1959 +0,0 @@
-/*
- * DO NOT EDIT THIS FILE - it is generated by Glade.
- */
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdio.h>
-
-#include <bonobo.h>
-#include <gnome.h>
-
-#include "callbacks.h"
-#include "interface.h"
-#include "support.h"
-
-#define GLADE_HOOKUP_OBJECT(component,widget,name) \
-  g_object_set_data_full (G_OBJECT (component), name, \
-    gtk_widget_ref (widget), (GDestroyNotify) gtk_widget_unref)
-
-#define GLADE_HOOKUP_OBJECT_NO_REF(component,widget,name) \
-  g_object_set_data (G_OBJECT (component), name, widget)
-
-static GnomeUIInfo file1_menu_uiinfo[] =
-{
-  {
-    GNOME_APP_UI_ITEM, N_("_Connect"),
-    N_("Connect to Director"),
-    (gpointer) on_connect_activate, NULL, NULL,
-    GNOME_APP_PIXMAP_NONE, NULL,
-    0, (GdkModifierType) 0, NULL
-  },
-  {
-    GNOME_APP_UI_ITEM, N_("_Disconnect"),
-    N_("Disconnect from Director"),
-    (gpointer) on_disconnect_activate, NULL, NULL,
-    GNOME_APP_PIXMAP_NONE, NULL,
-    0, (GdkModifierType) 0, NULL
-  },
-  GNOMEUIINFO_SEPARATOR,
-  {
-    GNOME_APP_UI_ITEM, N_("gtk-quit"),
-    NULL,
-    (gpointer) on_exit_activate, NULL, NULL,
-    GNOME_APP_PIXMAP_NONE, NULL,
-    0, (GdkModifierType) 0, NULL
-  },
-  GNOMEUIINFO_END
-};
-
-static GnomeUIInfo edit1_menu_uiinfo[] =
-{
-  {
-    GNOME_APP_UI_ITEM, N_("gtk-cut"),
-    NULL,
-    (gpointer) on_cut1_activate, NULL, NULL,
-    GNOME_APP_PIXMAP_NONE, NULL,
-    0, (GdkModifierType) 0, NULL
-  },
-  {
-    GNOME_APP_UI_ITEM, N_("gtk-copy"),
-    NULL,
-    (gpointer) on_copy1_activate, NULL, NULL,
-    GNOME_APP_PIXMAP_NONE, NULL,
-    0, (GdkModifierType) 0, NULL
-  },
-  {
-    GNOME_APP_UI_ITEM, N_("gtk-paste"),
-    NULL,
-    (gpointer) on_paste1_activate, NULL, NULL,
-    GNOME_APP_PIXMAP_NONE, NULL,
-    0, (GdkModifierType) 0, NULL
-  },
-  {
-    GNOME_APP_UI_ITEM, N_("gtk-clear"),
-    NULL,
-    (gpointer) on_clear1_activate, NULL, NULL,
-    GNOME_APP_PIXMAP_NONE, NULL,
-    0, (GdkModifierType) 0, NULL
-  },
-  GNOMEUIINFO_SEPARATOR,
-  GNOMEUIINFO_END
-};
-
-static GnomeUIInfo item1_menu_uiinfo[] =
-{
-  {
-    GNOME_APP_UI_ITEM, N_("_Display Messages"),
-    NULL,
-    (gpointer) on_msgs_activate, NULL, NULL,
-    GNOME_APP_PIXMAP_NONE, NULL,
-    0, (GdkModifierType) 0, NULL
-  },
-  GNOMEUIINFO_END
-};
-
-static GnomeUIInfo settings1_menu_uiinfo[] =
-{
-  {
-    GNOME_APP_UI_ITEM, N_("gtk-preferences"),
-    NULL,
-    (gpointer) on_preferences1_activate, NULL, NULL,
-    GNOME_APP_PIXMAP_NONE, NULL,
-    0, (GdkModifierType) 0, NULL
-  },
-  GNOMEUIINFO_END
-};
-
-static GnomeUIInfo help1_menu_uiinfo[] =
-{
-  {
-    GNOME_APP_UI_ITEM, N_("gnome-stock-about"),
-    NULL,
-    (gpointer) on_about_activate, NULL, NULL,
-    GNOME_APP_PIXMAP_NONE, NULL,
-    0, (GdkModifierType) 0, NULL
-  },
-  GNOMEUIINFO_END
-};
-
-static GnomeUIInfo menubar1_uiinfo[] =
-{
-  {
-    GNOME_APP_UI_SUBTREE, N_("_File"),
-    NULL,
-    file1_menu_uiinfo, NULL, NULL,
-    GNOME_APP_PIXMAP_NONE, NULL,
-    0, (GdkModifierType) 0, NULL
-  },
-  {
-    GNOME_APP_UI_SUBTREE, N_("_Edit"),
-    NULL,
-    edit1_menu_uiinfo, NULL, NULL,
-    GNOME_APP_PIXMAP_NONE, NULL,
-    0, (GdkModifierType) 0, NULL
-  },
-  {
-    GNOME_APP_UI_SUBTREE, N_("_View"),
-    N_("Display Messages"),
-    item1_menu_uiinfo, NULL, NULL,
-    GNOME_APP_PIXMAP_NONE, NULL,
-    0, (GdkModifierType) 0, NULL
-  },
-  {
-    GNOME_APP_UI_SUBTREE, N_("_Settings"),
-    NULL,
-    settings1_menu_uiinfo, NULL, NULL,
-    GNOME_APP_PIXMAP_NONE, NULL,
-    0, (GdkModifierType) 0, NULL
-  },
-  {
-    GNOME_APP_UI_SUBTREE, N_("_Help"),
-    NULL,
-    help1_menu_uiinfo, NULL, NULL,
-    GNOME_APP_PIXMAP_NONE, NULL,
-    0, (GdkModifierType) 0, NULL
-  },
-  GNOMEUIINFO_END
-};
-
-GtkWidget*
-create_console (void)
-{
-  GtkWidget *console;
-  GtkWidget *vbox6;
-  GtkWidget *handlebox1;
-  GtkWidget *menubar1;
-  GtkWidget *handlebox2;
-  GtkWidget *toolbar2;
-  GtkIconSize tmp_toolbar_icon_size;
-  GtkWidget *tmp_image;
-  GtkWidget *connect_button1;
-  GtkWidget *run_button1;
-  GtkWidget *dir_button;
-  GtkWidget *restore_button;
-  GtkWidget *label_button;
-  GtkWidget *msgs_button;
-  GtkWidget *vbox7;
-  GtkWidget *scroll1;
-  GtkWidget *text1;
-  GtkWidget *hbox18;
-  GtkWidget *label38;
-  GtkWidget *entry1;
-  GtkWidget *hbox19;
-  GtkWidget *frame1;
-  GtkWidget *label39;
-  GtkWidget *frame2;
-  GtkWidget *status1;
-  GtkAccelGroup *accel_group;
-  GtkTooltips *tooltips;
-
-  tooltips = gtk_tooltips_new ();
-
-  accel_group = gtk_accel_group_new ();
-
-  console = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_title (GTK_WINDOW (console), _("Bacula Console"));
-  gtk_window_set_position (GTK_WINDOW (console), GTK_WIN_POS_CENTER);
-  gtk_window_set_default_size (GTK_WINDOW (console), 700, 600);
-
-  vbox6 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox6);
-  gtk_container_add (GTK_CONTAINER (console), vbox6);
-
-  handlebox1 = gtk_handle_box_new ();
-  gtk_widget_show (handlebox1);
-  gtk_box_pack_start (GTK_BOX (vbox6), handlebox1, FALSE, TRUE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (handlebox1), 1);
-
-  menubar1 = gtk_menu_bar_new ();
-  gtk_widget_show (menubar1);
-  gtk_container_add (GTK_CONTAINER (handlebox1), menubar1);
-  gnome_app_fill_menu (GTK_MENU_SHELL (menubar1), menubar1_uiinfo,
-                       accel_group, FALSE, 0);
-
-  handlebox2 = gtk_handle_box_new ();
-  gtk_widget_show (handlebox2);
-  gtk_box_pack_start (GTK_BOX (vbox6), handlebox2, FALSE, TRUE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (handlebox2), 1);
-
-  toolbar2 = gtk_toolbar_new ();
-  gtk_widget_show (toolbar2);
-  gtk_container_add (GTK_CONTAINER (handlebox2), toolbar2);
-  gtk_container_set_border_width (GTK_CONTAINER (toolbar2), 1);
-  gtk_toolbar_set_style (GTK_TOOLBAR (toolbar2), GTK_TOOLBAR_BOTH);
-  tmp_toolbar_icon_size = gtk_toolbar_get_icon_size (GTK_TOOLBAR (toolbar2));
-
-  tmp_image = gtk_image_new_from_stock ("gtk-disconnect", tmp_toolbar_icon_size);
-  gtk_widget_show (tmp_image);
-  connect_button1 = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Connect"));
-  gtk_widget_show (connect_button1);
-  gtk_container_add (GTK_CONTAINER (toolbar2), connect_button1);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (connect_button1), tooltips, _("Connect to Director"), NULL);
-
-  tmp_image = gtk_image_new_from_stock ("gtk-execute", tmp_toolbar_icon_size);
-  gtk_widget_show (tmp_image);
-  run_button1 = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Run"));
-  gtk_widget_show (run_button1);
-  gtk_container_add (GTK_CONTAINER (toolbar2), run_button1);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (run_button1), tooltips, _("Run a Job"), NULL);
-
-  tmp_image = gtk_image_new_from_stock ("gnome-stock-text-bulleted-list", tmp_toolbar_icon_size);
-  gtk_widget_show (tmp_image);
-  dir_button = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Dir Status"));
-  gtk_widget_show (dir_button);
-  gtk_container_add (GTK_CONTAINER (toolbar2), dir_button);
-
-  tmp_image = gtk_image_new_from_stock ("gtk-revert-to-saved", tmp_toolbar_icon_size);
-  gtk_widget_show (tmp_image);
-  restore_button = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Restore"));
-  gtk_widget_show (restore_button);
-  gtk_container_add (GTK_CONTAINER (toolbar2), restore_button);
-
-  tmp_image = gtk_image_new_from_stock ("gtk-save-as", tmp_toolbar_icon_size);
-  gtk_widget_show (tmp_image);
-  label_button = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Label"));
-  gtk_widget_show (label_button);
-  gtk_container_add (GTK_CONTAINER (toolbar2), label_button);
-
-  tmp_image = gtk_image_new_from_stock ("gtk-find", tmp_toolbar_icon_size);
-  gtk_widget_show (tmp_image);
-  msgs_button = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Msgs"));
-  gtk_widget_show (msgs_button);
-  gtk_container_add (GTK_CONTAINER (toolbar2), msgs_button);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (msgs_button), tooltips, _("Display Messages"), NULL);
-
-  vbox7 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox7);
-  gtk_box_pack_start (GTK_BOX (vbox6), vbox7, TRUE, TRUE, 0);
-
-  scroll1 = gtk_scrolled_window_new (NULL, NULL);
-  gtk_widget_show (scroll1);
-  gtk_box_pack_start (GTK_BOX (vbox7), scroll1, TRUE, TRUE, 0);
-  GTK_WIDGET_UNSET_FLAGS (scroll1, GTK_CAN_FOCUS);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll1), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scroll1), GTK_SHADOW_IN);
-
-  text1 = gtk_text_view_new ();
-  gtk_widget_show (text1);
-  gtk_container_add (GTK_CONTAINER (scroll1), text1);
-  GTK_WIDGET_UNSET_FLAGS (text1, GTK_CAN_FOCUS);
-  gtk_text_view_set_editable (GTK_TEXT_VIEW (text1), FALSE);
-  gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text1), GTK_WRAP_WORD);
-
-  hbox18 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox18);
-  gtk_box_pack_start (GTK_BOX (vbox7), hbox18, FALSE, TRUE, 0);
-
-  label38 = gtk_label_new (_(" Command: "));
-  gtk_widget_show (label38);
-  gtk_box_pack_start (GTK_BOX (hbox18), label38, FALSE, TRUE, 0);
-  gtk_label_set_justify (GTK_LABEL (label38), GTK_JUSTIFY_CENTER);
-
-  entry1 = gtk_entry_new ();
-  gtk_widget_show (entry1);
-  gtk_box_pack_start (GTK_BOX (hbox18), entry1, TRUE, TRUE, 0);
-  GTK_WIDGET_SET_FLAGS (entry1, GTK_CAN_DEFAULT);
-  gtk_tooltips_set_tip (tooltips, entry1, _("Enter Commands Here"), NULL);
-  gtk_entry_set_max_length (GTK_ENTRY (entry1), 150);
-
-  hbox19 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox19);
-  gtk_box_pack_start (GTK_BOX (vbox7), hbox19, FALSE, FALSE, 0);
-
-  frame1 = gtk_frame_new (NULL);
-  gtk_widget_show (frame1);
-  gtk_box_pack_start (GTK_BOX (hbox19), frame1, FALSE, TRUE, 0);
-
-  label39 = gtk_label_new (_(" Status: "));
-  gtk_widget_show (label39);
-  gtk_container_add (GTK_CONTAINER (frame1), label39);
-  gtk_label_set_justify (GTK_LABEL (label39), GTK_JUSTIFY_CENTER);
-
-  frame2 = gtk_frame_new (NULL);
-  gtk_widget_show (frame2);
-  gtk_box_pack_start (GTK_BOX (hbox19), frame2, TRUE, TRUE, 0);
-
-  status1 = gtk_label_new (_("  "));
-  gtk_widget_show (status1);
-  gtk_container_add (GTK_CONTAINER (frame2), status1);
-  gtk_misc_set_alignment (GTK_MISC (status1), 0, 0.5);
-
-  g_signal_connect ((gpointer) console, "delete_event",
-                    G_CALLBACK (on_console_delete_event),
-                    NULL);
-  g_signal_connect ((gpointer) connect_button1, "clicked",
-                    G_CALLBACK (on_connect_button_clicked),
-                    NULL);
-  g_signal_connect ((gpointer) run_button1, "clicked",
-                    G_CALLBACK (on_run_button_clicked),
-                    NULL);
-  g_signal_connect ((gpointer) dir_button, "clicked",
-                    G_CALLBACK (on_dir_button_clicked),
-                    NULL);
-  g_signal_connect ((gpointer) restore_button, "clicked",
-                    G_CALLBACK (on_restore_button_clicked),
-                    NULL);
-  g_signal_connect ((gpointer) label_button, "clicked",
-                    G_CALLBACK (on_label_button_clicked),
-                    NULL);
-  g_signal_connect ((gpointer) msgs_button, "clicked",
-                    G_CALLBACK (on_msgs_button_clicked),
-                    NULL);
-  g_signal_connect ((gpointer) entry1, "key_press_event",
-                    G_CALLBACK (on_entry1_key_press_event),
-                    NULL);
-  g_signal_connect ((gpointer) entry1, "key_release_event",
-                    G_CALLBACK (on_entry1_key_release_event),
-                    NULL);
-
-  /* Store pointers to all widgets, for use by lookup_widget(). */
-  GLADE_HOOKUP_OBJECT_NO_REF (console, console, "console");
-  GLADE_HOOKUP_OBJECT (console, vbox6, "vbox6");
-  GLADE_HOOKUP_OBJECT (console, handlebox1, "handlebox1");
-  GLADE_HOOKUP_OBJECT (console, menubar1, "menubar1");
-  GLADE_HOOKUP_OBJECT (console, menubar1_uiinfo[0].widget, "file1");
-  GLADE_HOOKUP_OBJECT (console, file1_menu_uiinfo[0].widget, "connect1");
-  GLADE_HOOKUP_OBJECT (console, file1_menu_uiinfo[1].widget, "disconnect1");
-  GLADE_HOOKUP_OBJECT (console, file1_menu_uiinfo[2].widget, "menuitem4");
-  GLADE_HOOKUP_OBJECT (console, file1_menu_uiinfo[3].widget, "exit1");
-  GLADE_HOOKUP_OBJECT (console, menubar1_uiinfo[1].widget, "edit1");
-  GLADE_HOOKUP_OBJECT (console, edit1_menu_uiinfo[0].widget, "cut1");
-  GLADE_HOOKUP_OBJECT (console, edit1_menu_uiinfo[1].widget, "copy1");
-  GLADE_HOOKUP_OBJECT (console, edit1_menu_uiinfo[2].widget, "paste1");
-  GLADE_HOOKUP_OBJECT (console, edit1_menu_uiinfo[3].widget, "clear1");
-  GLADE_HOOKUP_OBJECT (console, edit1_menu_uiinfo[4].widget, "separator1");
-  GLADE_HOOKUP_OBJECT (console, menubar1_uiinfo[2].widget, "item1");
-  GLADE_HOOKUP_OBJECT (console, item1_menu_uiinfo[0].widget, "msgs");
-  GLADE_HOOKUP_OBJECT (console, menubar1_uiinfo[3].widget, "settings1");
-  GLADE_HOOKUP_OBJECT (console, settings1_menu_uiinfo[0].widget, "preferences1");
-  GLADE_HOOKUP_OBJECT (console, menubar1_uiinfo[4].widget, "help1");
-  GLADE_HOOKUP_OBJECT (console, help1_menu_uiinfo[0].widget, "about1");
-  GLADE_HOOKUP_OBJECT (console, handlebox2, "handlebox2");
-  GLADE_HOOKUP_OBJECT (console, toolbar2, "toolbar2");
-  GLADE_HOOKUP_OBJECT (console, connect_button1, "connect_button1");
-  GLADE_HOOKUP_OBJECT (console, run_button1, "run_button1");
-  GLADE_HOOKUP_OBJECT (console, dir_button, "dir_button");
-  GLADE_HOOKUP_OBJECT (console, restore_button, "restore_button");
-  GLADE_HOOKUP_OBJECT (console, label_button, "label_button");
-  GLADE_HOOKUP_OBJECT (console, msgs_button, "msgs_button");
-  GLADE_HOOKUP_OBJECT (console, vbox7, "vbox7");
-  GLADE_HOOKUP_OBJECT (console, scroll1, "scroll1");
-  GLADE_HOOKUP_OBJECT (console, text1, "text1");
-  GLADE_HOOKUP_OBJECT (console, hbox18, "hbox18");
-  GLADE_HOOKUP_OBJECT (console, label38, "label38");
-  GLADE_HOOKUP_OBJECT (console, entry1, "entry1");
-  GLADE_HOOKUP_OBJECT (console, hbox19, "hbox19");
-  GLADE_HOOKUP_OBJECT (console, frame1, "frame1");
-  GLADE_HOOKUP_OBJECT (console, label39, "label39");
-  GLADE_HOOKUP_OBJECT (console, frame2, "frame2");
-  GLADE_HOOKUP_OBJECT (console, status1, "status1");
-  GLADE_HOOKUP_OBJECT_NO_REF (console, tooltips, "tooltips");
-
-  gtk_widget_grab_focus (entry1);
-  gtk_widget_grab_default (entry1);
-  gtk_window_add_accel_group (GTK_WINDOW (console), accel_group);
-
-  return console;
-}
-
-GtkWidget*
-create_about1 (void)
-{
-  GtkWidget *about1;
-  GtkWidget *dialog_vbox5;
-  GtkWidget *vbox8;
-  GtkWidget *vbox9;
-  GtkWidget *about_head;
-  GtkWidget *hseparator1;
-  GtkWidget *copyright;
-  GtkWidget *authors;
-  GtkWidget *theme;
-  GtkWidget *dialog_action_area5;
-  GtkWidget *hbox20;
-  GtkWidget *label44;
-  GtkWidget *about_button;
-
-  about1 = gtk_dialog_new ();
-  gtk_window_set_title (GTK_WINDOW (about1), _("About Bacula Console"));
-  gtk_window_set_modal (GTK_WINDOW (about1), TRUE);
-  gtk_window_set_type_hint (GTK_WINDOW (about1), GDK_WINDOW_TYPE_HINT_DIALOG);
-
-  dialog_vbox5 = GTK_DIALOG (about1)->vbox;
-  gtk_widget_show (dialog_vbox5);
-
-  vbox8 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox8);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox5), vbox8, TRUE, TRUE, 0);
-
-  vbox9 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox9);
-  gtk_box_pack_start (GTK_BOX (vbox8), vbox9, TRUE, TRUE, 0);
-
-  about_head = gtk_label_new (_("Bacula Console\n"));
-  gtk_widget_show (about_head);
-  gtk_box_pack_start (GTK_BOX (vbox9), about_head, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (about_head), GTK_JUSTIFY_CENTER);
-
-  hseparator1 = gtk_hseparator_new ();
-  gtk_widget_show (hseparator1);
-  gtk_box_pack_start (GTK_BOX (vbox9), hseparator1, FALSE, FALSE, 0);
-
-  copyright = gtk_label_new (_("Copyright (c) 2000 - 2004, Kern Sibbald and John Walker"));
-  gtk_widget_show (copyright);
-  gtk_box_pack_start (GTK_BOX (vbox9), copyright, TRUE, FALSE, 0);
-  gtk_misc_set_alignment (GTK_MISC (copyright), 0.1, 0.5);
-
-  authors = gtk_label_new (_("Authors: Kern Sibbald and John Walker"));
-  gtk_widget_show (authors);
-  gtk_box_pack_start (GTK_BOX (vbox9), authors, TRUE, FALSE, 0);
-  gtk_misc_set_alignment (GTK_MISC (authors), 0.0400001, 0.5);
-
-  theme = gtk_label_new (_("It comes by night and sucks the essence from your computers"));
-  gtk_widget_show (theme);
-  gtk_box_pack_start (GTK_BOX (vbox9), theme, TRUE, FALSE, 0);
-  gtk_misc_set_alignment (GTK_MISC (theme), 0.15, 0.5);
-
-  dialog_action_area5 = GTK_DIALOG (about1)->action_area;
-  gtk_widget_show (dialog_action_area5);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area5), GTK_BUTTONBOX_END);
-
-  hbox20 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox20);
-  gtk_container_add (GTK_CONTAINER (dialog_action_area5), hbox20);
-
-  label44 = gtk_label_new ("");
-  gtk_widget_show (label44);
-  gtk_box_pack_start (GTK_BOX (hbox20), label44, TRUE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label44), GTK_JUSTIFY_CENTER);
-
-  about_button = gtk_button_new_from_stock ("gtk-ok");
-  gtk_widget_show (about_button);
-  gtk_box_pack_start (GTK_BOX (hbox20), about_button, FALSE, FALSE, 0);
-  gtk_widget_set_size_request (about_button, 400, 640);
-  gtk_container_set_border_width (GTK_CONTAINER (about_button), 1);
-  GTK_WIDGET_SET_FLAGS (about_button, GTK_CAN_DEFAULT);
-
-  g_signal_connect ((gpointer) about_button, "clicked",
-                    G_CALLBACK (on_about_button_clicked),
-                    NULL);
-
-  /* Store pointers to all widgets, for use by lookup_widget(). */
-  GLADE_HOOKUP_OBJECT_NO_REF (about1, about1, "about1");
-  GLADE_HOOKUP_OBJECT_NO_REF (about1, dialog_vbox5, "dialog_vbox5");
-  GLADE_HOOKUP_OBJECT (about1, vbox8, "vbox8");
-  GLADE_HOOKUP_OBJECT (about1, vbox9, "vbox9");
-  GLADE_HOOKUP_OBJECT (about1, about_head, "about_head");
-  GLADE_HOOKUP_OBJECT (about1, hseparator1, "hseparator1");
-  GLADE_HOOKUP_OBJECT (about1, copyright, "copyright");
-  GLADE_HOOKUP_OBJECT (about1, authors, "authors");
-  GLADE_HOOKUP_OBJECT (about1, theme, "theme");
-  GLADE_HOOKUP_OBJECT_NO_REF (about1, dialog_action_area5, "dialog_action_area5");
-  GLADE_HOOKUP_OBJECT (about1, hbox20, "hbox20");
-  GLADE_HOOKUP_OBJECT (about1, label44, "label44");
-  GLADE_HOOKUP_OBJECT (about1, about_button, "about_button");
-
-  return about1;
-}
-
-GtkWidget*
-create_SelectDirectorDialog (void)
-{
-  GtkWidget *SelectDirectorDialog;
-  GtkWidget *dialog_vbox6;
-  GtkWidget *vbox10;
-  GtkWidget *label48;
-  GtkWidget *label47;
-  GtkWidget *combo1;
-  GList *combo1_items = NULL;
-  GtkWidget *dirselect;
-  GtkWidget *dialog_action_area2;
-  GtkWidget *hbox21;
-  GtkWidget *button11;
-  GtkWidget *label46;
-  GtkWidget *button13;
-
-  SelectDirectorDialog = gtk_dialog_new ();
-  gtk_window_set_title (GTK_WINDOW (SelectDirectorDialog), _("Select Director"));
-  gtk_window_set_modal (GTK_WINDOW (SelectDirectorDialog), TRUE);
-  gtk_window_set_type_hint (GTK_WINDOW (SelectDirectorDialog), GDK_WINDOW_TYPE_HINT_DIALOG);
-
-  dialog_vbox6 = GTK_DIALOG (SelectDirectorDialog)->vbox;
-  gtk_widget_show (dialog_vbox6);
-
-  vbox10 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox10);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox6), vbox10, TRUE, TRUE, 0);
-
-  label48 = gtk_label_new ("");
-  gtk_widget_show (label48);
-  gtk_box_pack_start (GTK_BOX (vbox10), label48, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label48), GTK_JUSTIFY_CENTER);
-  gtk_misc_set_alignment (GTK_MISC (label48), 0.48, 0.46);
-
-  label47 = gtk_label_new (_("Select Director"));
-  gtk_widget_show (label47);
-  gtk_box_pack_start (GTK_BOX (vbox10), label47, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label47), GTK_JUSTIFY_CENTER);
-
-  combo1 = gtk_combo_new ();
-  g_object_set_data (G_OBJECT (GTK_COMBO (combo1)->popwin),
-                     "GladeParentKey", combo1);
-  gtk_widget_show (combo1);
-  gtk_box_pack_start (GTK_BOX (vbox10), combo1, FALSE, FALSE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (combo1), 6);
-  combo1_items = g_list_append (combo1_items, (gpointer) "");
-  gtk_combo_set_popdown_strings (GTK_COMBO (combo1), combo1_items);
-  g_list_free (combo1_items);
-
-  dirselect = GTK_COMBO (combo1)->entry;
-  gtk_widget_show (dirselect);
-
-  dialog_action_area2 = GTK_DIALOG (SelectDirectorDialog)->action_area;
-  gtk_widget_show (dialog_action_area2);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area2), GTK_BUTTONBOX_END);
-
-  hbox21 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox21);
-  gtk_container_add (GTK_CONTAINER (dialog_action_area2), hbox21);
-
-  button11 = gtk_button_new_from_stock ("gtk-ok");
-  gtk_widget_show (button11);
-  gtk_box_pack_start (GTK_BOX (hbox21), button11, FALSE, FALSE, 0);
-
-  label46 = gtk_label_new (_("         "));
-  gtk_widget_show (label46);
-  gtk_box_pack_start (GTK_BOX (hbox21), label46, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label46), GTK_JUSTIFY_CENTER);
-  gtk_misc_set_padding (GTK_MISC (label46), 2, 0);
-
-  button13 = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_widget_show (button13);
-  gtk_box_pack_start (GTK_BOX (hbox21), button13, FALSE, FALSE, 0);
-
-  g_signal_connect ((gpointer) button11, "clicked",
-                    G_CALLBACK (on_select_director_OK_clicked),
-                    NULL);
-  g_signal_connect ((gpointer) button13, "clicked",
-                    G_CALLBACK (on_select_director_cancel_clicked),
-                    NULL);
-
-  /* Store pointers to all widgets, for use by lookup_widget(). */
-  GLADE_HOOKUP_OBJECT_NO_REF (SelectDirectorDialog, SelectDirectorDialog, "SelectDirectorDialog");
-  GLADE_HOOKUP_OBJECT_NO_REF (SelectDirectorDialog, dialog_vbox6, "dialog_vbox6");
-  GLADE_HOOKUP_OBJECT (SelectDirectorDialog, vbox10, "vbox10");
-  GLADE_HOOKUP_OBJECT (SelectDirectorDialog, label48, "label48");
-  GLADE_HOOKUP_OBJECT (SelectDirectorDialog, label47, "label47");
-  GLADE_HOOKUP_OBJECT (SelectDirectorDialog, combo1, "combo1");
-  GLADE_HOOKUP_OBJECT (SelectDirectorDialog, dirselect, "dirselect");
-  GLADE_HOOKUP_OBJECT_NO_REF (SelectDirectorDialog, dialog_action_area2, "dialog_action_area2");
-  GLADE_HOOKUP_OBJECT (SelectDirectorDialog, hbox21, "hbox21");
-  GLADE_HOOKUP_OBJECT (SelectDirectorDialog, button11, "button11");
-  GLADE_HOOKUP_OBJECT (SelectDirectorDialog, label46, "label46");
-  GLADE_HOOKUP_OBJECT (SelectDirectorDialog, button13, "button13");
-
-  return SelectDirectorDialog;
-}
-
-GtkWidget*
-create_RunDialog (void)
-{
-  GtkWidget *RunDialog;
-  GtkWidget *dialog_vbox7;
-  GtkWidget *vbox11;
-  GtkWidget *vbox12;
-  GtkWidget *label62;
-  GtkWidget *alignment1;
-  GtkWidget *hbox28;
-  GtkWidget *hbox29;
-  GtkWidget *label63;
-  GtkWidget *combo_job;
-  GList *combo_job_items = NULL;
-  GtkWidget *entry_job;
-  GtkWidget *label64;
-  GtkWidget *combo_type;
-  GList *combo_type_items = NULL;
-  GtkWidget *entry_type;
-  GtkWidget *label114;
-  GtkWidget *hbox30;
-  GtkWidget *label66;
-  GtkWidget *combo_client;
-  GList *combo_client_items = NULL;
-  GtkWidget *entry_client;
-  GtkWidget *label67;
-  GtkWidget *hbox31;
-  GtkWidget *label68;
-  GtkWidget *combo_fileset;
-  GList *combo_fileset_items = NULL;
-  GtkWidget *entry_fileset;
-  GtkWidget *label156;
-  GtkWidget *label155;
-  GtkObject *spinbutton1_adj;
-  GtkWidget *spinbutton1;
-  GtkWidget *hbox32;
-  GtkWidget *label70;
-  GtkWidget *combo_level;
-  GList *combo_level_items = NULL;
-  GtkWidget *entry_level;
-  GtkWidget *label71;
-  GtkWidget *hbox33;
-  GtkWidget *label72;
-  GtkWidget *combo_pool;
-  GList *combo_pool_items = NULL;
-  GtkWidget *entry_pool;
-  GtkWidget *label73;
-  GtkWidget *hbox39;
-  GtkWidget *label96;
-  GtkWidget *combo_storage;
-  GList *combo_storage_items = NULL;
-  GtkWidget *entry_storage;
-  GtkWidget *label97;
-  GtkWidget *hbox40;
-  GtkWidget *label98;
-  GtkWidget *combo_messages;
-  GList *combo_messages_items = NULL;
-  GtkWidget *entry_messages;
-  GtkWidget *label99;
-  GtkWidget *hbox34;
-  GtkWidget *label77;
-  GtkWidget *entry_where;
-  GtkWidget *label78;
-  GtkWidget *hbox41;
-  GtkWidget *label100;
-  GtkWidget *entry_when;
-  GtkWidget *label101;
-  GtkWidget *hbox60;
-  GtkWidget *label153;
-  GtkWidget *entry28;
-  GtkWidget *label154;
-  GtkWidget *label84;
-  GtkWidget *dialog_action_area6;
-  GtkWidget *hbuttonbox1;
-  GtkWidget *run_ok;
-  GtkWidget *run_cancel;
-
-  RunDialog = gtk_dialog_new ();
-  gtk_window_set_title (GTK_WINDOW (RunDialog), _("Run a Job"));
-  gtk_window_set_type_hint (GTK_WINDOW (RunDialog), GDK_WINDOW_TYPE_HINT_DIALOG);
-
-  dialog_vbox7 = GTK_DIALOG (RunDialog)->vbox;
-  gtk_widget_show (dialog_vbox7);
-
-  vbox11 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox11);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox7), vbox11, TRUE, TRUE, 0);
-
-  vbox12 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox12);
-  gtk_box_pack_start (GTK_BOX (vbox11), vbox12, TRUE, TRUE, 0);
-
-  label62 = gtk_label_new (_("Run a Job"));
-  gtk_widget_show (label62);
-  gtk_box_pack_start (GTK_BOX (vbox12), label62, FALSE, FALSE, 2);
-  gtk_label_set_justify (GTK_LABEL (label62), GTK_JUSTIFY_CENTER);
-  gtk_misc_set_padding (GTK_MISC (label62), 0, 9);
-
-  alignment1 = gtk_alignment_new (0.5, 0.5, 1, 1);
-  gtk_widget_show (alignment1);
-  gtk_box_pack_start (GTK_BOX (vbox12), alignment1, FALSE, FALSE, 2);
-
-  hbox28 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox28);
-  gtk_container_add (GTK_CONTAINER (alignment1), hbox28);
-  gtk_container_set_border_width (GTK_CONTAINER (hbox28), 1);
-
-  hbox29 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox29);
-  gtk_box_pack_start (GTK_BOX (hbox28), hbox29, TRUE, TRUE, 0);
-
-  label63 = gtk_label_new (_("Job:"));
-  gtk_widget_show (label63);
-  gtk_box_pack_start (GTK_BOX (hbox29), label63, FALSE, FALSE, 0);
-  gtk_widget_set_size_request (label63, 85, 16);
-  gtk_label_set_justify (GTK_LABEL (label63), GTK_JUSTIFY_RIGHT);
-
-  combo_job = gtk_combo_new ();
-  g_object_set_data (G_OBJECT (GTK_COMBO (combo_job)->popwin),
-                     "GladeParentKey", combo_job);
-  gtk_widget_show (combo_job);
-  gtk_box_pack_start (GTK_BOX (hbox29), combo_job, TRUE, TRUE, 1);
-  gtk_widget_set_size_request (combo_job, 198, -1);
-  gtk_combo_set_value_in_list (GTK_COMBO (combo_job), TRUE, FALSE);
-  combo_job_items = g_list_append (combo_job_items, (gpointer) "");
-  gtk_combo_set_popdown_strings (GTK_COMBO (combo_job), combo_job_items);
-  g_list_free (combo_job_items);
-
-  entry_job = GTK_COMBO (combo_job)->entry;
-  gtk_widget_show (entry_job);
-  gtk_editable_set_editable (GTK_EDITABLE (entry_job), FALSE);
-
-  label64 = gtk_label_new (_("   Type:"));
-  gtk_widget_show (label64);
-  gtk_box_pack_start (GTK_BOX (hbox29), label64, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label64), GTK_JUSTIFY_CENTER);
-
-  combo_type = gtk_combo_new ();
-  g_object_set_data (G_OBJECT (GTK_COMBO (combo_type)->popwin),
-                     "GladeParentKey", combo_type);
-  gtk_widget_show (combo_type);
-  gtk_box_pack_start (GTK_BOX (hbox29), combo_type, FALSE, FALSE, 0);
-  gtk_widget_set_size_request (combo_type, 141, 24);
-  gtk_combo_set_value_in_list (GTK_COMBO (combo_type), TRUE, FALSE);
-  combo_type_items = g_list_append (combo_type_items, (gpointer) "");
-  gtk_combo_set_popdown_strings (GTK_COMBO (combo_type), combo_type_items);
-  g_list_free (combo_type_items);
-
-  entry_type = GTK_COMBO (combo_type)->entry;
-  gtk_widget_show (entry_type);
-  gtk_editable_set_editable (GTK_EDITABLE (entry_type), FALSE);
-
-  label114 = gtk_label_new (_(" "));
-  gtk_widget_show (label114);
-  gtk_box_pack_start (GTK_BOX (hbox28), label114, FALSE, FALSE, 30);
-
-  hbox30 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox30);
-  gtk_box_pack_start (GTK_BOX (vbox12), hbox30, TRUE, TRUE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (hbox30), 1);
-
-  label66 = gtk_label_new (_("Client:"));
-  gtk_widget_show (label66);
-  gtk_box_pack_start (GTK_BOX (hbox30), label66, FALSE, FALSE, 0);
-  gtk_widget_set_size_request (label66, 85, 16);
-  gtk_label_set_justify (GTK_LABEL (label66), GTK_JUSTIFY_RIGHT);
-
-  combo_client = gtk_combo_new ();
-  g_object_set_data (G_OBJECT (GTK_COMBO (combo_client)->popwin),
-                     "GladeParentKey", combo_client);
-  gtk_widget_show (combo_client);
-  gtk_box_pack_start (GTK_BOX (hbox30), combo_client, TRUE, TRUE, 1);
-  gtk_combo_set_value_in_list (GTK_COMBO (combo_client), TRUE, FALSE);
-  combo_client_items = g_list_append (combo_client_items, (gpointer) "");
-  gtk_combo_set_popdown_strings (GTK_COMBO (combo_client), combo_client_items);
-  g_list_free (combo_client_items);
-
-  entry_client = GTK_COMBO (combo_client)->entry;
-  gtk_widget_show (entry_client);
-  gtk_editable_set_editable (GTK_EDITABLE (entry_client), FALSE);
-
-  label67 = gtk_label_new (_(" "));
-  gtk_widget_show (label67);
-  gtk_box_pack_start (GTK_BOX (hbox30), label67, FALSE, FALSE, 123);
-  gtk_label_set_justify (GTK_LABEL (label67), GTK_JUSTIFY_CENTER);
-
-  hbox31 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox31);
-  gtk_box_pack_start (GTK_BOX (vbox12), hbox31, TRUE, TRUE, 2);
-  gtk_container_set_border_width (GTK_CONTAINER (hbox31), 1);
-
-  label68 = gtk_label_new (_("FileSet: "));
-  gtk_widget_show (label68);
-  gtk_box_pack_start (GTK_BOX (hbox31), label68, FALSE, FALSE, 0);
-  gtk_widget_set_size_request (label68, 85, 16);
-  gtk_label_set_justify (GTK_LABEL (label68), GTK_JUSTIFY_RIGHT);
-
-  combo_fileset = gtk_combo_new ();
-  g_object_set_data (G_OBJECT (GTK_COMBO (combo_fileset)->popwin),
-                     "GladeParentKey", combo_fileset);
-  gtk_widget_show (combo_fileset);
-  gtk_box_pack_start (GTK_BOX (hbox31), combo_fileset, TRUE, TRUE, 0);
-  gtk_combo_set_value_in_list (GTK_COMBO (combo_fileset), TRUE, FALSE);
-  combo_fileset_items = g_list_append (combo_fileset_items, (gpointer) "");
-  gtk_combo_set_popdown_strings (GTK_COMBO (combo_fileset), combo_fileset_items);
-  g_list_free (combo_fileset_items);
-
-  entry_fileset = GTK_COMBO (combo_fileset)->entry;
-  gtk_widget_show (entry_fileset);
-  gtk_editable_set_editable (GTK_EDITABLE (entry_fileset), FALSE);
-
-  label156 = gtk_label_new ("");
-  gtk_widget_show (label156);
-  gtk_box_pack_start (GTK_BOX (hbox31), label156, FALSE, FALSE, 0);
-  gtk_widget_set_size_request (label156, 13, 16);
-
-  label155 = gtk_label_new (_("Priority:"));
-  gtk_widget_show (label155);
-  gtk_box_pack_start (GTK_BOX (hbox31), label155, TRUE, TRUE, 0);
-  gtk_widget_set_size_request (label155, 103, -1);
-
-  spinbutton1_adj = gtk_adjustment_new (10, 0, 100, 1, 10, 10);
-  spinbutton1 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton1_adj), 1, 0);
-  gtk_widget_show (spinbutton1);
-  gtk_box_pack_start (GTK_BOX (hbox31), spinbutton1, TRUE, TRUE, 4);
-  gtk_widget_set_size_request (spinbutton1, 85, 24);
-
-  hbox32 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox32);
-  gtk_box_pack_start (GTK_BOX (vbox12), hbox32, TRUE, TRUE, 2);
-  gtk_container_set_border_width (GTK_CONTAINER (hbox32), 1);
-
-  label70 = gtk_label_new (_("Level:"));
-  gtk_widget_show (label70);
-  gtk_box_pack_start (GTK_BOX (hbox32), label70, FALSE, FALSE, 0);
-  gtk_widget_set_size_request (label70, 85, 16);
-  gtk_label_set_justify (GTK_LABEL (label70), GTK_JUSTIFY_RIGHT);
-
-  combo_level = gtk_combo_new ();
-  g_object_set_data (G_OBJECT (GTK_COMBO (combo_level)->popwin),
-                     "GladeParentKey", combo_level);
-  gtk_widget_show (combo_level);
-  gtk_box_pack_start (GTK_BOX (hbox32), combo_level, TRUE, TRUE, 0);
-  gtk_combo_set_value_in_list (GTK_COMBO (combo_level), TRUE, FALSE);
-  combo_level_items = g_list_append (combo_level_items, (gpointer) "");
-  combo_level_items = g_list_append (combo_level_items, (gpointer) "");
-  gtk_combo_set_popdown_strings (GTK_COMBO (combo_level), combo_level_items);
-  g_list_free (combo_level_items);
-
-  entry_level = GTK_COMBO (combo_level)->entry;
-  gtk_widget_show (entry_level);
-  gtk_editable_set_editable (GTK_EDITABLE (entry_level), FALSE);
-
-  label71 = gtk_label_new (_("             "));
-  gtk_widget_show (label71);
-  gtk_box_pack_start (GTK_BOX (hbox32), label71, FALSE, FALSE, 100);
-  gtk_label_set_justify (GTK_LABEL (label71), GTK_JUSTIFY_CENTER);
-
-  hbox33 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox33);
-  gtk_box_pack_start (GTK_BOX (vbox12), hbox33, TRUE, TRUE, 2);
-  gtk_container_set_border_width (GTK_CONTAINER (hbox33), 1);
-
-  label72 = gtk_label_new (_("Pool:"));
-  gtk_widget_show (label72);
-  gtk_box_pack_start (GTK_BOX (hbox33), label72, FALSE, FALSE, 0);
-  gtk_widget_set_size_request (label72, 85, 16);
-  gtk_label_set_justify (GTK_LABEL (label72), GTK_JUSTIFY_CENTER);
-
-  combo_pool = gtk_combo_new ();
-  g_object_set_data (G_OBJECT (GTK_COMBO (combo_pool)->popwin),
-                     "GladeParentKey", combo_pool);
-  gtk_widget_show (combo_pool);
-  gtk_box_pack_start (GTK_BOX (hbox33), combo_pool, TRUE, TRUE, 0);
-  gtk_combo_set_value_in_list (GTK_COMBO (combo_pool), TRUE, FALSE);
-  combo_pool_items = g_list_append (combo_pool_items, (gpointer) "");
-  combo_pool_items = g_list_append (combo_pool_items, (gpointer) "");
-  gtk_combo_set_popdown_strings (GTK_COMBO (combo_pool), combo_pool_items);
-  g_list_free (combo_pool_items);
-
-  entry_pool = GTK_COMBO (combo_pool)->entry;
-  gtk_widget_show (entry_pool);
-  gtk_editable_set_editable (GTK_EDITABLE (entry_pool), FALSE);
-
-  label73 = gtk_label_new (_("   "));
-  gtk_widget_show (label73);
-  gtk_box_pack_start (GTK_BOX (hbox33), label73, FALSE, FALSE, 120);
-  gtk_label_set_justify (GTK_LABEL (label73), GTK_JUSTIFY_CENTER);
-
-  hbox39 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox39);
-  gtk_box_pack_start (GTK_BOX (vbox12), hbox39, TRUE, TRUE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (hbox39), 1);
-
-  label96 = gtk_label_new (_("Storage:"));
-  gtk_widget_show (label96);
-  gtk_box_pack_start (GTK_BOX (hbox39), label96, FALSE, FALSE, 0);
-  gtk_widget_set_size_request (label96, 85, 16);
-  gtk_label_set_justify (GTK_LABEL (label96), GTK_JUSTIFY_CENTER);
-
-  combo_storage = gtk_combo_new ();
-  g_object_set_data (G_OBJECT (GTK_COMBO (combo_storage)->popwin),
-                     "GladeParentKey", combo_storage);
-  gtk_widget_show (combo_storage);
-  gtk_box_pack_start (GTK_BOX (hbox39), combo_storage, TRUE, TRUE, 0);
-  gtk_combo_set_value_in_list (GTK_COMBO (combo_storage), TRUE, FALSE);
-  combo_storage_items = g_list_append (combo_storage_items, (gpointer) "");
-  combo_storage_items = g_list_append (combo_storage_items, (gpointer) "");
-  gtk_combo_set_popdown_strings (GTK_COMBO (combo_storage), combo_storage_items);
-  g_list_free (combo_storage_items);
-
-  entry_storage = GTK_COMBO (combo_storage)->entry;
-  gtk_widget_show (entry_storage);
-  gtk_editable_set_editable (GTK_EDITABLE (entry_storage), FALSE);
-
-  label97 = gtk_label_new (_("   "));
-  gtk_widget_show (label97);
-  gtk_box_pack_start (GTK_BOX (hbox39), label97, FALSE, FALSE, 120);
-  gtk_label_set_justify (GTK_LABEL (label97), GTK_JUSTIFY_CENTER);
-
-  hbox40 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox40);
-  gtk_box_pack_start (GTK_BOX (vbox12), hbox40, TRUE, TRUE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (hbox40), 1);
-
-  label98 = gtk_label_new (_("Messages:"));
-  gtk_widget_show (label98);
-  gtk_box_pack_start (GTK_BOX (hbox40), label98, FALSE, FALSE, 0);
-  gtk_widget_set_size_request (label98, 85, 16);
-  gtk_label_set_justify (GTK_LABEL (label98), GTK_JUSTIFY_CENTER);
-
-  combo_messages = gtk_combo_new ();
-  g_object_set_data (G_OBJECT (GTK_COMBO (combo_messages)->popwin),
-                     "GladeParentKey", combo_messages);
-  gtk_widget_show (combo_messages);
-  gtk_box_pack_start (GTK_BOX (hbox40), combo_messages, TRUE, TRUE, 0);
-  gtk_combo_set_value_in_list (GTK_COMBO (combo_messages), TRUE, FALSE);
-  combo_messages_items = g_list_append (combo_messages_items, (gpointer) "");
-  gtk_combo_set_popdown_strings (GTK_COMBO (combo_messages), combo_messages_items);
-  g_list_free (combo_messages_items);
-
-  entry_messages = GTK_COMBO (combo_messages)->entry;
-  gtk_widget_show (entry_messages);
-  gtk_editable_set_editable (GTK_EDITABLE (entry_messages), FALSE);
-
-  label99 = gtk_label_new (_("   "));
-  gtk_widget_show (label99);
-  gtk_box_pack_start (GTK_BOX (hbox40), label99, FALSE, FALSE, 120);
-  gtk_label_set_justify (GTK_LABEL (label99), GTK_JUSTIFY_CENTER);
-
-  hbox34 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox34);
-  gtk_box_pack_start (GTK_BOX (vbox12), hbox34, TRUE, TRUE, 2);
-  gtk_container_set_border_width (GTK_CONTAINER (hbox34), 1);
-
-  label77 = gtk_label_new (_("Where: "));
-  gtk_widget_show (label77);
-  gtk_box_pack_start (GTK_BOX (hbox34), label77, FALSE, FALSE, 0);
-  gtk_widget_set_size_request (label77, 85, 16);
-  gtk_label_set_justify (GTK_LABEL (label77), GTK_JUSTIFY_CENTER);
-
-  entry_where = gtk_entry_new ();
-  gtk_widget_show (entry_where);
-  gtk_box_pack_start (GTK_BOX (hbox34), entry_where, TRUE, TRUE, 0);
-
-  label78 = gtk_label_new (_("   "));
-  gtk_widget_show (label78);
-  gtk_box_pack_start (GTK_BOX (hbox34), label78, FALSE, FALSE, 120);
-  gtk_label_set_justify (GTK_LABEL (label78), GTK_JUSTIFY_CENTER);
-
-  hbox41 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox41);
-  gtk_box_pack_start (GTK_BOX (vbox11), hbox41, TRUE, TRUE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (hbox41), 1);
-
-  label100 = gtk_label_new (_("When:"));
-  gtk_widget_show (label100);
-  gtk_box_pack_start (GTK_BOX (hbox41), label100, FALSE, FALSE, 0);
-  gtk_widget_set_size_request (label100, 85, 16);
-  gtk_label_set_justify (GTK_LABEL (label100), GTK_JUSTIFY_CENTER);
-
-  entry_when = gtk_entry_new ();
-  gtk_widget_show (entry_when);
-  gtk_box_pack_start (GTK_BOX (hbox41), entry_when, TRUE, TRUE, 0);
-
-  label101 = gtk_label_new (_("   "));
-  gtk_widget_show (label101);
-  gtk_box_pack_start (GTK_BOX (hbox41), label101, FALSE, FALSE, 120);
-  gtk_label_set_justify (GTK_LABEL (label101), GTK_JUSTIFY_CENTER);
-
-  hbox60 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox60);
-  gtk_box_pack_start (GTK_BOX (vbox11), hbox60, TRUE, TRUE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (hbox60), 1);
-
-  label153 = gtk_label_new (_("Bootstrap:"));
-  gtk_widget_show (label153);
-  gtk_box_pack_start (GTK_BOX (hbox60), label153, FALSE, FALSE, 0);
-  gtk_widget_set_size_request (label153, 85, 16);
-  gtk_label_set_justify (GTK_LABEL (label153), GTK_JUSTIFY_CENTER);
-
-  entry28 = gtk_entry_new ();
-  gtk_widget_show (entry28);
-  gtk_box_pack_start (GTK_BOX (hbox60), entry28, TRUE, TRUE, 0);
-
-  label154 = gtk_label_new (_("   "));
-  gtk_widget_show (label154);
-  gtk_box_pack_start (GTK_BOX (hbox60), label154, FALSE, FALSE, 36);
-  gtk_label_set_justify (GTK_LABEL (label154), GTK_JUSTIFY_CENTER);
-
-  label84 = gtk_label_new (_("   "));
-  gtk_widget_show (label84);
-  gtk_box_pack_start (GTK_BOX (vbox11), label84, FALSE, FALSE, 0);
-  gtk_widget_set_size_request (label84, 12, 19);
-  gtk_label_set_justify (GTK_LABEL (label84), GTK_JUSTIFY_CENTER);
-
-  dialog_action_area6 = GTK_DIALOG (RunDialog)->action_area;
-  gtk_widget_show (dialog_action_area6);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area6), GTK_BUTTONBOX_END);
-
-  hbuttonbox1 = gtk_hbutton_box_new ();
-  gtk_widget_show (hbuttonbox1);
-  gtk_container_add (GTK_CONTAINER (dialog_action_area6), hbuttonbox1);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox1), GTK_BUTTONBOX_END);
-  gtk_box_set_spacing (GTK_BOX (hbuttonbox1), 8);
-
-  run_ok = gtk_button_new_from_stock ("gtk-ok");
-  gtk_widget_show (run_ok);
-  gtk_container_add (GTK_CONTAINER (hbuttonbox1), run_ok);
-  GTK_WIDGET_SET_FLAGS (run_ok, GTK_CAN_DEFAULT);
-
-  run_cancel = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_widget_show (run_cancel);
-  gtk_container_add (GTK_CONTAINER (hbuttonbox1), run_cancel);
-  GTK_WIDGET_SET_FLAGS (run_cancel, GTK_CAN_DEFAULT);
-
-  g_signal_connect ((gpointer) entry_job, "changed",
-                    G_CALLBACK (on_entry_job_changed),
-                    NULL);
-  g_signal_connect ((gpointer) run_ok, "clicked",
-                    G_CALLBACK (on_run_ok_clicked),
-                    NULL);
-  g_signal_connect ((gpointer) run_cancel, "clicked",
-                    G_CALLBACK (on_run_cancel_clicked),
-                    NULL);
-
-  /* Store pointers to all widgets, for use by lookup_widget(). */
-  GLADE_HOOKUP_OBJECT_NO_REF (RunDialog, RunDialog, "RunDialog");
-  GLADE_HOOKUP_OBJECT_NO_REF (RunDialog, dialog_vbox7, "dialog_vbox7");
-  GLADE_HOOKUP_OBJECT (RunDialog, vbox11, "vbox11");
-  GLADE_HOOKUP_OBJECT (RunDialog, vbox12, "vbox12");
-  GLADE_HOOKUP_OBJECT (RunDialog, label62, "label62");
-  GLADE_HOOKUP_OBJECT (RunDialog, alignment1, "alignment1");
-  GLADE_HOOKUP_OBJECT (RunDialog, hbox28, "hbox28");
-  GLADE_HOOKUP_OBJECT (RunDialog, hbox29, "hbox29");
-  GLADE_HOOKUP_OBJECT (RunDialog, label63, "label63");
-  GLADE_HOOKUP_OBJECT (RunDialog, combo_job, "combo_job");
-  GLADE_HOOKUP_OBJECT (RunDialog, entry_job, "entry_job");
-  GLADE_HOOKUP_OBJECT (RunDialog, label64, "label64");
-  GLADE_HOOKUP_OBJECT (RunDialog, combo_type, "combo_type");
-  GLADE_HOOKUP_OBJECT (RunDialog, entry_type, "entry_type");
-  GLADE_HOOKUP_OBJECT (RunDialog, label114, "label114");
-  GLADE_HOOKUP_OBJECT (RunDialog, hbox30, "hbox30");
-  GLADE_HOOKUP_OBJECT (RunDialog, label66, "label66");
-  GLADE_HOOKUP_OBJECT (RunDialog, combo_client, "combo_client");
-  GLADE_HOOKUP_OBJECT (RunDialog, entry_client, "entry_client");
-  GLADE_HOOKUP_OBJECT (RunDialog, label67, "label67");
-  GLADE_HOOKUP_OBJECT (RunDialog, hbox31, "hbox31");
-  GLADE_HOOKUP_OBJECT (RunDialog, label68, "label68");
-  GLADE_HOOKUP_OBJECT (RunDialog, combo_fileset, "combo_fileset");
-  GLADE_HOOKUP_OBJECT (RunDialog, entry_fileset, "entry_fileset");
-  GLADE_HOOKUP_OBJECT (RunDialog, label156, "label156");
-  GLADE_HOOKUP_OBJECT (RunDialog, label155, "label155");
-  GLADE_HOOKUP_OBJECT (RunDialog, spinbutton1, "spinbutton1");
-  GLADE_HOOKUP_OBJECT (RunDialog, hbox32, "hbox32");
-  GLADE_HOOKUP_OBJECT (RunDialog, label70, "label70");
-  GLADE_HOOKUP_OBJECT (RunDialog, combo_level, "combo_level");
-  GLADE_HOOKUP_OBJECT (RunDialog, entry_level, "entry_level");
-  GLADE_HOOKUP_OBJECT (RunDialog, label71, "label71");
-  GLADE_HOOKUP_OBJECT (RunDialog, hbox33, "hbox33");
-  GLADE_HOOKUP_OBJECT (RunDialog, label72, "label72");
-  GLADE_HOOKUP_OBJECT (RunDialog, combo_pool, "combo_pool");
-  GLADE_HOOKUP_OBJECT (RunDialog, entry_pool, "entry_pool");
-  GLADE_HOOKUP_OBJECT (RunDialog, label73, "label73");
-  GLADE_HOOKUP_OBJECT (RunDialog, hbox39, "hbox39");
-  GLADE_HOOKUP_OBJECT (RunDialog, label96, "label96");
-  GLADE_HOOKUP_OBJECT (RunDialog, combo_storage, "combo_storage");
-  GLADE_HOOKUP_OBJECT (RunDialog, entry_storage, "entry_storage");
-  GLADE_HOOKUP_OBJECT (RunDialog, label97, "label97");
-  GLADE_HOOKUP_OBJECT (RunDialog, hbox40, "hbox40");
-  GLADE_HOOKUP_OBJECT (RunDialog, label98, "label98");
-  GLADE_HOOKUP_OBJECT (RunDialog, combo_messages, "combo_messages");
-  GLADE_HOOKUP_OBJECT (RunDialog, entry_messages, "entry_messages");
-  GLADE_HOOKUP_OBJECT (RunDialog, label99, "label99");
-  GLADE_HOOKUP_OBJECT (RunDialog, hbox34, "hbox34");
-  GLADE_HOOKUP_OBJECT (RunDialog, label77, "label77");
-  GLADE_HOOKUP_OBJECT (RunDialog, entry_where, "entry_where");
-  GLADE_HOOKUP_OBJECT (RunDialog, label78, "label78");
-  GLADE_HOOKUP_OBJECT (RunDialog, hbox41, "hbox41");
-  GLADE_HOOKUP_OBJECT (RunDialog, label100, "label100");
-  GLADE_HOOKUP_OBJECT (RunDialog, entry_when, "entry_when");
-  GLADE_HOOKUP_OBJECT (RunDialog, label101, "label101");
-  GLADE_HOOKUP_OBJECT (RunDialog, hbox60, "hbox60");
-  GLADE_HOOKUP_OBJECT (RunDialog, label153, "label153");
-  GLADE_HOOKUP_OBJECT (RunDialog, entry28, "entry28");
-  GLADE_HOOKUP_OBJECT (RunDialog, label154, "label154");
-  GLADE_HOOKUP_OBJECT (RunDialog, label84, "label84");
-  GLADE_HOOKUP_OBJECT_NO_REF (RunDialog, dialog_action_area6, "dialog_action_area6");
-  GLADE_HOOKUP_OBJECT (RunDialog, hbuttonbox1, "hbuttonbox1");
-  GLADE_HOOKUP_OBJECT (RunDialog, run_ok, "run_ok");
-  GLADE_HOOKUP_OBJECT (RunDialog, run_cancel, "run_cancel");
-
-  return RunDialog;
-}
-
-static GnomeUIInfo file2_menu_uiinfo[] =
-{
-  GNOMEUIINFO_MENU_NEW_ITEM (N_("_New"), NULL, on_new1_activate, NULL),
-  GNOMEUIINFO_MENU_OPEN_ITEM (on_open1_activate, NULL),
-  GNOMEUIINFO_MENU_SAVE_ITEM (on_save1_activate, NULL),
-  GNOMEUIINFO_MENU_SAVE_AS_ITEM (on_save_as1_activate, NULL),
-  GNOMEUIINFO_SEPARATOR,
-  GNOMEUIINFO_MENU_EXIT_ITEM (on_quit1_activate, NULL),
-  GNOMEUIINFO_END
-};
-
-static GnomeUIInfo edit2_menu_uiinfo[] =
-{
-  GNOMEUIINFO_MENU_CUT_ITEM (on_cut2_activate, NULL),
-  GNOMEUIINFO_MENU_COPY_ITEM (on_copy2_activate, NULL),
-  GNOMEUIINFO_MENU_PASTE_ITEM (on_paste2_activate, NULL),
-  GNOMEUIINFO_MENU_CLEAR_ITEM (on_clear2_activate, NULL),
-  GNOMEUIINFO_SEPARATOR,
-  GNOMEUIINFO_MENU_PROPERTIES_ITEM (on_properties1_activate, NULL),
-  GNOMEUIINFO_SEPARATOR,
-  GNOMEUIINFO_MENU_PREFERENCES_ITEM (on_preferences2_activate, NULL),
-  GNOMEUIINFO_END
-};
-
-static GnomeUIInfo view1_menu_uiinfo[] =
-{
-  GNOMEUIINFO_END
-};
-
-static GnomeUIInfo help2_menu_uiinfo[] =
-{
-  GNOMEUIINFO_MENU_ABOUT_ITEM (on_about2_activate, NULL),
-  GNOMEUIINFO_END
-};
-
-static GnomeUIInfo menubar2_uiinfo[] =
-{
-  GNOMEUIINFO_MENU_FILE_TREE (file2_menu_uiinfo),
-  GNOMEUIINFO_MENU_EDIT_TREE (edit2_menu_uiinfo),
-  GNOMEUIINFO_MENU_VIEW_TREE (view1_menu_uiinfo),
-  GNOMEUIINFO_MENU_HELP_TREE (help2_menu_uiinfo),
-  GNOMEUIINFO_END
-};
-
-GtkWidget*
-create_restore_file_selection (void)
-{
-  GtkWidget *restore_file_selection;
-  GtkWidget *vbox13;
-  GtkWidget *handlebox4;
-  GtkWidget *menubar2;
-  GtkWidget *handlebox3;
-  GtkWidget *toolbar3;
-  GtkIconSize tmp_toolbar_icon_size;
-  GtkWidget *restore_up_button;
-  GtkWidget *restore_add_button;
-  GtkWidget *restore_remove_button;
-  GtkWidget *hbox38;
-  GtkWidget *label88;
-  GtkWidget *restore_dir;
-  GtkWidget *hpaned1;
-  GtkWidget *tree;
-  GtkWidget *scrolled;
-  GtkWidget *hbox44;
-  GtkWidget *FilesSelected;
-  GtkWidget *restore_select_ok;
-  GtkWidget *label152;
-  GtkWidget *restore_select_cancel;
-  GtkWidget *label1001;
-  GtkAccelGroup *accel_group;
-
-  accel_group = gtk_accel_group_new ();
-
-  restore_file_selection = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_widget_set_size_request (restore_file_selection, 640, 480);
-  gtk_window_set_title (GTK_WINDOW (restore_file_selection), _("Restore File Selection"));
-  gtk_window_set_modal (GTK_WINDOW (restore_file_selection), TRUE);
-  gtk_window_set_default_size (GTK_WINDOW (restore_file_selection), 700, 450);
-
-  vbox13 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox13);
-  gtk_container_add (GTK_CONTAINER (restore_file_selection), vbox13);
-
-  handlebox4 = gtk_handle_box_new ();
-  gtk_widget_show (handlebox4);
-  gtk_box_pack_start (GTK_BOX (vbox13), handlebox4, FALSE, FALSE, 0);
-
-  menubar2 = gtk_menu_bar_new ();
-  gtk_widget_show (menubar2);
-  gtk_container_add (GTK_CONTAINER (handlebox4), menubar2);
-  gnome_app_fill_menu (GTK_MENU_SHELL (menubar2), menubar2_uiinfo,
-                       accel_group, FALSE, 0);
-
-  handlebox3 = gtk_handle_box_new ();
-  gtk_widget_show (handlebox3);
-  gtk_box_pack_start (GTK_BOX (vbox13), handlebox3, FALSE, FALSE, 0);
-
-  toolbar3 = gtk_toolbar_new ();
-  gtk_widget_show (toolbar3);
-  gtk_container_add (GTK_CONTAINER (handlebox3), toolbar3);
-  gtk_toolbar_set_style (GTK_TOOLBAR (toolbar3), GTK_TOOLBAR_BOTH);
-  tmp_toolbar_icon_size = gtk_toolbar_get_icon_size (GTK_TOOLBAR (toolbar3));
-
-  restore_up_button = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-go-up");
-  gtk_widget_show (restore_up_button);
-  gtk_container_add (GTK_CONTAINER (toolbar3), restore_up_button);
-
-  restore_add_button = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-add");
-  gtk_widget_show (restore_add_button);
-  gtk_container_add (GTK_CONTAINER (toolbar3), restore_add_button);
-
-  restore_remove_button = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-remove");
-  gtk_widget_show (restore_remove_button);
-  gtk_container_add (GTK_CONTAINER (toolbar3), restore_remove_button);
-
-  hbox38 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox38);
-  gtk_box_pack_start (GTK_BOX (vbox13), hbox38, FALSE, TRUE, 0);
-
-  label88 = gtk_label_new (_("Current dir:"));
-  gtk_widget_show (label88);
-  gtk_box_pack_start (GTK_BOX (hbox38), label88, FALSE, TRUE, 0);
-  gtk_label_set_justify (GTK_LABEL (label88), GTK_JUSTIFY_CENTER);
-
-  restore_dir = gtk_entry_new ();
-  gtk_widget_show (restore_dir);
-  gtk_box_pack_start (GTK_BOX (hbox38), restore_dir, TRUE, TRUE, 0);
-
-  hpaned1 = gtk_hpaned_new ();
-  gtk_widget_show (hpaned1);
-  gtk_box_pack_start (GTK_BOX (vbox13), hpaned1, TRUE, TRUE, 0);
-
-  tree = gtk_scrolled_window_new (NULL, NULL);
-  gtk_widget_show (tree);
-  gtk_paned_pack1 (GTK_PANED (hpaned1), tree, FALSE, TRUE);
-  gtk_widget_set_size_request (tree, 164, 78);
-
-  scrolled = gtk_scrolled_window_new (NULL, NULL);
-  gtk_widget_show (scrolled);
-  gtk_paned_pack2 (GTK_PANED (hpaned1), scrolled, TRUE, TRUE);
-
-  hbox44 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox44);
-  gtk_box_pack_start (GTK_BOX (vbox13), hbox44, FALSE, TRUE, 5);
-  gtk_widget_set_size_request (hbox44, 301, 30);
-
-  FilesSelected = gtk_label_new (_("Files Selected: "));
-  gtk_widget_show (FilesSelected);
-  gtk_box_pack_start (GTK_BOX (hbox44), FilesSelected, TRUE, TRUE, 0);
-  gtk_misc_set_alignment (GTK_MISC (FilesSelected), 0.02, 0.5);
-
-  restore_select_ok = gtk_button_new_from_stock ("gtk-ok");
-  gtk_widget_show (restore_select_ok);
-  gtk_box_pack_start (GTK_BOX (hbox44), restore_select_ok, FALSE, TRUE, 0);
-  gtk_widget_set_size_request (restore_select_ok, 72, 30);
-
-  label152 = gtk_label_new ("");
-  gtk_widget_show (label152);
-  gtk_box_pack_start (GTK_BOX (hbox44), label152, FALSE, FALSE, 0);
-  gtk_widget_set_size_request (label152, 34, 16);
-
-  restore_select_cancel = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_widget_show (restore_select_cancel);
-  gtk_box_pack_start (GTK_BOX (hbox44), restore_select_cancel, FALSE, TRUE, 0);
-
-  label1001 = gtk_label_new (_(" "));
-  gtk_widget_show (label1001);
-  gtk_box_pack_start (GTK_BOX (hbox44), label1001, FALSE, FALSE, 8);
-
-  g_signal_connect ((gpointer) restore_file_selection, "delete_event",
-                    G_CALLBACK (on_restore_files_delete_event),
-                    NULL);
-  g_signal_connect ((gpointer) restore_up_button, "clicked",
-                    G_CALLBACK (on_restore_up_button_clicked),
-                    NULL);
-  g_signal_connect ((gpointer) restore_add_button, "clicked",
-                    G_CALLBACK (on_restore_add_button_clicked),
-                    NULL);
-  g_signal_connect ((gpointer) restore_remove_button, "clicked",
-                    G_CALLBACK (on_restore_remove_button_clicked),
-                    NULL);
-  g_signal_connect ((gpointer) restore_select_ok, "clicked",
-                    G_CALLBACK (on_restore_select_ok_clicked),
-                    NULL);
-  g_signal_connect ((gpointer) restore_select_cancel, "clicked",
-                    G_CALLBACK (on_restore_select_cancel_clicked),
-                    NULL);
-
-  /* Store pointers to all widgets, for use by lookup_widget(). */
-  GLADE_HOOKUP_OBJECT_NO_REF (restore_file_selection, restore_file_selection, "restore_file_selection");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, vbox13, "vbox13");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, handlebox4, "handlebox4");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, menubar2, "menubar2");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, menubar2_uiinfo[0].widget, "file2");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, file2_menu_uiinfo[0].widget, "new1");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, file2_menu_uiinfo[1].widget, "open1");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, file2_menu_uiinfo[2].widget, "save1");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, file2_menu_uiinfo[3].widget, "save_as1");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, file2_menu_uiinfo[4].widget, "separator4");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, file2_menu_uiinfo[5].widget, "quit1");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, menubar2_uiinfo[1].widget, "edit2");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, edit2_menu_uiinfo[0].widget, "cut2");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, edit2_menu_uiinfo[1].widget, "copy2");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, edit2_menu_uiinfo[2].widget, "paste2");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, edit2_menu_uiinfo[3].widget, "clear2");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, edit2_menu_uiinfo[4].widget, "separator5");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, edit2_menu_uiinfo[5].widget, "properties1");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, edit2_menu_uiinfo[6].widget, "separator6");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, edit2_menu_uiinfo[7].widget, "preferences2");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, menubar2_uiinfo[2].widget, "view1");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, menubar2_uiinfo[3].widget, "help2");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, help2_menu_uiinfo[0].widget, "about2");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, handlebox3, "handlebox3");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, toolbar3, "toolbar3");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, restore_up_button, "restore_up_button");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, restore_add_button, "restore_add_button");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, restore_remove_button, "restore_remove_button");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, hbox38, "hbox38");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, label88, "label88");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, restore_dir, "restore_dir");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, hpaned1, "hpaned1");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, tree, "tree");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, scrolled, "scrolled");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, hbox44, "hbox44");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, FilesSelected, "FilesSelected");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, restore_select_ok, "restore_select_ok");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, label152, "label152");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, restore_select_cancel, "restore_select_cancel");
-  GLADE_HOOKUP_OBJECT (restore_file_selection, label1001, "label1001");
-
-  gtk_window_add_accel_group (GTK_WINDOW (restore_file_selection), accel_group);
-
-  return restore_file_selection;
-}
-
-GtkWidget*
-create_label_dialog (void)
-{
-  GtkWidget *label_dialog;
-  GtkWidget *dialog_vbox9;
-  GtkWidget *vbox16;
-  GtkWidget *label106;
-  GtkWidget *hbox45;
-  GtkWidget *label107;
-  GtkWidget *label_combo_storage;
-  GList *label_combo_storage_items = NULL;
-  GtkWidget *entry26;
-  GtkWidget *hbox46;
-  GtkWidget *label109;
-  GtkWidget *label_combo_pool;
-  GList *label_combo_pool_items = NULL;
-  GtkWidget *entry27;
-  GtkWidget *hbox47;
-  GtkWidget *label111;
-  GtkWidget *label_entry_volume;
-  GtkWidget *hbox48;
-  GtkWidget *slot1;
-  GtkObject *label_slot_adj;
-  GtkWidget *label_slot;
-  GtkWidget *label113;
-  GtkWidget *dialog_action_area8;
-  GtkWidget *hbuttonbox3;
-  GtkWidget *label_ok;
-  GtkWidget *label_cancel;
-
-  label_dialog = gtk_dialog_new ();
-  gtk_window_set_title (GTK_WINDOW (label_dialog), _("Label a Volume"));
-  gtk_window_set_modal (GTK_WINDOW (label_dialog), TRUE);
-  gtk_window_set_type_hint (GTK_WINDOW (label_dialog), GDK_WINDOW_TYPE_HINT_DIALOG);
-
-  dialog_vbox9 = GTK_DIALOG (label_dialog)->vbox;
-  gtk_widget_show (dialog_vbox9);
-
-  vbox16 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox16);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox9), vbox16, FALSE, TRUE, 0);
-
-  label106 = gtk_label_new (_("Label a Volume"));
-  gtk_widget_show (label106);
-  gtk_box_pack_start (GTK_BOX (vbox16), label106, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label106), GTK_JUSTIFY_CENTER);
-  gtk_misc_set_padding (GTK_MISC (label106), 0, 9);
-
-  hbox45 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox45);
-  gtk_box_pack_start (GTK_BOX (vbox16), hbox45, FALSE, TRUE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (hbox45), 5);
-
-  label107 = gtk_label_new (_("Storage:"));
-  gtk_widget_show (label107);
-  gtk_box_pack_start (GTK_BOX (hbox45), label107, TRUE, TRUE, 0);
-  gtk_label_set_justify (GTK_LABEL (label107), GTK_JUSTIFY_CENTER);
-  gtk_misc_set_alignment (GTK_MISC (label107), 0.15, 0.5);
-
-  label_combo_storage = gtk_combo_new ();
-  g_object_set_data (G_OBJECT (GTK_COMBO (label_combo_storage)->popwin),
-                     "GladeParentKey", label_combo_storage);
-  gtk_widget_show (label_combo_storage);
-  gtk_box_pack_start (GTK_BOX (hbox45), label_combo_storage, TRUE, TRUE, 15);
-  gtk_combo_set_value_in_list (GTK_COMBO (label_combo_storage), TRUE, FALSE);
-  label_combo_storage_items = g_list_append (label_combo_storage_items, (gpointer) "");
-  label_combo_storage_items = g_list_append (label_combo_storage_items, (gpointer) "");
-  gtk_combo_set_popdown_strings (GTK_COMBO (label_combo_storage), label_combo_storage_items);
-  g_list_free (label_combo_storage_items);
-
-  entry26 = GTK_COMBO (label_combo_storage)->entry;
-  gtk_widget_show (entry26);
-  gtk_editable_set_editable (GTK_EDITABLE (entry26), FALSE);
-
-  hbox46 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox46);
-  gtk_box_pack_start (GTK_BOX (vbox16), hbox46, FALSE, TRUE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (hbox46), 5);
-
-  label109 = gtk_label_new (_("Pool:"));
-  gtk_widget_show (label109);
-  gtk_box_pack_start (GTK_BOX (hbox46), label109, TRUE, TRUE, 0);
-  gtk_misc_set_alignment (GTK_MISC (label109), 0.12, 0.5);
-
-  label_combo_pool = gtk_combo_new ();
-  g_object_set_data (G_OBJECT (GTK_COMBO (label_combo_pool)->popwin),
-                     "GladeParentKey", label_combo_pool);
-  gtk_widget_show (label_combo_pool);
-  gtk_box_pack_start (GTK_BOX (hbox46), label_combo_pool, TRUE, TRUE, 14);
-  gtk_combo_set_value_in_list (GTK_COMBO (label_combo_pool), TRUE, FALSE);
-  label_combo_pool_items = g_list_append (label_combo_pool_items, (gpointer) "");
-  label_combo_pool_items = g_list_append (label_combo_pool_items, (gpointer) "");
-  gtk_combo_set_popdown_strings (GTK_COMBO (label_combo_pool), label_combo_pool_items);
-  g_list_free (label_combo_pool_items);
-
-  entry27 = GTK_COMBO (label_combo_pool)->entry;
-  gtk_widget_show (entry27);
-  gtk_editable_set_editable (GTK_EDITABLE (entry27), FALSE);
-
-  hbox47 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox47);
-  gtk_box_pack_start (GTK_BOX (vbox16), hbox47, FALSE, TRUE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (hbox47), 5);
-
-  label111 = gtk_label_new (_("Volume Name:"));
-  gtk_widget_show (label111);
-  gtk_box_pack_start (GTK_BOX (hbox47), label111, TRUE, TRUE, 0);
-  gtk_misc_set_alignment (GTK_MISC (label111), 0.17, 0.5);
-
-  label_entry_volume = gtk_entry_new ();
-  gtk_widget_show (label_entry_volume);
-  gtk_box_pack_start (GTK_BOX (hbox47), label_entry_volume, TRUE, TRUE, 0);
-
-  hbox48 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox48);
-  gtk_box_pack_start (GTK_BOX (vbox16), hbox48, TRUE, TRUE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (hbox48), 5);
-
-  slot1 = gtk_label_new (_("Slot:"));
-  gtk_widget_show (slot1);
-  gtk_box_pack_start (GTK_BOX (hbox48), slot1, FALSE, TRUE, 0);
-  gtk_misc_set_alignment (GTK_MISC (slot1), 0.09, 0.5);
-
-  label_slot_adj = gtk_adjustment_new (0, 0, 10000, 1, 10, 10);
-  label_slot = gtk_spin_button_new (GTK_ADJUSTMENT (label_slot_adj), 1, 0);
-  gtk_widget_show (label_slot);
-  gtk_box_pack_start (GTK_BOX (hbox48), label_slot, TRUE, TRUE, 0);
-  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (label_slot), TRUE);
-
-  label113 = gtk_label_new (_("   "));
-  gtk_widget_show (label113);
-  gtk_box_pack_start (GTK_BOX (vbox16), label113, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label113), GTK_JUSTIFY_CENTER);
-
-  dialog_action_area8 = GTK_DIALOG (label_dialog)->action_area;
-  gtk_widget_show (dialog_action_area8);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area8), GTK_BUTTONBOX_END);
-
-  hbuttonbox3 = gtk_hbutton_box_new ();
-  gtk_widget_show (hbuttonbox3);
-  gtk_container_add (GTK_CONTAINER (dialog_action_area8), hbuttonbox3);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox3), GTK_BUTTONBOX_END);
-  gtk_box_set_spacing (GTK_BOX (hbuttonbox3), 8);
-
-  label_ok = gtk_button_new_from_stock ("gtk-ok");
-  gtk_widget_show (label_ok);
-  gtk_container_add (GTK_CONTAINER (hbuttonbox3), label_ok);
-  GTK_WIDGET_SET_FLAGS (label_ok, GTK_CAN_DEFAULT);
-
-  label_cancel = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_widget_show (label_cancel);
-  gtk_container_add (GTK_CONTAINER (hbuttonbox3), label_cancel);
-  GTK_WIDGET_SET_FLAGS (label_cancel, GTK_CAN_DEFAULT);
-
-  g_signal_connect ((gpointer) label_ok, "clicked",
-                    G_CALLBACK (on_label_ok_clicked),
-                    NULL);
-  g_signal_connect ((gpointer) label_cancel, "clicked",
-                    G_CALLBACK (on_label_cancel_clicked),
-                    NULL);
-
-  /* Store pointers to all widgets, for use by lookup_widget(). */
-  GLADE_HOOKUP_OBJECT_NO_REF (label_dialog, label_dialog, "label_dialog");
-  GLADE_HOOKUP_OBJECT_NO_REF (label_dialog, dialog_vbox9, "dialog_vbox9");
-  GLADE_HOOKUP_OBJECT (label_dialog, vbox16, "vbox16");
-  GLADE_HOOKUP_OBJECT (label_dialog, label106, "label106");
-  GLADE_HOOKUP_OBJECT (label_dialog, hbox45, "hbox45");
-  GLADE_HOOKUP_OBJECT (label_dialog, label107, "label107");
-  GLADE_HOOKUP_OBJECT (label_dialog, label_combo_storage, "label_combo_storage");
-  GLADE_HOOKUP_OBJECT (label_dialog, entry26, "entry26");
-  GLADE_HOOKUP_OBJECT (label_dialog, hbox46, "hbox46");
-  GLADE_HOOKUP_OBJECT (label_dialog, label109, "label109");
-  GLADE_HOOKUP_OBJECT (label_dialog, label_combo_pool, "label_combo_pool");
-  GLADE_HOOKUP_OBJECT (label_dialog, entry27, "entry27");
-  GLADE_HOOKUP_OBJECT (label_dialog, hbox47, "hbox47");
-  GLADE_HOOKUP_OBJECT (label_dialog, label111, "label111");
-  GLADE_HOOKUP_OBJECT (label_dialog, label_entry_volume, "label_entry_volume");
-  GLADE_HOOKUP_OBJECT (label_dialog, hbox48, "hbox48");
-  GLADE_HOOKUP_OBJECT (label_dialog, slot1, "slot1");
-  GLADE_HOOKUP_OBJECT (label_dialog, label_slot, "label_slot");
-  GLADE_HOOKUP_OBJECT (label_dialog, label113, "label113");
-  GLADE_HOOKUP_OBJECT_NO_REF (label_dialog, dialog_action_area8, "dialog_action_area8");
-  GLADE_HOOKUP_OBJECT (label_dialog, hbuttonbox3, "hbuttonbox3");
-  GLADE_HOOKUP_OBJECT (label_dialog, label_ok, "label_ok");
-  GLADE_HOOKUP_OBJECT (label_dialog, label_cancel, "label_cancel");
-
-  return label_dialog;
-}
-
-GtkWidget*
-create_RestoreDialog (void)
-{
-  GtkWidget *RestoreDialog;
-  GtkWidget *dialog_vbox10;
-  GtkWidget *vbox17;
-  GtkWidget *vbox18;
-  GtkWidget *label119;
-  GtkWidget *alignment3;
-  GtkWidget *hbox50;
-  GtkWidget *hbox51;
-  GtkWidget *label120;
-  GtkWidget *combo_restore_job;
-  GList *combo_restore_job_items = NULL;
-  GtkWidget *restore_job_entry;
-  GtkWidget *label122;
-  GtkWidget *hbox52;
-  GtkWidget *label125;
-  GtkWidget *combo_restore_client;
-  GList *combo_restore_client_items = NULL;
-  GtkWidget *restore_client_entry;
-  GtkWidget *label127;
-  GtkWidget *hbox53;
-  GtkWidget *label128;
-  GtkWidget *combo_restore_fileset;
-  GList *combo_restore_fileset_items = NULL;
-  GtkWidget *restore_fileset_entry;
-  GtkWidget *label130;
-  GtkWidget *hbox55;
-  GtkWidget *label135;
-  GtkWidget *combo_restore_pool;
-  GList *combo_restore_pool_items = NULL;
-  GtkWidget *restore_pool_entry;
-  GtkWidget *label138;
-  GtkWidget *hbox56;
-  GtkWidget *label139;
-  GtkWidget *combo_restore_storage;
-  GList *combo_restore_storage_items = NULL;
-  GtkWidget *restore_storage_entry;
-  GtkWidget *label142;
-  GtkWidget *hbox59;
-  GtkWidget *label148;
-  GtkWidget *restore_before_entry;
-  GtkWidget *label149;
-  GtkWidget *label150;
-  GtkWidget *dialog_action_area9;
-  GtkWidget *helpbutton1;
-  GtkWidget *select_files_button;
-  GtkWidget *alignment2;
-  GtkWidget *hbox49;
-  GtkWidget *image1;
-  GtkWidget *restore_select_button;
-  GtkWidget *restore_cancel;
-
-  RestoreDialog = gtk_dialog_new ();
-  gtk_window_set_title (GTK_WINDOW (RestoreDialog), _("Restore Files Dialog"));
-  gtk_window_set_default_size (GTK_WINDOW (RestoreDialog), 300, 200);
-  gtk_window_set_type_hint (GTK_WINDOW (RestoreDialog), GDK_WINDOW_TYPE_HINT_DIALOG);
-
-  dialog_vbox10 = GTK_DIALOG (RestoreDialog)->vbox;
-  gtk_widget_show (dialog_vbox10);
-
-  vbox17 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox17);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox10), vbox17, TRUE, TRUE, 0);
-
-  vbox18 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox18);
-  gtk_box_pack_start (GTK_BOX (vbox17), vbox18, TRUE, TRUE, 0);
-
-  label119 = gtk_label_new (_("Restore Files"));
-  gtk_widget_show (label119);
-  gtk_box_pack_start (GTK_BOX (vbox18), label119, FALSE, FALSE, 2);
-  gtk_label_set_justify (GTK_LABEL (label119), GTK_JUSTIFY_CENTER);
-  gtk_misc_set_padding (GTK_MISC (label119), 0, 9);
-
-  alignment3 = gtk_alignment_new (0.5, 0.5, 1, 1);
-  gtk_widget_show (alignment3);
-  gtk_box_pack_start (GTK_BOX (vbox18), alignment3, FALSE, FALSE, 2);
-
-  hbox50 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox50);
-  gtk_container_add (GTK_CONTAINER (alignment3), hbox50);
-
-  hbox51 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox51);
-  gtk_box_pack_start (GTK_BOX (hbox50), hbox51, TRUE, TRUE, 0);
-
-  label120 = gtk_label_new (_("Job:"));
-  gtk_widget_show (label120);
-  gtk_box_pack_start (GTK_BOX (hbox51), label120, FALSE, FALSE, 0);
-  gtk_widget_set_size_request (label120, 66, 16);
-  gtk_label_set_justify (GTK_LABEL (label120), GTK_JUSTIFY_RIGHT);
-
-  combo_restore_job = gtk_combo_new ();
-  g_object_set_data (G_OBJECT (GTK_COMBO (combo_restore_job)->popwin),
-                     "GladeParentKey", combo_restore_job);
-  gtk_widget_show (combo_restore_job);
-  gtk_box_pack_start (GTK_BOX (hbox51), combo_restore_job, TRUE, TRUE, 1);
-  gtk_combo_set_value_in_list (GTK_COMBO (combo_restore_job), TRUE, FALSE);
-  combo_restore_job_items = g_list_append (combo_restore_job_items, (gpointer) "");
-  gtk_combo_set_popdown_strings (GTK_COMBO (combo_restore_job), combo_restore_job_items);
-  g_list_free (combo_restore_job_items);
-
-  restore_job_entry = GTK_COMBO (combo_restore_job)->entry;
-  gtk_widget_show (restore_job_entry);
-  gtk_editable_set_editable (GTK_EDITABLE (restore_job_entry), FALSE);
-
-  label122 = gtk_label_new ("");
-  gtk_widget_show (label122);
-  gtk_box_pack_start (GTK_BOX (hbox51), label122, FALSE, FALSE, 27);
-  gtk_label_set_justify (GTK_LABEL (label122), GTK_JUSTIFY_CENTER);
-
-  hbox52 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox52);
-  gtk_box_pack_start (GTK_BOX (vbox18), hbox52, TRUE, TRUE, 0);
-
-  label125 = gtk_label_new (_("Client:"));
-  gtk_widget_show (label125);
-  gtk_box_pack_start (GTK_BOX (hbox52), label125, FALSE, FALSE, 0);
-  gtk_widget_set_size_request (label125, 66, 16);
-  gtk_label_set_justify (GTK_LABEL (label125), GTK_JUSTIFY_RIGHT);
-
-  combo_restore_client = gtk_combo_new ();
-  g_object_set_data (G_OBJECT (GTK_COMBO (combo_restore_client)->popwin),
-                     "GladeParentKey", combo_restore_client);
-  gtk_widget_show (combo_restore_client);
-  gtk_box_pack_start (GTK_BOX (hbox52), combo_restore_client, TRUE, TRUE, 1);
-  gtk_combo_set_value_in_list (GTK_COMBO (combo_restore_client), TRUE, FALSE);
-  combo_restore_client_items = g_list_append (combo_restore_client_items, (gpointer) "");
-  gtk_combo_set_popdown_strings (GTK_COMBO (combo_restore_client), combo_restore_client_items);
-  g_list_free (combo_restore_client_items);
-
-  restore_client_entry = GTK_COMBO (combo_restore_client)->entry;
-  gtk_widget_show (restore_client_entry);
-  gtk_editable_set_editable (GTK_EDITABLE (restore_client_entry), FALSE);
-
-  label127 = gtk_label_new (_(" "));
-  gtk_widget_show (label127);
-  gtk_box_pack_start (GTK_BOX (hbox52), label127, FALSE, FALSE, 25);
-  gtk_label_set_justify (GTK_LABEL (label127), GTK_JUSTIFY_CENTER);
-
-  hbox53 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox53);
-  gtk_box_pack_start (GTK_BOX (vbox18), hbox53, TRUE, TRUE, 2);
-
-  label128 = gtk_label_new (_("FileSet: "));
-  gtk_widget_show (label128);
-  gtk_box_pack_start (GTK_BOX (hbox53), label128, FALSE, FALSE, 0);
-  gtk_widget_set_size_request (label128, 66, 16);
-  gtk_label_set_justify (GTK_LABEL (label128), GTK_JUSTIFY_RIGHT);
-
-  combo_restore_fileset = gtk_combo_new ();
-  g_object_set_data (G_OBJECT (GTK_COMBO (combo_restore_fileset)->popwin),
-                     "GladeParentKey", combo_restore_fileset);
-  gtk_widget_show (combo_restore_fileset);
-  gtk_box_pack_start (GTK_BOX (hbox53), combo_restore_fileset, TRUE, TRUE, 0);
-  gtk_combo_set_value_in_list (GTK_COMBO (combo_restore_fileset), TRUE, FALSE);
-  combo_restore_fileset_items = g_list_append (combo_restore_fileset_items, (gpointer) "");
-  gtk_combo_set_popdown_strings (GTK_COMBO (combo_restore_fileset), combo_restore_fileset_items);
-  g_list_free (combo_restore_fileset_items);
-
-  restore_fileset_entry = GTK_COMBO (combo_restore_fileset)->entry;
-  gtk_widget_show (restore_fileset_entry);
-  gtk_editable_set_editable (GTK_EDITABLE (restore_fileset_entry), FALSE);
-
-  label130 = gtk_label_new (_("  "));
-  gtk_widget_show (label130);
-  gtk_box_pack_start (GTK_BOX (hbox53), label130, FALSE, FALSE, 23);
-  gtk_label_set_justify (GTK_LABEL (label130), GTK_JUSTIFY_CENTER);
-
-  hbox55 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox55);
-  gtk_box_pack_start (GTK_BOX (vbox18), hbox55, TRUE, TRUE, 2);
-
-  label135 = gtk_label_new (_("Pool:"));
-  gtk_widget_show (label135);
-  gtk_box_pack_start (GTK_BOX (hbox55), label135, FALSE, FALSE, 0);
-  gtk_widget_set_size_request (label135, 66, 16);
-  gtk_label_set_justify (GTK_LABEL (label135), GTK_JUSTIFY_CENTER);
-
-  combo_restore_pool = gtk_combo_new ();
-  g_object_set_data (G_OBJECT (GTK_COMBO (combo_restore_pool)->popwin),
-                     "GladeParentKey", combo_restore_pool);
-  gtk_widget_show (combo_restore_pool);
-  gtk_box_pack_start (GTK_BOX (hbox55), combo_restore_pool, TRUE, TRUE, 0);
-  gtk_combo_set_value_in_list (GTK_COMBO (combo_restore_pool), TRUE, FALSE);
-  combo_restore_pool_items = g_list_append (combo_restore_pool_items, (gpointer) "");
-  combo_restore_pool_items = g_list_append (combo_restore_pool_items, (gpointer) "");
-  gtk_combo_set_popdown_strings (GTK_COMBO (combo_restore_pool), combo_restore_pool_items);
-  g_list_free (combo_restore_pool_items);
-
-  restore_pool_entry = GTK_COMBO (combo_restore_pool)->entry;
-  gtk_widget_show (restore_pool_entry);
-  gtk_editable_set_editable (GTK_EDITABLE (restore_pool_entry), FALSE);
-
-  label138 = gtk_label_new (_("   "));
-  gtk_widget_show (label138);
-  gtk_box_pack_start (GTK_BOX (hbox55), label138, FALSE, FALSE, 21);
-  gtk_label_set_justify (GTK_LABEL (label138), GTK_JUSTIFY_CENTER);
-
-  hbox56 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox56);
-  gtk_box_pack_start (GTK_BOX (vbox18), hbox56, TRUE, TRUE, 0);
-
-  label139 = gtk_label_new (_("Storage:"));
-  gtk_widget_show (label139);
-  gtk_box_pack_start (GTK_BOX (hbox56), label139, FALSE, FALSE, 0);
-  gtk_widget_set_size_request (label139, 66, 16);
-  gtk_label_set_justify (GTK_LABEL (label139), GTK_JUSTIFY_CENTER);
-
-  combo_restore_storage = gtk_combo_new ();
-  g_object_set_data (G_OBJECT (GTK_COMBO (combo_restore_storage)->popwin),
-                     "GladeParentKey", combo_restore_storage);
-  gtk_widget_show (combo_restore_storage);
-  gtk_box_pack_start (GTK_BOX (hbox56), combo_restore_storage, TRUE, TRUE, 0);
-  gtk_combo_set_value_in_list (GTK_COMBO (combo_restore_storage), TRUE, FALSE);
-  combo_restore_storage_items = g_list_append (combo_restore_storage_items, (gpointer) "");
-  combo_restore_storage_items = g_list_append (combo_restore_storage_items, (gpointer) "");
-  gtk_combo_set_popdown_strings (GTK_COMBO (combo_restore_storage), combo_restore_storage_items);
-  g_list_free (combo_restore_storage_items);
-
-  restore_storage_entry = GTK_COMBO (combo_restore_storage)->entry;
-  gtk_widget_show (restore_storage_entry);
-  gtk_editable_set_editable (GTK_EDITABLE (restore_storage_entry), FALSE);
-
-  label142 = gtk_label_new (_("   "));
-  gtk_widget_show (label142);
-  gtk_box_pack_start (GTK_BOX (hbox56), label142, FALSE, FALSE, 21);
-  gtk_label_set_justify (GTK_LABEL (label142), GTK_JUSTIFY_CENTER);
-
-  hbox59 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox59);
-  gtk_box_pack_start (GTK_BOX (vbox17), hbox59, TRUE, TRUE, 0);
-
-  label148 = gtk_label_new (_("Before:"));
-  gtk_widget_show (label148);
-  gtk_box_pack_start (GTK_BOX (hbox59), label148, FALSE, FALSE, 0);
-  gtk_widget_set_size_request (label148, 66, 16);
-  gtk_label_set_justify (GTK_LABEL (label148), GTK_JUSTIFY_CENTER);
-
-  restore_before_entry = gtk_entry_new ();
-  gtk_widget_show (restore_before_entry);
-  gtk_box_pack_start (GTK_BOX (hbox59), restore_before_entry, TRUE, TRUE, 0);
-
-  label149 = gtk_label_new (_("   "));
-  gtk_widget_show (label149);
-  gtk_box_pack_start (GTK_BOX (hbox59), label149, FALSE, FALSE, 53);
-  gtk_label_set_justify (GTK_LABEL (label149), GTK_JUSTIFY_CENTER);
-
-  label150 = gtk_label_new (_("   "));
-  gtk_widget_show (label150);
-  gtk_box_pack_start (GTK_BOX (vbox17), label150, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label150), GTK_JUSTIFY_CENTER);
-
-  dialog_action_area9 = GTK_DIALOG (RestoreDialog)->action_area;
-  gtk_widget_show (dialog_action_area9);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area9), GTK_BUTTONBOX_END);
-
-  helpbutton1 = gtk_button_new_from_stock ("gtk-help");
-  gtk_widget_show (helpbutton1);
-  gtk_dialog_add_action_widget (GTK_DIALOG (RestoreDialog), helpbutton1, GTK_RESPONSE_HELP);
-  GTK_WIDGET_SET_FLAGS (helpbutton1, GTK_CAN_DEFAULT);
-
-  select_files_button = gtk_button_new ();
-  gtk_widget_show (select_files_button);
-  gtk_dialog_add_action_widget (GTK_DIALOG (RestoreDialog), select_files_button, 0);
-  GTK_WIDGET_SET_FLAGS (select_files_button, GTK_CAN_DEFAULT);
-
-  alignment2 = gtk_alignment_new (0.5, 0.5, 0, 0);
-  gtk_widget_show (alignment2);
-  gtk_container_add (GTK_CONTAINER (select_files_button), alignment2);
-
-  hbox49 = gtk_hbox_new (FALSE, 2);
-  gtk_widget_show (hbox49);
-  gtk_container_add (GTK_CONTAINER (alignment2), hbox49);
-
-  image1 = gtk_image_new_from_stock ("gtk-apply", GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (image1);
-  gtk_box_pack_start (GTK_BOX (hbox49), image1, FALSE, FALSE, 0);
-
-  restore_select_button = gtk_label_new_with_mnemonic (_("Select Files"));
-  gtk_widget_show (restore_select_button);
-  gtk_box_pack_start (GTK_BOX (hbox49), restore_select_button, FALSE, FALSE, 0);
-
-  restore_cancel = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_widget_show (restore_cancel);
-  gtk_dialog_add_action_widget (GTK_DIALOG (RestoreDialog), restore_cancel, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (restore_cancel, GTK_CAN_DEFAULT);
-
-  g_signal_connect ((gpointer) restore_job_entry, "changed",
-                    G_CALLBACK (on_restore_job_entry_changed),
-                    NULL);
-  g_signal_connect ((gpointer) select_files_button, "clicked",
-                    G_CALLBACK (on_select_files_button_clicked),
-                    NULL);
-  g_signal_connect ((gpointer) restore_cancel, "clicked",
-                    G_CALLBACK (on_restore_cancel_clicked),
-                    NULL);
-
-  /* Store pointers to all widgets, for use by lookup_widget(). */
-  GLADE_HOOKUP_OBJECT_NO_REF (RestoreDialog, RestoreDialog, "RestoreDialog");
-  GLADE_HOOKUP_OBJECT_NO_REF (RestoreDialog, dialog_vbox10, "dialog_vbox10");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, vbox17, "vbox17");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, vbox18, "vbox18");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, label119, "label119");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, alignment3, "alignment3");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, hbox50, "hbox50");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, hbox51, "hbox51");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, label120, "label120");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, combo_restore_job, "combo_restore_job");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, restore_job_entry, "restore_job_entry");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, label122, "label122");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, hbox52, "hbox52");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, label125, "label125");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, combo_restore_client, "combo_restore_client");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, restore_client_entry, "restore_client_entry");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, label127, "label127");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, hbox53, "hbox53");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, label128, "label128");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, combo_restore_fileset, "combo_restore_fileset");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, restore_fileset_entry, "restore_fileset_entry");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, label130, "label130");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, hbox55, "hbox55");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, label135, "label135");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, combo_restore_pool, "combo_restore_pool");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, restore_pool_entry, "restore_pool_entry");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, label138, "label138");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, hbox56, "hbox56");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, label139, "label139");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, combo_restore_storage, "combo_restore_storage");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, restore_storage_entry, "restore_storage_entry");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, label142, "label142");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, hbox59, "hbox59");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, label148, "label148");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, restore_before_entry, "restore_before_entry");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, label149, "label149");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, label150, "label150");
-  GLADE_HOOKUP_OBJECT_NO_REF (RestoreDialog, dialog_action_area9, "dialog_action_area9");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, helpbutton1, "helpbutton1");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, select_files_button, "select_files_button");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, alignment2, "alignment2");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, hbox49, "hbox49");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, image1, "image1");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, restore_select_button, "restore_select_button");
-  GLADE_HOOKUP_OBJECT (RestoreDialog, restore_cancel, "restore_cancel");
-
-  return RestoreDialog;
-}
-
-GtkWidget*
-create_progress_dialog (void)
-{
-  GtkWidget *progress_dialog;
-  GtkWidget *dialog_vbox11;
-  GtkWidget *vbox19;
-  GtkWidget *label1002;
-  GtkWidget *label1003;
-  GtkWidget *progressbar1;
-  GtkWidget *label1004;
-  GtkWidget *dialog_action_area10;
-  GtkWidget *closebutton1;
-
-  progress_dialog = gtk_dialog_new ();
-  gtk_window_set_title (GTK_WINDOW (progress_dialog), _("Progress"));
-  gtk_window_set_type_hint (GTK_WINDOW (progress_dialog), GDK_WINDOW_TYPE_HINT_DIALOG);
-
-  dialog_vbox11 = GTK_DIALOG (progress_dialog)->vbox;
-  gtk_widget_show (dialog_vbox11);
-
-  vbox19 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox19);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox11), vbox19, TRUE, TRUE, 0);
-
-  label1002 = gtk_label_new ("");
-  gtk_widget_show (label1002);
-  gtk_box_pack_start (GTK_BOX (vbox19), label1002, FALSE, FALSE, 0);
-  gtk_widget_set_size_request (label1002, 0, 43);
-
-  label1003 = gtk_label_new ("");
-  gtk_widget_show (label1003);
-  gtk_box_pack_start (GTK_BOX (vbox19), label1003, FALSE, FALSE, 0);
-  gtk_widget_set_size_request (label1003, 0, 36);
-
-  progressbar1 = gtk_progress_bar_new ();
-  gtk_widget_show (progressbar1);
-  gtk_box_pack_start (GTK_BOX (vbox19), progressbar1, TRUE, FALSE, 0);
-  gtk_widget_set_size_request (progressbar1, 150, 33);
-
-  label1004 = gtk_label_new ("");
-  gtk_widget_show (label1004);
-  gtk_box_pack_start (GTK_BOX (vbox19), label1004, FALSE, FALSE, 0);
-  gtk_widget_set_size_request (label1004, 0, 52);
-
-  dialog_action_area10 = GTK_DIALOG (progress_dialog)->action_area;
-  gtk_widget_show (dialog_action_area10);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area10), GTK_BUTTONBOX_END);
-
-  closebutton1 = gtk_button_new_from_stock ("gtk-close");
-  gtk_widget_show (closebutton1);
-  gtk_dialog_add_action_widget (GTK_DIALOG (progress_dialog), closebutton1, GTK_RESPONSE_CLOSE);
-  GTK_WIDGET_SET_FLAGS (closebutton1, GTK_CAN_DEFAULT);
-
-  /* Store pointers to all widgets, for use by lookup_widget(). */
-  GLADE_HOOKUP_OBJECT_NO_REF (progress_dialog, progress_dialog, "progress_dialog");
-  GLADE_HOOKUP_OBJECT_NO_REF (progress_dialog, dialog_vbox11, "dialog_vbox11");
-  GLADE_HOOKUP_OBJECT (progress_dialog, vbox19, "vbox19");
-  GLADE_HOOKUP_OBJECT (progress_dialog, label1002, "label1002");
-  GLADE_HOOKUP_OBJECT (progress_dialog, label1003, "label1003");
-  GLADE_HOOKUP_OBJECT (progress_dialog, progressbar1, "progressbar1");
-  GLADE_HOOKUP_OBJECT (progress_dialog, label1004, "label1004");
-  GLADE_HOOKUP_OBJECT_NO_REF (progress_dialog, dialog_action_area10, "dialog_action_area10");
-  GLADE_HOOKUP_OBJECT (progress_dialog, closebutton1, "closebutton1");
-
-  return progress_dialog;
-}
-
diff --git a/bacula/src/gnome2-console/interface.h b/bacula/src/gnome2-console/interface.h
deleted file mode 100644 (file)
index 899d3c4..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * DO NOT EDIT THIS FILE - it is generated by Glade.
- */
-
-GtkWidget* create_console (void);
-GtkWidget* create_about1 (void);
-GtkWidget* create_SelectDirectorDialog (void);
-GtkWidget* create_RunDialog (void);
-GtkWidget* create_restore_file_selection (void);
-GtkWidget* create_label_dialog (void);
-GtkWidget* create_RestoreDialog (void);
-GtkWidget* create_progress_dialog (void);
diff --git a/bacula/src/gnome2-console/restore.c b/bacula/src/gnome2-console/restore.c
deleted file mode 100644 (file)
index e9698ab..0000000
+++ /dev/null
@@ -1,386 +0,0 @@
-/*
- * Handle console GUI selection of files
- *  Kern Sibbald, March, 2004
- *
-*/
-/*
-   Bacula® - The Network Backup Solution
-
-   Copyright (C) 2004-2006 Free Software Foundation Europe e.V.
-
-   The main author of Bacula is Kern Sibbald, with contributions from
-   many others, a complete list can be found in the file AUTHORS.
-   This program is Free Software; you can redistribute it and/or
-   modify it under the terms of version two of the GNU General Public
-   License as published by the Free Software Foundation and included
-   in the file LICENSE.
-
-   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., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.
-
-   Bacula® is a registered trademark of Kern Sibbald.
-   The licensor of Bacula is the Free Software Foundation Europe
-   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
-   Switzerland, email:ftf@fsfeurope.org.
-*/
-
-
-#include "bacula.h"
-#include "console.h"
-#include "interface.h"
-#include "support.h"
-#include "restore.h"
-
-extern BSOCK *UA_sock;
-void write_director(const gchar *msg);
-void start_director_reader(gpointer data);
-void stop_director_reader(gpointer data);
-
-
-/* Forward referenced subroutines */
-void FillDirectory(const char *path, Window *window);
-Window *new_window();
-static void click_column_cb(GtkCList *item, gint column, Window *restore);
-static void select_row_cb(GtkCList *item, gint row, gint column,
-             GdkEventButton *event, Window *restore);
-void row_data_destroy_cb(gpointer data);
-void split_path_and_filename(const char *fname, POOLMEM **path, int *pnl,
-        POOLMEM **file, int *fnl);
-
-#ifdef needed
-static GdkPixmap *check_pixmap = NULL;
-static GdkPixmap *check_trans = NULL;
-static GdkPixmap *blank_pixmap = NULL;
-static GdkPixmap *blank_trans = NULL;
-#endif
-
-static GtkWidget *restore_dir;        /* current directory edit box */
-static GtkWidget *scrolled;           /* select files scrolled window */
-static Window *restore;
-
-const int NUM_COLUMNS = 7;
-const int CHECK_COLUMN = 0;
-const int FILE_COLUMN = 1;
-const int MODES_COLUMN = 2;
-const int DATE_COLUMN = 6;
-
-
-/*
- * Read Director output and discard it until next prompt
- */
-static void discard_to_prompt()
-{
-   while (bnet_recv(UA_sock) > 0) {
-      set_text(UA_sock->msg, UA_sock->msglen);
-   }
-}
-
-/*
- * Move up one directory
- */
-void
-on_restore_up_button_clicked(GtkButton *button, gpointer user_data)
-{
-   split_path_and_filename(restore->fname, &restore->path, &restore->pnl,
-                              &restore->file, &restore->fnl);
-   FillDirectory(restore->path, restore);
-}
-
-static void mark_row(int row, bool mark)
-{
-   char *file;
-   int len;
-   char new_mark[10];
-
-   gtk_clist_get_text(restore->list, row, FILE_COLUMN, &file);
-   if (mark) {
-      bstrncpy(new_mark, "x", sizeof(new_mark));
-      len = Mmsg(&restore->buf, "mark %s", file);
-   } else {
-      bstrncpy(new_mark, " ", sizeof(new_mark));
-      len = Mmsg(&restore->buf, "unmark %s", file);
-   }
-   gtk_clist_set_text(restore->list, row, CHECK_COLUMN, new_mark);
-    /* strip trailing slash from directory name */
-   while (len > 1 && restore->buf[len-1] == '/') {
-      restore->buf[len-1] = 0;
-   }
-   write_director(restore->buf);
-   discard_to_prompt();
-}
-
-void
-on_restore_add_button_clicked(GtkButton *button, gpointer user_data)
-{
-   int num_selected = g_list_length(restore->list->selection);
-   int row;
-
-   for (int i=0; i < num_selected; i++) {
-      row = (int)(long int)g_list_nth_data(restore->list->selection, i);
-      mark_row(row, true);
-   }
-}
-
-
-void
-on_restore_remove_button_clicked(GtkButton *button, gpointer user_data)
-{
-   int num_selected = g_list_length(restore->list->selection);
-   int row;
-
-   for (int i=0; i < num_selected; i++) {
-      row = (int)(long int)g_list_nth_data(restore->list->selection, i);
-      mark_row(row, false);
-   }
-}
-
-/*
- * Called once at the beginning of the program for setup
- */
-void select_restore_setup()
-{
-   const gchar *title[NUM_COLUMNS] = {_("Mark"), _("File"), _("Mode"), _("User"), _("Group"), _("Size"), _("Date")};
-
-   restore_file_selection = create_restore_file_selection();
-   if (!restore_file_selection) {
-      Dmsg0(000, "Restore_files not setup.\n");
-   }
-   restore_dir = lookup_widget(restore_file_selection, "restore_dir");
-   scrolled = lookup_widget(restore_file_selection, "scrolled");
-   if (!scrolled) {
-      Dmsg0(000, "Scrolled not setup.\n");
-   }
-
-   restore = new_window();
-
-#ifdef needed
-   check_pixmap = gdk_pixmap_colormap_create_from_xpm(NULL,
-                  gdk_colormap_get_system(), &check_trans, NULL,
-                  "check.xpm");
-   blank_pixmap = gdk_pixmap_colormap_create_from_xpm(NULL,
-                  gdk_colormap_get_system(), &blank_trans, NULL,
-                  "blank.xpm");
-#endif
-
-   /* XXX: Stupid gtk_clist_set_selection_mode() has incorrect declaration of the title argument */
-   /* XXX: Workaround by typecast... peter@ifm.liu.se */
-
-   restore->list = (GtkCList *)gtk_clist_new_with_titles(NUM_COLUMNS, (gchar **) title);
-   gtk_clist_set_selection_mode(restore->list, GTK_SELECTION_EXTENDED);
-   gtk_clist_set_sort_column(restore->list, FILE_COLUMN);
-   gtk_clist_set_auto_sort(restore->list, true);
-   gtk_signal_connect(GTK_OBJECT(restore->list), "click_column",
-                      G_CALLBACK(click_column_cb), restore);
-   gtk_signal_connect(GTK_OBJECT(restore->list), "select_row",
-                      G_CALLBACK(select_row_cb), restore);
-
-   gtk_container_add(GTK_CONTAINER(scrolled), GTK_WIDGET(restore->list));
-   restore->buf   = get_pool_memory(PM_FNAME);
-   restore->fname = get_pool_memory(PM_FNAME);
-   restore->path  = get_pool_memory(PM_NAME);
-   restore->file  = get_pool_memory(PM_NAME);
-}
-
-/*
- * Select files dialog called
- */
-void select_restore_files()
-{
-   discard_to_prompt();
-   set_restore_dialog_defaults();
-   gtk_widget_show(GTK_WIDGET(restore->list));
-   FillDirectory("/", restore);
-   gtk_main();
-}
-
-
-/*
- * Fill the CList box with files at path
- */
-void FillDirectory(const char *path, Window *restore)
-{
-   char pathbuf[MAXSTRING];
-   char modes[20], user[20], group[20], size[20], date[30];
-   char file[1000];
-   char marked[10];
-   gchar *text[NUM_COLUMNS] = {marked, file, modes, user, group, size, date};
-   GtkCList *list = restore->list;
-   int row = 0;
-
-   stop_director_reader(NULL);
-   pm_strcpy(&restore->fname, path);
-   gtk_entry_set_text(GTK_ENTRY(restore_dir), restore->fname);
-   gtk_clist_freeze(list);
-   gtk_clist_clear(list);
-
-   bsnprintf(pathbuf, sizeof(pathbuf), "cd %s", path);
-   Dmsg1(100, "%s\n", pathbuf);
-   write_director(pathbuf);
-   discard_to_prompt();
-
-   write_director("dir");
-   while (bnet_recv(UA_sock) > 0) {
-      char *p = UA_sock->msg;
-      char *l;
-      strip_trailing_junk(UA_sock->msg);
-      if (*p == '$') {
-         break;
-      }
-      Dmsg1(200, "Got: %s\n", p);
-      if (!*p) {
-         continue;
-      }
-      l = p;
-      skip_nonspaces(&p);             /* permissions */
-      *p++ = 0;
-      bstrncpy(modes, l, sizeof(modes));
-      skip_spaces(&p);
-      skip_nonspaces(&p);             /* link count */
-      *p++ = 0;
-      skip_spaces(&p);
-      l = p;
-      skip_nonspaces(&p);             /* user */
-      *p++ = 0;
-      skip_spaces(&p);
-      bstrncpy(user, l, sizeof(user));
-      l = p;
-      skip_nonspaces(&p);             /* group */
-      *p++ = 0;
-      bstrncpy(group, l, sizeof(group));
-      skip_spaces(&p);
-      l = p;
-      skip_nonspaces(&p);             /* size */
-      *p++ = 0;
-      bstrncpy(size, l, sizeof(size));
-      skip_spaces(&p);
-      l = p;
-      skip_nonspaces(&p);             /* date/time */
-      skip_spaces(&p);
-      skip_nonspaces(&p);
-      *p++ = 0;
-      bstrncpy(date, l, sizeof(date));
-      skip_spaces(&p);
-      if (*p == '*') {
-         bstrncpy(marked, "x", sizeof(marked));
-         p++;
-      } else {
-         bstrncpy(marked, " ", sizeof(marked));
-      }
-      split_path_and_filename(p, &restore->path, &restore->pnl,
-                              &restore->file, &restore->fnl);
-
-//    Dmsg1(000, "restore->fname=%s\n", restore->fname);
-      bstrncpy(file, restore->file, sizeof(file));
-//    printf("modes=%s user=%s group=%s size=%s date=%s file=%s\n",
-//       modes, user, group, size, date, file);
-
-      gtk_clist_append(list, text);
-
-      row++;
-   }
-
-   /* Fix up length of file column */
-   gtk_clist_set_column_width(list, FILE_COLUMN, gtk_clist_optimal_column_width(list, FILE_COLUMN));
-   gtk_clist_set_column_width(list, MODES_COLUMN, gtk_clist_optimal_column_width(list, MODES_COLUMN));
-   gtk_clist_thaw(list);
-   start_director_reader(NULL);
-}
-
-Window *new_window()
-{
-   Window *window = (Window *)malloc(sizeof(Window));
-   memset(window, 0, sizeof(window));
-   return window;
-}
-
-
-/*
- * User clicked a column title
- */
-static void click_column_cb(GtkCList *item, gint column, Window *restore)
-{
-}
-
-/*
- * User selected a row
- */
-static void select_row_cb(GtkCList *item, gint row, gint column,
-             GdkEventButton *event, Window *restore)
-{
-   char *file;
-   char *marked = NULL;
-   /* Column non-negative => double click */
-   if (column >= 0) {
-      gtk_clist_unselect_row(item, row, column);
-      /* Double click on column 0 means to mark or unmark */
-      if (column == 0) {
-         gtk_clist_get_text(restore->list, row, CHECK_COLUMN, &marked);
-         Dmsg1(200, "Marked=%s\n", marked);
-         if (!marked || strcmp(marked, "x") != 0) {
-            mark_row(row, true);
-         } else {
-            mark_row(row, false);
-         }
-      } else {
-      /* Double clicking on directory means to move to it */
-         int len;
-         gtk_clist_get_text(item, row, FILE_COLUMN, &file);
-         len = strlen(file);
-         if (len > 0 && file[len-1] == '/') {
-            /* Change to new directory */
-            pm_strcpy(restore->path, restore->fname);
-            if (*file == '*') {
-               Mmsg(restore->fname, "%s%s", restore->path, file+1);
-            } else {
-               Mmsg(restore->fname, "%s%s", restore->path, file);
-            }
-            FillDirectory(restore->fname, restore);
-         }
-      }
-   }
-}
-
-/*
- * CList row is being destroyed get rid of our data
- */
-void row_data_destroy_cb(gpointer data)
-{
-   if (data) {
-      free(data);
-   }
-}
-
-#ifdef xxx
-   GdkPixmap *pixmap, *trans;
-         utf8_mark = g_locale_to_utf8(new_mark, -1, NULL, NULL, NULL);
-         gtk_clist_get_pixmap(restore->list, row, CHECK_COLUMN, &pixmap, &trans);
-         if (pixmap == blank_pixmap) {
-            bstrncpy(new_mark, "x", sizeof(new_mark));
-//          gtk_clist_set_pixmap(item, row, CHECK_COLUMN, check_pixmap, check_trans);
-#endif
-#ifdef xxx
-static void window_delete_cb(GtkWidget *item, GdkEvent *event, Window *restore)
-{
-   gtk_widget_destroy(restore->window);
-   gtk_main_quit();
-   free_pool_memory(restore->buf);
-   free_pool_memory(restore->fname);
-   free_pool_memory(restore->path);
-   free_pool_memory(restore->file);
-   free(restore);
-}
-#endif
-#ifdef xxx
-      if (marked) {
-         gtk_clist_set_pixmap(list, row, CHECK_COLUMN, check_pixmap, check_trans);
-      } else {
-         gtk_clist_set_pixmap(list, row, CHECK_COLUMN, blank_pixmap, blank_trans);
-      }
-#endif
diff --git a/bacula/src/gnome2-console/restore.h b/bacula/src/gnome2-console/restore.h
deleted file mode 100644 (file)
index 01ddca5..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-   Bacula® - The Network Backup Solution
-
-   Copyright (C) 2000-2006 Free Software Foundation Europe e.V.
-
-   The main author of Bacula is Kern Sibbald, with contributions from
-   many others, a complete list can be found in the file AUTHORS.
-   This program is Free Software; you can redistribute it and/or
-   modify it under the terms of version two of the GNU General Public
-   License as published by the Free Software Foundation and included
-   in the file LICENSE.
-
-   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., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.
-
-   Bacula® is a registered trademark of Kern Sibbald.
-   The licensor of Bacula is the Free Software Foundation Europe
-   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
-   Switzerland, email:ftf@fsfeurope.org.
-*/
-
-typedef struct {
-   GtkCList  *list;
-   POOLMEM *buf;                      /* scratch buffer */
-   POOLMEM *fname;                    /* full path and file name */
-   POOLMEM *path;                     /* path, no file */
-   POOLMEM *file;                     /* file, no path */
-   int fnl;                           /* file length */
-   int pnl;                           /* path length */
-} Window;
diff --git a/bacula/src/gnome2-console/support.c b/bacula/src/gnome2-console/support.c
deleted file mode 100644 (file)
index 06a04b7..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * DO NOT EDIT THIS FILE - it is generated by Glade.
- */
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdio.h>
-
-#include <gnome.h>
-
-#include "support.h"
-
-GtkWidget*
-lookup_widget                          (GtkWidget       *widget,
-                                        const gchar     *widget_name)
-{
-  GtkWidget *parent, *found_widget;
-
-  for (;;)
-    {
-      if (GTK_IS_MENU (widget))
-        parent = gtk_menu_get_attach_widget (GTK_MENU (widget));
-      else
-        parent = widget->parent;
-      if (!parent)
-        parent = (GtkWidget*) g_object_get_data (G_OBJECT (widget), "GladeParentKey");
-      if (parent == NULL)
-        break;
-      widget = parent;
-    }
-
-  found_widget = (GtkWidget*) g_object_get_data (G_OBJECT (widget),
-                                                 widget_name);
-  if (!found_widget)
-    g_warning ("Widget not found: %s", widget_name);
-  return found_widget;
-}
-
-/* This is an internally used function to create pixmaps. */
-GtkWidget*
-create_pixmap                          (GtkWidget       *widget,
-                                        const gchar     *filename)
-{
-  GtkWidget *pixmap;
-  gchar *pathname;
-
-  if (!filename || !filename[0])
-      return gtk_image_new ();
-
-  pathname = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_APP_PIXMAP,
-                                        filename, TRUE, NULL);
-  if (!pathname)
-    {
-      g_warning (_("Couldn't find pixmap file: %s"), filename);
-      return gtk_image_new ();
-    }
-
-  pixmap = gtk_image_new_from_file (pathname);
-  g_free (pathname);
-  return pixmap;
-}
-
-/* This is an internally used function to create pixmaps. */
-GdkPixbuf*
-create_pixbuf                          (const gchar     *filename)
-{
-  gchar *pathname = NULL;
-  GdkPixbuf *pixbuf;
-  GError *error = NULL;
-
-  if (!filename || !filename[0])
-      return NULL;
-
-  pathname = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_APP_PIXMAP,
-                                        filename, TRUE, NULL);
-
-  if (!pathname)
-    {
-      g_warning (_("Couldn't find pixmap file: %s"), filename);
-      return NULL;
-    }
-
-  pixbuf = gdk_pixbuf_new_from_file (pathname, &error);
-  if (!pixbuf)
-    {
-      fprintf (stderr, "Failed to load pixbuf file: %s: %s\n",
-               pathname, error->message);
-      g_error_free (error);
-    }
-  g_free (pathname);
-  return pixbuf;
-}
-
-/* This is used to set ATK action descriptions. */
-void
-glade_set_atk_action_description       (AtkAction       *action,
-                                        const gchar     *action_name,
-                                        const gchar     *description)
-{
-  gint n_actions, i;
-
-  n_actions = atk_action_get_n_actions (action);
-  for (i = 0; i < n_actions; i++)
-    {
-      if (!strcmp (atk_action_get_name (action, i), action_name))
-        atk_action_set_description (action, i, description);
-    }
-}
-
diff --git a/bacula/src/gnome2-console/support.h b/bacula/src/gnome2-console/support.h
deleted file mode 100644 (file)
index 8e0506a..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * DO NOT EDIT THIS FILE - it is generated by Glade.
- */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include <gnome.h>
-
-
-#undef Q_
-#ifdef ENABLE_NLS
-#  define Q_(String) g_strip_context ((String), gettext (String))
-#else
-#  define Q_(String) g_strip_context ((String), (String))
-#endif
-
-
-/*
- * Public Functions.
- */
-
-/*
- * This function returns a widget in a component created by Glade.
- * Call it with the toplevel widget in the component (i.e. a window/dialog),
- * or alternatively any widget in the component, and the name of the widget
- * you want returned.
- */
-GtkWidget*  lookup_widget              (GtkWidget       *widget,
-                                        const gchar     *widget_name);
-
-
-
-/*
- * Private Functions.
- */
-
-/* This is used to create the pixmaps used in the interface. */
-GtkWidget*  create_pixmap              (GtkWidget       *widget,
-                                        const gchar     *filename);
-
-/* This is used to create the pixbufs used in the interface. */
-GdkPixbuf*  create_pixbuf              (const gchar     *filename);
-
-/* This is used to set ATK action descriptions. */
-void        glade_set_atk_action_description (AtkAction       *action,
-                                              const gchar     *action_name,
-                                              const gchar     *description);
diff --git a/bacula/src/gnome2-console/test-gnome-console.conf b/bacula/src/gnome2-console/test-gnome-console.conf
deleted file mode 100644 (file)
index b2725a1..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Bacula User Agent (or Console) Configuration File
-#
-
-Director {
-  Name = rufus-dir
-  DIRport = 8101
-  address = rufus
-  Password = UA_password
-}
index 9a8af4fb1dad39b75e4d0796ea547a08af9bb9d7..f3292ce89b30d0196b60911dec101f974501ccab 100644 (file)
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "3.1.4"
-#define BDATE   "25 September 2009"
-#define LSMDATE "25Sep09"
+#define BDATE   "26 September 2009"
+#define LSMDATE "26Sep09"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2009 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2009"       /* year for copyright messages in progs */
index 20a1631f96578f667cb4e32458e483035560fae1..70fb2d3de3dc33b9f7fee5e41947d0a7d5976939 100644 (file)
@@ -3,6 +3,7 @@
 General:
 
 26Sep08
+kes  Remove gnome-console
 kes  Implement store_size32 and store_size64
 25Sep08
 kes  Fix Alpha ifdefing -- should fix bug #1359