<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][15347] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=15347">15347</a></dd>
<dt>Author</dt> <dd>nmartin</dd>
<dt>Date</dt> <dd>2009-11-04 08:38:21 -0600 (Wed, 04 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>replaced tabs with spaces -python\!</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribnmartinosx_address_book_dialfsdialpy">freeswitch/trunk/contrib/nmartin/osx_address_book_dial/fsdial.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribnmartinosx_address_book_dialfsdialpy"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/nmartin/osx_address_book_dial/fsdial.py (15346 => 15347)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/nmartin/osx_address_book_dial/fsdial.py 2009-11-04 14:37:13 UTC (rev 15346)
+++ freeswitch/trunk/contrib/nmartin/osx_address_book_dial/fsdial.py 2009-11-04 14:38:21 UTC (rev 15347)
</span><span class="lines">@@ -38,45 +38,44 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def main(argv):
</span><del>- # change these to match your configuration
- my_number = "1000" #@mydomain.com
- server_addr = "fs.ip.add.ress"
- server_port = "8021"
- server_auth = "ClueCon"
-
-
- try:
-
- parser = OptionParser()
- parser.add_option("-n", "--number", dest="number",
- help="number to dial")
</del><ins>+ # change these to match your configuration
+ my_number = "1000" #@mydomain.com
+ server_addr = "my.ip.addr.ess"
+ server_port = "8021"
+ server_auth = "ClueCon"
+
+
+ try:
+
+ parser = OptionParser()
+ parser.add_option("-n", "--number", dest="number",
+ help="number to dial")
</ins><span class="cx">
</span><del>- (options, args) = parser.parse_args()
</del><ins>+ (options, args) = parser.parse_args()
+
+ if not options.number:
+ print "ERROR: destination number required"
+ sys.exit(2)
+
+ cmd = "api originate {ignore_early_media=true,origination_caller_id_number=" + options.number + ",effective_caller_id_number=" + my_number + "}user/" + my_number + " &transfer(" + options.number + " XML default)"
+ print cmd
+
+ con = ESLconnection(server_addr, server_port, server_auth)
+ #are we connected?
</ins><span class="cx">
</span><del>-
- if not options.number:
- print "ERROR: destination number required"
- sys.exit(2)
-
- cmd = "api originate {ignore_early_media=true,origination_caller_id_number=" + options.number + ",effective_caller_id_number=" + my_number + "}user/" + my_number + " &transfer(" + options.number + " XML default)"
- print cmd
-
- con = ESLconnection(server_addr, server_port, server_auth)
- #are we connected?
</del><ins>+ if con.connected:
+
+ e=con.sendRecv(cmd)
+ print e.getBody()
</ins><span class="cx">
</span><del>- if con.connected:
-
- e=con.sendRecv(cmd)
- print e.getBody()
</del><ins>+ else:
</ins><span class="cx">
</span><del>- else:
</del><ins>+ print "Not Connected"
+ sys.exit(2)
</ins><span class="cx">
</span><del>- print "Not Connected"
- sys.exit(2)
-
- except:
- print "Unexpected error:", sys.exc_info()[0]
- raise
-
</del><ins>+ except:
+ print "Unexpected error:", sys.exc_info()[0]
+ raise
+
</ins><span class="cx"> if __name__ == "__main__":
</span><span class="cx"> main(sys.argv[1:])
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>