summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-04-21 00:33:35 +0000
committerThierry Vignaud <tv@mageia.org>2013-04-21 00:33:35 +0000
commit7fe70fd6fb58ec02231b92f8f41192066377cfaf (patch)
tree46b1d1a58a80b4d69745a53f4997bb4758585108
parentfd5d38b27fe516b8a7bc4298a9041e9251a816ad (diff)
downloaddrakx-7fe70fd6fb58ec02231b92f8f41192066377cfaf.tar
drakx-7fe70fd6fb58ec02231b92f8f41192066377cfaf.tar.gz
drakx-7fe70fd6fb58ec02231b92f8f41192066377cfaf.tar.bz2
drakx-7fe70fd6fb58ec02231b92f8f41192066377cfaf.tar.xz
drakx-7fe70fd6fb58ec02231b92f8f41192066377cfaf.zip
only enable "quit confirm" popup dialog when asked (mga#8476)
(when clicking "X")
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/mygtk2.pm7
2 files changed, 10 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index dfeb3452d..6fb502bf7 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- popup dialog confirming to quit when clicking "X" (mga#8476):
+ o do not enable it by default
+ o enable apps to enable it on demand
- updated translations
Version 15.40 - 19 April 2013
diff --git a/perl-install/mygtk2.pm b/perl-install/mygtk2.pm
index 3cd9e59f2..779e77e8f 100644
--- a/perl-install/mygtk2.pm
+++ b/perl-install/mygtk2.pm
@@ -1212,8 +1212,15 @@ sub mygtk2::MagicWindow::AUTOLOAD {
$w->{$s1}->$meth(@args);
}
+my $enable_quit_popup;
+sub enable_quit_popup {
+ my ($bool) = @_;
+ $enable_quit_popup = $bool;
+}
+
state $in_callback;
sub quit_popup() {
+ return if !$enable_quit_popup;
if (!$in_callback) {
$in_callback = 1;
my $_guard = before_leaving { undef $in_callback };