Compilation bug fixed.

configure.ac

@@ -64,7 +64,7 @@ VERSION=`echo $VERSION | cut -d- -f1`
 AC_SUBST(VERSION)
 
 dnl Settings need Standard C++ Library
-LIBS="$LIBS -lstdc++ -lgsm"
+LIBS="$LIBS -lstdc++"
 
 dnl Solaris pkgadd support definitions
 PKGADD_PKG="SFLPhone"
@@ -150,6 +150,11 @@ PKG_CHECK_MODULES([libosip2], [libosip2 >= ${LIBOSIP2_OSIPLISTNOPOINTER_MIN_VERS
 SIP_CFLAGS="$SIP_CFLAGS $LIBOSIP2_CFLAGS";
 AC_SUBST(SIP_CFLAGS)
 
+dnl LIBGSM1_MIN_VERSION=1.10
+dnl PKG_CHECK_MODULES(gsm, gsm >= ${LIBGSM1_MIN_VERSION})
+dnl SFLPHONE_CFLAGS="$SFLPHONE_CFLAGS $libgsm1_CFLAGS"
+dnl SFLPHONE_LIBS="$SFLPHONE_LIBS $libgsm1_LIBS"
+
 LIBSAMPLERATE_MIN_VERSION=0.1.1
 PKG_CHECK_MODULES(samplerate, samplerate >= ${LIBSAMPLERATE_MIN_VERSION})
 SFLPHONE_CFLAGS="$SFLPHONE_CFLAGS $samplerate_CFLAGS"

sflphone-gtk/src/actions.c

@@ -165,7 +165,7 @@ sflphone_init()
 sflphone_hang_up()
 {
 	call_t * selectedCall = call_get_selected();
-	main_window_callinfo(FALSE, selectedCall);
+	//main_window_callinfo(FALSE, selectedCall);
 	if(selectedCall)
 	{
 		switch(selectedCall->state)
@@ -197,7 +197,7 @@ sflphone_pick_up()
 {
 	call_t * selectedCall = call_get_selected();
         //printf("full name: %s\n",g_hash_table_lookup(selectedCall->properties, ACCOUNT_IAX_FULL_NAME));
-	main_window_callinfo(TRUE, selectedCall);
+	//main_window_callinfo(TRUE, selectedCall);
 	if(selectedCall)
 	{
 		switch(selectedCall->state)
@@ -269,7 +269,7 @@ sflphone_fail( call_t * c )
 	c->state = CALL_STATE_FAILURE;
 	update_call_tree(c);
 	update_menus();
-	main_window_callinfo(FALSE, c);
+	//main_window_callinfo(FALSE, c);
 }
 
 	void 
@@ -334,7 +334,7 @@ sflphone_hung_up (call_t * c )
 	call_list_remove(c->callID);
 	update_call_tree_remove(c);
 	update_menus();
-	main_window_callinfo(FALSE, c);
+	//main_window_callinfo(FALSE, c);
 }
 
 void process_dialing(call_t * c, guint keyval, gchar * key)

sflphone-gtk/src/configwindow.c

@@ -82,7 +82,7 @@ config_window_fill_codec_list()
     GtkTreeIter iter;
     int i;
     gtk_list_store_clear(codec_store);
-    gchar * description = "Select a codec:";
+    //gchar * description = "Select a codec:";
     //gtk_list_store_append(codec_store, &iter);
     //gtk_list_store_set(codec_store, &iter, 0, description, -1);
     for(i=0; i<codec_list_get_size(); i++)
@@ -96,7 +96,7 @@ config_window_fill_codec_list()
       }
     }
   }
-	gtk_combo_box_set_active(combo_box, 0);
+	//gtk_combo_box_set_active(combo_box, 0);
 }
 
 void
@@ -196,7 +196,7 @@ select_account(GtkTreeSelection *sel, GtkTreeModel *model)
 static void
 select_codec( GtkComboBox* wid)
 {
-	guint item = gtk_combo_box_get_active(wid);
+	//guint item = gtk_combo_box_get_active(wid);
 	/* now we want this selected codec to be used as the preferred codec */
 	/* ie first in the list in the user config */
 	//codec_set_prefered_order(item);
@@ -263,7 +263,7 @@ create_accounts_tab()
 	GtkTreeSelection *sel;
 	GtkWidget *label;
 
-	GtkTreeIter iter;
+	//GtkTreeIter iter;
         GValue val;
         val.g_type = G_TYPE_POINTER;
 
@@ -374,9 +374,9 @@ create_audio_tab ()
 	GtkWidget * label;
 	GtkWidget * codecBox;
 	GtkWidget * rate_box;
-	GtkWidget * image; 
+	//GtkWidget * image; 
 	GtkWidget * hbox1;
-	GtkTreeIter iter;
+	//GtkTreeIter iter;
 	GtkCellRenderer *renderer;
 	
 
@@ -453,7 +453,7 @@ create_audio_tab ()
 	gtk_widget_show_all(ret);
 	config_window_fill_codec_list();
 	config_window_fill_rate_list();
-	gtk_combo_box_set_active(rate_box, 0);
+	//gtk_combo_box_set_active(rate_box, 0);
 
 	return ret;
 	

src/audio/Makefile.am

@@ -13,7 +13,7 @@ SPEEX_LIB=
 endif
 
 libaudio_la_SOURCES =      audiofile.cpp	 tonelist.cpp     \
-audiortp.cpp         dtmf.cpp   tone.cpp  audiolayer.cpp audiodevice.cpp  dtmfgenerator.cpp  gsmcodec.cpp \
+audiortp.cpp         dtmf.cpp   tone.cpp  audiolayer.cpp audiodevice.cpp  dtmfgenerator.cpp   \
 tonegenerator.cpp   codecDescriptor.cpp \
 audioloop.cpp ringbuffer.cpp $(SPEEX_SOURCES_CPP)
 
@@ -24,6 +24,6 @@ libaudio_la_CPPFLAGS = $(SPEEX_FLAG)
 
 noinst_HEADERS = audioloop.h       common.h ringbuffer.h           audiofile.h  \
  tonelist.h         audiortp.h audiocodec.h    audiolayer.h audiodevice.h \
- dtmfgenerator.h    gsmcodec.h      tonegenerator.h     \
+ dtmfgenerator.h         tonegenerator.h     \
  codecDescriptor.h    dtmf.h tone.h \
  CodecSpeex.h

src/audio/codecDescriptor.cpp

@@ -22,7 +22,6 @@
 #include <iostream>
 
 #include "audiocodec.h"
-#include "gsmcodec.h"
 #include "codecDescriptor.h"
 /*#ifdef HAVE_SPEEX
  #include "CodecSpeex.h"