r2702 - trunk/minisip/minisip/gui/gtkgui

[erik at minisip.org]

Author: erik
Date: 2006-08-10 14:09:30 +0200 (Thu, 10 Aug 2006)
New Revision: 2702

Modified:
   trunk/minisip/minisip/gui/gtkgui/CallWidget.cxx
   trunk/minisip/minisip/gui/gtkgui/CallWidget.h
Log:

 * Compilation fix: Same fix as last commit (MEDIA_RECORD available only on
   gtkmm >=2.6), but this time the compile fix is when using the old
   library (the one in debian stable).



Modified: trunk/minisip/minisip/gui/gtkgui/CallWidget.cxx
===================================================================
--- trunk/minisip/minisip/gui/gtkgui/CallWidget.cxx	2006-08-10 11:58:35 UTC (rev 2701)
+++ trunk/minisip/minisip/gui/gtkgui/CallWidget.cxx	2006-08-10 12:09:30 UTC (rev 2702)
@@ -118,11 +118,12 @@
 		SLOT( *this, 
 			&CallWidget::audioOutSilenceButtonToggled ) );
 	
+#ifdef HAVE_LIBGLADEMM_2_6
 	topBox->pack_start( callRecordButton, false, false );
 	callRecordButton.signal_toggled().connect( 
 		SLOT( *this, 
 			&CallWidget::callRecordButtonToggled ) );
-
+#endif
 	pack_start( *topBox, false, false, 4 );
 	
 	DtmfWidget * dtmfWidget = manage( new DtmfWidget() );
@@ -279,7 +280,7 @@
 }
 
 void CallWidget::callRecordButtonToggled () {
-#ifndef OLDLIBGLADEMM
+#ifdef HAVE_LIBGLADEMM_2_6
 	string param;
 	if( callRecordButton.get_active() ) {
 		param = "START";
@@ -321,7 +322,9 @@
 #ifndef OLDLIBGLADEMM
 			monitoringButton.show();
 			audioOutSilenceButton.show();
+#ifdef HAVE_LIBGLADEMM_2_6
 			callRecordButton.show();
+#endif
 			transferArrow.show_all();
 			dtmfArrow.show_all();
 #endif
@@ -388,7 +391,9 @@
 #ifndef OLDLIBGLADEMM
 					monitoringButton.hide();
 					audioOutSilenceButton.hide();
+#ifdef HAVE_LIBGLADEMM_2_6
 					callRecordButton.hide();
+#endif
 					transferArrow.hide();
 					dtmfArrow.hide();
 #endif
@@ -406,7 +411,9 @@
 #ifndef OLDLIBGLADEMM
 					monitoringButton.hide();
 					audioOutSilenceButton.hide();
+#ifdef HAVE_LIBGLADEMM_2_6
 					callRecordButton.hide();
+#endif
 					transferArrow.hide();
 					dtmfArrow.hide();
 #endif

Modified: trunk/minisip/minisip/gui/gtkgui/CallWidget.h
===================================================================
--- trunk/minisip/minisip/gui/gtkgui/CallWidget.h	2006-08-10 11:58:35 UTC (rev 2701)
+++ trunk/minisip/minisip/gui/gtkgui/CallWidget.h	2006-08-10 12:09:30 UTC (rev 2702)
@@ -142,9 +142,11 @@
 //		Gtk::CheckButton audioOutSilenceButton;
 		IconToggleButton monitoringButton;
 		IconToggleButton audioOutSilenceButton;
+#endif
+#ifdef HAVE_LIBGLADEMM_2_6
 		IconToggleButton callRecordButton;
+#endif
 
-#endif
 		Gtk::Image secureImage;
 		Gtk::Image insecureImage;
 		StockButton acceptButton;