update identity selection to work with firmware 7

[snom-frontend] / snom.pl

diff --git a/snom.pl b/snom.pl
index 97b8e9937dca9ad06a5cf44b9d41b18e388b124a..645a68e700fa3b59c875ddac633fa8685007d476 100755 (executable)
--- a/snom.pl
+++ b/snom.pl
@@ -1,5 +1,5 @@
 #!/bin/sh
-#$Id: snom.pl,v 1.43 2006-05-23 19:14:09 michael Exp $
+#$Id: snom.pl,v 1.45 2007-06-23 11:29:58 michael Exp $
 
 PATH=/opt/csw/bin:/opt/local/bin:/usr/bin:/bin exec perl -w -x "$0" "$@"
 
@@ -288,7 +288,7 @@ sub KBDInput
                }
        }
 
-       if (!$event->state || $event->state eq 'shift-mask') {
+       if (!$event->state || !($event->state & "control-mask" || $event->state & "mod1-mask")) {
                if ($keyval == $Gtk2::Gdk::Keysyms{asterisk}) {snom_key('*'); return TRUE;}
                if ($keyval == $Gtk2::Gdk::Keysyms{KP_Multiply}) {snom_key('*'); return TRUE;}
                if ($keyval == $Gtk2::Gdk::Keysyms{numbersign}) {snom_key('#'); return TRUE;}
@@ -341,7 +341,7 @@ sub KBDInput
                        }
                }
        } else {
-               if ($event->state eq 'mod1-mask') {
+               if ($event->state & "mod1-mask") {
                        for (my $i=1; $i<13; $i++) {
                                if ($keyval == $Gtk2::Gdk::Keysyms{"F${i}"}) {
                                        snom_key("P${i}");
@@ -374,18 +374,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 {