[evolution/kill-bonobo: 25/25] Merge commit 'EVOLUTION_2_27_3' into kill-bonobo

[Matthew Barnes <mbarnes src gnome org>]

commit c6aabcca4fa3e1af7cbb3b3295ef2c7d61b77d06
Merge: f4d748a... ed2d227...
Author: Matthew Barnes <mbarnes redhat com>
Date:   Fri Jun 19 19:05:26 2009 -0400

    Merge commit 'EVOLUTION_2_27_3' into kill-bonobo
    
    Conflicts:
    	composer/e-composer-header-table.h
    	composer/e-composer-header.c
    	composer/e-composer-private.c
    	configure.ac
    	mail/em-account-editor.c
    	po/POTFILES.in
    	po/or.po
    	widgets/misc/e-search-bar.c

 composer/e-composer-header.c       |   10 +-
 composer/e-composer-private.c      |   92 +-
 configure.ac                       |    2 +-
 e-util/e-util.c                    |  119 +-
 mail/em-account-editor.c           |    6 +-
 po/bn_IN.po                        |10474 +++++++++++++++++++-----------------
 po/fr.po                           | 9391 +++++++++++++++-----------------
 po/nb.po                           | 3242 ++++++------
 po/or.po                           | 4002 +++++++-------
 po/sv.po                           | 9718 ++++++++++++++++-----------------
 widgets/misc/e-account-combo-box.c |   47 +-
 widgets/misc/e-attachment-paned.c  |   15 +
 widgets/misc/e-attachment-paned.h  |    4 +
 13 files changed, 18449 insertions(+), 18673 deletions(-)
---
diff --cc composer/e-composer-private.c
index d4ec9dd,e834f41..5613670
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@@ -87,10 -85,9 +87,9 @@@ e_composer_private_init (EMsgComposer *
  
  	GtkhtmlEditor *editor;
  	GtkUIManager *ui_manager;
 -	GtkWidget *widget;
  	GtkWidget *container;
 +	GtkWidget *widget;
  	GtkWidget *send_widget;
- 	GtkWidget *exp_box;
  	const gchar *path;
  	gchar *filename;
  	gint ii;
diff --cc configure.ac
index 6a902f4,035f38d..3433bfc
--- a/configure.ac
+++ b/configure.ac
@@@ -1212,10 -1207,10 +1212,10 @@@ if test "x${enable_nss}" = "xyes" || te
  					esac
  				fi
  			else
- 		 		nsslibs="-lssl3 -lsmime3 -lnss3 $SOFTOKN3_LIB"
+ 		 		nsslibs="-lssl3 -lsmime3 -lnss3"
  	 		fi	
  			
 -			AC_CACHE_CHECK([for Mozilla nss libraries], moz_nss_libs,
 +			AC_CACHE_CHECK([for Mozilla nss libraries], ac_cv_moz_nss_libs,
  			[
  	 			LIBS_save="$LIBS"
  				LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs"
diff --cc mail/em-account-editor.c
index 01f8b9c,a9d0fcc..5179815
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@@ -2808,19 -2786,26 +2806,17 @@@ emae_check_complete(EConfig *ec, const 
  				gtk_entry_set_text(emae->priv->transport.username, user);
  				if (uri && (url = camel_url_new(uri, NULL)) != NULL) {
  					refresh = TRUE;
 +					camel_url_set_protocol(url, mail_servers[index].proto);
 +					camel_url_set_param(url, "use_ssl", mail_servers[index].ssl);
 +					camel_url_set_host (url, mail_servers[index].recv);
  					camel_url_set_user (url, user);
 -					if (index != -1) {
 -						camel_url_set_protocol(url, mail_servers[index].proto);
 -						camel_url_set_param(url, "use_ssl", mail_servers[index].ssl);
 -						camel_url_set_host (url, mail_servers[index].recv);
 -						gtk_entry_set_text(emae->priv->source.hostname, mail_servers[index].recv);
 -						gtk_entry_set_text(emae->priv->transport.hostname, mail_servers[index].send);
 -						camel_url_set_host (url, mail_servers[index].recv);
 -
 -					} else {
 -						camel_url_set_host (url, "");
 -					}
 -					camel_url_set_user (url, user);
 -					g_free (uri);
 +					gtk_entry_set_text(emae->priv->source.hostname, mail_servers[index].recv);
 +					gtk_entry_set_text(emae->priv->transport.hostname, mail_servers[index].send);
  					uri = camel_url_to_string(url, 0);
  					e_account_set_string(emae->account, E_ACCOUNT_SOURCE_URL, uri);
 +
  					g_free(uri);
  					camel_url_free(url);
--				} else {
- 					g_warning("buz1\n");
 -					g_free(uri);
  				}
  
  			}