Merge branch 'jbonjean'

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

@@ -25,6 +25,11 @@
 #include <gtk/gtk.h>
 #include <math.h>
 
+#if GTK_CHECK_VERSION(2,16,0)
+#else
+#include <libsexy/sexy-icon-entry.h>
+#endif
+
 void show_advanced_tls_options(GHashTable * properties)
 {
     GtkDialog * tlsDialog;
@@ -146,7 +151,7 @@ void show_advanced_tls_options(GHashTable * properties)
 	gtk_entry_set_icon_from_stock (GTK_ENTRY (privateKeyPasswordEntry), GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_DIALOG_AUTHENTICATION);
 #else
 	privateKeyPasswordEntry = sexy_icon_entry_new();
-	image = gtk_image_new_from_stock(GTK_STOCK_DIALOG_AUTHENTICATION , GTK_ICON_SIZE_SMALL_TOOLBAR );
+	GtkWidget * image = gtk_image_new_from_stock(GTK_STOCK_DIALOG_AUTHENTICATION , GTK_ICON_SIZE_SMALL_TOOLBAR );
 	sexy_icon_entry_set_icon(SEXY_ICON_ENTRY(privateKeyPasswordEntry), SEXY_ICON_ENTRY_PRIMARY , GTK_IMAGE(image) );
 #endif
 	gtk_entry_set_visibility(GTK_ENTRY(privateKeyPasswordEntry), FALSE);

tools/build-system/distributions/opensuse/build-packages-opensuse.sh

@@ -7,7 +7,7 @@
 # Author: Julien Bonjean (julien@bonjean.info) 
 #
 # Creation Date: 2009-05-27
-# Last Modified: 2009-05-29 18:11:44 -0400
+# Last Modified: 2009-09-11 11:22:27 -0400
 #####################################################
 
 . ../globals
@@ -20,7 +20,7 @@ if [ "$?" -ne "0" ]; then
 fi
 
 echo "Do updates"
-sudo /usr/bin/zypper -n update >/dev/null
+sudo /usr/bin/zypper -n update --auto-agree-with-licenses >/dev/null
 
 # create build directories
 echo "Create directories"