Fixe problem when calling from different path

[snom-frontend] / snom.pl

diff --git a/snom.pl b/snom.pl
index 6f580ab3da4a1ee726cedc76a0265081ef337f75..93b1eee690a6e581d842b2c0974d4366cb161513 100755 (executable)
--- a/snom.pl
+++ b/snom.pl
@@ -1,5 +1,4 @@
 #!/bin/sh
-#$Id: snom.pl,v 1.44 2006/05/24 14:31:16 michael Exp $
 
 PATH=/opt/csw/bin:/opt/local/bin:/usr/bin:/bin exec perl -w -x "$0" "$@"
 
@@ -12,6 +11,8 @@ use Glib qw/TRUE FALSE/;
 use Gtk2 '-init';
 use Gtk2::Gdk::Keysyms;
 use LWP::UserAgent;
+use FindBin qw($Bin);
+
 
 my %g_key = ();
 my %g_arrows;
@@ -201,7 +202,55 @@ $mainbox->show();
 
 
 
+#########################################################
+#
+#     Tray Icon
+#
+#########################################################
+sub quit_cb {
+   my ($widget, $status_icon) = @_;
+ 
+   $status_icon->set_visible(0) if $status_icon;
+   Gtk2->main_quit();
+}
+
+sub popup_menu_cb {
+   my ($widget, $button, $time, $menu) = @_;
+
+   if ($button == 3) {
+         my ($x, $y, $push_in)
+         = Gtk2::StatusIcon::position_menu($menu, $widget);
+
+       $menu->show_all();
+       $menu->popup( undef, undef,
+             sub{return ($x,$y,0)} ,
+             undef, 0, $time );
+   }
+}
+
+sub activate_icon_cb {
+       if ($window->visible){
+               $window->hide();
+       } else {
+               $window->show();
+       }
+}
+
+my $status_icon = Gtk2::StatusIcon->new_from_file($Bin.'/snom.ico');
+my $menu = Gtk2::Menu->new();
+
+my $menuItem = Gtk2::ImageMenuItem->new_from_stock('gtk-quit');
+$menuItem->signal_connect('activate', \&quit_cb, $status_icon);
+$menu->append($menuItem);
+
+$status_icon->set_tooltip('Snom Tray');
+$status_icon->signal_connect('activate', \&activate_icon_cb);
+$status_icon->signal_connect('popup-menu', \&popup_menu_cb, $menu);
+$status_icon->set_visible(1);
+########################################################################333
+
 $window->add($mainbox);
+$window->set_icon_from_file($Bin.'/snom.ico');
 $window->show();
 
 $g_key{OK}->grab_focus();
@@ -389,18 +438,24 @@ sub UpdatePhoneInfo
        }
        my @lines=split("\n", $response->content());
        my $num = 0;
+       my $activated = 0;
+
        foreach (@lines) {
                chomp;
                #<option value="1" selected>51@stargate.gernoth.loc</option>
                #<option value="2">89@asterix.ear-projekt.de</option>
                #<option value="3">41@grumpy.gernoth.loc</option>
-               if (m/^\<option value=\"(.+)\"( selected)?\>([^<\@]*)\@([^<]*)\<\/option\>$/) {
+               if (m/^\<option value=\"(.+)\"( selected)?\>([^<\@]*)\@([^<]*)\<\/option\>\s*$/) {
                        my $line = $3;
                        $g_identity->append_text("${3}");
-                       $g_identity->set_active(${1}-1) if(defined($2));
+                       if (defined($2)) {
+                               $g_identity->set_active(${1}-1);
+                               $activated=1;
+                       }
                        $num++;
                }
        }
+       $g_identity->set_active(0) if (!$activated);
        if ($num > 1) {
                $g_identity->show;
        } else {