Sophie

Sophie

distrib > Mandriva > 2008.0 > i586 > by-pkgid > 202ada0a0b723a5e333d365b8fcf1d28 > files > 1

jabbin-2.0-0.svn152.1mdv2008.0.src.rpm

--- jabbin-2.0beta2a/3party/jrtplib/rtprandom.cpp	2006-08-10 12:09:46.000000000 +0200
+++ jabbin-2.0beta2a.n/3party/jrtplib/rtprandom.cpp	2007-09-10 17:09:44.000000000 +0200
@@ -53,7 +53,7 @@
 	x = (u_int32_t)getpid();
 	x += (u_int32_t)time(0);
 	x -= (u_int32_t)clock();
-	x ^= (u_int32_t)(this);
+	x ^= (u_int32_t)((u_int8_t *)this - (u_int8_t *)0);
 
 #ifdef RTP_SUPPORT_GNUDRAND
 	srand48_r(x,&drandbuffer);
--- jabbin-2.0beta2a/voip/stun.cpp	2006-08-10 12:09:58.000000000 +0200
+++ jabbin-2.0beta2a.n/voip/stun.cpp	2007-09-10 17:15:17.000000000 +0200
@@ -673,12 +673,10 @@
       asm("rdtsc" : "=A" (tick));
 #elif defined (__SUNPRO_CC) || defined( __sparc__ )	
       tick = gethrtime();
-#elif defined(__MACH__) 
+#else
       int fd=open("/dev/random",O_RDONLY);
       read(fd,&tick,sizeof(tick));
       closesocket(fd);
-#else
-#     error Need some way to seed the random number generator 
 #endif 
       int seed = int(tick);
 #ifdef WIN32
--- jabbin-2.0beta2a/src/libpsi/psiwidgets/iconaction.cpp	2006-08-10 12:09:52.000000000 +0200
+++ jabbin-2.0beta2a.n/src/libpsi/psiwidgets/iconaction.cpp	2007-09-10 17:18:08.000000000 +0200
@@ -72,7 +72,7 @@
 
 			QMap<QPopupMenu *, int>::Iterator it = popups.begin();
 			for ( ; it != popups.end(); ++it ) {
-				if ( (int)it.key() == (int)obj ) {
+				if ( (void *)it.key() == (void *)obj ) {
 					dirty = true;
 					popups.remove( it );
 					break;
--- jabbin-svn152/voip/jabbinmediaengine.cpp	2007-09-13 15:02:14.000000000 +0200
+++ jabbin-svn152.n/voip/jabbinmediaengine.cpp	2007-09-19 15:15:04.000000000 +0200
@@ -30,7 +30,7 @@
   dying_ = false;
   SetInterface( NULL );
 
-  qDebug( "Network interface: %d", (int)network_interface() );
+  /*qDebug( "Network interface: %d", (int)network_interface() );*/
 
   mediaStream = new MediaStream(0);
 }
@@ -56,7 +56,7 @@
 */
   pt_ = pt;
   qDebug("set codec: , payload type: %d", pt_);
-  qDebug( "Network interface: %d", (int)network_interface() );
+  /*qDebug( "Network interface: %d", (int)network_interface() );*/
 
   mediaStream->stop();
   mediaStream->start( &incomingPackets, this, pt_ );