diff -ru ekiga-3.0.2-old/lib/engine/audioinput/skel/audioinput-core.cpp ekiga-3.0.2/lib/engine/audioinput/skel/audioinput-core.cpp
--- ekiga-3.0.2-old/lib/engine/audioinput/skel/audioinput-core.cpp	2009-01-12 14:52:58.000000000 -0500
+++ ekiga-3.0.2/lib/engine/audioinput/skel/audioinput-core.cpp	2009-03-14 13:54:09.000000000 -0400
@@ -198,14 +198,13 @@
        iter++)
     (*iter)->get_devices (devices);
 
-  if (PTrace::CanTrace(4)) {
-     for (std::vector<AudioInputDevice>::iterator iter = devices.begin ();
-         iter != devices.end ();
-         iter++) {
-      PTRACE(4, "AudioInputCore\tDetected Device: " << *iter);
-    }
-  }
-
+#if PTRACING
+	for (std::vector<AudioInputDevice>::iterator iter = devices.begin ();
+			iter != devices.end ();
+			iter++) {
+		PTRACE(4, "AudioInputCore\tDetected Device: " << *iter);
+	}
+#endif // PTRACING
 }
 
 void AudioInputCore::set_device(const AudioInputDevice & device)
diff -ru ekiga-3.0.2-old/lib/engine/audiooutput/skel/audiooutput-core.cpp ekiga-3.0.2/lib/engine/audiooutput/skel/audiooutput-core.cpp
--- ekiga-3.0.2-old/lib/engine/audiooutput/skel/audiooutput-core.cpp	2009-01-12 14:52:58.000000000 -0500
+++ ekiga-3.0.2/lib/engine/audiooutput/skel/audiooutput-core.cpp	2009-03-14 13:53:59.000000000 -0400
@@ -151,14 +151,13 @@
        iter++)
     (*iter)->get_devices (devices);
 
-  if (PTrace::CanTrace(4)) {
-     for (std::vector<AudioOutputDevice>::iterator iter = devices.begin ();
-         iter != devices.end ();
-         iter++) {
-      PTRACE(4, "AudioOutputCore\tDetected Device: " << *iter);
-    }
-  }
-
+#if PTRACING
+	for (std::vector<AudioOutputDevice>::iterator iter = devices.begin ();
+			iter != devices.end ();
+			iter++) {
+		PTRACE(4, "AudioOutputCore\tDetected Device: " << *iter);
+	}
+#endif // PTRACING
 }
 
 void AudioOutputCore::set_device(AudioOutputPS ps, const AudioOutputDevice & device)
diff -ru ekiga-3.0.2-old/lib/engine/videoinput/skel/videoinput-core.cpp ekiga-3.0.2/lib/engine/videoinput/skel/videoinput-core.cpp
--- ekiga-3.0.2-old/lib/engine/videoinput/skel/videoinput-core.cpp	2009-01-12 14:52:59.000000000 -0500
+++ ekiga-3.0.2/lib/engine/videoinput/skel/videoinput-core.cpp	2009-03-14 13:54:35.000000000 -0400
@@ -201,13 +201,13 @@
        iter++)
     (*iter)->get_devices (devices);
 
-  if (PTrace::CanTrace(4)) {
-     for (std::vector<VideoInputDevice>::iterator iter = devices.begin ();
-         iter != devices.end ();
-         iter++) {
-      PTRACE(4, "VidInputCore\tDetected Device: " << *iter);
-    }
-  }
+#if PTRACING
+	for (std::vector<VideoInputDevice>::iterator iter = devices.begin ();
+			iter != devices.end ();
+			iter++) {
+		PTRACE(4, "VidInputCore\tDetected Device: " << *iter);
+	}
+#endif
 }
 
 void VideoInputCore::set_device(const VideoInputDevice & device, int channel, VideoInputFormat format)
diff -ru ekiga-3.0.2-old/lib/gui/xvwindow.cpp ekiga-3.0.2/lib/gui/xvwindow.cpp
--- ekiga-3.0.2-old/lib/gui/xvwindow.cpp	2009-01-12 14:52:58.000000000 -0500
+++ ekiga-3.0.2/lib/gui/xvwindow.cpp	2009-03-14 13:56:05.000000000 -0400
@@ -409,8 +409,9 @@
           continue;
         }
 
-        if (PTrace::CanTrace (4)) 
-          DumpCapabilities (candidateXVPort);
+#if PTRACING
+				DumpCapabilities (candidateXVPort);
+#endif // PTRACING
 
         // Check if the Port supports YV12/YUV colorspace
         supportsYV12 = false;
@@ -684,16 +685,16 @@
       }
     }
   
-    if ( (_useShm) && (PTrace::CanTrace (4)) ) {
-      int j = 0;
-      PTRACE(4, "XVideo\tCreated XvImage (" << _XVImage[i]->width << "x" << _XVImage[i]->height 
-            << ", data size: " << _XVImage[i]->data_size << ", num_planes: " << _XVImage[i]->num_planes);
-  
-      for (j = 0 ; j < _XVImage[i]->num_planes ; j++) 
-        PTRACE(4, "XVideo\t  Plane " << j << ": pitch=" << _XVImage[i]->pitches [j] << ", offset=" << _XVImage[i]->offsets [j]);
-    }
-  
-    if (_useShm) {
+#if PTRACING
+		int j = 0;
+		PTRACE(4, "XVideo\tCreated XvImage (" << _XVImage[i]->width << "x" << _XVImage[i]->height 
+				<< ", data size: " << _XVImage[i]->data_size << ", num_planes: " << _XVImage[i]->num_planes);
+
+		for (j = 0 ; j < _XVImage[i]->num_planes ; j++) 
+			PTRACE(4, "XVideo\t  Plane " << j << ": pitch=" << _XVImage[i]->pitches [j] << ", offset=" << _XVImage[i]->offsets [j]);
+#endif // PTRACING
+
+		if (_useShm) {
       _XShmInfo[i].shmid = shmget (IPC_PRIVATE, _XVImage[i]->data_size, IPC_CREAT | 0777);
       if (_XShmInfo[i].shmid < 0) {
         XFree (_XVImage[i]);
diff -ru ekiga-3.0.2-old/lib/gui/xwindow.cpp ekiga-3.0.2/lib/gui/xwindow.cpp
--- ekiga-3.0.2-old/lib/gui/xwindow.cpp	2009-01-12 14:52:57.000000000 -0500
+++ ekiga-3.0.2/lib/gui/xwindow.cpp	2009-03-14 13:56:50.000000000 -0400
@@ -200,8 +200,9 @@
   PTRACE(4, "X11\tInitiasing new X11 window with " << windowWidth << "x" << windowHeight << " at " << x << "," << y);
   XLockDisplay (_display);
 
-  if (PTrace::CanTrace (4)) 
-    DumpVisuals();
+#if PTRACING
+	DumpVisuals();
+#endif // PTRACING
 
   if (!CreateAtomsAndWindow(gc, x, y, windowWidth, windowHeight)) {
     XUnlockDisplay(_display);
diff -ru ekiga-3.0.2-old/src/gui/main.cpp ekiga-3.0.2/src/gui/main.cpp
--- ekiga-3.0.2-old/src/gui/main.cpp	2009-01-12 14:56:04.000000000 -0500
+++ ekiga-3.0.2/src/gui/main.cpp	2009-03-14 12:47:03.000000000 -0400
@@ -4713,10 +4713,13 @@
   /* Ekiga initialisation */
   static GnomeMeeting instance;
 
+#if PTRACING
   if (debug_level != 0)
     PTrace::Initialise (PMAX (PMIN (5, debug_level), 0), NULL,
 			PTrace::Timestamp | PTrace::Thread
 			| PTrace::Blocks | PTrace::DateAndTime);
+#endif // PTRACING
+
 #ifdef EKIGA_REVISION
   PTRACE(1, "Ekiga SVN revision: " << EKIGA_REVISION);
 #endif