[Pkg-voip-commits] r2675 - in twinkle/trunk/debian: . patches

[Mark Purcell]

Author: msp
Date: 2006-11-04 13:02:18 +0100 (Sat, 04 Nov 2006)
New Revision: 2675

Added:
   twinkle/trunk/debian/patches/dtmf.patch
   twinkle/trunk/debian/patches/invite4xx.patch
Modified:
   twinkle/trunk/debian/changelog
Log:
* Grab upstream patches: DTMF & Invite4xx
* VoIP Provider issue: Can't talk for more than a minute (Closes: #365588)
* Rebuild

Modified: twinkle/trunk/debian/changelog
===================================================================
--- twinkle/trunk/debian/changelog	2006-11-04 11:30:51 UTC (rev 2674)
+++ twinkle/trunk/debian/changelog	2006-11-04 12:02:18 UTC (rev 2675)
@@ -1,9 +1,16 @@
-twinkle (1:0.9-3) UNRELEASED; urgency=low
+twinkle (1:0.9-4) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Grab upstream patches: DTMF & Invite4xx
+  * VoIP Provider issue: Can't talk for more than a minute (Closes: #365588)
 
- -- Mark Purcell <msp at debian.org>  Mon, 16 Oct 2006 21:08:29 +0100
+ -- Mark Purcell <msp at debian.org>  Sat,  4 Nov 2006 12:01:25 +0000
 
+twinkle (1:0.9-3) unstable; urgency=low
+
+  * Rebuild
+
+ -- Mark Purcell <msp at debian.org>  Wed,  1 Nov 2006 21:38:21 +0000
+
 twinkle (1:0.9-2) unstable; urgency=low
 
   * Build-Depends: libzrtpcpp-dev

Added: twinkle/trunk/debian/patches/dtmf.patch
===================================================================
--- twinkle/trunk/debian/patches/dtmf.patch	2006-11-04 11:30:51 UTC (rev 2674)
+++ twinkle/trunk/debian/patches/dtmf.patch	2006-11-04 12:02:18 UTC (rev 2675)
@@ -0,0 +1,40 @@
+Index: src/session.cpp
+===================================================================
+--- src/session.cpp	(revision 223)
++++ src/session.cpp	(working copy)
+@@ -653,18 +653,19 @@
+ 		case DTMF_AUTO:
+ 		case DTMF_INBAND:
+ 			get_line()->ci_set_dtmf_supported(true, true);
++			ui->cb_dtmf_supported(get_line()->get_line_number());
+ 			break;
+ 		case DTMF_RFC2833:
+ 			get_line()->ci_set_dtmf_supported(false);
++			ui->cb_dtmf_not_supported(get_line()->get_line_number());
+ 			break;
+ 		case DTMF_INFO:
+ 			get_line()->ci_set_dtmf_supported(true, false, true);
++			ui->cb_dtmf_supported(get_line()->get_line_number());
+ 			break;
+ 		default:
+ 			assert(false);
+ 		}
+-		
+-		ui->cb_line_state_changed();
+ 	}
+ 
+ 	audio_rtp_session->run();
+@@ -675,10 +676,10 @@
+ 		MEMMAN_DELETE(audio_rtp_session);
+ 		delete audio_rtp_session;
+ 		audio_rtp_session = NULL;
++	
++		get_line()->ci_set_dtmf_supported(false);
++		ui->cb_line_state_changed();
+ 	}
+-	
+-	get_line()->ci_set_dtmf_supported(false);
+-	ui->cb_line_state_changed();
+ }
+ 
+ t_audio_session *t_session::get_audio_session(void) const {

Added: twinkle/trunk/debian/patches/invite4xx.patch
===================================================================
--- twinkle/trunk/debian/patches/invite4xx.patch	2006-11-04 11:30:51 UTC (rev 2674)
+++ twinkle/trunk/debian/patches/invite4xx.patch	2006-11-04 12:02:18 UTC (rev 2675)
@@ -0,0 +1,16 @@
+Index: src/line.cpp
+===================================================================
+--- src/line.cpp	(revision 225)
++++ src/line.cpp	(working copy)
+@@ -966,9 +966,8 @@
+ 			} else {
+ 				d->recvd_response(r, tuid, tid);
+ 			}
+-		}
+-		
+-		if (r->hdr_cseq.method == INVITE) {
++		} else {
++			d->recvd_response(r, tuid, tid);
+ 			pending_dialogs.remove(d);
+ 			MEMMAN_DELETE(d);
+ 			delete d;