diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-05-04 21:08:32 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-05-04 21:08:32 +0800 |
| commit | c3e0648d8b5a1d73f82f0a7691b9ab1320248392 (patch) | |
| tree | 677c9472380b3119d08f42eb48c001d18bfd6243 /composer | |
| parent | 5395bd3308e25f3ca2ac1b35460ba6df1d294f4b (diff) | |
| parent | fb970ccf14e33d92cfb9409d44f7b06355e958fc (diff) | |
| download | gsoc2013-evolution-c3e0648d8b5a1d73f82f0a7691b9ab1320248392.tar.gz gsoc2013-evolution-c3e0648d8b5a1d73f82f0a7691b9ab1320248392.tar.zst gsoc2013-evolution-c3e0648d8b5a1d73f82f0a7691b9ab1320248392.zip | |
Merge branch 'master' into kill-bonobo
Conflicts:
addressbook/gui/Makefile.am
addressbook/gui/widgets/Makefile.am
addressbook/gui/widgets/eab-popup-control.c
calendar/gui/e-meeting-time-sel.c
calendar/gui/migration.c
calendar/modules/e-memo-shell-module-migrate.h
e-util/e-logger.c
mail/e-mail-attachment-bar.c
mail/em-composer-utils.c
mail/em-format-html-display.c
plugins/mail-account-disable/Makefile.am
plugins/select-one-source/Makefile.am
po/es.po
shell/Makefile.am
shell/e-shell-common.h
shell/e-shell-nm.c
shell/e-shell-window-commands.c
shell/e-shell-window.c
shell/e-sidebar.c
shell/e-user-creatable-items-handler.c
shell/importer/Makefile.am
shell/test/Makefile.am
widgets/misc/test-error.c
widgets/misc/test-info-label.c
widgets/misc/test-multi-config-dialog.c
Diffstat (limited to 'composer')
| -rw-r--r-- | composer/e-composer-autosave.c | 4 | ||||
| -rw-r--r-- | composer/evolution-composer.ui | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/composer/e-composer-autosave.c b/composer/e-composer-autosave.c index 78b8134941..842deae9c9 100644 --- a/composer/e-composer-autosave.c +++ b/composer/e-composer-autosave.c @@ -28,7 +28,7 @@ #define AUTOSAVE_PREFIX ".evolution-composer.autosave" #define AUTOSAVE_SEED AUTOSAVE_PREFIX "-XXXXXX" -#define AUTOSAVE_INTERVAL 60000 /* 60 seconds */ +#define AUTOSAVE_INTERVAL 60 /* 60 seconds */ typedef struct _AutosaveState AutosaveState; @@ -222,7 +222,7 @@ e_composer_autosave_register (EMsgComposer *composer) composer_autosave_notify, NULL); if (autosave_source_id == 0) - autosave_source_id = g_timeout_add ( + autosave_source_id = g_timeout_add_seconds ( AUTOSAVE_INTERVAL, (GSourceFunc) composer_autosave_timeout, NULL); } diff --git a/composer/evolution-composer.ui b/composer/evolution-composer.ui index 2f99708a0e..44a0a5162f 100644 --- a/composer/evolution-composer.ui +++ b/composer/evolution-composer.ui @@ -23,6 +23,9 @@ <placeholder name='external-editor-holder'/> <separator/> <separator/> + <placeholder name='external-editor-holder'/> + <separator/> + <separator/> <menuitem action='print-preview'/> <menuitem action='print'/> <separator/> |