lib/rami.rb in adhearsion-0.7.6 vs lib/rami.rb in adhearsion-0.7.7

@@ -213,11 +213,11 @@
                                 'Channel' => h['Channel'],
                                 'Context' => h['Context'],
                                 'Exten' =>h['Exten'],
                                 'Priority' =>h['Priority'],
                                 'Timeout' =>h['Timeout'],
-                                'CallerID' =>h['CallerID'],
+                                'CallerID' =>h['Callerid'] || h['CallerID'],
                                 'Variable' =>h['Variable'],
                                 'Account' =>h['Account'],
                                 'Application' =>h['Application'],
                                 'Data' =>h['Data'],
                                 'Async' => h['Async']}.delete_if {|key, value| value.nil? },@timeout)
@@ -385,10 +385,11 @@
 
       MSG
     $HUTDOWN.now!
     return 
   end
-  login = {'Action' => 'login', 'Username' => @username, 'Secret' => @secret, 'Events' => 'Off'}
+  events = $HELPERS['manager_proxy']['events']
+  login = {'Action' => 'login', 'Username' => @username, 'Secret' => @secret, 'Events' => events ? 'On' : 'Off'}
   writesock(login)
   accum = {}
   login = 0
   status = Timeout.timeout(10) do
     while login == 0