Merge branch 'master' into earlymedia

sflphone-client-gnome/src/Makefile.am

@@ -34,7 +34,7 @@ noinst_HEADERS =  actions.h sflnotify.h mainwindow.h dialpad.h codeclist.h \
                   accountlist.h sliders.h statusicon.h callable_obj.h conference_obj.h \
                   shortcuts.h eel-gconf-extensions.h logger.h
 
-sflphone_client_gnome_LDADD = $(DEPS_LIBS) $(NOTIFY_LIBS) $(SFLPHONEGTK_LIBS) $(LIBSEXY_LIBS) $(X11_LIBS)
+sflphone_client_gnome_LDADD = $(DEPS_LIBS) $(NOTIFY_LIBS) $(SFLPHONEGTK_LIBS) $(LIBSEXY_LIBS) $(X11_LIBS) $(DBUSGLIB_LIBS)
 
 # add symbolic link	     
 install-exec-local:

sflphone-client-gnome/src/config/Makefile.am

@@ -16,5 +16,6 @@ libconfig_la_SOURCES = \
   utils.c 
 
 libconfig_la_LDFLAGS = @DEPS_LDFLAGS@
+libconfig_la_LIBADD = @DEPS_LIBS@
 					  
 libconfig_la_CFLAGS = @DEPS_CFLAGS@ 

sflphone-client-gnome/src/config/addressbook-config.c

@@ -183,7 +183,7 @@ search_phone_home_cb (GtkWidget *widget)
 {
 
     addressbook_config->search_phone_home = (guint) gtk_toggle_button_get_active (
-            GTK_TOGGLE_BUTTON (widget));
+                                                GTK_TOGGLE_BUTTON (widget));
 }
 
 static void
@@ -338,7 +338,7 @@ create_addressbook_settings()
     scale_button = gtk_hbox_new (FALSE, 0);
     scale_label = gtk_label_new (_ ("Download limit :"));
     gtk_box_pack_start (GTK_BOX (scale_button),scale_label,FALSE,FALSE,0);
-    value = gtk_spin_button_new_with_range (1, 500, 1);
+    value = gtk_spin_button_new_with_range (1, G_MAXINT, 1);
     gtk_label_set_mnemonic_widget (GTK_LABEL (scale_label), value);
     gtk_spin_button_set_value (GTK_SPIN_BUTTON (value) , addressbook_config->max_results);
     g_signal_connect (G_OBJECT (value) , "value-changed" , G_CALLBACK (max_results_cb), NULL);

sflphone-client-gnome/src/widget/Makefile.am

@@ -8,5 +8,6 @@ libwidget_la_SOURCES = \
 		imwidget.c
 
 libwidget_la_LDFLAGS = @DEPS_LDFLAGS@
+libwidget_la_LIBADD = @DEPS_LIBS@
 					  
 libwidget_la_CFLAGS = @DEPS_CFLAGS@ 

sflphone-common/src/Makefile.am

@@ -42,7 +42,7 @@ sflphoned_CXXFLAGS = \
 
 # libsflphone 
 
-sflphoned_LDADD = ./libsflphone.la
+sflphoned_LDADD = ./libsflphone.la $(libssl_LIBS) -lcrypto
 noinst_LTLIBRARIES = libsflphone.la
 
 noinst_HEADERS = \