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 /e-util/gconf-bridge.c | |
| 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 'e-util/gconf-bridge.c')
| -rw-r--r-- | e-util/gconf-bridge.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/e-util/gconf-bridge.c b/e-util/gconf-bridge.c index 4ab0f59646..852d5f8f53 100644 --- a/e-util/gconf-bridge.c +++ b/e-util/gconf-bridge.c @@ -645,8 +645,8 @@ window_binding_perform_scheduled_sync (WindowBinding *binding) return FALSE; } -#define WINDOW_BINDING_SYNC_DELAY 1000 /* Delay before syncing new window - dimensions to GConf, in ms */ +#define WINDOW_BINDING_SYNC_DELAY 1 /* Delay before syncing new window + dimensions to GConf, in s */ /* Called when the window han been resized or moved */ static gboolean @@ -657,7 +657,7 @@ window_binding_configure_event_cb (GtkWindow *window, /* Schedule a sync */ if (binding->sync_timeout_id == 0) { binding->sync_timeout_id = - g_timeout_add (WINDOW_BINDING_SYNC_DELAY, + g_timeout_add_seconds (WINDOW_BINDING_SYNC_DELAY, (GSourceFunc) window_binding_perform_scheduled_sync, binding); |