X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/snom-frontend/blobdiff_plain/a56262448a11bb90d558c3f69e955cf595896398..b4c10db9bc70e920a92cff57002c06cfa4d2daa2:/snom.pl

diff --git a/snom.pl b/snom.pl
index 3ee79da..93b1eee 100755
--- 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;
@@ -235,21 +236,21 @@ sub activate_icon_cb {
 	}
 }
 
-my $status_icon = Gtk2::StatusIcon->new_from_file('snom.ico');
+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->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('snom.ico');
+$window->set_icon_from_file($Bin.'/snom.ico');
 $window->show();
 
 $g_key{OK}->grab_focus();
@@ -437,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 {