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

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);