Use e_restore_window() and "org.gnome.evolution.window".

Apply it to all windows with persistent size and/or position.

1 files changed, 32 insertions, 22 deletions

diff --git a/data/evolution.convert b/data/evolution.convert
index 46da5db91f..d52b7e14e5 100644
--- a/data/evolution.convert
+++ b/data/evolution.convert
@@ -17,11 +17,13 @@ skip-warning-dialog = /apps/evolution/shell/skip_warning_dialog
 start-offline = /apps/evolution/shell/start_offline
 statusbar-visible = /apps/evolution/shell/view_defaults/statusbar_visible
 toolbar-visible = /apps/evolution/shell/view_defaults/toolbar_visible
-window-height = /apps/evolution/shell/view_defaults/window_height
-window-maximized = /apps/evolution/shell/view_defaults/window_maximized
-window-width = /apps/evolution/shell/view_defaults/window_width
-window-x = /apps/evolution/shell/view_defaults/window_x
-window-y = /apps/evolution/shell/view_defaults/window_y
+
+[org.gnome.evolution.shell:/org/gnome/evolution/mail/shell/window]
+height = /apps/evolution/shell/view_defaults/window_height
+maximized = /apps/evolution/shell/view_defaults/window_maximized
+width = /apps/evolution/shell/view_defaults/window_width
+x = /apps/evolution/shell/view_defaults/window_x
+y = /apps/evolution/shell/view_defaults/window_y
 
 [org.gnome.evolution.addressbook]
 address-formatting = /apps/evolution/addressbook/display/address_formatting
@@ -115,7 +117,6 @@ composer-charset = /apps/evolution/mail/composer/charset
 composer-current-folder = /apps/evolution/mail/composer/current_folder
 composer-gallery-path = /apps/evolution/mail/composer/gallery_path
 composer-group-reply-to-list = /apps/evolution/mail/composer/group_reply_to_list
-composer-height = /apps/evolution/mail/composer/height
 composer-ignore-list-reply-to = /apps/evolution/mail/composer/ignore_list_reply_to
 composer-inline-spelling = /apps/evolution/mail/composer/inline_spelling
 composer-magic-links = /apps/evolution/mail/composer/magic_links
@@ -137,15 +138,11 @@ composer-sign-reply-if-signed = /apps/evolution/mail/composer/sign_reply_if_sign
 composer-spell-color = /apps/evolution/mail/composer/spell_color
 composer-spell-languages = /apps/evolution/mail/composer/spell_languages
 composer-top-signature = /apps/evolution/mail/composer/top_signature
-composer-width = /apps/evolution/mail/composer/width
 default-account = /apps/evolution/mail/default_account
 enable-local = /apps/evolution/mail/display/enable_local
 enable-vfolders = /apps/evolution/mail/display/enable_vfolders
 error-level = /apps/evolution/mail/display/error_level
 error-timeout = /apps/evolution/mail/display/error_timeout
-filter-editor-height = /apps/evolution/mail/filter_editor_height
-filter-editor-maximized = /apps/evolution/mail/filter_editor_maximized
-filter-editor-width = /apps/evolution/mail/filter_editor_width
 filters-log-actions = /apps/evolution/mail/filters/log
 filters-log-file = /apps/evolution/mail/filters/logfile
 flush-outbox = /apps/evolution/mail/filters/flush-outbox
@@ -167,9 +164,6 @@ labels = /apps/evolution/mail/labels
 layout = /apps/evolution/mail/display/layout
 load-http-images = /apps/evolution/mail/display/load_http_images
 magic-spacebar = /apps/evolution/mail/display/magic_spacebar
-mail-browser-height = /apps/evolution/mail/mail_browser_height
-mail-browser-maximized = /apps/evolution/mail/mail_browser_maximized
-mail-browser-width = /apps/evolution/mail/mail_browser_width
 mark-citations = /apps/evolution/mail/display/mark_citations
 mark-seen = /apps/evolution/mail/display/mark_seen
 mark-seen-timeout = /apps/evolution/mail/display/mark_seen_timeout
@@ -199,10 +193,7 @@ reply-style = /apps/evolution/mail/format/reply_style
 safe-list = /apps/evolution/mail/display/safe_list
 save-dir = /apps/evolution/mail/save_dir
 send-recv-all-on-start = /apps/evolution/mail/send_recv_all_on_start
-send-recv-height = /apps/evolution/mail/send_recv_height
-send-recv-maximized = /apps/evolution/mail/send_recv_maximized
 send-recv-on-start = /apps/evolution/mail/send_recv_on_start
-send-recv-width = /apps/evolution/mail/send_recv_width
 show-all-headers = /apps/evolution/mail/display/show_all_headers
 show-animated-images = /apps/evolution/mail/display/animated_images
 show-deleted = /apps/evolution/mail/display/show_deleted
@@ -211,9 +202,6 @@ show-real-date = /apps/evolution/mail/display/show_real_date
 show-sender-photo = /apps/evolution/mail/display/sender_photo
 side-bar-search = /apps/evolution/mail/display/side_bar_search
 sort-accounts-alpha = /apps/evolution/mail/display/sort_accounts_alpha
-subscription-editor-height = /apps/evolution/mail/subscription_editor_height
-subscription-editor-maximized = /apps/evolution/mail/subscription_editor_maximized
-subscription-editor-width = /apps/evolution/mail/subscription_editor_width
 sync-interval = /apps/evolution/mail/sync_interval
 thread-expand = /apps/evolution/mail/display/thread_expand
 thread-latest = /apps/evolution/mail/display/thread_latest
@@ -224,9 +212,31 @@ trash-empty-on-exit-days = /apps/evolution/mail/trash/empty_on_exit_days
 use-custom-font = /apps/evolution/mail/display/fonts/use_custom
 variable-width-font = /apps/evolution/mail/display/fonts/variable
 vertical-view-fonts = /apps/evolution/mail/display/vertical_view_fonts
-vfolder-editor-height = /apps/evolution/mail/vfolder_editor_height
-vfolder-editor-maximized = /apps/evolution/mail/vfolder_editor_maximized
-vfolder-editor-width = /apps/evolution/mail/vfolder_editor_width
+
+[org.gnome.evolution.window:/org/gnome/evolution/mail/browser-window/]
+height = /apps/evolution/mail/mail_browser_height
+maximized = /apps/evolution/mail/mail_browser_maximized
+width = /apps/evolution/mail/mail_browser_width
+
+[org.gnome.evolution.window:/org/gnome/evolution/mail/filter-window]
+height = /apps/evolution/mail/filter_editor_height
+maximized = /apps/evolution/mail/filter_editor_maximized
+width = /apps/evolution/mail/filter_editor_width
+
+[org.gnome.evolution.window:/org/gnome/evolution/mail/send-recv-window]
+height = /apps/evolution/mail/send_recv_height
+maximized = /apps/evolution/mail/send_recv_maximized
+width = /apps/evolution/mail/send_recv_width
+
+[org.gnome.evolution.window:/org/gnome/evolution/mail/subscription-window]
+height = /apps/evolution/mail/subscription_editor_height
+maximized = /apps/evolution/mail/subscription_editor_maximized
+width = /apps/evolution/mail/subscription_editor_width
+
+[org.gnome.evolution.window:/org/gnome/evolution/mail/vfolder-window]
+height = /apps/evolution/mail/vfolder_editor_height
+maximized = /apps/evolution/mail/vfolder_editor_maximized
+width = /apps/evolution/mail/vfolder_editor_width
 
 [org.gnome.evolution.bogofilter]
 utf8-for-spam-filter = /apps/evolution/mail/junk/bogofilter/unicode