diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-02-23 22:49:34 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-02-23 22:49:34 +0300 |
commit | 923d44aeb7cb6d21eeb459fdc1b58137e37c2b1c (patch) | |
tree | 324f50710997113250f1c24abf043eceb2c2b883 /git-gui/lib/error.tcl | |
parent | 0d2dd191cdfa3f1795c4df60a5cfb0f7e58c097a (diff) | |
parent | 31e0b2ca81ad985a8768c33c0aba547a51d05277 (diff) |
Sync with 1.5.4.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui/lib/error.tcl')
-rw-r--r-- | git-gui/lib/error.tcl | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/git-gui/lib/error.tcl b/git-gui/lib/error.tcl index 0fdd7531da..08a24622c7 100644 --- a/git-gui/lib/error.tcl +++ b/git-gui/lib/error.tcl @@ -1,6 +1,14 @@ # git-gui branch (create/delete) support # Copyright (C) 2006, 2007 Shawn Pearce +proc _error_parent {} { + set p [grab current .] + if {$p eq {}} { + return . + } + return $p +} + proc error_popup {msg} { set title [appname] if {[reponame] ne {}} { @@ -11,8 +19,8 @@ proc error_popup {msg} { -type ok \ -title [append "$title: " [mc "error"]] \ -message $msg] - if {[winfo ismapped .]} { - lappend cmd -parent . + if {[winfo ismapped [_error_parent]]} { + lappend cmd -parent [_error_parent] } eval $cmd } @@ -27,13 +35,13 @@ proc warn_popup {msg} { -type ok \ -title [append "$title: " [mc "warning"]] \ -message $msg] - if {[winfo ismapped .]} { - lappend cmd -parent . + if {[winfo ismapped [_error_parent]]} { + lappend cmd -parent [_error_parent] } eval $cmd } -proc info_popup {msg {parent .}} { +proc info_popup {msg} { set title [appname] if {[reponame] ne {}} { append title " ([reponame])" @@ -56,8 +64,8 @@ proc ask_popup {msg} { -type yesno \ -title $title \ -message $msg] - if {[winfo ismapped .]} { - lappend cmd -parent . + if {[winfo ismapped [_error_parent]]} { + lappend cmd -parent [_error_parent] } eval $cmd } |