[evolution/wip/gsettings: 12/17] Merge branch 'master' into wip/gsettings

[Rodrigo Moya <rodrigo src gnome org>]

commit 900d019a0332b24d2bee7ea1407b149fca2c0598
Merge: cdb0964 badc11e
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Thu Nov 17 15:55:48 2011 +0100

    Merge branch 'master' into wip/gsettings

 calendar/gui/alarm-notify/alarm-notify.c |   93 +++-
 calendar/gui/alarm-notify/alarm-notify.h |    3 +-
 calendar/gui/e-meeting-time-sel-item.c   |   37 +-
 calendar/gui/e-meeting-time-sel.c        |   49 +-
 calendar/gui/e-meeting-time-sel.h        |   10 +-
 doc/reference/shell/eshell-sections.txt  |    2 -
 e-util/e-datetime-format.c               |   22 +
 e-util/e-datetime-format.h               |    1 +
 e-util/e-util.c                          |   74 --
 e-util/e-util.h                          |   12 +-
 filter/e-filter-color.c                  |    3 +-
 filter/e-filter-element.h                |    1 +
 filter/e-filter-file.c                   |    4 +-
 filter/e-filter-input.c                  |    4 +-
 filter/e-filter-int.c                    |    2 -
 filter/e-filter-option.c                 |    4 +-
 filter/e-filter-part.c                   |    2 +-
 mail/e-mail-session.c                    |   58 +-
 mail/em-account-editor.c                 |   47 +-
 mail/em-composer-utils.c                 |   10 +-
 mail/em-filter-folder-element.c          |    3 +-
 mail/em-filter-source-element.c          |    4 +-
 mail/evolution-mail.schemas.in           |   15 +
 mail/mail-config.ui                      |   21 +-
 mail/mail.error.xml                      |   18 -
 modules/mail/e-mail-shell-settings.c     |    4 +
 modules/mail/em-composer-prefs.c         |    7 +
 po/es.po                                 | 1162 +++++++++++++++---------------
 28 files changed, 869 insertions(+), 803 deletions(-)
---
diff --cc calendar/gui/alarm-notify/alarm-notify.c
index 3b5402b,4f04974..bc3af20
--- a/calendar/gui/alarm-notify/alarm-notify.c
+++ b/calendar/gui/alarm-notify/alarm-notify.c
@@@ -220,8 -241,14 +239,14 @@@ alarm_notify_finalize (GObject *object
  	AlarmNotifyPrivate *priv;
  	gint ii;
  
 -	priv = ALARM_NOTIFY_GET_PRIVATE (object);
 +	priv = ALARM_NOTIFY (object)->priv;
  
+ 	if (priv->offline_timeout_id)
+ 		g_source_remove (priv->offline_timeout_id);
+ 	priv->offline_timeout_id = 0;
+ 	g_slist_free_full (priv->offline_sources, g_object_unref);
+ 	priv->offline_sources = NULL;
+ 
  	for (ii = 0; ii < E_CAL_CLIENT_SOURCE_TYPE_LAST; ii++) {
  		g_hash_table_foreach (
  			priv->uri_client_hash[ii],
diff --cc modules/mail/e-mail-shell-settings.c
index 5cc70ef,6b0cee6..8c845bd
--- a/modules/mail/e-mail-shell-settings.c
+++ b/modules/mail/e-mail-shell-settings.c
@@@ -320,13 -275,15 +320,17 @@@ e_mail_shell_settings_init (EShellBacke
  
  	e_shell_settings_install_property_for_key (
  		"composer-group-reply-to-list",
 -		"/apps/evolution/mail/composer/group_reply_to_list");
 +		MAIL_SCHEMA,
 +		"composer-group-reply-to-list");
  
  	e_shell_settings_install_property_for_key (
+ 		"composer-sign-reply-if-signed",
+ 		"/apps/evolution/mail/composer/sign_reply_if_signed");
+ 
+ 	e_shell_settings_install_property_for_key (
  		"composer-prompt-only-bcc",
 -		"/apps/evolution/mail/prompts/only_bcc");
 +		MAIL_SCHEMA,
 +		"prompt-on-only-bcc");
  
  	e_shell_settings_install_property_for_key (
  		"composer-prompt-private-list-reply",