Commit 51cacfd6 authored by Tails developers's avatar Tails developers

Merge remote-tracking branch 'origin/bugfix/gpgApplet_menu_in_bottom_panel' into testing

parents ae69d862 a76b2cef
......@@ -159,9 +159,8 @@ b) the "Artistic License" which comes with Perl.
my $ticon = shift;
my $event = shift;
my $time = shift;
my ($x, $y, $push) = Gtk2::StatusIcon::position_menu($menu, $ticon);
$menu->show_all;
$menu->popup(undef, undef, sub {($x, $y,$push)}, undef, $event, $time);
$menu->popup(undef, undef, undef, undef, $event, $time);
});
$icon->signal_connect('button-press-event' => sub {
......@@ -169,9 +168,8 @@ b) the "Artistic License" which comes with Perl.
my $event = shift;
return unless $event->button == 1;
my $action_menu = build_action_menu();
my ($x, $y, $push) = Gtk2::StatusIcon::position_menu($action_menu, $ticon);
$action_menu->show_all;
$action_menu->popup(undef, undef, sub {($x, $y,$push)}, undef, $event->button, $event->time);
$action_menu->popup(undef, undef, undef, undef, $event->button, $event->time);
});
foreach (all_clipboards()) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment