[Pkg-privacy-commits] [nautilus-wipe] 142/224: Imported Upstream version 0.1.1
Ulrike Uhlig
u-guest at moszumanska.debian.org
Thu Jul 7 19:45:44 UTC 2016
This is an automated email from the git hooks/post-receive script.
u-guest pushed a commit to branch master
in repository nautilus-wipe.
commit a1fdc239f4565a06b137702ed5a7e65f67129a90
Author: intrigeri <intrigeri at boum.org>
Date: Thu Aug 18 10:50:13 2011 +0200
Imported Upstream version 0.1.1
---
NEWS | 8 ++
aclocal.m4 | 10 +-
build/aux/config.guess | 219 ++++++++++++++++++++------------------
build/aux/config.sub | 156 +++++++++++++++++----------
build/aux/gnome-doc-utils.make | 2 +-
build/aux/ltmain.sh | 4 +-
configure | 105 ++++++++++++------
configure.ac | 22 +++-
help/C/nautilus-wipe.xml | 32 +++---
help/Makefile.in | 2 +-
nautilus-wipe/fill-operation.c | 8 +-
nautilus-wipe/nautilus-wipe.c | 7 +-
nautilus-wipe/operation-manager.c | 2 +-
nautilus-wipe/progress-dialog.c | 19 ++--
14 files changed, 370 insertions(+), 226 deletions(-)
diff --git a/NEWS b/NEWS
index 65551c1..6739998 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+0.1.1 (2011-08-17):
+
+ Minor improvements of 0.1 release.
+
+ * Support for GTK 3.x (and thus Nautilus 3.x)
+ * Minor UI cleanup of the progress dialog
+
+
0.1 (2011-05-15):
Initial release.
diff --git a/aclocal.m4 b/aclocal.m4
index 2497204..be00b34 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -513,7 +513,8 @@ AC_DEFUN([AM_NLS],
# ----------------------------------
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
@@ -559,7 +560,8 @@ m4_define([_PKG_CONFIG],
pkg_cv_[]$1="$$1"
elif test -n "$PKG_CONFIG"; then
PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes ],
[pkg_failed=yes])
else
pkg_failed=untried
@@ -607,9 +609,9 @@ if test $pkg_failed = yes; then
AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
diff --git a/build/aux/config.guess b/build/aux/config.guess
index c2246a4..40eaed4 100755
--- a/build/aux/config.guess
+++ b/build/aux/config.guess
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-# Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+# 2011 Free Software Foundation, Inc.
-timestamp='2009-12-30'
+timestamp='2011-05-11'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -57,7 +57,7 @@ GNU config.guess ($timestamp)
Originally written by Per Bothner.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -181,7 +181,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
fi
;;
*)
- os=netbsd
+ os=netbsd
;;
esac
# The OS release
@@ -224,7 +224,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
;;
*5.*)
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
;;
esac
# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -270,7 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- exit ;;
+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+ exitcode=$?
+ trap '' 0
+ exit $exitcode ;;
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# Should we change UNAME_MACHINE based on the output of uname instead
@@ -296,7 +299,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
echo s390-ibm-zvmoe
exit ;;
*:OS400:*:*)
- echo powerpc-ibm-os400
+ echo powerpc-ibm-os400
exit ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
@@ -395,23 +398,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# MiNT. But MiNT is downward compatible to TOS, so this should
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint${UNAME_RELEASE}
exit ;;
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
+ exit ;;
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint${UNAME_RELEASE}
exit ;;
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint${UNAME_RELEASE}
- exit ;;
+ echo m68k-milan-mint${UNAME_RELEASE}
+ exit ;;
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint${UNAME_RELEASE}
- exit ;;
+ echo m68k-hades-mint${UNAME_RELEASE}
+ exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
- exit ;;
+ echo m68k-unknown-mint${UNAME_RELEASE}
+ exit ;;
m68k:machten:*:*)
echo m68k-apple-machten${UNAME_RELEASE}
exit ;;
@@ -481,8 +484,8 @@ EOF
echo m88k-motorola-sysv3
exit ;;
AViiON:dgux:*:*)
- # DG/UX returns AViiON for all architectures
- UNAME_PROCESSOR=`/usr/bin/uname -p`
+ # DG/UX returns AViiON for all architectures
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
then
if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -495,7 +498,7 @@ EOF
else
echo i586-dg-dgux${UNAME_RELEASE}
fi
- exit ;;
+ exit ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
echo m88k-dolphin-sysv3
exit ;;
@@ -552,7 +555,7 @@ EOF
echo rs6000-ibm-aix3.2
fi
exit ;;
- *:AIX:*:[456])
+ *:AIX:*:[4567])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
@@ -595,52 +598,52 @@ EOF
9000/[678][0-9][0-9])
if [ -x /usr/bin/getconf ]; then
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
- case "${sc_cpu_version}" in
- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
- 532) # CPU_PA_RISC2_0
- case "${sc_kernel_bits}" in
- 32) HP_ARCH="hppa2.0n" ;;
- 64) HP_ARCH="hppa2.0w" ;;
+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+ case "${sc_cpu_version}" in
+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+ 532) # CPU_PA_RISC2_0
+ case "${sc_kernel_bits}" in
+ 32) HP_ARCH="hppa2.0n" ;;
+ 64) HP_ARCH="hppa2.0w" ;;
'') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
- esac ;;
- esac
+ esac ;;
+ esac
fi
if [ "${HP_ARCH}" = "" ]; then
eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ sed 's/^ //' << EOF >$dummy.c
- #define _HPUX_SOURCE
- #include <stdlib.h>
- #include <unistd.h>
+ #define _HPUX_SOURCE
+ #include <stdlib.h>
+ #include <unistd.h>
- int main ()
- {
- #if defined(_SC_KERNEL_BITS)
- long bits = sysconf(_SC_KERNEL_BITS);
- #endif
- long cpu = sysconf (_SC_CPU_VERSION);
+ int main ()
+ {
+ #if defined(_SC_KERNEL_BITS)
+ long bits = sysconf(_SC_KERNEL_BITS);
+ #endif
+ long cpu = sysconf (_SC_CPU_VERSION);
- switch (cpu)
- {
- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
- case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
- case CPU_PA_RISC2_0:
- #if defined(_SC_KERNEL_BITS)
- switch (bits)
- {
- case 64: puts ("hppa2.0w"); break;
- case 32: puts ("hppa2.0n"); break;
- default: puts ("hppa2.0"); break;
- } break;
- #else /* !defined(_SC_KERNEL_BITS) */
- puts ("hppa2.0"); break;
- #endif
- default: puts ("hppa1.0"); break;
- }
- exit (0);
- }
+ switch (cpu)
+ {
+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+ case CPU_PA_RISC2_0:
+ #if defined(_SC_KERNEL_BITS)
+ switch (bits)
+ {
+ case 64: puts ("hppa2.0w"); break;
+ case 32: puts ("hppa2.0n"); break;
+ default: puts ("hppa2.0"); break;
+ } break;
+ #else /* !defined(_SC_KERNEL_BITS) */
+ puts ("hppa2.0"); break;
+ #endif
+ default: puts ("hppa1.0"); break;
+ }
+ exit (0);
+ }
EOF
(CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -731,22 +734,22 @@ EOF
exit ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
echo c1-convex-bsd
- exit ;;
+ exit ;;
C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
if getsysinfo -f scalar_acc
then echo c32-convex-bsd
else echo c2-convex-bsd
fi
- exit ;;
+ exit ;;
C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
echo c34-convex-bsd
- exit ;;
+ exit ;;
C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
echo c38-convex-bsd
- exit ;;
+ exit ;;
C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
echo c4-convex-bsd
- exit ;;
+ exit ;;
CRAY*Y-MP:*:*:*)
echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit ;;
@@ -770,14 +773,14 @@ EOF
exit ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit ;;
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit ;;
5000:UNIX_System_V:4.*:*)
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -805,14 +808,14 @@ EOF
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
- # uname -m includes "-pc" on this system.
- echo ${UNAME_MACHINE}-mingw32
+ # uname -m includes "-pc" on this system.
+ echo ${UNAME_MACHINE}-mingw32
exit ;;
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
*:Interix*:*)
- case ${UNAME_MACHINE} in
+ case ${UNAME_MACHINE} in
x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
@@ -867,7 +870,7 @@ EOF
EV6) UNAME_MACHINE=alphaev6 ;;
EV67) UNAME_MACHINE=alphaev67 ;;
EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
+ esac
objdump --private-headers /bin/sh | grep -q ld.so.1
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
@@ -879,7 +882,13 @@ EOF
then
echo ${UNAME_MACHINE}-unknown-linux-gnu
else
- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_PCS_VFP
+ then
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ else
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+ fi
fi
exit ;;
avr32*:Linux:*:*)
@@ -892,7 +901,7 @@ EOF
echo crisv32-axis-linux-gnu
exit ;;
frv:Linux:*:*)
- echo frv-unknown-linux-gnu
+ echo frv-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
LIBC=gnu
@@ -960,7 +969,7 @@ EOF
echo ${UNAME_MACHINE}-ibm-linux
exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
sh*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -968,6 +977,9 @@ EOF
sparc:Linux:*:* | sparc64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
+ tile*:Linux:*:*)
+ echo ${UNAME_MACHINE}-tilera-linux-gnu
+ exit ;;
vax:Linux:*:*)
echo ${UNAME_MACHINE}-dec-linux-gnu
exit ;;
@@ -975,7 +987,7 @@ EOF
echo x86_64-unknown-linux-gnu
exit ;;
xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -984,11 +996,11 @@ EOF
echo i386-sequent-sysv4
exit ;;
i*86:UNIX_SV:4.2MP:2.*)
- # Unixware is an offshoot of SVR4, but it has its own version
- # number series starting with 2...
- # I am not positive that other SVR4 systems won't match this,
+ # Unixware is an offshoot of SVR4, but it has its own version
+ # number series starting with 2...
+ # I am not positive that other SVR4 systems won't match this,
# I just have to hope. -- rms.
- # Use sysv4.2uw... so that sysv4* matches it.
+ # Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
exit ;;
i*86:OS/2:*:*)
@@ -1020,7 +1032,7 @@ EOF
fi
exit ;;
i*86:*:5:[678]*)
- # UnixWare 7.x, OpenUNIX and OpenServer 6.
+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
case `/bin/uname -X | grep "^Machine"` in
*486*) UNAME_MACHINE=i486 ;;
*Pentium) UNAME_MACHINE=i586 ;;
@@ -1048,13 +1060,13 @@ EOF
exit ;;
pc:*:*:*)
# Left here for compatibility:
- # uname -m prints for DJGPP always 'pc', but it prints nothing about
- # the processor, so we play safe by assuming i586.
+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
+ # the processor, so we play safe by assuming i586.
# Note: whatever this is, it MUST be the same as what config.sub
# prints for the "djgpp" host, or else GDB configury will decide that
# this is a cross-build.
echo i586-pc-msdosdjgpp
- exit ;;
+ exit ;;
Intel:Mach:3*:*)
echo i386-pc-mach3
exit ;;
@@ -1089,8 +1101,8 @@ EOF
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
&& { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4; exit; } ;;
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && { echo i486-ncr-sysv4; exit; } ;;
NCR*:*:4.2:* | MPRAS*:*:4.2:*)
OS_REL='.3'
test -r /etc/.relid \
@@ -1133,10 +1145,10 @@ EOF
echo ns32k-sni-sysv
fi
exit ;;
- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
- # says <Richard.M.Bartel at ccMail.Census.GOV>
- echo i586-unisys-sysv4
- exit ;;
+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+ # says <Richard.M.Bartel at ccMail.Census.GOV>
+ echo i586-unisys-sysv4
+ exit ;;
*:UNIX_System_V:4*:FTX*)
# From Gerald Hewes <hewes at openmarket.com>.
# How about differentiating between stratus architectures? -djm
@@ -1162,11 +1174,11 @@ EOF
exit ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then
- echo mips-nec-sysv${UNAME_RELEASE}
+ echo mips-nec-sysv${UNAME_RELEASE}
else
- echo mips-unknown-sysv${UNAME_RELEASE}
+ echo mips-unknown-sysv${UNAME_RELEASE}
fi
- exit ;;
+ exit ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
echo powerpc-be-beos
exit ;;
@@ -1231,6 +1243,9 @@ EOF
*:QNX:*:4*)
echo i386-pc-qnx
exit ;;
+ NEO-?:NONSTOP_KERNEL:*:*)
+ echo neo-tandem-nsk${UNAME_RELEASE}
+ exit ;;
NSE-?:NONSTOP_KERNEL:*:*)
echo nse-tandem-nsk${UNAME_RELEASE}
exit ;;
@@ -1276,13 +1291,13 @@ EOF
echo pdp10-unknown-its
exit ;;
SEI:*:*:SEIUX)
- echo mips-sei-seiux${UNAME_RELEASE}
+ echo mips-sei-seiux${UNAME_RELEASE}
exit ;;
*:DragonFly:*:*)
echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit ;;
*:*VMS:*:*)
- UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
case "${UNAME_MACHINE}" in
A*) echo alpha-dec-vms ; exit ;;
I*) echo ia64-dec-vms ; exit ;;
@@ -1322,11 +1337,11 @@ main ()
#include <sys/param.h>
printf ("m68k-sony-newsos%s\n",
#ifdef NEWSOS4
- "4"
+ "4"
#else
- ""
+ ""
#endif
- ); exit (0);
+ ); exit (0);
#endif
#endif
diff --git a/build/aux/config.sub b/build/aux/config.sub
index c2d1257..30fdca8 100755
--- a/build/aux/config.sub
+++ b/build/aux/config.sub
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-# Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+# 2011 Free Software Foundation, Inc.
-timestamp='2010-01-22'
+timestamp='2011-03-23'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -76,7 +76,7 @@ version="\
GNU config.sub ($timestamp)
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -124,8 +124,9 @@ esac
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+ linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+ knetbsd*-gnu* | netbsd*-gnu* | \
kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
@@ -157,8 +158,8 @@ case $os in
os=
basic_machine=$1
;;
- -bluegene*)
- os=-cnk
+ -bluegene*)
+ os=-cnk
;;
-sim | -cisco | -oki | -wec | -winbond)
os=
@@ -174,10 +175,10 @@ case $os in
os=-chorusos
basic_machine=$1
;;
- -chorusrdb)
- os=-chorusrdb
+ -chorusrdb)
+ os=-chorusrdb
basic_machine=$1
- ;;
+ ;;
-hiux*)
os=-hiuxwe2
;;
@@ -282,11 +283,13 @@ case $basic_machine in
| moxie \
| mt \
| msp430 \
+ | nds32 | nds32le | nds32be \
| nios | nios2 \
| ns16k | ns32k \
+ | open8 \
| or32 \
| pdp10 | pdp11 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
| rx \
| score \
@@ -294,15 +297,24 @@ case $basic_machine in
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
- | spu | strongarm \
- | tahoe | thumb | tic4x | tic80 | tron \
+ | spu \
+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
| ubicom32 \
| v850 | v850e \
| we32k \
- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
basic_machine=$basic_machine-unknown
;;
+ c54x)
+ basic_machine=tic54x-unknown
+ ;;
+ c55x)
+ basic_machine=tic55x-unknown
+ ;;
+ c6x)
+ basic_machine=tic6x-unknown
+ ;;
m6811 | m68hc11 | m6812 | m68hc12 | picochip)
# Motorola 68HC11/12.
basic_machine=$basic_machine-unknown
@@ -314,6 +326,18 @@ case $basic_machine in
basic_machine=mt-unknown
;;
+ strongarm | thumb | xscale)
+ basic_machine=arm-unknown
+ ;;
+
+ xscaleeb)
+ basic_machine=armeb-unknown
+ ;;
+
+ xscaleel)
+ basic_machine=armel-unknown
+ ;;
+
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
# (2) the word "unknown" tends to confuse beginning users.
@@ -334,7 +358,7 @@ case $basic_machine in
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
| bfin-* | bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* \
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
@@ -368,26 +392,28 @@ case $basic_machine in
| mmix-* \
| mt-* \
| msp430-* \
+ | nds32-* | nds32le-* | nds32be-* \
| nios-* | nios2-* \
| none-* | np1-* | ns16k-* | ns32k-* \
+ | open8-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pyramid-* \
| romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
- | tahoe-* | thumb-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+ | tahoe-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tile-* | tilegx-* \
| tron-* \
| ubicom32-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
| ymp-* \
| z8k-* | z80-*)
@@ -412,7 +438,7 @@ case $basic_machine in
basic_machine=a29k-amd
os=-udi
;;
- abacus)
+ abacus)
basic_machine=abacus-unknown
;;
adobe68k)
@@ -482,11 +508,20 @@ case $basic_machine in
basic_machine=powerpc-ibm
os=-cnk
;;
+ c54x-*)
+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ c55x-*)
+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ c6x-*)
+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
c90)
basic_machine=c90-cray
os=-unicos
;;
- cegcc)
+ cegcc)
basic_machine=arm-unknown
os=-cegcc
;;
@@ -518,7 +553,7 @@ case $basic_machine in
basic_machine=craynv-cray
os=-unicosmp
;;
- cr16)
+ cr16 | cr16-*)
basic_machine=cr16-unknown
os=-elf
;;
@@ -734,7 +769,7 @@ case $basic_machine in
basic_machine=ns32k-utek
os=-sysv
;;
- microblaze)
+ microblaze)
basic_machine=microblaze-xilinx
;;
mingw32)
@@ -841,6 +876,12 @@ case $basic_machine in
np1)
basic_machine=np1-gould
;;
+ neo-tandem)
+ basic_machine=neo-tandem
+ ;;
+ nse-tandem)
+ basic_machine=nse-tandem
+ ;;
nsr-tandem)
basic_machine=nsr-tandem
;;
@@ -923,9 +964,10 @@ case $basic_machine in
;;
power) basic_machine=power-ibm
;;
- ppc) basic_machine=powerpc-unknown
+ ppc | ppcbe) basic_machine=powerpc-unknown
;;
- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ppc-* | ppcbe-*)
+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppcle | powerpclittle | ppc-le | powerpc-little)
basic_machine=powerpcle-unknown
@@ -1019,6 +1061,9 @@ case $basic_machine in
basic_machine=i860-stratus
os=-sysv4
;;
+ strongarm-* | thumb-*)
+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
sun2)
basic_machine=m68000-sun
;;
@@ -1075,20 +1120,8 @@ case $basic_machine in
basic_machine=t90-cray
os=-unicos
;;
- tic54x | c54x*)
- basic_machine=tic54x-unknown
- os=-coff
- ;;
- tic55x | c55x*)
- basic_machine=tic55x-unknown
- os=-coff
- ;;
- tic6x | c6x*)
- basic_machine=tic6x-unknown
- os=-coff
- ;;
- # This must be matched before tile*.
- tilegx*)
+ # This must be matched before tile*.
+ tilegx*)
basic_machine=tilegx-unknown
os=-linux-gnu
;;
@@ -1163,6 +1196,9 @@ case $basic_machine in
xps | xps100)
basic_machine=xps100-honeywell
;;
+ xscale-* | xscalee[bl]-*)
+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+ ;;
ymp)
basic_machine=ymp-cray
os=-unicos
@@ -1260,11 +1296,11 @@ esac
if [ x"$os" != x"" ]
then
case $os in
- # First match some system type aliases
- # that might get confused with valid system types.
+ # First match some system type aliases
+ # that might get confused with valid system types.
# -solaris* is a basic system type, with this one exception.
- -auroraux)
- os=-auroraux
+ -auroraux)
+ os=-auroraux
;;
-solaris1 | -solaris1.*)
os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1301,7 +1337,8 @@ case $os in
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+ | -mingw32* | -linux-gnu* | -linux-android* \
+ | -linux-newlib* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1348,7 +1385,7 @@ case $os in
-opened*)
os=-openedition
;;
- -os400*)
+ -os400*)
os=-os400
;;
-wince*)
@@ -1397,7 +1434,7 @@ case $os in
-sinix*)
os=-sysv4
;;
- -tpf*)
+ -tpf*)
os=-tpf
;;
-triton*)
@@ -1442,8 +1479,8 @@ case $os in
-dicos*)
os=-dicos
;;
- -nacl*)
- ;;
+ -nacl*)
+ ;;
-none)
;;
*)
@@ -1466,10 +1503,10 @@ else
# system, and we'll never get to this point.
case $basic_machine in
- score-*)
+ score-*)
os=-elf
;;
- spu-*)
+ spu-*)
os=-elf
;;
*-acorn)
@@ -1481,8 +1518,17 @@ case $basic_machine in
arm*-semi)
os=-aout
;;
- c4x-* | tic4x-*)
- os=-coff
+ c4x-* | tic4x-*)
+ os=-coff
+ ;;
+ tic54x-*)
+ os=-coff
+ ;;
+ tic55x-*)
+ os=-coff
+ ;;
+ tic6x-*)
+ os=-coff
;;
# This must come before the *-dec entry.
pdp10-*)
@@ -1509,7 +1555,7 @@ case $basic_machine in
m68*-cisco)
os=-aout
;;
- mep-*)
+ mep-*)
os=-elf
;;
mips*-cisco)
@@ -1536,7 +1582,7 @@ case $basic_machine in
*-ibm)
os=-aix
;;
- *-knuth)
+ *-knuth)
os=-mmixware
;;
*-wec)
diff --git a/build/aux/gnome-doc-utils.make b/build/aux/gnome-doc-utils.make
index bc2a61f..0da2cf9 100644
--- a/build/aux/gnome-doc-utils.make
+++ b/build/aux/gnome-doc-utils.make
@@ -361,7 +361,7 @@ $(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
## @ _DOC_POT
## A pot file
-_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot)
+_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot,$(if $(DOC_ID),$(DOC_ID).pot))
.PHONY: pot
pot: $(_DOC_POT)
$(_DOC_POT): $(_DOC_C_DOCS_NOENT)
diff --git a/build/aux/ltmain.sh b/build/aux/ltmain.sh
index 6f650ae..c7dd906 100755
--- a/build/aux/ltmain.sh
+++ b/build/aux/ltmain.sh
@@ -69,7 +69,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.4 Debian-2.4-2
+# $progname: (GNU libtool) 2.4 Debian-2.4-3
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -79,7 +79,7 @@
PROGRAM=libtool
PACKAGE=libtool
-VERSION="2.4 Debian-2.4-2"
+VERSION="2.4 Debian-2.4-3"
TIMESTAMP=""
package_revision=1.3293
diff --git a/configure b/configure
index f5d3131..6dfae68 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for nautilus-wipe 0.1.
+# Generated by GNU Autoconf 2.68 for nautilus-wipe 0.1.1.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='nautilus-wipe'
PACKAGE_TARNAME='nautilus-wipe'
-PACKAGE_VERSION='0.1'
-PACKAGE_STRING='nautilus-wipe 0.1'
+PACKAGE_VERSION='0.1.1'
+PACKAGE_STRING='nautilus-wipe 0.1.1'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -805,6 +805,7 @@ with_help_dir
with_omf_dir
with_help_formats
enable_scrollkeeper
+with_gtk3
with_nautilus_extdir
'
ac_precious_vars='build_alias
@@ -1373,7 +1374,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures nautilus-wipe 0.1 to adapt to many kinds of systems.
+\`configure' configures nautilus-wipe 0.1.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1443,7 +1444,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of nautilus-wipe 0.1:";;
+ short | recursive ) echo "Configuration of nautilus-wipe 0.1.1:";;
esac
cat <<\_ACEOF
@@ -1475,6 +1476,7 @@ Optional Packages:
--with-omf-dir=DIR path to OMF files
--with-help-formats=FORMATS
list of formats
+ --with-gtk3 build for GTK3 instead of GTK2 [[default=auto]]
--with-nautilus-extdir=DIR
nautilus plugins extension directory [auto]
@@ -1579,7 +1581,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-nautilus-wipe configure 0.1
+nautilus-wipe configure 0.1.1
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1944,7 +1946,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by nautilus-wipe $as_me 0.1, which was
+It was created by nautilus-wipe $as_me 0.1.1, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2761,7 +2763,7 @@ fi
# Define the identity of the package.
PACKAGE='nautilus-wipe'
- VERSION='0.1'
+ VERSION='0.1.1'
cat >>confdefs.h <<_ACEOF
@@ -12801,7 +12803,7 @@ fi
fi
if test -n "$PKG_CONFIG"; then
- _pkg_min_version=0.9.0
+ _pkg_min_version=0.9
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
@@ -12814,6 +12816,7 @@ $as_echo "no" >&6; }
fi
fi
+
gdu_cv_version_required=0.3.2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
@@ -12918,6 +12921,36 @@ NAUTILUS_EXTENSION=2.0
GSECUREDELETE_REQUIRED=0.1
GIO_UNIX_REQUIRED=2.0
+# choose whether to use GTK2 or GTK3
+
+# Check whether --with-gtk3 was given.
+if test "${with_gtk3+set}" = set; then :
+ withval=$with_gtk3; with_gtk3="$withval"
+else
+ with_gtk3=check
+fi
+
+# use GTK2 by default but if not found
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK package to use" >&5
+$as_echo_n "checking for GTK package to use... " >&6; }
+gtk_pkg="gtk+-2.0"
+if test "x$with_gtk3" = xcheck; then :
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_pkg >= \${GTK_REQUIRED}\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "$gtk_pkg >= ${GTK_REQUIRED}") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ :
+else
+ gtk_pkg="gtk+-3.0"
+fi
+elif test "x$with_gtk3" != xno; then :
+ gtk_pkg="gtk+-3.0"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gtk_pkg" >&5
+$as_echo "$gtk_pkg" >&6; }
+
# mandatory packages
pkg_failed=no
@@ -12934,6 +12967,7 @@ if test -n "$GLIB_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= ${GLIB_REQUIRED}" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -12950,6 +12984,7 @@ if test -n "$GLIB_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= ${GLIB_REQUIRED}" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -12969,9 +13004,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= ${GLIB_REQUIRED}" 2>&1`
+ GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= ${GLIB_REQUIRED}" 2>&1`
else
- GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= ${GLIB_REQUIRED}" 2>&1`
+ GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= ${GLIB_REQUIRED}" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GLIB_PKG_ERRORS" >&5
@@ -13017,12 +13052,13 @@ if test -n "$GTK_CFLAGS"; then
pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \${GTK_REQUIRED}\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= ${GTK_REQUIRED}") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_pkg >= \${GTK_REQUIRED}\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "$gtk_pkg >= ${GTK_REQUIRED}") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= ${GTK_REQUIRED}" 2>/dev/null`
+ pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "$gtk_pkg >= ${GTK_REQUIRED}" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -13033,12 +13069,13 @@ if test -n "$GTK_LIBS"; then
pkg_cv_GTK_LIBS="$GTK_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \${GTK_REQUIRED}\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= ${GTK_REQUIRED}") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_pkg >= \${GTK_REQUIRED}\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "$gtk_pkg >= ${GTK_REQUIRED}") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= ${GTK_REQUIRED}" 2>/dev/null`
+ pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "$gtk_pkg >= ${GTK_REQUIRED}" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -13058,14 +13095,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= ${GTK_REQUIRED}" 2>&1`
+ GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$gtk_pkg >= ${GTK_REQUIRED}" 2>&1`
else
- GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= ${GTK_REQUIRED}" 2>&1`
+ GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$gtk_pkg >= ${GTK_REQUIRED}" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GTK_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (gtk+-2.0 >= ${GTK_REQUIRED}) were not met:
+ as_fn_error $? "Package requirements ($gtk_pkg >= ${GTK_REQUIRED}) were not met:
$GTK_PKG_ERRORS
@@ -13112,6 +13149,7 @@ if test -n "$GCONF_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= ${GCONF_REQUIRED}" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -13128,6 +13166,7 @@ if test -n "$GCONF_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 >= ${GCONF_REQUIRED}" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -13147,9 +13186,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gconf-2.0 >= ${GCONF_REQUIRED}" 2>&1`
+ GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gconf-2.0 >= ${GCONF_REQUIRED}" 2>&1`
else
- GCONF_PKG_ERRORS=`$PKG_CONFIG --print-errors "gconf-2.0 >= ${GCONF_REQUIRED}" 2>&1`
+ GCONF_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gconf-2.0 >= ${GCONF_REQUIRED}" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GCONF_PKG_ERRORS" >&5
@@ -13201,6 +13240,7 @@ if test -n "$LIBNAUTILUS_EXTENSION_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBNAUTILUS_EXTENSION_CFLAGS=`$PKG_CONFIG --cflags "libnautilus-extension >= ${NAUTILUS_EXTENSION}" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -13217,6 +13257,7 @@ if test -n "$LIBNAUTILUS_EXTENSION_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBNAUTILUS_EXTENSION_LIBS=`$PKG_CONFIG --libs "libnautilus-extension >= ${NAUTILUS_EXTENSION}" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -13236,9 +13277,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBNAUTILUS_EXTENSION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnautilus-extension >= ${NAUTILUS_EXTENSION}" 2>&1`
+ LIBNAUTILUS_EXTENSION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnautilus-extension >= ${NAUTILUS_EXTENSION}" 2>&1`
else
- LIBNAUTILUS_EXTENSION_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnautilus-extension >= ${NAUTILUS_EXTENSION}" 2>&1`
+ LIBNAUTILUS_EXTENSION_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnautilus-extension >= ${NAUTILUS_EXTENSION}" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBNAUTILUS_EXTENSION_PKG_ERRORS" >&5
@@ -13290,6 +13331,7 @@ if test -n "$GSECUREDELETE_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GSECUREDELETE_CFLAGS=`$PKG_CONFIG --cflags "gsecuredelete >= ${GSECUREDELETE_REQUIRED}" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -13306,6 +13348,7 @@ if test -n "$GSECUREDELETE_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GSECUREDELETE_LIBS=`$PKG_CONFIG --libs "gsecuredelete >= ${GSECUREDELETE_REQUIRED}" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -13325,9 +13368,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GSECUREDELETE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gsecuredelete >= ${GSECUREDELETE_REQUIRED}" 2>&1`
+ GSECUREDELETE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gsecuredelete >= ${GSECUREDELETE_REQUIRED}" 2>&1`
else
- GSECUREDELETE_PKG_ERRORS=`$PKG_CONFIG --print-errors "gsecuredelete >= ${GSECUREDELETE_REQUIRED}" 2>&1`
+ GSECUREDELETE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gsecuredelete >= ${GSECUREDELETE_REQUIRED}" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GSECUREDELETE_PKG_ERRORS" >&5
@@ -13382,6 +13425,7 @@ if test -n "$GIO_UNIX_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GIO_UNIX_CFLAGS=`$PKG_CONFIG --cflags "gio-unix-2.0 >= ${GIO_UNIX_REQUIRED}" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -13398,6 +13442,7 @@ if test -n "$GIO_UNIX_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GIO_UNIX_LIBS=`$PKG_CONFIG --libs "gio-unix-2.0 >= ${GIO_UNIX_REQUIRED}" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -13417,9 +13462,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GIO_UNIX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gio-unix-2.0 >= ${GIO_UNIX_REQUIRED}" 2>&1`
+ GIO_UNIX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-unix-2.0 >= ${GIO_UNIX_REQUIRED}" 2>&1`
else
- GIO_UNIX_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-unix-2.0 >= ${GIO_UNIX_REQUIRED}" 2>&1`
+ GIO_UNIX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-unix-2.0 >= ${GIO_UNIX_REQUIRED}" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GIO_UNIX_PKG_ERRORS" >&5
@@ -14808,7 +14853,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by nautilus-wipe $as_me 0.1, which was
+This file was extended by nautilus-wipe $as_me 0.1.1, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14874,7 +14919,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-nautilus-wipe config.status 0.1
+nautilus-wipe config.status 0.1.1
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 987dff8..de1e6f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# Initially based on NautilusActions configure & build system.
AC_PREREQ([2.64])
-AC_INIT([nautilus-wipe],[0.1])
+AC_INIT([nautilus-wipe],[0.1.1])
AC_CONFIG_SRCDIR([nautilus-wipe/nautilus-wipe.h])
AC_CONFIG_AUX_DIR([build/aux])
AC_CONFIG_MACRO_DIR([build/m4])
@@ -16,6 +16,7 @@ LT_INIT([disable-static])
AC_PROG_CC
AM_PROG_CC_C_O
IT_PROG_INTLTOOL
+PKG_PROG_PKG_CONFIG([0.9])
GNOME_DOC_INIT
@@ -34,9 +35,26 @@ NAUTILUS_EXTENSION=2.0
GSECUREDELETE_REQUIRED=0.1
GIO_UNIX_REQUIRED=2.0
+# choose whether to use GTK2 or GTK3
+AC_ARG_WITH([gtk3],
+ [AS_HELP_STRING([--with-gtk3],
+ [build for GTK3 instead of GTK2 [[default=auto]]])],
+ [with_gtk3="$withval"],
+ [with_gtk3=check])
+# use GTK2 by default but if not found
+AC_MSG_CHECKING([for GTK package to use])
+gtk_pkg="gtk+-2.0"
+AS_IF([test "x$with_gtk3" = xcheck],
+ [PKG_CHECK_EXISTS([$gtk_pkg >= ${GTK_REQUIRED}],
+ [],
+ [gtk_pkg="gtk+-3.0"])],
+ [test "x$with_gtk3" != xno],
+ [gtk_pkg="gtk+-3.0"])
+AC_MSG_RESULT([$gtk_pkg])
+
# mandatory packages
PKG_CHECK_MODULES([GLIB], glib-2.0 >= ${GLIB_REQUIRED})
-PKG_CHECK_MODULES([GTK], gtk+-2.0 >= ${GTK_REQUIRED})
+PKG_CHECK_MODULES([GTK], $gtk_pkg >= ${GTK_REQUIRED})
PKG_CHECK_MODULES([GCONF], gconf-2.0 >= ${GCONF_REQUIRED})
PKG_CHECK_MODULES([LIBNAUTILUS_EXTENSION], libnautilus-extension >= ${NAUTILUS_EXTENSION})
PKG_CHECK_MODULES([GSECUREDELETE], gsecuredelete >= ${GSECUREDELETE_REQUIRED})
diff --git a/help/C/nautilus-wipe.xml b/help/C/nautilus-wipe.xml
index a90dde8..0e32074 100644
--- a/help/C/nautilus-wipe.xml
+++ b/help/C/nautilus-wipe.xml
@@ -170,8 +170,8 @@
available diskspace from <application>Nautilus</application>.
</para>
<para>
- Usually when you delete a file, even when bypassing the trash, it's
- not accessible anymore, but its content still exists on the media
+ Usually when you delete a file, even when bypassing the trash, it is
+ not accessible anymore, but its content still exists on the medium
that contained it until a new file is written over it.
Consequently, it can be quite easy to recover it.
</para>
@@ -205,11 +205,11 @@
new data.
</para>
<para>
- This could take weeks, months or years before this space is
- actually used for new data, actually overwriting the content of the
- deleted file. Until then, it's possible to recover it by reading
- directly the data on the storage media. That's a quite simple
- operation, automated by numerous softwares.
+ It could take weeks, months or years before this space get used for
+ new data, actually overwriting the content of the deleted file.
+ Until then, it is possible to recover the data by reading directly
+ on the storage medium. That's a quite simple operation, automated by
+ numerous software.
</para>
</sect2>
<sect2 id="nautilus-wipe-an-answer">
@@ -217,7 +217,7 @@
<para>
If you want to make the content of a file really hard to recover,
you have to overwrite it with other data. But that's not enough. On
- a magnetic hard disk, it's known
+ a magnetic hard disk, it is known
<footnote>
<para>
[2]. Peter Gutmann: Secure Deletion of Data from Magnetic and
@@ -229,14 +229,14 @@
</footnote>
that the content can still be
recovered by doing magnetic analysis of the hard disk surface. To
- address this issue, it's possible to overwrite the content to be
+ address this issue, it is possible to overwrite the content to be
deleted several times. That process is called "wiping".
</para>
<para>
If some sensible files have been already deleted without paying
attention to this issue, some of their data probably remains on the
- storage media. It's thus also useful to wipe all the available free
- space of a storage media.
+ storage medium. It is thus also useful to wipe all the available
+ free space of a storage medium.
</para>
</sect2>
<sect2 id="nautilus-wipe-limitations">
@@ -263,8 +263,8 @@
</listitem>
<listitem>
<para>
- storage media features: modern storage mediums often reorganize
- their content, e.g. to spread the writings over the media or to
+ storage media features: modern storage media often reorganize
+ their content, e.g. to spread the writings over the medium or to
hide defective places to the operating system. Consequently, you
can't be sure that the actual place occupied by your sensitive data
was wiped;
@@ -285,7 +285,7 @@
<listitem>
<para>
old algorithms: the wipe algorithms are old, and they are not
- guaranteed to work as expected on new storage medias.
+ guaranteed to work as expected on new storage media.
</para>
</listitem>
</itemizedlist>
@@ -434,7 +434,7 @@
<para>
Only one random pass is written. It should prevent software-only
data recovery performed by analyzing raw data stored on the
- storage media. However it is probably not sufficient against
+ storage medium. However it is probably not sufficient against
magnetic analysis of the hard drive surface.
</para>
</listitem>
@@ -455,7 +455,7 @@
<listitem>
<para>
do not ensure that overwriting data is actually written on the
- storage media.
+ storage medium.
</para>
</listitem>
</itemizedlist>
diff --git a/help/Makefile.in b/help/Makefile.in
index 60973aa..98feed1 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -340,7 +340,7 @@ _DOC_SRC_FIGURES = \
$(foreach fig,$(_DOC_C_FIGURES), $(foreach lc,C $(_DOC_REAL_LINGUAS), \
$(wildcard $(srcdir)/$(lc)/$(patsubst C/%,%,$(fig))) ))
-_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot)
+_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot,$(if $(DOC_ID),$(DOC_ID).pot))
################################################################################
_DOC_HTML_ALL = $(if $(filter html HTML,$(_DOC_REAL_FORMATS)), \
diff --git a/nautilus-wipe/fill-operation.c b/nautilus-wipe/fill-operation.c
index 0b52737..7eee3cf 100644
--- a/nautilus-wipe/fill-operation.c
+++ b/nautilus-wipe/fill-operation.c
@@ -324,7 +324,7 @@ nautilus_wipe_fill_operation_filter_files (GList *paths,
} else {
gchar *path;
- work_mounts = g_list_append (work_mounts, mountpoint);
+ work_mounts = g_list_prepend (work_mounts, mountpoint);
/* if it is not a directory, gets its container directory.
* no harm since files cannot be mountpoint themselves, then it gets
* at most the mountpoint itself */
@@ -333,19 +333,19 @@ nautilus_wipe_fill_operation_filter_files (GList *paths,
} else {
path = g_strdup (file_path);
}
- work_paths = g_list_append (work_paths, path);
+ work_paths = g_list_prepend (work_paths, path);
}
}
}
if (err || ! work_paths_) {
nautilus_wipe_path_list_free (work_paths);
} else {
- *work_paths_ = work_paths;
+ *work_paths_ = g_list_reverse (work_paths);
}
if (err || ! work_mounts_) {
nautilus_wipe_path_list_free (work_mounts);
} else {
- *work_mounts_ = work_mounts;
+ *work_mounts_ = g_list_reverse (work_mounts);
}
if (err) {
g_propagate_error (error, err);
diff --git a/nautilus-wipe/nautilus-wipe.c b/nautilus-wipe/nautilus-wipe.c
index 79d3f90..e7fd4b0 100644
--- a/nautilus-wipe/nautilus-wipe.c
+++ b/nautilus-wipe/nautilus-wipe.c
@@ -240,9 +240,10 @@ nautilus_wipe_path_list_copy (GList *src)
GList *paths = NULL;
while (src) {
- paths = g_list_append (paths, g_strdup (src->data));
+ paths = g_list_prepend (paths, g_strdup (src->data));
src = g_list_next (src);
}
+ paths = g_list_reverse (paths);
return paths;
}
@@ -263,7 +264,7 @@ nautilus_wipe_nfi_list_to_path_list (GList *nfis)
path = nautilus_wipe_nfi_get_path (nfis->data);
if (path) {
- paths = g_list_append (paths, path);
+ paths = g_list_prepend (paths, path);
} else {
success = FALSE;
}
@@ -272,6 +273,8 @@ nautilus_wipe_nfi_list_to_path_list (GList *nfis)
if (! success) {
nautilus_wipe_path_list_free (paths);
paths = NULL;
+ } else {
+ paths = g_list_reverse (paths);
}
return paths;
diff --git a/nautilus-wipe/operation-manager.c b/nautilus-wipe/operation-manager.c
index 08dde1a..3281e04 100644
--- a/nautilus-wipe/operation-manager.c
+++ b/nautilus-wipe/operation-manager.c
@@ -169,7 +169,7 @@ free_opdata (struct NautilusWipeOperationData *opdata)
/* if the parent window get destroyed, we honor gently the thing and leave it
* to the death. doing this is useful not to have a bad window pointer later */
static void
-opdata_window_destroy_handler (GtkObject *obj,
+opdata_window_destroy_handler (GtkWidget *obj,
struct NautilusWipeOperationData *opdata)
{
g_signal_handler_disconnect (opdata->window, opdata->window_destroy_hid);
diff --git a/nautilus-wipe/progress-dialog.c b/nautilus-wipe/progress-dialog.c
index cb33d21..553d0a2 100644
--- a/nautilus-wipe/progress-dialog.c
+++ b/nautilus-wipe/progress-dialog.c
@@ -153,7 +153,6 @@ update_action_area_visibility (NautilusWipeProgressDialog *dialog,
g_list_free (children);
}
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), n_children > 0);
if (n_children > 0) {
gtk_widget_show (container);
} else {
@@ -165,6 +164,7 @@ update_action_area_visibility (NautilusWipeProgressDialog *dialog,
static void
nautilus_wipe_progress_dialog_init (NautilusWipeProgressDialog *self)
{
+ GtkWidget *content_area;
GtkWidget *vbox;
self->priv = GET_PRIVATE (self);
@@ -176,11 +176,16 @@ nautilus_wipe_progress_dialog_init (NautilusWipeProgressDialog *self)
self->priv->canceled = FALSE;
self->priv->auto_hide_action_area = FALSE;
- vbox = gtk_dialog_get_content_area (GTK_DIALOG (self));
- gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
- gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (self->priv->label), TRUE, TRUE, 7);
+ gtk_container_set_border_width (GTK_CONTAINER (self), 5);
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (self));
+ vbox = g_object_new (GTK_TYPE_VBOX,
+ "spacing", 10, /* we add 2 around the progress bar */
+ "border-width", 5, NULL);
+ gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
+ gtk_widget_show (GTK_WIDGET (vbox));
+ gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (self->priv->label), TRUE, TRUE, 0);
gtk_widget_show (GTK_WIDGET (self->priv->label));
- gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (self->priv->progress), FALSE, TRUE, 7);
+ gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (self->priv->progress), FALSE, TRUE, 2);
gtk_widget_show (GTK_WIDGET (self->priv->progress));
gtk_progress_bar_set_ellipsize (self->priv->progress, PANGO_ELLIPSIZE_END);
@@ -283,7 +288,9 @@ nautilus_wipe_progress_dialog_new (GtkWindow *parent,
va_end (ap);
self = g_object_new (NAUTILUS_TYPE_WIPE_PROGRESS_DIALOG,
"transient-for", parent,
- "has-separator", ! (flags & GTK_DIALOG_NO_SEPARATOR),
+#if ! GTK_CHECK_VERSION (3, 0, 0)
+ "has-separator", FALSE,
+#endif
"modal", flags & GTK_DIALOG_MODAL,
"destroy-with-parent", flags & GTK_DIALOG_DESTROY_WITH_PARENT,
"text", text,
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/nautilus-wipe.git
More information about the Pkg-privacy-commits
mailing list