From bd4898c8a01f2fa9a7f6abadf91c2b51fd411695 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 14 Sep 2011 12:36:54 +0200 Subject: Make sure GConf schemas have defined default values --- mail/evolution-mail.schemas.in | 12 ++++++++++ .../apps_evolution_addressbook.schemas.in | 1 + .../calendar/apps_evolution_calendar.schemas.in | 5 ++++ shell/apps_evolution_shell.schemas.in | 27 ++++++++++++++++++---- 4 files changed, 40 insertions(+), 5 deletions(-) diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in index 36c8847605..f1dcd73ea6 100644 --- a/mail/evolution-mail.schemas.in +++ b/mail/evolution-mail.schemas.in @@ -138,6 +138,7 @@ evolution-mail list string + [] Spell checking languages @@ -536,6 +537,7 @@ evolution-mail list string + [] List of custom headers and whether they are enabled. @@ -580,6 +582,7 @@ evolution-mail list string + [] List of MIME types to check for Bonobo component viewers @@ -958,6 +961,7 @@ /schemas/apps/evolution/mail/subscription_editor_maximized /apps/evolution/mail/subscription_editor_maximized bool + false "Folder Subscriptions" window maximize state @@ -1496,6 +1500,7 @@ /apps/evolution/mail/default_account evolution-mail string + UID string of the default account. @@ -1510,6 +1515,7 @@ evolution-mail list string + [] List of accounts @@ -1526,6 +1532,7 @@ evolution-mail list string + [] List of accepted licenses @@ -1541,6 +1548,7 @@ /apps/evolution/mail/save_dir evolution-mail string + Save directory @@ -1554,6 +1562,7 @@ /apps/evolution/mail/composer/current_folder evolution-mail string + Composer load/attach directory @@ -1582,6 +1591,7 @@ /schemas/apps/evolution/mail/filter_editor_maximized /apps/evolution/mail/filter_editor_maximized bool + false "Filter Editor" window maximize state @@ -1660,6 +1670,7 @@ /apps/evolution/mail/send_recv_maximized evolution-mail bool + false "Send and Receive Mail" window maximize state @@ -1705,6 +1716,7 @@ /schemas/apps/evolution/mail/vfolder_editor_maximized /apps/evolution/mail/vfolder_editor_maximized bool + false "Search Folder Editor" window maximize state diff --git a/modules/addressbook/apps_evolution_addressbook.schemas.in b/modules/addressbook/apps_evolution_addressbook.schemas.in index e13337e82c..a6506d7a78 100644 --- a/modules/addressbook/apps_evolution_addressbook.schemas.in +++ b/modules/addressbook/apps_evolution_addressbook.schemas.in @@ -77,6 +77,7 @@ /apps/evolution/addressbook/display/primary_addressbook evolution-addressbook string + Primary address book diff --git a/modules/calendar/apps_evolution_calendar.schemas.in b/modules/calendar/apps_evolution_calendar.schemas.in index 7df4f95271..c34852ed4e 100644 --- a/modules/calendar/apps_evolution_calendar.schemas.in +++ b/modules/calendar/apps_evolution_calendar.schemas.in @@ -8,6 +8,7 @@ /apps/evolution/calendar/display/primary_calendar evolution-calendar string + Primary calendar @@ -501,6 +502,7 @@ /apps/evolution/calendar/memos/primary_memos evolution-calendar string + Primary memo list @@ -517,6 +519,7 @@ /apps/evolution/calendar/tasks/primary_tasks evolution-calendar string + Primary task list @@ -786,6 +789,7 @@ /apps/evolution/calendar/publish/template evolution-calendar string + Free/busy template URL The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain. @@ -797,6 +801,7 @@ /apps/evolution/calendar/audio_dir evolution-calendar string + Save directory for reminder audio diff --git a/shell/apps_evolution_shell.schemas.in b/shell/apps_evolution_shell.schemas.in index dd5544284c..09c376edda 100644 --- a/shell/apps_evolution_shell.schemas.in +++ b/shell/apps_evolution_shell.schemas.in @@ -8,6 +8,7 @@ /apps/evolution/version evolution string + Configuration version The configuration version of Evolution, with major/minor/configuration level (for example "2.6.0"). @@ -21,6 +22,7 @@ /apps/evolution/last_version evolution string + Last upgraded configuration version The last upgraded configuration version of Evolution, with major/minor/configuration level (for example "2.6.0"). @@ -63,6 +65,7 @@ /apps/evolution/shell/file_chooser_folder evolution string + Initial file chooser folder Initial folder for GtkFileChooser dialogs. @@ -103,6 +106,7 @@ /apps/evolution/shell/view_defaults/window_y evolution int + 0 Default window Y coordinate The default Y coordinate for the main window. @@ -114,6 +118,7 @@ /apps/evolution/shell/view_defaults/window_x evolution int + 0 Default window X coordinate The default X coordinate for the main window. @@ -149,7 +154,7 @@ /apps/evolution/shell/view_defaults/window_maximized evolution bool - TRUE + true Default window state Whether or not the window should be maximized. @@ -161,7 +166,7 @@ /apps/evolution/shell/view_defaults/buttons_visible evolution bool - TRUE + true Window buttons are visible Whether the window buttons should be visible. @@ -185,7 +190,7 @@ /apps/evolution/shell/view_defaults/toolbar_visible evolution bool - TRUE + true Toolbar is visible Whether the toolbar should be visible. @@ -197,7 +202,7 @@ /apps/evolution/shell/view_defaults/sidebar_visible evolution bool - TRUE + true Sidebar is visible Whether the sidebar should be visible. @@ -209,7 +214,7 @@ /apps/evolution/shell/view_defaults/statusbar_visible evolution bool - TRUE + true Statusbar is visible Whether the status bar should be visible. @@ -261,6 +266,7 @@ /apps/evolution/shell/network_config/http_port evolution int + 0 HTTP proxy port The port on the machine defined by "/apps/evolution/shell/network_config/http_host" that you proxy through. @@ -272,6 +278,7 @@ /apps/evolution/shell/network_config/http_host evolution string + HTTP proxy host name The machine name to proxy HTTP through. @@ -283,6 +290,7 @@ /apps/evolution/shell/network_config/secure_port evolution int + 0 Secure HTTP proxy port The port on the machine defined by "/apps/evolution/shell/network_config/secure_host" that you proxy through. @@ -294,6 +302,7 @@ /apps/evolution/shell/network_config/secure_host evolution string + Secure HTTP proxy host name The machine name to proxy secure HTTP through. @@ -305,6 +314,7 @@ /apps/evolution/shell/network_config/socks_port evolution int + 0 SOCKS proxy port The port on the machine defined by "/apps/evolution/shell/network_config/socks_host" that you proxy through. @@ -316,6 +326,7 @@ /apps/evolution/shell/network_config/socks_host evolution string + SOCKS proxy host name The machine name to proxy socks through. @@ -327,6 +338,7 @@ /apps/evolution/shell/network_config/use_http_proxy evolution bool + false Use HTTP proxy Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet. @@ -338,6 +350,7 @@ /apps/evolution/shell/network_config/use_authentication evolution bool + false Authenticate proxy server connections If true, then connections to the proxy server require authentication. The username is retrieved from the "/apps/evolution/shell/network_config/authentication_user" GConf key, and the password is retrieved from either gnome-keyring or the ~/.gnome2_private/Evolution password file. @@ -349,6 +362,7 @@ /apps/evolution/shell/network_config/authentication_user evolution string + HTTP proxy username Username to pass as authentication when doing HTTP proxying. @@ -360,6 +374,7 @@ /apps/evolution/shell/network_config/authentication_password evolution string + HTTP proxy password Password to pass as authentication when doing HTTP proxying. @@ -372,6 +387,7 @@ evolution list string + [] Non-proxy hosts This key contains a list of hosts which are connected to directly, rather than via the proxy (if it is active). The values can be hostnames, domains (using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and IPv6) and network addresses with a netmask (something like 192.168.0.0/24). @@ -383,6 +399,7 @@ /apps/evolution/shell/network_config/autoconfig_url evolution string + Automatic proxy configuration URL URL that provides proxy configuration values. -- cgit