[evolution/wip/gsettings: 22/25] Merge branch 'master' into wip/gsettings

[Rodrigo Moya <rodrigo src gnome org>]

commit 56a166bb42bd55216a489c0b850ddd6bca2a3cd5
Merge: 8fd93c9 6d5db4c
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Mon Oct 10 12:50:18 2011 +0200

    Merge branch 'master' into wip/gsettings

 addressbook/gui/contact-editor/e-contact-editor.c  |   34 +-
 calendar/gui/dialogs/comp-editor.c                 |   10 +-
 composer/e-composer-actions.c                      |    3 +-
 composer/e-composer-private.h                      |    2 -
 composer/e-msg-composer.c                          |   28 +-
 configure.ac                                       |    2 +-
 doc/reference/shell/eshell-sections.txt            |    5 -
 doc/reference/shell/tmpl/e-attachment-store.sgml   |   28 -
 doc/reference/shell/tmpl/e-shell.sgml              |   33 -
 doc/reference/shell/tmpl/eshell-unused.sgml        |   48 +
 e-util/e-file-utils.c                              |    3 +-
 e-util/e-util.h                                    |    2 -
 help/C/minimize-to-system-tray.page                |    2 +-
 help/es/es.po                                      |  895 ++--
 mail/e-mail-backend.c                              |   12 +-
 mail/e-mail-browser.c                              |    5 +-
 mail/e-mail-folder-utils.c                         |   42 +-
 mail/e-mail-session-utils.c                        |   33 +-
 mail/e-mail-session.c                              |   18 +-
 mail/e-mail-store-utils.c                          |   24 +-
 mail/em-account-editor.c                           |   23 +-
 mail/em-folder-properties.c                        |    6 +-
 mail/em-format-html-display.c                      |   30 +-
 mail/evolution-mail.schemas.in                     |   14 -
 mail/mail-dialogs.ui                               |   68 +-
 mail/mail-folder-cache.c                           |    2 +-
 mail/mail-mt.c                                     |    4 +-
 .../apps_evolution_addressbook.schemas.in          |   12 +
 modules/addressbook/autocompletion-config.c        |   12 +
 modules/addressbook/e-book-shell-backend.c         |    8 +-
 modules/addressbook/e-book-shell-settings.c        |    4 +
 modules/calendar/e-cal-shell-backend.c             |   21 +-
 modules/calendar/e-memo-shell-backend.c            |    8 +-
 modules/calendar/e-task-shell-backend.c            |    8 +-
 modules/composer-autosave/e-autosave-utils.c       |   21 +-
 modules/composer-autosave/e-composer-registry.c    |   10 +-
 modules/mail/e-mail-shell-backend.c                |   11 +-
 modules/mail/e-mail-shell-view-private.c           |   10 +-
 modules/mail/em-composer-prefs.c                   |    4 +-
 modules/offline-alert/evolution-offline-alert.c    |   13 +-
 plugins/itip-formatter/itip-formatter.c            |   47 +-
 plugins/mail-notification/mail-notification.c      |    4 +-
 po/de.po                                           | 4168 +++++++-------
 po/es.po                                           | 2065 ++++----
 po/lt.po                                           | 5904 ++++++++++----------
 po/vi.po                                           |  107 +-
 shell/apps_evolution_shell.schemas.in              |   14 -
 shell/e-shell-content.c                            |    1 -
 shell/e-shell-searchbar.c                          |   32 +-
 shell/e-shell-utils.c                              |   74 +-
 shell/e-shell-window-private.c                     |    2 +-
 shell/e-shell-window.c                             |   29 +-
 shell/e-shell.c                                    |  278 +-
 shell/e-shell.h                                    |    6 -
 shell/test/e-test-shell-backend.c                  |   14 +-
 widgets/misc/Makefile.am                           |    2 -
 widgets/misc/e-attachment-paned.c                  |  122 +-
 widgets/misc/e-attachment-paned.h                  |    5 +
 widgets/misc/e-attachment-store.c                  |  141 +-
 widgets/misc/e-attachment-store.h                  |    8 -
 widgets/misc/e-attachment.c                        |   15 +-
 widgets/misc/e-hinted-entry.c                      |  293 -
 widgets/misc/e-hinted-entry.h                      |   73 -
 widgets/table/e-table-header-item.c                |   10 +
 widgets/table/e-table.c                            |   33 +-
 widgets/table/e-table.h                            |    6 +
 widgets/table/e-tree.c                             |   36 +-
 widgets/table/e-tree.h                             |    3 +
 68 files changed, 7411 insertions(+), 7599 deletions(-)
---
diff --cc calendar/gui/dialogs/comp-editor.c
index 73bf421,4fa0250..d5eee61
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@@ -2194,9 -2190,10 +2191,10 @@@ comp_editor_init (CompEditor *editor
  		store, "row-inserted",
  		G_CALLBACK (attachment_store_changed_cb), editor);
  
 -	comp_editor_bind_gconf (editor);
 +	comp_editor_bind_settings (editor);
  
- 	e_shell_watch_window (shell, GTK_WINDOW (editor));
+ 	gtk_application_add_window (
+ 		GTK_APPLICATION (shell), GTK_WINDOW (editor));
  	e_shell_adapt_window_size (shell, GTK_WINDOW (editor));
  }
  
diff --cc shell/e-shell.c
index 7ef48c2,a9c2fdc..1e8cd3c
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@@ -46,9 -46,12 +46,8 @@@
  #include "e-shell-window.h"
  #include "e-shell-utils.h"
  
 -#define E_SHELL_GET_PRIVATE(obj) \
 -	(G_TYPE_INSTANCE_GET_PRIVATE \
 -	((obj), E_TYPE_SHELL, EShellPrivate))
 -
  struct _EShellPrivate {
  	GQueue alerts;
- 	GList *watched_windows;
  	EShellSettings *settings;
  	GConfClient *gconf_client;
  	GActionGroup *action_group;