Ove Kaaven schrob:
> Could you submit it in diff -u format, perhaps?
Sure.
Jan
--- wine.org 2006-11-15 20:29:48.000000000 +0100
+++ wine.new 2006-11-15 20:38:36.000000000 +0100
@@ -59,6 +59,7 @@
# xmessage not found; make sure the user notices this error
# (GUI users wouldn't even notice if we printed the text on console !)
MSGFILE=`mktemp "/tmp/wine.xmessage.XXXXXX"`
+ [ $? -eq 0 ] || exit 1
cat > $MSGFILE <<EOF
Warning:
The Wine launcher is unable to find the xmessage program,
@@ -261,6 +262,7 @@
echo "Invoking $WINEBIN/$WINE_BIN_NAME $@ ..."
$XMESSAGE -buttons " Okay ":0," See the Wine Usage Statement ":1,"
Configure Wine ":2 \
-title "Welcome to Wine" \
+ -default " Okay " \
"
You have started Wine without specifying any arguments.
@@ -302,6 +304,7 @@
echo "Invoking $WINEBIN/$WINE_BIN_NAME $@ ..."
$XMESSAGE -timeout 30 -buttons " Dismiss ":0," Never display this
message again ":3 \
-title "Wine Launch Window" \
+ -default " Dismiss " \
"Invoking $WINEBIN/$WINE_BIN_NAME $@ ...
This dialog box is a temporary status dialog to let you know
@@ -351,6 +354,7 @@
Please take note that you can reenable this window
by removing the $info_flag file." \
+ -default " Okay " \
-buttons " Okay ":0," Cancel ":1 2>/dev/null
if [ $? -eq 0 ] ; then
touch $info_flag
@@ -424,6 +428,8 @@
BUTTONS="$BUTTONS"', Configure :4'
BUTTONS="$BUTTONS"', Disable :3'
+ DEFAULT=' Okay '
+
#------------------------------------------------------------------------------
# Build an error message
#------------------------------------------------------------------------------
@@ -462,7 +468,7 @@
#------------------------------------------------------------------------------
# Display the message
#------------------------------------------------------------------------------
- $XMESSAGE -title "Wine Finished With Error" -buttons "$BUTTONS"
"$MESSAGE" 2>/dev/null
+ $XMESSAGE -title "Wine Finished With Error" -buttons "$BUTTONS"
-default "$DEFAULT" "$MESSAGE" 2>/dev/null
debug_return=$?
#------------------------------------------------------------------------------
@@ -482,7 +488,7 @@
# Process a view instruction
#------------------------------------------------------------------------------
if [ $debug_return -eq 5 ] ; then
- $XMESSAGE -title "View Wine Log" -file "$log_name" -buttons "
Okay ":0,"Delete $log_name":1
+ $XMESSAGE -title "View Wine Log" -file "$log_name" -buttons "
Okay ":0,"Delete $log_name":1 -default " Okay "
if [ $? -eq 1 ] ; then
echo "Deleting $log_name"
rm -f "$log_name"
@@ -502,7 +508,9 @@
Windows application.
Please take note that you can reenable this window
- by removing the $debug_flag file." -buttons " Okay ":0," Cancel
":1
+ by removing the $debug_flag file." \
+ -buttons " Okay ":0," Cancel ":1 \
+ -default " Okay "
if [ $? -eq 0 ] ; then
touch $debug_flag
