summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-09-30 02:01:48 +0000
committerThierry Vignaud <tv@mandriva.org>2008-09-30 02:01:48 +0000
commitc141a966a9d5ca6707c93654819b55b4a5fe09cc (patch)
tree7342e50d1bc6e73622188d9f08d7d55651af314f
parent168ac4cfe5a22c89d563cb01dd655ebeb0f1925c (diff)
downloaddrakx-backup-do-not-use-c141a966a9d5ca6707c93654819b55b4a5fe09cc.tar
drakx-backup-do-not-use-c141a966a9d5ca6707c93654819b55b4a5fe09cc.tar.gz
drakx-backup-do-not-use-c141a966a9d5ca6707c93654819b55b4a5fe09cc.tar.bz2
drakx-backup-do-not-use-c141a966a9d5ca6707c93654819b55b4a5fe09cc.tar.xz
drakx-backup-do-not-use-c141a966a9d5ca6707c93654819b55b4a5fe09cc.zip
(_gtk_any_Window,_gtk__FileChooserDialog) backport support for Gtk+2's
FileChooserDialog from main so that we can backport draksnapashot without second though
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/mygtk2.pm7
2 files changed, 8 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index b026631b3..c85e6652b 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,4 +1,5 @@
- libDrakX:
+ o add support for Gtk+2's FileChooserDialog for draksnapashot
o fix rpmdrake crashing when description begins by "Gtk2::.."
(#43802)
diff --git a/perl-install/mygtk2.pm b/perl-install/mygtk2.pm
index 5c1f6f7c8..b9d0f3d7a 100644
--- a/perl-install/mygtk2.pm
+++ b/perl-install/mygtk2.pm
@@ -586,6 +586,11 @@ sub _gtk_any_Window {
} elsif ($class eq 'Plug') {
$opts->{socket_id} or internal_error("can not create a Plug without a socket_id");
$w = "Gtk2::$class"->new(delete $opts->{socket_id});
+ } elsif ($class eq 'FileChooserDialog') {
+ my $action = delete $opts->{action} || internal_error("missing action for FileChooser");
+ $w = Gtk2::FileChooserDialog->new(delete $opts->{title}, delete $opts->{transient_for} || $::main_window,
+ $action, N("Cancel") => 'cancel', delete $opts->{button1} || N("Ok") => 'ok',
+ );
} else {
$w = "Gtk2::$class"->new;
}
@@ -738,6 +743,8 @@ sub _gtk__FileSelection {
$w;
}
+sub _gtk__FileChooserDialog { &_gtk_any_Window }
+
sub _gtk__FileChooser {
my ($w, $opts) = @_;