callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove the last remaining usage of GConf

Browse Source
This commit is contained in:
Milan Crha
2012-06-15 09:04:08 +02:00
parent 08dedf0a8a
commit 94daae3dba
65 changed files with 333 additions and 4541 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/alarm-notify/Makefile.am
View File

@ -21,7 +21,6 @@ evolution_alarm_notify_CPPFLAGS = \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
$(LIBNOTIFY_CFLAGS) \
$(DBUS_GLIB_CFLAGS) \
$(CANBERRA_CFLAGS)
ui_DATA = \
@ -55,7 +54,6 @@ evolution_alarm_notify_LDADD = \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
$(LIBNOTIFY_LIBS) \
$(DBUS_GLIB_LIBS) \
$(CANBERRA_LIBS) \
$(EVOLUTIONALARMNOTIFYICON)

5
calendar/alarm-notify/notify-main.c
View File

@ -30,8 +30,6 @@
#include <stdlib.h>
#include <glib/gi18n.h>
#include <dbus/dbus-glib.h>
#include "alarm-notify.h"
#ifdef G_OS_WIN32
@ -84,9 +82,6 @@ main (gint argc,
gtk_init (&argc, &argv);
/* this is to initialize threading for dbus-glib used by GConf */
dbus_g_thread_init ();
e_gdbus_templates_init_main_thread ();
#ifdef G_OS_WIN32

1
calendar/gui/e-memo-list-selector.c
View File

@ -19,7 +19,6 @@
*/
#include <config.h>
#include <gconf/gconf-client.h>
#include "e-memo-list-selector.h"

17
configure.ac
View File

@ -44,7 +44,6 @@ m4_define([gnome_icon_theme_minimum_version], [2.30.2.1])
m4_define([gsettings_desktop_schemas_minimum_version], [2.91.92])
m4_define([webkitgtk_minimum_version], [1.8.0])
m4_define([javascriptcoregtk_minimum_version], [1.8.0])
m4_define([gconf_minimum_version], [2.0.0]) dnl XXX Just a Guess
m4_define([libgdata_minimum_version], [0.10])
m4_define([libsoup_minimum_version], [2.38.1])
m4_define([libxml_minimum_version], [2.7.3])
@ -252,7 +251,6 @@ PKG_CHECK_MODULES([GNOME_PLATFORM],
cairo-gobject
gtk+-3.0 >= gtk_minimum_version
gail-3.0 >= gtk_minimum_version
gconf-2.0 >= gconf_minimum_version
libxml-2.0 >= libxml_minimum_version
shared-mime-info >= shared_mime_info_minimum_version
gnome-desktop-3.0 >= gnome_desktop_minimum_version
@ -272,15 +270,6 @@ PKG_CHECK_MODULES([EVOLUTION_DATA_SERVER],
AC_SUBST(EVOLUTION_DATA_SERVER_CFLAGS)
AC_SUBST(EVOLUTION_DATA_SERVER_LIBS)
dnl ******************************
dnl DBus-glib stuff, to initialize thread for GConf, which is using it
dnl this is returned back only temporarily and wil lbe removed as soon
dnl as eds will stop using GConf completely
dnl ******************************
PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= 0.6)
AC_SUBST(DBUS_GLIB_CFLAGS)
AC_SUBST(DBUS_GLIB_LIBS)
dnl ******************************
dnl Canberra / Canberra-GTK Sound
dnl ******************************
@ -1468,12 +1457,6 @@ AC_SUBST(dist_plugins_base)
AC_SUBST(dist_plugins_standard)
AC_SUBST(dist_plugins_experimental)
dnl ***********
dnl GConf stuff
dnl ***********
AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
AM_GCONF_SOURCE_2
dnl ******************
dnl Sub-version number
dnl ******************

1
data/Makefile.am
View File

@ -31,6 +31,7 @@ gsettings_SCHEMAS = \
org.gnome.evolution.plugin.itip.gschema.xml \
org.gnome.evolution.plugin.mail-notification.gschema.xml \
org.gnome.evolution.plugin.prefer-plain.gschema.xml \
org.gnome.evolution.plugin.publish-calendar.gschema.xml \
org.gnome.evolution.plugin.templates.gschema.xml
@INTLTOOL_XML_NOMERGE_RULE@

5
data/evolution.convert
View File

@ -133,6 +133,8 @@ 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
default-account = /apps/evolution/mail/default_account
drag-and-drop-save-file-format = /apps/evolution/mail/save_file_format
drag-and-drop-save-name-format = /apps/evolution/mail/save_name_format
error-level = /apps/evolution/mail/display/error_level
error-timeout = /apps/evolution/mail/display/error_timeout
filters-log-actions = /apps/evolution/mail/filters/log
@ -278,5 +280,8 @@ notify-status-notification = /apps/evolution/eplugin/mail-notification/status-no
mode = /apps/evolution/eplugin/prefer_plain/mode
show-suppressed = /apps/evolution/eplugin/prefer_plain/show_suppressed
[org.gnome.evolution.plugin.publish-calendar]
uris = /apps/evolution/calendar/publish/uris
[org.gnome.evolution.plugin.templates]
template-placeholders = /apps/evolution/mail/template_placeholders

10
data/org.gnome.evolution.mail.gschema.xml.in
View File

@ -130,6 +130,16 @@
<_summary>List of localized 'Re'</_summary>
<_description>Comma-separated list of localized 'Re' abbreviations to skip in a subject text when replying to a message, as an addition to the standard "Re" prefix. An example is 'SV,AV'.</_description>
</key>
<key name="drag-and-drop-save-file-format" type="s">
<default>'mbox'</default>
<_summary>Save file format for drag-and-drop operation</_summary>
<_description>Can be either 'mbox' or 'pdf'.</_description>
</key>
<key name="drag-and-drop-save-name-format" type="i">
<default>1</default>
<_summary>Save name format for drag-and-drop operation</_summary>
<_description>Can be either 2 to use current date and time or any other value for sent date of the message. This has a meaning only when dropping just one message.</_description>
</key>
<key name="show-animated-images" type="b">
<default>false</default>
<_summary>Show image animations</_summary>

9
data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in Normal file
View File

@ -0,0 +1,9 @@
<schemalist>
<schema gettext-domain="evolution" id="org.gnome.evolution.plugin.publish-calendar" path="/org/gnome/evolution/plugin/publish-calendar/">
<key name="uris" type="as">
<default>[]</default>
<_summary>List of Destinations for publishing</_summary>
<_description>The key specifies the list of destinations to where publish calendars. Each values specifies an XML with setup for publishing to one destination.</_description>
</key>
</schema>
</schemalist>

2
doc/devel/evolution-plugin-manual.xml
View File

@ -2361,7 +2361,7 @@
<para>The preferences target is used for global preferences. As
such it just contains a pointer to the global configuration store
- a GConfClient.</para>
- a GSettings.</para>
<informaltable>
<tgroup cols="2">

1
e-util/e-util.h
View File

@ -26,7 +26,6 @@
#include <sys/types.h>
#include <gtk/gtk.h>
#include <limits.h>
#include <gconf/gconf-client.h>
#include <libedataserver/libedataserver.h>

2
evolution-shell.pc.in
View File

@ -17,7 +17,7 @@ execversion=@BASE_VERSION@
Name: evolution-shell
Description: libraries needed for Evolution shell components
Version: @VERSION@
Requires: gtk+-3.0 gconf-2.0 libebackend-1.2 libedataserverui-3.0 webkitgtk-3.0
Requires: gtk+-3.0 libebackend-1.2 libedataserverui-3.0 webkitgtk-3.0
Requires.private: gnome-desktop-3.0
Libs: -L${privlibdir} -leshell -Wl,-R${privlibdir}
Cflags: -I${privincludedir}

35
mail/Makefile.am
View File

@ -274,7 +274,6 @@ EXTRA_DIST = \
README.async \
mail.error.xml \
$(ui_DATA) \
$(schema_in_files) \
$(server_in_files) \
$(etspec_DATA) \
filtertypes.xml \
@ -295,38 +294,6 @@ evolution-mail.pure: evolution-mail
endif
# GConf
schemadir = $(GCONF_SCHEMA_FILE_DIR)
schema_in_files = evolution-mail.schemas.in
schema_DATA = $(schema_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
if GCONF_SCHEMAS_INSTALL
if OS_WIN32
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
(echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \
echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \
cmd /c _temp.bat; \
rm _temp.bat; \
done \
fi
else
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
$(GCONFTOOL) --makefile-install-rule $$p; \
done \
fi
endif
endif
# Prologue
dist-hook:
@ -336,6 +303,4 @@ BUILT_SOURCES = $(error_DATA)
CLEANFILES = $(BUILT_SOURCES)
DISTCLEANFILES = $(schema_DATA)
-include $(top_srcdir)/git.mk

2
mail/e-mail-browser.c
View File

@ -45,8 +45,6 @@
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_MAIL_BROWSER, EMailBrowserPrivate))
#define MAIL_BROWSER_GCONF_PREFIX "/apps/evolution/mail/mail_browser"
#define ACTION_GROUP_STANDARD "action-group-standard"
#define ACTION_GROUP_SEARCH_FOLDERS "action-group-search-folders"

225
mail/e-mail-migrate.c
View File

@ -42,8 +42,6 @@
#include <gtk/gtk.h>
#include <gconf/gconf-client.h>
#include <libxml/tree.h>
#include <libxml/parser.h>
#include <libxml/xmlmemory.h>
@ -270,152 +268,6 @@ emm_setup_initial (const gchar *data_dir)
return TRUE;
}
static gboolean
is_in_plugs_list (GSList *list,
const gchar *value)
{
GSList *l;
for (l = list; l; l = l->next) {
if (l->data && !strcmp (l->data, value))
return TRUE;
}
return FALSE;
}
/*
* em_update_message_notify_settings_2_21
* DBus plugin and sound email notification was merged to
* mail-notification plugin, so move the options to new locations.
*/
static void
em_update_message_notify_settings_2_21 (void)
{
GConfClient *client;
GConfValue *is_key;
gboolean dbus, status;
GSList *list;
gchar *str;
gint val;
client = gconf_client_get_default ();
is_key = gconf_client_get (
client,
"/apps/evolution/eplugin/mail-notification/dbus-enabled", NULL);
if (is_key) {
/* already migrated, so do not migrate again */
gconf_value_free (is_key);
g_object_unref (client);
return;
}
gconf_client_set_bool (
client,
"/apps/evolution/eplugin/mail-notification/status-blink-icon",
gconf_client_get_bool (
client,
"/apps/evolution/mail/notification/blink-status-icon",
NULL), NULL);
gconf_client_set_bool (
client,
"/apps/evolution/eplugin/mail-notification/status-notification",
gconf_client_get_bool (
client,
"/apps/evolution/mail/notification/notification",
NULL), NULL);
list = gconf_client_get_list (
client, "/apps/evolution/eplugin/disabled",
GCONF_VALUE_STRING, NULL);
dbus = !is_in_plugs_list (list, "org.gnome.evolution.new_mail_notify");
status = !is_in_plugs_list (
list, "org.gnome.evolution.mail_notification");
gconf_client_set_bool (
client,
"/apps/evolution/eplugin/mail-notification/dbus-enabled",
dbus, NULL);
gconf_client_set_bool (
client,
"/apps/evolution/eplugin/mail-notification/status-enabled",
status, NULL);
if (!status) {
GSList *plugins, *l;
plugins = e_plugin_list_plugins ();
for (l = plugins; l; l = l->next) {
EPlugin *p = l->data;
if (p && p->id && !strcmp (p->id,
"org.gnome.evolution.mail_notification")) {
e_plugin_enable (p, 1);
break;
}
}
g_slist_foreach (plugins, (GFunc) g_object_unref, NULL);
g_slist_free (plugins);
}
g_slist_foreach (list, (GFunc) g_free, NULL);
g_slist_free (list);
val = gconf_client_get_int (
client, "/apps/evolution/mail/notify/type", NULL);
gconf_client_set_bool (
client,
"/apps/evolution/eplugin/mail-notification/sound-enabled",
val == 1 || val == 2, NULL);
gconf_client_set_bool (
client,
"/apps/evolution/eplugin/mail-notification/sound-beep",
val == 0 || val == 1, NULL);
str = gconf_client_get_string (
client, "/apps/evolution/mail/notify/sound", NULL);
gconf_client_set_string (
client,
"/apps/evolution/eplugin/mail-notification/sound-file",
str ? str : "", NULL);
g_free (str);
g_object_unref (client);
}
/* fixing typo in SpamAssassin name */
static void
em_update_sa_junk_setting_2_23 (void)
{
GConfClient *client;
GConfValue *key;
client = gconf_client_get_default ();
key = gconf_client_get (
client, "/apps/evolution/mail/junk/default_plugin", NULL);
if (key) {
const gchar *str = gconf_value_get_string (key);
if (str && strcmp (str, "Spamassasin") == 0)
gconf_client_set_string (
client,
"/apps/evolution/mail/junk/default_plugin",
"SpamAssassin", NULL);
gconf_value_free (key);
g_object_unref (client);
return;
}
g_object_unref (client);
}
static gboolean
mbox_to_maildir_migration_needed (EShellBackend *shell_backend)
{
@ -693,66 +545,6 @@ migrate_local_store (EShellBackend *shell_backend)
return TRUE;
}
static void
em_ensure_proxy_ignore_hosts_being_list (void)
{
const gchar *key = "/apps/evolution/shell/network_config/ignore_hosts";
GConfClient *client;
GConfValue *key_value;
/* Makes sure the 'key' is a list of strings, not a string,
* as set by previous versions. */
client = gconf_client_get_default ();
key_value = gconf_client_get (client, key, NULL);
if (key_value && key_value->type == GCONF_VALUE_STRING) {
gchar *value = gconf_client_get_string (client, key, NULL);
GSList *lst = NULL;
GError *error = NULL;
if (value && *value) {
gchar **split = g_strsplit (value, ",", -1);
if (split) {
gint ii;
for (ii = 0; split[ii]; ii++) {
const gchar *tmp = split[ii];
if (tmp && *tmp) {
gchar *val = g_strstrip (g_strdup (tmp));
if (val && *val)
lst = g_slist_append (lst, val);
else
g_free (val);
}
}
}
g_strfreev (split);
}
gconf_client_unset (client, key, NULL);
gconf_client_set_list (client, key, GCONF_VALUE_STRING, lst, &error);
g_slist_foreach (lst, (GFunc) g_free, NULL);
g_slist_free (lst);
g_free (value);
if (error) {
fprintf (
stderr, "%s: Failed to set a list values "
"with error: %s\n", G_STRFUNC, error->message);
g_error_free (error);
}
}
if (key_value)
gconf_value_free (key_value);
g_object_unref (client);
}
static void
em_rename_view_in_folder (gpointer data,
gpointer user_data)
@ -860,23 +652,6 @@ e_mail_migrate (EShellBackend *shell_backend,
if (major == 0)
return emm_setup_initial (data_dir);
#ifndef G_OS_WIN32
if (major < 2 || (major == 2 && minor < 22))
em_update_message_notify_settings_2_21 ();
if (major < 2 || (major == 2 && minor < 24))
em_update_sa_junk_setting_2_23 ();
#else
if (major < 2 || (major == 2 && minor < 24))
g_warning (
"Upgrading from ancient versions %d.%d "
"not supported on Windows", major, minor);
#endif
if (major < 2 || (major == 2 && minor < 32)) {
em_ensure_proxy_ignore_hosts_being_list ();
}
if (!migrate_local_store (shell_backend))
return FALSE;

1
mail/e-mail-reader-utils.c
View File

@ -30,7 +30,6 @@
#include <glib/gi18n.h>
#include <libxml/tree.h>
#include <gtkhtml/gtkhtml.h>
#include <gconf/gconf-client.h>
#include <camel/camel.h>
#include "libevolution-utils/e-alert-dialog.h"

29
mail/em-utils.c
View File

@ -975,7 +975,7 @@ em_utils_selection_set_urilist (GtkSelectionData *data,
gchar *tmpdir;
gchar *uri;
gint fd;
GConfClient *client;
GSettings *settings;
gchar *exporttype;
gint exportname;
@ -983,20 +983,21 @@ em_utils_selection_set_urilist (GtkSelectionData *data,
if (tmpdir == NULL)
return;
client = gconf_client_get_default ();
exporttype = gconf_client_get_string (
client, "/apps/evolution/mail/save_file_format", NULL);
if (exporttype == NULL)
settings = g_settings_new ("org.gnome.evolution.mail");
exporttype = g_settings_get_string (settings, "drag-and-drop-save-file-format");
if (g_strcmp0 (exporttype, "mbox") != 0 && g_strcmp0 (exporttype, "pdf") != 0) {
g_free (exporttype);
exporttype = g_strdup ("mbox");
exportname = gconf_client_get_int (
client, "/apps/evolution/mail/save_name_format", NULL);
}
exportname = g_settings_get_int (settings, "drag-and-drop-save-name-format");
g_object_unref (settings);
if (g_ascii_strcasecmp (exporttype, "mbox")==0) {
if (g_ascii_strcasecmp (exporttype, "mbox") == 0) {
gchar * file = NULL;
CamelStream *fstream;
if (uids->len > 1) {
gchar * tmp = g_strdup_printf(_("Messages from %s"), camel_folder_get_display_name (folder));
gchar * tmp = g_strdup_printf (_("Messages from %s"), camel_folder_get_display_name (folder));
e_filename_make_safe (tmp);
file = g_build_filename (tmpdir, tmp, NULL);
g_free (tmp);
@ -1004,11 +1005,11 @@ em_utils_selection_set_urilist (GtkSelectionData *data,
file = em_utils_build_export_filename (folder, uids->pdata[0], exporttype, exportname, tmpdir);
}
g_free (tmpdir);
fd = g_open (file, O_WRONLY | O_CREAT | O_EXCL | O_BINARY, 0666);
if (fd == -1) {
g_free (file);
g_free (exporttype);
g_free (tmpdir);
return;
}
@ -1029,9 +1030,10 @@ em_utils_selection_set_urilist (GtkSelectionData *data,
close (fd);
g_free (exporttype);
g_free (tmpdir);
g_free (file);
g_free (uri);
} else if(g_ascii_strcasecmp (exporttype, "pdf")==0) {
} else if (g_ascii_strcasecmp (exporttype, "pdf") == 0) {
gchar ** filenames, **uris;
gint i, uris_count = 0;
@ -1066,7 +1068,6 @@ em_utils_selection_set_urilist (GtkSelectionData *data,
uris[uris_count] = NULL;
gtk_selection_data_set_uris (data, uris);
g_free (tmpdir);
for (i = 0; i < uids->len; i++) {
g_free (filenames[i]);
}
@ -1076,10 +1077,10 @@ em_utils_selection_set_urilist (GtkSelectionData *data,
}
g_free (uris);
g_free (exporttype);
} else {
g_free (tmpdir);
} else {
g_free (exporttype);
g_free (tmpdir);
}
}

1828
mail/evolution-mail.schemas.in
View File

File diff suppressed because it is too large Load Diff

25
mail/importers/elm-importer.c
View File

@ -36,8 +36,6 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <gconf/gconf-client.h>
#include "mail-importer.h"
#include "libemail-utils/mail-mt.h"
@ -221,18 +219,6 @@ elm_import_exec (struct _elm_import_msg *m,
static void
elm_import_done (struct _elm_import_msg *m)
{
printf("importing complete\n");
if (m->base.error == NULL) {
GConfClient *gconf;
const gchar *key;
gconf = gconf_client_get_default ();
key = "/apps/evolution/importer/elm/mail";
gconf_client_set_bool (gconf, key, TRUE, NULL);
g_object_unref (gconf);
}
e_import_complete (m->import, (EImportTarget *) m->target);
}
@ -337,21 +323,14 @@ elm_getwidget (EImport *ei,
EImportImporter *im)
{
GtkWidget *box, *w;
GConfClient *gconf;
gboolean done_mail;
gconf = gconf_client_get_default ();
done_mail = gconf_client_get_bool (
gconf, "/apps/evolution/importer/elm/mail", NULL);
g_object_unref (gconf);
g_datalist_set_data (
&target->data, "elm-do-mail", GINT_TO_POINTER(!done_mail));
&target->data, "elm-do-mail", GINT_TO_POINTER(TRUE));
box = gtk_vbox_new (FALSE, 2);
w = gtk_check_button_new_with_label(_("Mail"));
gtk_toggle_button_set_active ((GtkToggleButton *) w, !done_mail);
gtk_toggle_button_set_active ((GtkToggleButton *) w, TRUE);
g_signal_connect (
w, "toggled",
G_CALLBACK (checkbox_toggle_cb), target);

36
mail/importers/pine-importer.c
View File

@ -36,8 +36,6 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <gconf/gconf-client.h>
#include <libebook/libebook.h>
#include "mail-importer.h"
@ -291,23 +289,6 @@ pine_import_exec (struct _pine_import_msg *m,
static void
pine_import_done (struct _pine_import_msg *m)
{
printf("importing complete\n");
if (m->base.error == NULL) {
GConfClient *gconf;
gconf = gconf_client_get_default ();
if (GPOINTER_TO_INT(g_datalist_get_data(&m->target->data, "pine-do-addr")))
gconf_client_set_bool (
gconf, "/apps/evolution/importer/pine/addr",
TRUE, NULL);
if (GPOINTER_TO_INT(g_datalist_get_data(&m->target->data, "pine-do-mail")))
gconf_client_set_bool (
gconf, "/apps/evolution/importer/pine/mail",
TRUE, NULL);
g_object_unref (gconf);
}
e_import_complete (m->import, (EImportTarget *) m->target);
}
@ -429,34 +410,25 @@ pine_getwidget (EImport *ei,
EImportImporter *im)
{
GtkWidget *box, *w;
GConfClient *gconf;
gboolean done_mail, done_addr;
gconf = gconf_client_get_default ();
done_mail = gconf_client_get_bool (
gconf, "/apps/evolution/importer/pine/mail", NULL);
done_addr = gconf_client_get_bool (
gconf, "/apps/evolution/importer/pine/address", NULL);
g_object_unref (gconf);
g_datalist_set_data (
&target->data, "pine-do-mail",
GINT_TO_POINTER (!done_mail));
GINT_TO_POINTER (TRUE));
g_datalist_set_data (
&target->data, "pine-do-addr",
GINT_TO_POINTER (!done_addr));
GINT_TO_POINTER (TRUE));
box = gtk_vbox_new (FALSE, 2);
w = gtk_check_button_new_with_label(_("Mail"));
gtk_toggle_button_set_active ((GtkToggleButton *) w, !done_mail);
gtk_toggle_button_set_active ((GtkToggleButton *) w, TRUE);
g_signal_connect (
w, "toggled",
G_CALLBACK (checkbox_mail_toggle_cb), target);
gtk_box_pack_start ((GtkBox *) box, w, FALSE, FALSE, 0);
w = gtk_check_button_new_with_label(_("Address Book"));
gtk_toggle_button_set_active ((GtkToggleButton *) w, !done_addr);
gtk_toggle_button_set_active ((GtkToggleButton *) w, TRUE);
g_signal_connect (
w, "toggled",
G_CALLBACK (checkbox_addr_toggle_cb), target);

3
mail/mail-send-recv.c
View File

@ -58,9 +58,6 @@
/* pseudo-uri to key the send task on */
#define SEND_URI_KEY "send-task:"
/* Prefix for window size GConf keys */
#define GCONF_KEY_PREFIX "/apps/evolution/mail/send_recv"
/* send/receive email */
/* ********************************************************************** */

35
modules/addressbook/Makefile.am
View File

@ -82,46 +82,11 @@ module_addressbook_la_LIBADD = \
module_addressbook_la_LDFLAGS = \
-module -avoid-version $(NO_UNDEFINED)
# GConf schemas
schemadir = $(GCONF_SCHEMA_FILE_DIR)
schema_in_files = apps_evolution_addressbook.schemas.in
schema_DATA = $(schema_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
if GCONF_SCHEMAS_INSTALL
if OS_WIN32
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
(echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \
echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \
cmd /c _temp.bat; \
rm _temp.bat; \
done \
fi
else
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
$(GCONFTOOL) --makefile-install-rule $$p; \
done \
fi
endif
endif
ui_DATA = \
ldap-config.ui
DISTCLEANFILES = $(schema_DATA)
EXTRA_DIST = \
$(ui_DATA) \
$(schema_in_files) \
openldap-extract.h
dist-hook:

155
modules/addressbook/apps_evolution_addressbook.schemas.in
View File

@ -1,155 +0,0 @@
<gconfschemafile>
<schemalist>
<!-- Completion uris -->
<schema>
<key>/schemas/apps/evolution/addressbook/completion/uris</key>
<applyto>/apps/evolution/addressbook/completion/uris</applyto>
<owner>evolution-addressbook</owner>
<type>string</type>
<default></default>
<locale name="C">
<short>EFolderList XML for the list of completion URIs</short>
<long>EFolderList XML for the list of completion URIs.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/addressbook/completion/minimum_query_length</key>
<applyto>/apps/evolution/addressbook/completion/minimum_query_length</applyto>
<owner>evolution-addressbook</owner>
<type>int</type>
<default>3</default>
<locale name="C">
<short>Autocomplete length</short>
<long>The number of characters that must be typed before Evolution will attempt to autocomplete.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/addressbook/completion/show_address</key>
<applyto>/apps/evolution/addressbook/completion/show_address</applyto>
<owner>evolution-addressbook</owner>
<type>bool</type>
<default>false</default>
<locale name="C">
<short>Show autocompleted name with an address</short>
<long>Whether force showing the mail address with the name of the autocompleted contact in the entry.</long>
</locale>
</schema>
<!-- Select names last used uri -->
<schema>
<key>/schemas/apps/evolution/addressbook/select_names/last_used_uri</key>
<applyto>/apps/evolution/addressbook/select_names/last_used_uri</applyto>
<owner>evolution-addressbook</owner>
<type>string</type>
<default></default>
<locale name="C">
<short>URI for the folder last used in the select names dialog</short>
<long>URI for the folder last used in the select names dialog.</long>
</locale>
</schema>
<!-- View state -->
<schema>
<key>/schemas/apps/evolution/addressbook/display/layout</key>
<applyto>/apps/evolution/addressbook/display/layout</applyto>
<owner>evolution-addressbook</owner>
<type>int</type>
<default>0</default>
<locale name="C">
<short>Contact layout style</short>
<long>
The layout style determines where to place the preview pane
in relation to the contact list. "0" (Classic View) places
the preview pane below the contact list. "1" (Vertical View)
places the preview pane next to the contact list.
</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/addressbook/display/primary_addressbook</key>
<applyto>/apps/evolution/addressbook/display/primary_addressbook</applyto>
<owner>evolution-addressbook</owner>
<type>string</type>
<default></default>
<locale name="C">
<short>Primary address book</short>
<long>
The UID of the selected (or "primary") address book in the
sidebar of the "Contacts" view.
</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/addressbook/display/hpane_position</key>
<applyto>/apps/evolution/addressbook/display/hpane_position</applyto>
<owner>evolution-addressbook</owner>
<type>int</type>
<default>200</default>
<locale name="C">
<short>Contact preview pane position (horizontal)</short>
<long>
Position of the contact preview pane when oriented horizontally.
</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/addressbook/display/vpane_position</key>
<applyto>/apps/evolution/addressbook/display/vpane_position</applyto>
<owner>evolution-addressbook</owner>
<type>int</type>
<default>400</default>
<locale name="C">
<short>Contact preview pane position (vertical)</short>
<long>
Position of the contact preview pane when oriented vertically.
</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/addressbook/display/show_preview</key>
<applyto>/apps/evolution/addressbook/display/show_preview</applyto>
<owner>evolution-addressbook</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>Show preview pane</short>
<long>Whether to show the preview pane.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/addressbook/display/preview_show_maps</key>
<applyto>/apps/evolution/addressbook/display/preview_show_maps</applyto>
<owner>evolution-addressbook</owner>
<type>bool</type>
<default>false</default>
<locale name="C">
<short>Show maps</short>
<long>Whether to show maps in preview pane.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/addressbook/display/address_formatting</key>
<applyto>/apps/evolution/addressbook/display/address_formatting</applyto>
<owner>evolution-addressbook</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>Enable address formatting</short>
<long>Whether addresses should be formatted according to standard in their destination country.</long>
</locale>
</schema>
</schemalist>
</gconfschemafile>

61
modules/backup-restore/evolution-backup-tool.c
View File

@ -53,8 +53,14 @@
#define EVOLUTION "evolution"
#define EVOLUTION_DIR "$DATADIR/"
#define EVOLUTION_DIR_FILE EVOLUTION ".dir"
#define GCONF_DUMP_FILE "backup-restore-gconf.xml"
#define GCONF_DIR "/apps/evolution"
#define ANCIENT_GCONF_DUMP_FILE "backup-restore-gconf.xml"
#define DCONF_DUMP_FILE_EDS "backup-restore-dconf-eds.ini"
#define DCONF_DUMP_FILE_EVO "backup-restore-dconf-evo.ini"
#define DCONF_PATH_EDS "/org/gnome/evolution-data-server/"
#define DCONF_PATH_EVO "/org/gnome/evolution/"
static gboolean backup_op = FALSE;
static gchar *bk_file = NULL;
@ -313,10 +319,15 @@ backup (const gchar *filename,
return;
txt = _("Backing Evolution accounts and settings");
run_cmd ("gconftool-2 --dump " GCONF_DIR " > " EVOLUTION_DIR GCONF_DUMP_FILE);
run_cmd ("dconf dump " DCONF_PATH_EDS " >" EVOLUTION_DIR DCONF_DUMP_FILE_EDS);
run_cmd ("dconf dump " DCONF_PATH_EVO " >" EVOLUTION_DIR DCONF_DUMP_FILE_EVO);
replace_in_file (
EVOLUTION_DIR GCONF_DUMP_FILE,
EVOLUTION_DIR DCONF_DUMP_FILE_EDS,
e_get_user_data_dir (), EVOUSERDATADIR_MAGIC);
replace_in_file (
EVOLUTION_DIR DCONF_DUMP_FILE_EVO,
e_get_user_data_dir (), EVOUSERDATADIR_MAGIC);
write_dir_file ();
@ -514,17 +525,35 @@ restore (const gchar *filename,
if (is_new_format) {
/* new format has it in DATADIR... */
replace_in_file (
EVOLUTION_DIR GCONF_DUMP_FILE,
EVOUSERDATADIR_MAGIC, e_get_user_data_dir ());
run_cmd ("gconftool-2 --load " EVOLUTION_DIR GCONF_DUMP_FILE);
run_cmd ("rm " EVOLUTION_DIR GCONF_DUMP_FILE);
GString *file = replace_variables (EVOLUTION_DIR ANCIENT_GCONF_DUMP_FILE);
if (file && g_file_test (file->str, G_FILE_TEST_EXISTS)) {
/* ancient backup */
replace_in_file (
EVOLUTION_DIR ANCIENT_GCONF_DUMP_FILE,
EVOUSERDATADIR_MAGIC, e_get_user_data_dir ());
run_cmd ("gconftool-2 --load " EVOLUTION_DIR ANCIENT_GCONF_DUMP_FILE);
run_cmd ("rm " EVOLUTION_DIR ANCIENT_GCONF_DUMP_FILE);
} else {
replace_in_file (
EVOLUTION_DIR DCONF_DUMP_FILE_EDS,
EVOUSERDATADIR_MAGIC, e_get_user_data_dir ());
run_cmd ("cat " EVOLUTION_DIR DCONF_DUMP_FILE_EDS " | dconf load " DCONF_PATH_EDS);
run_cmd ("rm " EVOLUTION_DIR DCONF_DUMP_FILE_EDS);
replace_in_file (
EVOLUTION_DIR DCONF_DUMP_FILE_EVO,
EVOUSERDATADIR_MAGIC, e_get_user_data_dir ());
run_cmd ("cat " EVOLUTION_DIR DCONF_DUMP_FILE_EVO " | dconf load " DCONF_PATH_EVO);
run_cmd ("rm " EVOLUTION_DIR DCONF_DUMP_FILE_EVO);
}
g_string_free (file, TRUE);
} else {
gchar *gconf_dump_file;
/* ... old format in ~/.evolution */
gconf_dump_file = g_build_filename (
"$HOME", ".evolution", GCONF_DUMP_FILE, NULL);
"$HOME", ".evolution", ANCIENT_GCONF_DUMP_FILE, NULL);
replace_in_file (
gconf_dump_file,
@ -635,9 +664,19 @@ check (const gchar *filename,
command = g_strdup_printf (
"tar ztf %s | grep -e \"^\\.evolution/%s$\"",
quotedfname, GCONF_DUMP_FILE);
quotedfname, ANCIENT_GCONF_DUMP_FILE);
result = system (command);
g_free (command);
if (result != 0) {
/* maybe it's an ancient backup */
command = g_strdup_printf (
"tar ztf %s | grep -e \"^\\.evolution/%s$\"",
quotedfname, ANCIENT_GCONF_DUMP_FILE);
result = system (command);
g_free (command);
}
g_free (quotedfname);
g_message ("Third result %d", result);

34
modules/bogofilter/Makefile.am
View File

@ -22,38 +22,4 @@ module_bogofilter_la_LIBADD = \
module_bogofilter_la_LDFLAGS = \
-module -avoid-version $(NO_UNDEFINED)
schemadir = $(GCONF_SCHEMA_FILE_DIR)
schema_in_files = evolution-bogofilter.schemas.in
schema_DATA = $(schema_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
if GCONF_SCHEMAS_INSTALL
if OS_WIN32
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
(echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \
echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \
cmd /c _temp.bat; \
rm _temp.bat; \
done \
fi
else
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
$(GCONFTOOL) --makefile-install-rule $$p; \
done \
fi
endif
endif
DISTCLEANFILES = $(schema_DATA)
EXTRA_DIST = $(schema_in_files)
-include $(top_srcdir)/git.mk

20
modules/bogofilter/evolution-bogofilter.schemas.in
View File

@ -1,20 +0,0 @@
<gconfschemafile>
<schemalist>
<schema>
<key>/schemas/apps/evolution/mail/junk/bogofilter/unicode</key>
<applyto>/apps/evolution/mail/junk/bogofilter/unicode</applyto>
<owner>evolution-bogofilter</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>Convert mail messages to Unicode</short>
<long>
Convert message text to Unicode UTF-8 to unify spam/ham tokens
coming from different character sets.
</long>
</locale>
</schema>
</schemalist>
</gconfschemafile>

30
modules/calendar/Makefile.am
View File

@ -102,39 +102,9 @@ module_calendar_la_LIBADD = \
module_calendar_la_LDFLAGS = \
-module -avoid-version $(NO_UNDEFINED)
schemadir = $(GCONF_SCHEMA_FILE_DIR)
schema_in_files = apps_evolution_calendar.schemas.in
schema_DATA = $(schema_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
ui_DATA = e-calendar-preferences.ui
EXTRA_DIST = \
$(schema_in_files) \
$(ui_DATA)
DISTCLEANFILES = $(schema_DATA)
if GCONF_SCHEMAS_INSTALL
if OS_WIN32
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
(echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \
echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \
cmd /c _temp.bat; \
rm _temp.bat; \
done \
fi
else
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
$(GCONFTOOL) --makefile-install-rule $$p; \
done \
fi
endif
endif
-include $(top_srcdir)/git.mk

839
modules/calendar/apps_evolution_calendar.schemas.in
View File

@ -1,839 +0,0 @@
<gconfschemafile>
<schemalist>
<!-- Display -->
<schema>
<key>/schemas/apps/evolution/calendar/display/primary_calendar</key>
<applyto>/apps/evolution/calendar/display/primary_calendar</applyto>
<owner>evolution-calendar</owner>
<type>string</type>
<default></default>
<locale name="C">
<short>Primary calendar</short>
<long>
The UID of the selected (or "primary") calendar in the
sidebar of the "Calendar" view.
</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/timezone</key>
<applyto>/apps/evolution/calendar/display/timezone</applyto>
<owner>evolution-calendar</owner>
<type>string</type>
<default>UTC</default>
<locale name="C">
<short>Timezone</short>
<long>The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like "America/New York".</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/use_system_timezone</key>
<applyto>/apps/evolution/calendar/display/use_system_timezone</applyto>
<owner>evolution-calendar</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>Use system timezone</short>
<long>Use the system timezone instead of the timezone selected
in Evolution.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/day_second_zone</key>
<applyto>/apps/evolution/calendar/display/day_second_zone</applyto>
<owner>evolution-calendar</owner>
<type>string</type>
<default></default>
<locale name="C">
<short>The second timezone for a Day View</short>
<long>Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/day_second_zones</key>
<applyto>/apps/evolution/calendar/display/day_second_zones</applyto>
<owner>evolution-calendar</owner>
<type>list</type>
<list_type>string</list_type>
<default>[]</default>
<locale name="C">
<short>Recently used second time zones in a Day View</short>
<long>List of recently used second time zones in a Day View.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/day_second_zones_max</key>
<applyto>/apps/evolution/calendar/display/day_second_zones_max</applyto>
<owner>evolution-calendar</owner>
<type>int</type>
<default>5</default>
<locale name="C">
<short>Maximum number of recently used timezones to remember.</short>
<long>Maximum number of recently used timezones to remember in a 'day_second_zones' list.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/use_24hour_format</key>
<applyto>/apps/evolution/calendar/display/use_24hour_format</applyto>
<owner>evolution-calendar</owner>
<type>bool</type>
<default>false</default>
<locale name="C">
<short>Twenty four hour time format</short>
<long>Whether to show times in twenty four hour format instead of using am/pm.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/show_role</key>
<applyto>/apps/evolution/calendar/display/show_role</applyto>
<owner>evolution-calendar</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>Show Role field in the event/task/meeting editor</short>
<long>Whether to show role field in the event/task/meeting editor</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/show_status</key>
<applyto>/apps/evolution/calendar/display/show_status</applyto>
<owner>evolution-calendar</owner>
<type>bool</type>
<default>false</default>
<locale name="C">
<short>Show status field in the event/task/meeting editor</short>
<long>Whether to show status field in the event/task/meeting editor</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/show_type</key>
<applyto>/apps/evolution/calendar/display/show_type</applyto>
<owner>evolution-calendar</owner>
<type>bool</type>
<default>false</default>
<locale name="C">
<short>Show type field in the event/task/meeting editor</short>
<long>Whether to show type field in the event/task/meeting editor</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/show_rsvp</key>
<applyto>/apps/evolution/calendar/display/show_rsvp</applyto>
<owner>evolution-calendar</owner>
<type>bool</type>
<default>false</default>
<locale name="C">
<short>Show RSVP field in the event/task/meeting editor</short>
<long>Whether to show RSVP field in the event/task/meeting editor</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/show_timezone</key>
<applyto>/apps/evolution/calendar/display/show_timezone</applyto>
<owner>evolution-calendar</owner>
<type>bool</type>
<default>false</default>
<locale name="C">
<short>Show timezone field in the event/meeting editor</short>
<long>Whether to show timezone field in the event/meeting editor</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/show_categories</key>
<applyto>/apps/evolution/calendar/display/show_categories</applyto>
<owner>evolution-calendar</owner>
<type>bool</type>
<default>false</default>
<locale name="C">
<short>Show categories field in the event/meeting/task editor</short>
<long>Whether to show categories field in the event/meeting editor</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/week_start_day</key>
<applyto>/apps/evolution/calendar/display/week_start_day</applyto>
<owner>evolution-calendar</owner>
<type>int</type>
<default>1</default>
<locale name="C">
<short>Week start</short>
<long>Weekday the week starts on, from Sunday (0) to Saturday (6).</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/day_start_hour</key>
<applyto>/apps/evolution/calendar/display/day_start_hour</applyto>
<owner>evolution-calendar</owner>
<type>int</type>
<default>9</default>
<locale name="C">
<short>Workday start hour</short>
<long>Hour the workday starts on, in twenty four hour format, 0 to 23.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/day_start_minute</key>
<applyto>/apps/evolution/calendar/display/day_start_minute</applyto>
<owner>evolution-calendar</owner>
<type>int</type>
<default>0</default>
<locale name="C">
<short>Workday start minute</short>
<long>Minute the workday starts on, 0 to 59.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/day_end_hour</key>
<applyto>/apps/evolution/calendar/display/day_end_hour</applyto>
<owner>evolution-calendar</owner>
<type>int</type>
<default>17</default>
<locale name="C">
<short>Workday end hour</short>
<long>Hour the workday ends on, in twenty four hour format, 0 to 23.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/day_end_minute</key>
<applyto>/apps/evolution/calendar/display/day_end_minute</applyto>
<owner>evolution-calendar</owner>
<type>int</type>
<default>0</default>
<locale name="C">
<short>Workday end minute</short>
<long>Minute the workday ends on, 0 to 59.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/time_divisions</key>
<applyto>/apps/evolution/calendar/display/time_divisions</applyto>
<owner>evolution-calendar</owner>
<type>int</type>
<default>30</default>
<locale name="C">
<short>Time divisions</short>
<long>Intervals shown in Day and Work Week views, in minutes.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/hpane_position</key>
<applyto>/apps/evolution/calendar/display/hpane_position</applyto>
<owner>evolution-calendar</owner>
<type>int</type>
<default>400</default>
<locale name="C">
<short>Horizontal pane position</short>
<long>Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/vpane_position</key>
<applyto>/apps/evolution/calendar/display/vpane_position</applyto>
<owner>evolution-calendar</owner>
<type>int</type>
<default>150</default>
<locale name="C">
<short>Vertical pane position</short>
<long>Position of the vertical pane, between the view and the date navigator calendar and task list when not in the month view, in pixels.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/month_hpane_position</key>
<applyto>/apps/evolution/calendar/display/month_hpane_position</applyto>
<owner>evolution-calendar</owner>
<type>int</type>
<default>32000</default>
<locale name="C">
<short>Month view horizontal pane position </short>
<long>Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/month_vpane_position</key>
<applyto>/apps/evolution/calendar/display/month_vpane_position</applyto>
<owner>evolution-calendar</owner>
<type>int</type>
<default>150</default>
<locale name="C">
<short>Month view vertical pane position </short>
<long>Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/date_navigator_pane_position</key>
<applyto>/apps/evolution/calendar/display/date_navigator_pane_position</applyto>
<owner>evolution-calendar</owner>
<type>int</type>
<default>150</default>
<locale name="C">
<short>Month view vertical pane position </short>
<long>Position of the vertical pane, between the calendar lists and the date navigator calendar.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/memo_layout</key>
<applyto>/apps/evolution/calendar/display/memo_layout</applyto>
<type>int</type>
<default>0</default>
<locale name="C">
<short>Memo layout style</short>
<long>
The layout style determines where to place the preview pane
in relation to the memo list. "0" (Classic View) places the
preview pane below the memo list. "1" (Vertical View) places
the preview pane next to the memo list.
</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/show_memo_preview</key>
<applyto>/apps/evolution/calendar/display/show_memo_preview</applyto>
<owner>evolution-calendar</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>Show the memo preview pane</short>
<long>
If "true", show the memo preview pane in the main window.
</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/memo_hpane_position</key>
<applyto>/apps/evolution/calendar/display/memo_hpane_position</applyto>
<owner>evolution-calendar</owner>
<type>int</type>
<default>200</default>
<locale name="C">
<short>Memo preview pane position (horizontal)</short>
<long>
Position of the task preview pane when oriented horizontally.
</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/memo_vpane_position</key>
<applyto>/apps/evolution/calendar/display/memo_vpane_position</applyto>
<owner>evolution-calendar</owner>
<type>int</type>
<default>400</default>
<locale name="C">
<short>Memo preview pane position (vertical)</short>
<long>
Position of the memo preview pane when oriented vertically.
</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/task_layout</key>
<applyto>/apps/evolution/calendar/display/task_layout</applyto>
<type>int</type>
<default>0</default>
<locale name="C">
<short>Task layout style</short>
<long>
The layout style determines where to place the preview pane
in relation to the task list. "0" (Classic View) places the
preview pane below the task list. "1" (Vertical View) places
the preview pane next to the task list.
</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/show_task_preview</key>
<applyto>/apps/evolution/calendar/display/show_task_preview</applyto>
<owner>evolution-calendar</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>Show the task preview pane</short>
<long>
If "true", show the task preview pane in the main window.
</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/task_hpane_position</key>
<applyto>/apps/evolution/calendar/display/task_hpane_position</applyto>
<owner>evolution-calendar</owner>
<type>int</type>
<default>200</default>
<locale name="C">
<short>Task preview pane position (horizontal)</short>
<long>
Position of the task preview pane when oriented horizontally.
</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/task_vpane_position</key>
<applyto>/apps/evolution/calendar/display/task_vpane_position</applyto>
<owner>evolution-calendar</owner>
<type>int</type>
<default>400</default>
<locale name="C">
<short>Task preview pane position (vertical)</short>
<long>
Position of the task preview pane when oriented vertically.
</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/compress_weekend</key>
<applyto>/apps/evolution/calendar/display/compress_weekend</applyto>
<owner>evolution-calendar</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>Compress weekends in month view</short>
<long>Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/show_event_end</key>
<applyto>/apps/evolution/calendar/display/show_event_end</applyto>
<owner>evolution-calendar</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>Show appointment end times in week and month views</short>
<long>Whether to display the end time of events in the week and month views.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/working_days</key>
<applyto>/apps/evolution/calendar/display/working_days</applyto>
<owner>evolution-calendar</owner>
<type>int</type>
<default>62</default>
<locale name="C">
<short>Work days</short>
<long>Days on which the start and end of work hours should be indicated.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/marcus_bains_line</key>
<applyto>/apps/evolution/calendar/display/marcus_bains_line</applyto>
<owner>evolution-calendar</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>Marcus Bains Line</short>
<long>Whether to draw the Marcus Bains Line (line at current time) in the calendar.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/marcus_bains_color_dayview</key>
<applyto>/apps/evolution/calendar/display/marcus_bains_color_dayview</applyto>
<owner>evolution-calendar</owner>
<type>string</type>
<default>#ff0000</default>
<locale name="C">
<short>Marcus Bains Line Color - Day View</short>
<long>Color to draw the Marcus Bains line in the Day View.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/marcus_bains_color_timebar</key>
<applyto>/apps/evolution/calendar/display/marcus_bains_color_timebar</applyto>
<owner>evolution-calendar</owner>
<type>string</type>
<default>#ff0000</default>
<locale name="C">
<short>Marcus Bains Line Color - Time bar</short>
<long>Color to draw the Marcus Bains Line in the Time bar (empty for default).</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/recur_events_italic</key>
<applyto>/apps/evolution/calendar/display/recur_events_italic</applyto>
<owner>evolution-calendar</owner>
<type>bool</type>
<default>false</default>
<locale name="C">
<short>Recurrent Events in Italic</short>
<long>Show days with recurrent events in italic font in bottom left calendar.</long>
</locale>
</schema>
<!-- Memos -->
<schema>
<key>/schemas/apps/evolution/calendar/memos/primary_memos</key>
<applyto>/apps/evolution/calendar/memos/primary_memos</applyto>
<owner>evolution-calendar</owner>
<type>string</type>
<default></default>
<locale name="C">
<short>Primary memo list</short>
<long>
The UID of the selected (or "primary") memo list in the
sidebar of the "Memos" view.
</long>
</locale>
</schema>
<!-- Tasks -->
<schema>
<key>/schemas/apps/evolution/calendar/tasks/primary_tasks</key>
<applyto>/apps/evolution/calendar/tasks/primary_tasks</applyto>
<owner>evolution-calendar</owner>
<type>string</type>
<default></default>
<locale name="C">
<short>Primary task list</short>
<long>
The UID of the selected (or "primary") task list in the
sidebar of the "Tasks" view.
</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/tasks/hide_completed</key>
<applyto>/apps/evolution/calendar/tasks/hide_completed</applyto>
<owner>evolution-calendar</owner>
<type>bool</type>
<default>false</default>
<locale name="C">
<short>Hide completed tasks</short>
<long>Whether to hide completed tasks in the tasks view.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/tasks/hide_completed_units</key>
<applyto>/apps/evolution/calendar/tasks/hide_completed_units</applyto>
<owner>evolution-calendar</owner>
<type>string</type>
<default>days</default>
<locale name="C">
<short>Hide task units</short>
<long>Units for determining when to hide tasks, "minutes", "hours" or "days".</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/tasks/hide_completed_value</key>
<applyto>/apps/evolution/calendar/tasks/hide_completed_value</applyto>
<owner>evolution-calendar</owner>
<type>int</type>
<default>1</default>
<locale name="C">
<short>Hide task value</short>
<long>Number of units for determining when to hide tasks.</long>
</locale>
</schema>
<!-- Tasks: Colors -->
<schema>
<key>/schemas/apps/evolution/calendar/tasks/colors/due_today</key>
<applyto>/apps/evolution/calendar/tasks/colors/due_today</applyto>
<owner>evolution-calendar</owner>
<type>string</type>
<default>#1e90ff</default>
<locale name="C">
<short>Tasks due today color</short>
<long>Background color of tasks that are due today, in "#rrggbb" format.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/tasks/colors/overdue</key>
<applyto>/apps/evolution/calendar/tasks/colors/overdue</applyto>
<owner>evolution-calendar</owner>
<type>string</type>
<default>#ff0000</default>
<locale name="C">
<short>Overdue tasks color</short>
<long>Background color of tasks that are overdue, in "#rrggbb" format.</long>
</locale>
</schema>
<!-- Miscellaneous -->
<schema>
<key>/schemas/apps/evolution/calendar/prompts/confirm_delete</key>
<applyto>/apps/evolution/calendar/prompts/confirm_delete</applyto>
<owner>evolution-calendar</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>Ask for confirmation when deleting items</short>
<long>Whether to ask for confirmation when deleting an appointment or task.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/prompts/confirm_purge</key>
<applyto>/apps/evolution/calendar/prompts/confirm_purge</applyto>
<owner>evolution-calendar</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>Confirm expunge</short>
<long>Whether to ask for confirmation when expunging appointments and tasks.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/other/use_default_reminder</key>
<applyto>/apps/evolution/calendar/other/use_default_reminder</applyto>
<owner>evolution-calendar</owner>
<type>bool</type>
<default>false</default>
<locale name="C">
<short>Default appointment reminder</short>
<long>Whether to set a default reminder for appointments.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/other/default_reminder_interval</key>
<applyto>/apps/evolution/calendar/other/default_reminder_interval</applyto>
<owner>evolution-calendar</owner>
<type>int</type>
<default>15</default>
<locale name="C">
<short>Default reminder value</short>
<long>Number of units for determining a default reminder.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/other/default_reminder_units</key>
<applyto>/apps/evolution/calendar/other/default_reminder_units</applyto>
<owner>evolution-calendar</owner>
<type>string</type>
<default>minutes</default>
<locale name="C">
<short>Default reminder units</short>
<long>Units for a default reminder, "minutes", "hours" or "days".</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/other/use_ba_reminder</key>
<applyto>/apps/evolution/calendar/other/use_ba_reminder</applyto>
<owner>evolution-calendar</owner>
<type>bool</type>
<default>false</default>
<locale name="C">
<short>Birthday and anniversary reminder</short>
<long>
Whether to set a reminder for birthdays and anniversaries.
</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/other/ba_reminder_interval</key>
<applyto>/apps/evolution/calendar/other/ba_reminder_interval</applyto>
<owner>evolution-calendar</owner>
<type>int</type>
<default>15</default>
<locale name="C">
<short>Birthday and anniversary reminder value</short>
<long>
Number of units for determining a birthday or anniversary reminder.
</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/other/ba_reminder_units</key>
<applyto>/apps/evolution/calendar/other/ba_reminder_units</applyto>
<owner>evolution-calendar</owner>
<type>string</type>
<default>minutes</default>
<locale name="C">
<short>Birthday and anniversary reminder units</short>
<long>
Units for a birthday or anniversary reminder, "minutes", "hours"
or "days".
</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/show_week_numbers</key>
<applyto>/apps/evolution/calendar/display/show_week_numbers</applyto>
<owner>evolution-calendar</owner>
<type>bool</type>
<default>false</default>
<locale name="C">
<short>Show week numbers in Day View, Work Week View, and Date Navigator</short>
<long>Whether to show week numbers in various places in the Calendar.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/month_scroll_by_week</key>
<applyto>/apps/evolution/calendar/display/month_scroll_by_week</applyto>
<owner>evolution-calendar</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>Scroll Month View by a week</short>
<long>Whether to scroll a Month View by a week, not by a month.</long>
</locale>
</schema>
<!-- Alarm notification -->
<schema>
<key>/schemas/apps/evolution/calendar/notify/last_notification_time</key>
<applyto>/apps/evolution/calendar/notify/last_notification_time</applyto>
<owner>evolution-calendar</owner>
<type>int</type>
<default>-1</default>
<locale name="C">
<short>Last reminder time</short>
<long>Time the last reminder ran, in time_t.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/notify/calendars</key>
<applyto>/apps/evolution/calendar/notify/calendars</applyto>
<owner>evolution-calendar</owner>
<type>list</type>
<list_type>string</list_type>
<default>[]</default>
<locale name="C">
<short>Calendars to run reminders for</short>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/notify/programs</key>
<applyto>/apps/evolution/calendar/notify/programs</applyto>
<owner>evolution-calendar</owner>
<type>list</type>
<list_type>string</list_type>
<default>[]</default>
<locale name="C">
<short>Reminder programs</short>
<long>Programs that are allowed to be run by reminders.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/notify/notify_with_tray</key>
<applyto>/apps/evolution/calendar/notify/notify_with_tray</applyto>
<owner>evolution-calendar</owner>
<type>bool</type>
<default>false</default>
<locale name="C">
<short>Show display reminders in notification tray</short>
<long>Whether or not to use the notification tray for display reminders.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/publish/uris</key>
<applyto>/apps/evolution/calendar/publish/uris</applyto>
<owner>evolution-calendar</owner>
<type>list</type>
<list_type>string</list_type>
<default>[]</default>
<locale name="C">
<short>Free/busy server URLs</short>
<long>List of server URLs for free/busy publishing.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/publish/template</key>
<applyto>/apps/evolution/calendar/publish/template</applyto>
<owner>evolution-calendar</owner>
<type>string</type>
<default></default>
<locale name="C">
<short>Free/busy template URL</short>
<long>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.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/audio_dir</key>
<applyto>/apps/evolution/calendar/audio_dir</applyto>
<owner>evolution-calendar</owner>
<type>string</type>
<default></default>
<locale name="C">
<short>Save directory for reminder audio</short>
<long>
Directory for saving reminder audio files
</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/error_timeout</key>
<applyto>/apps/evolution/calendar/display/error_timeout</applyto>
<owner>evolution-calendar</owner>
<type>int</type>
<default>60</default>
<locale name="C">
<short>Amount of time in seconds the error should be shown on the status bar.</short>
<long> Amount of time in seconds the error should be shown on the status bar.
</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/calendar/display/error_level</key>
<applyto>/apps/evolution/calendar/display/error_level</applyto>
<owner>evolution-calendar</owner>
<type>int</type>
<default>0</default>
<locale name="C">
<short>Level beyond which the message should be logged.</short>
<long> This can have three possible values. 0 for errors. 1 for warnings.
2 for debug messages.
</long>
</locale>
</schema>
</schemalist>
</gconfschemafile>

37
modules/calendar/e-cal-shell-settings.c
View File

@ -104,10 +104,10 @@ transform_icaltimezone_to_string (GBinding *binding,
}
static gboolean
transform_weekdays_gconf_to_evolution (GBinding *binding,
const GValue *source_value,
GValue *target_value,
gpointer user_data)
transform_weekdays_settings_to_evolution (GBinding *binding,
const GValue *source_value,
GValue *target_value,
gpointer user_data)
{
GDateWeekday weekday;
@ -119,7 +119,7 @@ transform_weekdays_gconf_to_evolution (GBinding *binding,
/* This is purposefully verbose for better readability. */
/* GConf numbering */
/* setting numbering */
switch (g_value_get_int (source_value)) {
case 0:
weekday = G_DATE_SUNDAY;
@ -177,10 +177,10 @@ transform_weekdays_gconf_to_evolution (GBinding *binding,
}
static gboolean
transform_weekdays_evolution_to_gconf (GBinding *binding,
const GValue *source_value,
GValue *target_value,
gpointer user_data)
transform_weekdays_evolution_to_settings (GBinding *binding,
const GValue *source_value,
GValue *target_value,
gpointer user_data)
{
GDateWeekday weekday;
@ -192,7 +192,7 @@ transform_weekdays_evolution_to_gconf (GBinding *binding,
/* This is purposefully verbose for better readability. */
/* GConf numbering */
/* setting numbering */
switch (g_value_get_int (source_value)) {
case 0:
weekday = G_DATE_MONDAY;
@ -692,7 +692,7 @@ e_cal_shell_backend_init_settings (EShell *shell)
/* Do not bind to this. Use "cal-week-start-day" instead. */
e_shell_settings_install_property_for_key (
"cal-week-start-day-gconf",
"cal-week-start-day-setting",
CALENDAR_SCHEMA,
"week-start-day");
@ -727,11 +727,8 @@ e_cal_shell_backend_init_settings (EShell *shell)
"prefer-new-item");
/* These properties use transform functions to convert
* GConf values to forms more useful to Evolution. We
* have to use separate properties because GConfBridge
* does not support transform functions. Much of this
* is backward-compatibility cruft for poorly designed
* GConf schemas. */
* GSettings values to forms more useful to Evolution.
*/
e_shell_settings_install_property (
g_param_spec_enum (
@ -815,15 +812,15 @@ e_cal_shell_backend_init_settings (EShell *shell)
G_PARAM_READWRITE));
g_object_bind_property_full (
shell_settings, "cal-week-start-day-gconf",
shell_settings, "cal-week-start-day-setting",
shell_settings, "cal-week-start-day",
G_BINDING_BIDIRECTIONAL |
G_BINDING_SYNC_CREATE,
transform_weekdays_gconf_to_evolution,
transform_weekdays_evolution_to_gconf,
transform_weekdays_settings_to_evolution,
transform_weekdays_evolution_to_settings,
NULL, (GDestroyNotify) NULL);
/* XXX These are my favorite. Storing a bit array in GConf
/* XXX These are my favorite. Storing a bit array in GSettings
* instead of separate boolean keys. Brilliant move. */
e_shell_settings_install_property (

61
modules/mail/e-mail-config-format-html.c
View File

@ -32,28 +32,29 @@
static gpointer parent_class;
static void
headers_changed_cb (GConfClient *client,
guint cnxn_id,
GConfEntry *entry,
headers_changed_cb (GSettings *settings,
const gchar *key,
gpointer user_data)
{
GSList *header_config_list, *p;
gint ii;
gchar **headers;
EExtension *extension;
EMailFormatter *formatter;
g_return_if_fail (client != NULL);
g_return_if_fail (settings != NULL);
if (key && !g_str_equal (key, "headers"))
return;
extension = user_data;
formatter = E_MAIL_FORMATTER (e_extension_get_extensible (extension));
header_config_list = gconf_client_get_list (
client, "/apps/evolution/mail/display/headers",
GCONF_VALUE_STRING, NULL);
headers = g_settings_get_strv (settings, "headers");
e_mail_formatter_clear_headers (formatter);
for (p = header_config_list; p; p = g_slist_next (p)) {
for (ii = 0; headers && headers[ii]; ii++) {
EMailReaderHeader *h;
gchar *xml = (gchar *) p->data;
const gchar *xml = headers[ii];
h = e_mail_reader_header_from_xml (xml);
if (h && h->enabled)
@ -64,26 +65,10 @@ headers_changed_cb (GConfClient *client,
e_mail_reader_header_free (h);
}
if (!header_config_list)
if (!headers || !headers[0])
e_mail_formatter_set_default_headers (formatter);
g_slist_foreach (header_config_list, (GFunc) g_free, NULL);
g_slist_free (header_config_list);
}
static void
remove_header_notify_cb (gpointer data)
{
GConfClient *client;
guint notify_id;
notify_id = GPOINTER_TO_INT (data);
g_return_if_fail (notify_id != 0);
client = gconf_client_get_default ();
gconf_client_notify_remove (client, notify_id);
gconf_client_remove_dir (client, "/apps/evolution/mail/display", NULL);
g_object_unref (client);
g_strfreev (headers);
}
static void
@ -93,8 +78,7 @@ mail_config_format_html_constructed (GObject *object)
EExtensible *extensible;
EShellSettings *shell_settings;
EShell *shell;
GConfClient *client;
guint notify_id;
GSettings *settings;
extension = E_EXTENSION (object);
extensible = e_extension_get_extensible (extension);
@ -140,21 +124,16 @@ mail_config_format_html_constructed (GObject *object)
G_BINDING_SYNC_CREATE);
client = gconf_client_get_default ();
gconf_client_add_dir (
client, "/apps/evolution/mail/display",
GCONF_CLIENT_PRELOAD_NONE, NULL);
notify_id = gconf_client_notify_add (
client, "/apps/evolution/mail/display/headers",
(GConfClientNotifyFunc) headers_changed_cb,
object, NULL, NULL);
settings = g_settings_new ("org.gnome.evolution.mail");
g_signal_connect (settings, "changed", G_CALLBACK (headers_changed_cb), object);
g_object_set_data_full (
G_OBJECT (extensible), "reader-header-notify-id",
GINT_TO_POINTER (notify_id), remove_header_notify_cb);
G_OBJECT (extensible), "reader-header-settings",
settings, g_object_unref);
/* Initial synchronization */
headers_changed_cb (client, 0, NULL, object);
headers_changed_cb (settings, NULL, object);
/* Chain up to parent's constructed() method. */
G_OBJECT_CLASS (parent_class)->constructed (object);

2
modules/mail/e-mail-config-web-view.c
View File

@ -79,7 +79,7 @@ mail_config_web_view_load_style (EMailConfigWebView *extension)
/* Some of our mail and composer preferences are passed down to
* GtkHtml through style properties, unfortunately. This builds
* a style sheet for the EWebView using values from GConf. */
* a style sheet for the EWebView using values from GSettings. */
custom_fonts = e_shell_settings_get_boolean (
extension->shell_settings, "mail-use-custom-fonts");

9
modules/mail/e-mail-shell-settings.c
View File

@ -25,8 +25,6 @@
#include "e-mail-shell-settings.h"
#include <gconf/gconf-client.h>
#include <mail/e-mail-backend.h>
#include <shell/e-shell.h>
@ -368,13 +366,6 @@ e_mail_shell_settings_init (EShellBackend *shell_backend)
MAIL_SCHEMA,
"paned-view-headers-state");
/* These properties use transform functions to convert
* GConf values to forms more useful to Evolution. We
* have to use separate properties because GConfBridge
* does not support transform functions. Much of this
* is backward-compatibility cruft for poorly designed
* GConf schemas. */
e_shell_settings_install_property (
g_param_spec_enum (
"mail-sidebar-ellipsize",

2
modules/mail/em-composer-prefs.c
View File

@ -208,7 +208,7 @@ spell_language_save (EMComposerPrefs *prefs)
}
spell_languages = g_list_reverse (spell_languages);
/* Update the GConf value. */
/* Update the GSettings value. */
e_save_spell_languages (spell_languages);
g_list_free (spell_languages);

60
modules/mail/em-mailer-prefs.c
View File

@ -100,7 +100,6 @@ em_mailer_prefs_finalize (GObject *object)
EMMailerPrefs *prefs = (EMMailerPrefs *) object;
g_object_unref (prefs->builder);
g_object_unref (prefs->gconf);
g_object_unref (prefs->settings);
/* Chain up to parent's finalize() method. */
@ -120,9 +119,6 @@ static void
em_mailer_prefs_init (EMMailerPrefs *preferences)
{
preferences->settings = g_settings_new ("org.gnome.evolution.mail");
/* XXX Still need this for a little while longer. */
preferences->gconf = gconf_client_get_default ();
}
enum {
@ -376,12 +372,12 @@ emmp_header_add_sensitivity (EMMailerPrefs *prefs)
static void
emmp_save_headers (EMMailerPrefs *prefs)
{
GSList *header_list;
GPtrArray *headers;
GtkTreeIter iter;
gboolean valid;
/* Headers */
header_list = NULL;
headers = g_ptr_array_new_full (3, g_free);
valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (prefs->header_list_store), &iter);
while (valid) {
struct _EMailReaderHeader h;
@ -397,16 +393,18 @@ emmp_save_headers (EMMailerPrefs *prefs)
h.enabled = enabled;
if ((xml = e_mail_reader_header_to_xml (&h)))
header_list = g_slist_append (header_list, xml);
g_ptr_array_add (headers, xml);
g_free (h.name);
valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (prefs->header_list_store), &iter);
}
gconf_client_set_list (prefs->gconf, "/apps/evolution/mail/display/headers", GCONF_VALUE_STRING, header_list, NULL);
g_slist_foreach (header_list, (GFunc) g_free, NULL);
g_slist_free (header_list);
g_ptr_array_add (headers, NULL);
g_settings_set_strv (prefs->settings, "headers", (const gchar * const *) headers->pdata);
g_ptr_array_free (headers, TRUE);
}
static void
@ -706,7 +704,8 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
EMailSession *session,
EShell *shell)
{
GSList *header_config_list, *header_add_list, *p;
GSList *header_add_list, *p;
gchar **headers_config;
EShellSettings *shell_settings;
GHashTable *default_header_hash;
GtkWidget *toplevel;
@ -928,7 +927,7 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
G_BINDING_SYNC_CREATE);
/* headers */
locked = !gconf_client_key_is_writable (prefs->gconf, "/apps/evolution/mail/display/headers", NULL);
locked = !g_settings_is_writable (prefs->settings, "headers");
widget = e_builder_get_widget (prefs->builder, "photo_show");
g_object_bind_property (
@ -999,7 +998,7 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
NULL);
/* populated the listview with entries; firstly we add all the default headers, and then
* we add read header configuration out of gconf. If a header in gconf is a default header,
* we add read header configuration out of settings. If a header in settings is a default header,
* we update the enabled flag accordingly
*/
header_add_list = NULL;
@ -1015,31 +1014,30 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
header_add_list = g_slist_append (header_add_list, h);
}
/* read stored headers from gconf */
header_config_list = gconf_client_get_list (prefs->gconf, "/apps/evolution/mail/display/headers", GCONF_VALUE_STRING, NULL);
p = header_config_list;
while (p) {
EMailReaderHeader *h, *def;
gchar *xml = (gchar *) p->data;
/* read stored headers from settings */
headers_config = g_settings_get_strv (prefs->settings, "headers");
if (headers_config) {
for (i = 0; headers_config[i]; i++) {
EMailReaderHeader *h, *def;
const gchar *xml = headers_config[i];
h = e_mail_reader_header_from_xml (xml);
if (h) {
def = g_hash_table_lookup (default_header_hash, h->name);
if (def) {
def->enabled = h->enabled;
e_mail_reader_header_free (h);
} else {
h->is_default = FALSE;
header_add_list = g_slist_append (header_add_list, h);
h = e_mail_reader_header_from_xml (xml);
if (h) {
def = g_hash_table_lookup (default_header_hash, h->name);
if (def) {
def->enabled = h->enabled;
e_mail_reader_header_free (h);
} else {
h->is_default = FALSE;
header_add_list = g_slist_append (header_add_list, h);
}
}
}
p = p->next;
g_strfreev (headers_config);
}
g_hash_table_destroy (default_header_hash);
g_slist_foreach (header_config_list, (GFunc) g_free, NULL);
g_slist_free (header_config_list);
p = header_add_list;
while (p) {

2
modules/mail/em-mailer-prefs.h
View File

@ -24,7 +24,6 @@
#define EM_MAILER_PREFS_H
#include <gtk/gtk.h>
#include <gconf/gconf-client.h>
#include <shell/e-shell.h>
#include <widgets/misc/e-preferences-window.h>
@ -57,7 +56,6 @@ struct _EMMailerPrefs {
GtkVBox parent_object;
GtkBuilder *builder;
GConfClient *gconf;
GSettings *settings;
/* General tab */

34
modules/mailto-handler/Makefile.am
View File

@ -21,38 +21,4 @@ module_mailto_handler_la_LIBADD = \
module_mailto_handler_la_LDFLAGS = \
-module -avoid-version $(NO_UNDEFINED)
schemadir = $(GCONF_SCHEMA_FILE_DIR)
schema_in_files = apps-evolution-mail-prompts-checkdefault.schemas.in
schema_DATA = $(schema_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
if GCONF_SCHEMAS_INSTALL
if OS_WIN32
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
(echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \
echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \
cmd /c _temp.bat; \
rm _temp.bat; \
done \
fi
else
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
$(GCONFTOOL) --makefile-install-rule $$p; \
done \
fi
endif
endif
EXTRA_DIST = $(schema_in_files)
DISTCLEANFILES = $(schema_DATA)
-include $(top_srcdir)/git.mk

16
modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in
View File

@ -1,16 +0,0 @@
<gconfschemafile>
<schemalist>
<schema>
<key>/schemas/apps/evolution/mail/prompts/checkdefault</key>
<applyto>/apps/evolution/mail/prompts/checkdefault</applyto>
<owner>evolution-mail</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>Check whether Evolution is the default mailer</short>
<long>Every time Evolution starts, check whether or not it is the default mailer.</long>
</locale>
</schema>
</schemalist>
</gconfschemafile>

34
modules/spamassassin/Makefile.am
View File

@ -22,38 +22,4 @@ module_spamassassin_la_LIBADD = \
module_spamassassin_la_LDFLAGS = \
-module -avoid-version $(NO_UNDEFINED)
schemadir = $(GCONF_SCHEMA_FILE_DIR)
schema_in_files = evolution-spamassassin.schemas.in
schema_DATA = $(schema_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
if GCONF_SCHEMAS_INSTALL
if OS_WIN32
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
(echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \
echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \
cmd /c _temp.bat; \
rm _temp.bat; \
done \
fi
else
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
$(GCONFTOOL) --makefile-install-rule $$p; \
done \
fi
endif
endif
DISTCLEANFILES = $(schema_DATA)
EXTRA_DIST = $(schema_in_files)
-include $(top_srcdir)/git.mk

4
modules/spamassassin/evolution-spamassassin.c
View File

@ -1145,10 +1145,6 @@ e_spam_assassin_init (ESpamAssassin *extension)
extension->socket_path_mutex = g_mutex_new ();
/* XXX Once we move to GSettings these probably don't
* need to be properties anymore. GConfBridge is
* just easier to deal with than GConfClient. */
settings = g_settings_new ("org.gnome.evolution.spamassassin");
g_settings_bind (

33
modules/spamassassin/evolution-spamassassin.schemas.in
View File

@ -1,33 +0,0 @@
<gconfschemafile>
<schemalist>
<schema>
<key>/schemas/apps/evolution/mail/junk/sa/local_only</key>
<applyto>/apps/evolution/mail/junk/sa/local_only</applyto>
<owner>evolution-spamassassin</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>Use only local spam tests.</short>
<long>
Use only the local spam tests (no DNS).
</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/mail/junk/sa/use_daemon</key>
<applyto>/apps/evolution/mail/junk/sa/use_daemon</applyto>
<owner>evolution-spamassassin</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>Use SpamAssassin daemon and client</short>
<long>
Use SpamAssassin daemon and client (spamc/spamd).
</long>
</locale>
</schema>
</schemalist>
</gconfschemafile>

35
plugins/attachment-reminder/Makefile.am
View File

@ -36,45 +36,12 @@ liborg_gnome_evolution_attachment_reminder_la_LIBADD = \
$(GNOME_PLATFORM_LIBS) \
$(GTKHTML_LIBS)
schemadir = $(GCONF_SCHEMA_FILE_DIR)
schema_in_files = apps-evolution-attachment-reminder.schemas.in
schema_DATA = $(schema_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
if GCONF_SCHEMAS_INSTALL
if OS_WIN32
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
(echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \
echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \
cmd /c _temp.bat; \
rm _temp.bat; \
done \
fi
else
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
$(GCONFTOOL) --makefile-install-rule $$p; \
done \
fi
endif
endif
EXTRA_DIST = org-gnome-evolution-attachment-reminder.eplug.xml \
org-gnome-attachment-reminder.error.xml \
$(schema_in_files)
org-gnome-attachment-reminder.error.xml
BUILT_SOURCES = org-gnome-evolution-attachment-reminder.eplug \
org-gnome-attachment-reminder.error
CLEANFILES = $(BUILT_SOURCES)
DISTCLEANFILES = $(schema_DATA)
-include $(top_srcdir)/git.mk

26
plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in
View File

@ -1,26 +0,0 @@
<gconfschemafile>
<schemalist>
<schema>
<key>/schemas/apps/evolution/mail/attachment_reminder_clues</key>
<applyto>/apps/evolution/mail/attachment_reminder_clues</applyto>
<owner>evolution-mail</owner>
<type>list</type>
<list_type>string</list_type>
<!-- The following are the keywords used by the plugin to understand
whether the user wanted to send a attachment. The list can have any
number of strings.-->
<default>[attachment,attaching,attached,enclosed]</default>
<locale name="C">
<short>List of clues for the attachment reminder plugin to look for
in a message body</short>
<long>
List of clues for the attachment reminder plugin to look for
in a message body
</long>
</locale>
</schema>
</schemalist>
</gconfschemafile>

32
plugins/email-custom-header/Makefile.am
View File

@ -32,42 +32,11 @@ liborg_gnome_email_custom_header_la_LIBADD = \
liborg_gnome_email_custom_header_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
schemadir = $(GCONF_SCHEMA_FILE_DIR)
schema_in_files = apps_evolution_email_custom_header.schemas.in
schema_DATA = $(schema_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
if GCONF_SCHEMAS_INSTALL
if OS_WIN32
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
(echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \
echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \
cmd /c _temp.bat; \
rm _temp.bat; \
done \
fi
else
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
$(GCONFTOOL) --makefile-install-rule $$p; \
done \
fi
endif
endif
ui_DATA = \
org-gnome-email-custom-header.ui
EXTRA_DIST = \
org-gnome-email-custom-header.eplug.xml \
$(schema_in_files) \
$(ui_DATA)
BUILT_SOURCES = \
@ -75,6 +44,5 @@ BUILT_SOURCES = \
$(error_i18n)
CLEANFILES = $(BUILT_SOURCES)
DISTCLEANFILES = $(schema_DATA)
-include $(top_srcdir)/git.mk

17
plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in
View File

@ -1,17 +0,0 @@
<gconfschemafile>
<schemalist>
<schema>
<key>/schemas/apps/evolution/eplugin/email_custom_header/customHeader</key>
<applyto>/apps/evolution/eplugin/email_custom_header/customHeader</applyto>
<owner>evolution-eplugin</owner>
<type>list</type>
<list_type>string</list_type>
<default>[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]</default>
<locale name="C">
<short>List of Custom Headers</short>
<long>The key specifies the list of custom headers that you can add to an outgoing message. The format for specifying a Header and Header value is: Name of the custom header followed by "=" and the values separated by ";"</long>
</locale>
</schema>
</schemalist>
</gconfschemafile>

111
plugins/email-custom-header/email-custom-header.c
View File

@ -26,7 +26,6 @@
#include <string.h>
#include <glib/gi18n.h>
#include <gconf/gconf-client.h>
#include "mail/em-utils.h"
#include "mail/em-event.h"
#include "composer/e-msg-composer.h"
@ -35,18 +34,19 @@
#include "email-custom-header.h"
#define d(x)
#define GCONF_KEY_CUSTOM_HEADER "/apps/evolution/eplugin/email_custom_header/customHeader"
#define ECM_SETTINGS_ID "org.gnome.evolution.plugin.email-custom-header"
#define ECM_SETTINGS_KEY "custom-header"
#define CUSTOM_HEADER_OPTIONS_DIALOG_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), EMAIL_CUSTOM_HEADER_OPTIONS_DIALOG, CustomHeaderOptionsDialogPrivate))
typedef struct {
GConfClient *gconf;
GtkWidget *treeview;
GtkWidget *header_add;
GtkWidget *header_edit;
GtkWidget *header_remove;
GtkWidget *treeview;
GtkWidget *header_add;
GtkWidget *header_edit;
GtkWidget *header_remove;
GtkListStore *store;
} ConfigData;
@ -197,11 +197,15 @@ epech_dialog_run (CustomHeaderOptionsDialog *mch,
GtkWidget *parent)
{
CustomHeaderOptionsDialogPrivate *priv;
GSettings *settings;
GtkWidget *toplevel;
g_return_val_if_fail (mch != NULL || EMAIL_CUSTOM_HEADER_OPTIONS_IS_DIALOG (mch), FALSE);
priv = mch->priv;
epech_get_header_list (mch);
settings = g_settings_new (ECM_SETTINGS_ID);
epech_load_from_settings (settings, ECM_SETTINGS_KEY, mch);
g_object_unref (settings);
priv->builder = gtk_builder_new ();
e_load_ui_builder_definition (
@ -228,41 +232,26 @@ epech_dialog_run (CustomHeaderOptionsDialog *mch,
}
static void
epech_get_header_list (CustomHeaderOptionsDialog *mch)
{
GConfClient *client;
client = gconf_client_get_default ();
g_return_if_fail (GCONF_IS_CLIENT (client));
gconf_client_add_dir (client, GCONF_KEY_CUSTOM_HEADER, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
epech_load_from_gconf (client, "/apps/evolution/eplugin/email_custom_header/customHeader", mch);
return;
}
static void
epech_load_from_gconf (GConfClient *client,
const gchar *path,
CustomHeaderOptionsDialog *mch)
epech_load_from_settings (GSettings *settings,
const gchar *key,
CustomHeaderOptionsDialog *mch)
{
CustomHeaderOptionsDialogPrivate *priv;
EmailCustomHeaderDetails temp_header_details= {-1, -1, NULL, NULL};
CustomSubHeader temp_header_value_details = {NULL};
GSList *header_list,*q;
gchar *buffer;
gchar **headers;
gint index,pos;
priv = mch->priv;
priv->email_custom_header_details = g_array_new (TRUE, TRUE, sizeof (EmailCustomHeaderDetails));
header_list = gconf_client_get_list (client,path,GCONF_VALUE_STRING, NULL);
headers = g_settings_get_strv (settings, key);
for (q = header_list,pos = 0; q != NULL; q = q->next,pos++) {
for (pos = 0; headers && headers[pos]; pos++) {
gchar **parse_header_list;
memset (&temp_header_value_details,0,sizeof (CustomSubHeader));
memset (&temp_header_value_details, 0, sizeof (CustomSubHeader));
temp_header_details.sub_header_type_value = g_array_new (TRUE, TRUE, sizeof (CustomSubHeader));
buffer = q->data;
parse_header_list = g_strsplit_set (buffer, "=;,", -1);
parse_header_list = g_strsplit_set (headers[pos], "=;,", -1);
temp_header_details.header_type_value = g_string_new("");
if (temp_header_details.header_type_value) {
g_string_assign (temp_header_details.header_type_value, parse_header_list[0]);
@ -283,6 +272,8 @@ epech_load_from_gconf (GConfClient *client,
}
temp_header_details.number_of_header = pos;
g_strfreev (headers);
}
static void
@ -562,9 +553,12 @@ static void
commit_changes (ConfigData *cd)
{
GtkTreeModel *model = NULL;
GSList *header_config_list = NULL;
GPtrArray *headers;
GtkTreeIter iter;
gboolean valid;
GSettings *settings;
headers = g_ptr_array_new_full (3, g_free);
model = gtk_tree_view_get_model (GTK_TREE_VIEW (cd->treeview));
valid = gtk_tree_model_get_iter_first (model, &iter);
@ -580,9 +574,12 @@ commit_changes (ConfigData *cd)
/* Check if the keyword is not empty */
if ((keyword) && (g_utf8_strlen (g_strstrip (keyword), -1) > 0)) {
if ((value) && (g_utf8_strlen (g_strstrip (value), -1) > 0)) {
gchar *tmp = keyword;
keyword = g_strconcat (keyword, "=", value, NULL);
g_free (tmp);
}
header_config_list = g_slist_append (header_config_list, g_strdup (keyword));
g_ptr_array_add (headers, g_strdup (keyword));
}
g_free (keyword);
@ -591,10 +588,13 @@ commit_changes (ConfigData *cd)
valid = gtk_tree_model_iter_next (model, &iter);
}
gconf_client_set_list (cd->gconf, GCONF_KEY_CUSTOM_HEADER, GCONF_VALUE_STRING, header_config_list, NULL);
g_ptr_array_add (headers, NULL);
g_slist_foreach (header_config_list, (GFunc) g_free, NULL);
g_slist_free (header_config_list);
settings = g_settings_new (ECM_SETTINGS_ID);
g_settings_set_strv (settings, ECM_SETTINGS_KEY, (const gchar * const *) headers->pdata);
g_object_unref (settings);
g_ptr_array_free (headers, TRUE);
}
static void
@ -759,7 +759,6 @@ destroy_cd_data (gpointer data)
if (!cd)
return;
g_object_unref (cd->gconf);
g_free (cd);
}
@ -770,13 +769,11 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
GtkTreeSelection *selection;
GtkTreeIter iter;
GtkWidget *hbox;
GSList *list;
GSList *header_list = NULL;
gchar **headers;
gint index;
gchar *buffer;
GtkTreeViewColumn *col;
gint col_pos;
GConfClient *client = gconf_client_get_default ();
GSettings *settings;
ConfigData *cd = g_new0 (ConfigData, 1);
GtkWidget *ech_configuration_box;
@ -844,8 +841,6 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
gtk_container_add (GTK_CONTAINER (vbuttonbox1), header_remove);
gtk_widget_set_can_default (header_remove, TRUE);
cd->gconf = gconf_client_get_default ();
cd->treeview = header_treeview;
cd->store = gtk_list_store_new (HEADER_N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING);
@ -904,27 +899,29 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
G_CALLBACK (header_edit_clicked), cd);
gtk_widget_set_sensitive (cd->header_edit, FALSE);
/* Populate tree view with values from gconf */
header_list = gconf_client_get_list (client,GCONF_KEY_CUSTOM_HEADER,GCONF_VALUE_STRING, NULL);
/* Populate tree view with values from settings */
settings = g_settings_new (ECM_SETTINGS_ID);
headers = g_settings_get_strv (settings, ECM_SETTINGS_KEY);
g_object_unref (settings);
for (list = header_list; list; list = g_slist_next (list)) {
gchar **parse_header_list;
if (headers) {
gint ii;
buffer = list->data;
gtk_list_store_append (cd->store, &iter);
for (ii = 0; headers[ii]; ii++) {
gchar **parse_header_list;
parse_header_list = g_strsplit_set (buffer, "=,", -1);
gtk_list_store_append (cd->store, &iter);
gtk_list_store_set (cd->store, &iter, HEADER_KEY_COLUMN, parse_header_list[0], -1);
parse_header_list = g_strsplit_set (headers[ii], "=,", -1);
for (index = 0; parse_header_list[index + 1] ; ++index) {
gtk_list_store_set (cd->store, &iter, HEADER_VALUE_COLUMN, parse_header_list[index + 1], -1);
gtk_list_store_set (cd->store, &iter, HEADER_KEY_COLUMN, parse_header_list[0], -1);
for (index = 0; parse_header_list[index + 1] ; ++index) {
gtk_list_store_set (cd->store, &iter, HEADER_VALUE_COLUMN, parse_header_list[index + 1], -1);
}
}
}
if (header_list) {
g_slist_foreach (header_list, (GFunc) g_free, NULL);
g_slist_free (header_list);
g_strfreev (headers);
}
/* Add the list here */

4
plugins/email-custom-header/email-custom-header.h
View File

@ -86,7 +86,5 @@ static guint signals[LAST_SIGNAL] = {0};
CustomHeaderOptionsDialog *epech_dialog_new (void);
static gboolean epech_dialog_run (CustomHeaderOptionsDialog *mch, GtkWidget *parent);
static void epech_get_header_list (CustomHeaderOptionsDialog *mch);
static void epech_load_from_gconf (GConfClient *client,const gchar *path,CustomHeaderOptionsDialog *mch);
static void epech_load_from_settings (GSettings *settings, const gchar *path, CustomHeaderOptionsDialog *mch);
#endif

35
plugins/external-editor/Makefile.am
View File

@ -48,46 +48,13 @@ liborg_gnome_external_editor_la_LIBADD = \
$(GNOME_PLATFORM_LIBS) \
$(GTKHTML_LIBS)
schemadir = $(GCONF_SCHEMA_FILE_DIR)
schema_in_files = apps-evolution-external-editor.schemas.in
schema_DATA = $(schema_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
if GCONF_SCHEMAS_INSTALL
if OS_WIN32
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
(echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \
echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \
cmd /c _temp.bat; \
rm _temp.bat; \
done \
fi
else
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
$(GCONFTOOL) --makefile-install-rule $$p; \
done \
fi
endif
endif
EXTRA_DIST = \
org-gnome-external-editor.eplug.xml \
org-gnome-external-editor.error.xml \
$(schema_in_files)
org-gnome-external-editor.error.xml
BUILT_SOURCES = org-gnome-external-editor.eplug \
org-gnome-external-editor.error
CLEANFILES = $(BUILT_SOURCES)
DISTCLEANFILES = $(schema_DATA)
-include $(top_srcdir)/git.mk

28
plugins/external-editor/apps-evolution-external-editor.schemas.in
View File

@ -1,28 +0,0 @@
<gconfschemafile>
<schemalist>
<schema>
<key>/schemas/apps/evolution/eplugin/external-editor/editor-command</key>
<applyto>/apps/evolution/eplugin/external-editor/editor-command</applyto>
<owner>evolution-mail</owner>
<type>string</type>
<default>gedit</default>
<locale name="C">
<short>Default External Editor</short>
<long>The default command that must be used as the editor.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/eplugin/external-editor/launch-on-key-press</key>
<applyto>/apps/evolution/eplugin/external-editor/launch-on-key-press</applyto>
<owner>evolution-mail</owner>
<type>bool</type>
<default>false</default>
<locale name="C">
<short>Automatically launch when a new mail is edited</short>
<long>Automatically launch editor when key is pressed in the mail composer</long>
</locale>
</schema>
</schemalist>
</gconfschemafile>

37
plugins/face/Makefile.am
View File

@ -34,18 +34,9 @@ error_DATA = org-gnome-face.error
errordir = $(privdatadir)/errors
# GConf schemas
schemadir = $(GCONF_SCHEMA_FILE_DIR)
schema_in_files = apps_evolution_eplugin_face.schemas.in
schema_DATA = $(schema_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
EXTRA_DIST = \
org-gnome-face.eplug.xml \
org-gnome-face.error.xml \
$(schema_in_files)
org-gnome-face.error.xml
BUILT_SOURCES = \
org-gnome-face.eplug \
@ -53,30 +44,4 @@ BUILT_SOURCES = \
CLEANFILES = $(BUILT_SOURCES)
DISTCLEANFILES = $(schema_DATA)
if GCONF_SCHEMAS_INSTALL
if OS_WIN32
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
(echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \
echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \
cmd /c _temp.bat; \
rm _temp.bat; \
done \
fi
else
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
$(GCONFTOOL) --makefile-install-rule $$p; \
done \
fi
endif
endif
-include $(top_srcdir)/git.mk

17
plugins/face/apps_evolution_eplugin_face.schemas.in
View File

@ -1,17 +0,0 @@
<gconfschemafile>
<schemalist>
<schema>
<key>/schemas/apps/evolution/eplugin/face/insert_by_default</key>
<applyto>/apps/evolution/eplugin/face/insert_by_default</applyto>
<owner>org.gnome.evolution.plugins.face</owner>
<type>bool</type>
<default>false</default>
<locale name="C">
<short>Insert Face picture by default</short>
<long>Whether insert Face picture to outgoing messages by default. The picture should be set before checking this, otherwise nothing happens.</long>
</locale>
</schema>
</schemalist>
</gconfschemafile>

35
plugins/mail-notification/Makefile.am
View File

@ -37,44 +37,11 @@ liborg_gnome_mail_notification_la_LIBADD = \
$(CANBERRA_LIBS) \
$(GTKHTML_LIBS)
schemadir = $(GCONF_SCHEMA_FILE_DIR)
schema_in_files = apps-evolution-mail-notification.schemas.in
schema_DATA = $(schema_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
if GCONF_SCHEMAS_INSTALL
if OS_WIN32
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
(echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \
echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \
cmd /c _temp.bat; \
rm _temp.bat; \
done \
fi
else
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
$(GCONFTOOL) --makefile-install-rule $$p; \
done \
fi
endif
endif
BUILT_SOURCES = $(plugin_DATA)
CLEANFILES = $(BUILT_SOURCES)
DISTCLEANFILES = $(schema_DATA)
EXTRA_DIST = \
org-gnome-mail-notification.eplug.xml \
$(schema_in_files)
org-gnome-mail-notification.eplug.xml
-include $(top_srcdir)/git.mk

73
plugins/mail-notification/apps-evolution-mail-notification.schemas.in
View File

@ -1,73 +0,0 @@
<gconfschemafile>
<schemalist>
<schema>
<key>/schemas/apps/evolution/eplugin/mail-notification/notify-only-inbox</key>
<applyto>/apps/evolution/eplugin/mail-notification/notify-only-inbox</applyto>
<owner>evolution-mail</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>Notify new messages for Inbox only.</short>
<long>Whether to notify new messages in Inbox folder only.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/eplugin/mail-notification/status-enabled</key>
<applyto>/apps/evolution/eplugin/mail-notification/status-enabled</applyto>
<owner>evolution-mail</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>Enable icon in notification area.</short>
<long>Show new mail icon in notification area when new messages arrive.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/eplugin/mail-notification/sound-enabled</key>
<applyto>/apps/evolution/eplugin/mail-notification/sound-enabled</applyto>
<owner>evolution-mail</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>Play sound when new messages arrive.</short>
<long>Whether play sound or beep when new messages arrive.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/eplugin/mail-notification/sound-beep</key>
<applyto>/apps/evolution/eplugin/mail-notification/sound-beep</applyto>
<owner>evolution-mail</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>Beep or play sound file.</short>
<long>If "true", then beep, otherwise will play sound file when new messages arrive.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/eplugin/mail-notification/sound-file</key>
<applyto>/apps/evolution/eplugin/mail-notification/sound-file</applyto>
<owner>evolution-mail</owner>
<type>string</type>
<default></default>
<locale name="C">
<short>Sound filename to be played.</short>
<long>Sound file to be played when new messages arrive, if not in beep mode.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/eplugin/mail-notification/sound-use-theme</key>
<applyto>/apps/evolution/eplugin/mail-notification/sound-use-theme</applyto>
<owner>evolution-mail</owner>
<type>bool</type>
<default>false</default>
<locale name="C">
<short>Use sound theme</short>
<long>Play themed sound when new messages arrive, if not in beep mode.</long>
</locale>
</schema>
</schemalist>
</gconfschemafile>

114
plugins/publish-calendar/publish-calendar.c
View File

@ -26,7 +26,6 @@
#include <string.h>
#include <gtk/gtk.h>
#include <gconf/gconf-client.h>
#include <glib/gi18n.h>
#include <gio/gio.h>
@ -470,12 +469,12 @@ publish (EPublishUri *uri,
}
typedef struct {
GConfClient *gconf;
GtkWidget *treeview;
GtkWidget *url_add;
GtkWidget *url_edit;
GtkWidget *url_remove;
GtkWidget *url_enable;
GSettings *settings;
GtkWidget *treeview;
GtkWidget *url_add;
GtkWidget *url_edit;
GtkWidget *url_remove;
GtkWidget *url_enable;
} PublishUIData;
static void
@ -499,9 +498,12 @@ add_timeout (EPublishUri *uri)
static void
update_timestamp (EPublishUri *uri)
{
GConfClient *client;
GSList *uris, *l;
GSettings *settings;
gchar **set_uris;
GPtrArray *uris_array;
gboolean found = FALSE;
gchar *xml;
gint ii;
guint id;
/* Remove timeout if we have one */
@ -511,32 +513,40 @@ update_timestamp (EPublishUri *uri)
add_timeout (uri);
}
/* Update timestamp in gconf */
/* Update timestamp in settings */
xml = e_publish_uri_to_xml (uri);
client = gconf_client_get_default ();
uris = gconf_client_get_list (client, "/apps/evolution/calendar/publish/uris", GCONF_VALUE_STRING, NULL);
for (l = uris; l; l = g_slist_next (l)) {
gchar *d = l->data;
if (strcmp (d, xml) == 0) {
uris = g_slist_remove (uris, d);
g_free (d);
break;
}
}
g_free (xml);
if (uri->last_pub_time)
g_free (uri->last_pub_time);
uri->last_pub_time = g_strdup_printf ("%d", (gint) time (NULL));
uris = g_slist_prepend (uris, e_publish_uri_to_xml (uri));
uris_array = g_ptr_array_new_full (3, g_free);
settings = g_settings_new (PC_SETTINGS_ID);
set_uris = g_settings_get_strv (settings, PC_SETTINGS_URIS);
gconf_client_set_list (client, "/apps/evolution/calendar/publish/uris", GCONF_VALUE_STRING, uris, NULL);
for (ii = 0; set_uris && set_uris[ii]; ii++) {
const gchar *d = set_uris[ii];
g_slist_foreach (uris, (GFunc) g_free, NULL);
g_slist_free (uris);
g_object_unref (client);
if (!found && g_str_equal (d, xml)) {
found = TRUE;
g_ptr_array_add (uris_array, e_publish_uri_to_xml (uri));
} else {
g_ptr_array_add (uris_array, g_strdup (d));
}
}
g_strfreev (set_uris);
g_free (xml);
/* this should not happen, right? */
if (!found)
g_ptr_array_add (uris_array, e_publish_uri_to_xml (uri));
g_ptr_array_add (uris_array, NULL);
g_settings_set_strv (settings, PC_SETTINGS_URIS, (const gchar * const *) uris_array->pdata);
g_object_unref (settings);
g_ptr_array_free (uris_array, TRUE);
}
static void
@ -575,12 +585,12 @@ static void
url_list_changed (PublishUIData *ui)
{
GtkTreeModel *model = NULL;
GSList *url_list = NULL;
GPtrArray *uris;
GtkTreeIter iter;
gboolean valid;
GConfClient *client;
GSettings *settings;
url_list = NULL;
uris = g_ptr_array_new_full (3, g_free);
model = gtk_tree_view_get_model (GTK_TREE_VIEW (ui->treeview));
valid = gtk_tree_model_get_iter_first (model, &iter);
@ -590,15 +600,19 @@ url_list_changed (PublishUIData *ui)
gtk_tree_model_get (model, &iter, URL_LIST_URL_COLUMN, &url, -1);
if ((xml = e_publish_uri_to_xml (url)))
url_list = g_slist_append (url_list, xml);
if ((xml = e_publish_uri_to_xml (url)) != NULL)
g_ptr_array_add (uris, xml);
valid = gtk_tree_model_iter_next (model, &iter);
}
client = gconf_client_get_default ();
gconf_client_set_list (client, "/apps/evolution/calendar/publish/uris", GCONF_VALUE_STRING, url_list, NULL);
g_slist_foreach (url_list, (GFunc) g_free, NULL);
g_slist_free (url_list);
g_ptr_array_add (uris, NULL);
settings = g_settings_new (PC_SETTINGS_ID);
g_settings_set_strv (settings, PC_SETTINGS_URIS, (const gchar * const *) uris->pdata);
g_object_unref (settings);
g_ptr_array_free (uris, TRUE);
}
static void
@ -926,21 +940,18 @@ publish_urls (gpointer data)
}
static gpointer
publish_uris_set_timeout (GSList *uris)
publish_uris_set_timeout (gchar **uris)
{
GSList *l;
gint ii;
uri_timeouts = g_hash_table_new (g_direct_hash, g_direct_equal);
l = uris;
while (l) {
gchar *xml = l->data;
for (ii = 0; uris && uris[ii]; ii++) {
const gchar *xml = uris[ii];
EPublishUri *uri = e_publish_uri_from_xml (xml);
if (!uri->location) {
g_free (uri);
l = g_slist_next (l);
continue;
}
@ -948,11 +959,9 @@ publish_uris_set_timeout (GSList *uris)
/* Add a timeout based on the last publish time */
add_offset_timeout (uri);
l = g_slist_next (l);
}
g_slist_foreach (uris, (GFunc) g_free, NULL);
g_slist_free (uris);
g_strfreev (uris);
return NULL;
}
@ -961,8 +970,6 @@ gint
e_plugin_lib_enable (EPlugin *ep,
gint enable)
{
GSList *uris;
GConfClient *client;
EShell *shell = e_shell_get_default ();
if (shell) {
@ -976,17 +983,20 @@ e_plugin_lib_enable (EPlugin *ep,
}
if (enable) {
GSettings *settings;
gchar **uris;
GThread *thread = NULL;
GError *error = NULL;
client = gconf_client_get_default ();
uris = gconf_client_get_list (client, "/apps/evolution/calendar/publish/uris", GCONF_VALUE_STRING, NULL);
settings = g_settings_new (PC_SETTINGS_ID);
uris = g_settings_get_strv (settings, PC_SETTINGS_URIS);
g_object_unref (settings);
thread = g_thread_create ((GThreadFunc) publish_uris_set_timeout, uris, FALSE, &error);
if (!thread) {
g_warning ("Could create thread to set timeout for publishing uris : %s", error->message);
g_error_free (error);
}
g_object_unref (client);
}
return 0;

56
plugins/publish-calendar/publish-location.c
View File

@ -29,34 +29,23 @@
#include <string.h>
#include <libxml/tree.h>
#include <gconf/gconf-client.h>
#include <libedataserverui/libedataserverui.h>
static EPublishUri *
migrateURI (const gchar *xml,
xmlDocPtr doc)
{
GConfClient *client;
GSList *uris, *l, *events = NULL;
GSettings *settings;
GSList *events = NULL;
gchar **set_uris;
GPtrArray *uris_array;
xmlChar *location, *enabled, *frequency, *username;
xmlNodePtr root, p;
EPublishUri *uri;
gchar *password, *temp;
EUri *euri;
client = gconf_client_get_default ();
uris = gconf_client_get_list (
client, "/apps/evolution/calendar/publish/uris",
GCONF_VALUE_STRING, NULL);
l = uris;
while (l && l->data) {
gchar *str = l->data;
if (strcmp (xml, str) == 0) {
uris = g_slist_remove (uris, str);
g_free (str);
}
l = g_slist_next (l);
}
gint ii;
gboolean found = FALSE;
uri = g_new0 (EPublishUri, 1);
@ -106,13 +95,32 @@ migrateURI (const gchar *xml,
}
uri->events = events;
uris = g_slist_prepend (uris, e_publish_uri_to_xml (uri));
gconf_client_set_list (
client, "/apps/evolution/calendar/publish/uris",
GCONF_VALUE_STRING, uris, NULL);
g_slist_foreach (uris, (GFunc) g_free, NULL);
g_slist_free (uris);
g_object_unref (client);
uris_array = g_ptr_array_new_full (3, g_free);
settings = g_settings_new (PC_SETTINGS_ID);
set_uris = g_settings_get_strv (settings, PC_SETTINGS_URIS);
for (ii = 0; set_uris && set_uris[ii]; ii++) {
const gchar *str = set_uris[ii];
if (!found && g_str_equal (xml, str)) {
found = TRUE;
g_ptr_array_add (uris_array, e_publish_uri_to_xml (uri));
} else {
g_ptr_array_add (uris_array, g_strdup (str));
}
}
g_strfreev (set_uris);
/* this should not happen, right? */
if (!found)
g_ptr_array_add (uris_array, e_publish_uri_to_xml (uri));
g_ptr_array_add (uris_array, NULL);
g_settings_set_strv (settings, PC_SETTINGS_URIS, (const gchar * const *) uris_array->pdata);
g_ptr_array_free (uris_array, TRUE);
g_object_unref (settings);
cleanup:
xmlFree (location);

3
plugins/publish-calendar/publish-location.h
View File

@ -26,6 +26,9 @@
#include <glib.h>
#define PC_SETTINGS_ID "org.gnome.evolution.plugin.publish-calendar"
#define PC_SETTINGS_URIS "uris"
G_BEGIN_DECLS
enum publish_frequency {

1
plugins/save-calendar/rdf-format.c
View File

@ -26,7 +26,6 @@
#include <string.h>
#include <glib/gi18n.h>
#include <gconf/gconf-client.h>
#include <libxml/xmlmemory.h>
#include <libxml/parser.h>

35
plugins/templates/Makefile.am
View File

@ -29,43 +29,10 @@ liborg_gnome_templates_la_LIBADD = \
$(GNOME_PLATFORM_LIBS) \
$(GTKHTML_LIBS)
schemadir = $(GCONF_SCHEMA_FILE_DIR)
schema_in_files = apps-evolution-template-placeholders.schemas.in
schema_DATA = $(schema_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
if GCONF_SCHEMAS_INSTALL
if OS_WIN32
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
(echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \
echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \
cmd /c _temp.bat; \
rm _temp.bat; \
done \
fi
else
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
$(GCONFTOOL) --makefile-install-rule $$p; \
done \
fi
endif
endif
EXTRA_DIST = org-gnome-templates.eplug.xml \
$(schema_in_files)
EXTRA_DIST = org-gnome-templates.eplug.xml
BUILT_SOURCES = org-gnome-templates.eplug
CLEANFILES = $(BUILT_SOURCES)
DISTCLEANFILES = $(schema_DATA)
-include $(top_srcdir)/git.mk

26
plugins/templates/apps-evolution-template-placeholders.schemas.in
View File

@ -1,26 +0,0 @@
<gconfschemafile>
<schemalist>
<schema>
<key>/schemas/apps/evolution/mail/template_placeholders</key>
<applyto>/apps/evolution/mail/template_placeholders</applyto>
<owner>evolution-mail</owner>
<type>list</type>
<list_type>string</list_type>
<!-- The following are the keyword/value pairs used by the plugin to
substitute the messages stored under the Templates folder. The list can
have any number of such pairs.-->
<default>[myphone=012345,myplace=Abcd,myname=Alice]</default>
<locale name="C">
<short>List of keyword/value pairs for the Templates plugin to
substitute in a message body.</short>
<long>
List of keyword/value pairs for the Templates plugin to
substitute in a message body.
</long>
</locale>
</schema>
</schemalist>
</gconfschemafile>

14
po/POTFILES.in
View File

@ -150,6 +150,7 @@ data/org.gnome.evolution.plugin.face-picture.gschema.xml.in
data/org.gnome.evolution.plugin.itip.gschema.xml.in
data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in
data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in
data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in
data/org.gnome.evolution.plugin.templates.gschema.xml.in
data/org.gnome.evolution.shell.gschema.xml.in
data/org.gnome.evolution.spamassassin.gschema.xml.in
@ -259,7 +260,6 @@ mail/em-subscription-editor.c
mail/em-utils.c
mail/em-vfolder-editor.c
mail/em-vfolder-editor-rule.c
mail/evolution-mail.schemas.in
mail/importers/elm-importer.c
mail/importers/evolution-mbox-importer.c
mail/importers/mail-importer.c
@ -273,7 +273,6 @@ mail/mail-vfolder-ui.c
mail/message-list.c
mail/message-list.etspec
mail/searchtypes.xml
modules/addressbook/apps_evolution_addressbook.schemas.in
modules/addressbook/autocompletion-config.c
modules/addressbook/eab-composer-util.c
modules/addressbook/e-book-shell-backend.c
@ -290,7 +289,6 @@ modules/backup-restore/evolution-backup-restore.c
modules/backup-restore/evolution-backup-tool.c
modules/backup-restore/org-gnome-backup-restore.error.xml
modules/bogofilter/evolution-bogofilter.c
modules/bogofilter/evolution-bogofilter.schemas.in
modules/book-config-google/evolution-book-config-google.c
modules/book-config-ldap/evolution-book-config-ldap.c
modules/book-config-webdav/evolution-book-config-webdav.c
@ -305,7 +303,6 @@ modules/cal-config-google/evolution-cal-config-google.c
modules/cal-config-local/evolution-cal-config-local.c
modules/cal-config-weather/evolution-cal-config-weather.c
modules/cal-config-webcal/evolution-cal-config-webcal.c
modules/calendar/apps_evolution_calendar.schemas.in
modules/calendar/e-cal-attachment-handler.c
modules/calendar/e-calendar-preferences.c
[type: gettext/glade]modules/calendar/e-calendar-preferences.ui
@ -352,7 +349,6 @@ modules/mail/e-mail-shell-view.c
modules/mail/e-mail-shell-view-private.c
modules/mail/em-composer-prefs.c
modules/mail/em-mailer-prefs.c
modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in
modules/mailto-handler/evolution-mailto-handler.c
modules/mdn/evolution-mdn.c
modules/mdn/evolution-mdn.error.xml
@ -365,7 +361,6 @@ modules/prefer-plain/e-mail-parser-prefer-plain.c
modules/prefer-plain/plugin/config-ui.c
modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml
modules/spamassassin/evolution-spamassassin.c
modules/spamassassin/evolution-spamassassin.schemas.in
modules/startup-wizard/e-mail-config-import-page.c
modules/startup-wizard/e-mail-config-import-progress-page.c
modules/startup-wizard/e-startup-assistant.c
@ -374,7 +369,6 @@ modules/text-highlight/text-highlight.c
modules/vcard-inline/e-mail-formatter-vcard-inline.c
modules/vcard-inline/e-mail-parser-vcard-inline.c
modules/web-inspector/evolution-web-inspector.c
plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in
plugins/attachment-reminder/attachment-reminder.c
plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml
plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml
@ -382,15 +376,12 @@ plugins/bbdb/bbdb.c
plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml
plugins/dbx-import/dbx-importer.c
plugins/dbx-import/org-gnome-dbx-import.eplug.xml
plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in
plugins/email-custom-header/email-custom-header.c
plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml
[type: gettext/glade]plugins/email-custom-header/org-gnome-email-custom-header.ui
plugins/external-editor/apps-evolution-external-editor.schemas.in
plugins/external-editor/external-editor.c
plugins/external-editor/org-gnome-external-editor.eplug.xml
plugins/external-editor/org-gnome-external-editor.error.xml
plugins/face/apps_evolution_eplugin_face.schemas.in
plugins/face/face.c
plugins/face/org-gnome-face.eplug.xml
plugins/face/org-gnome-face.error.xml
@ -398,7 +389,6 @@ plugins/image-inline/org-gnome-image-inline.eplug.xml
plugins/mailing-list-actions/mailing-list-actions.c
plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml
plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml
plugins/mail-notification/apps-evolution-mail-notification.schemas.in
plugins/mail-notification/mail-notification.c
plugins/mail-notification/org-gnome-mail-notification.eplug.xml
plugins/mail-to-task/mail-to-task.c
@ -418,10 +408,8 @@ plugins/save-calendar/ical-format.c
plugins/save-calendar/org-gnome-save-calendar.eplug.xml
plugins/save-calendar/rdf-format.c
plugins/save-calendar/save-calendar.c
plugins/templates/apps-evolution-template-placeholders.schemas.in
plugins/templates/org-gnome-templates.eplug.xml
plugins/templates/templates.c
shell/apps_evolution_shell.schemas.in
shell/e-shell-backend.c
shell/e-shell.c
shell/e-shell-content.c

37
shell/Makefile.am
View File

@ -62,7 +62,6 @@ libeshell_la_CPPFLAGS = \
$(GNOME_PLATFORM_CFLAGS) \
$(EGG_SMCLIENT_CFLAGS) \
$(GTKHTML_CFLAGS) \
$(DBUS_GLIB_CFLAGS) \
$(CLUTTER_CFLAGS)
libeshell_la_SOURCES = \
@ -101,7 +100,6 @@ libeshell_la_LIBADD = \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
$(EGG_SMCLIENT_LIBS) \
$(DBUS_GLIB_LIBS) \
$(CLUTTER_LIBS)
# Evolution executable
@ -185,43 +183,10 @@ error_DATA = shell.error
errordir = $(privdatadir)/errors
@EVO_PLUGIN_RULE@
# GConf schemas
schemadir = $(GCONF_SCHEMA_FILE_DIR)
schema_in_files = apps_evolution_shell.schemas.in
schema_DATA = $(schema_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
if GCONF_SCHEMAS_INSTALL
if OS_WIN32
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
(echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \
echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \
cmd /c _temp.bat; \
rm _temp.bat; \
done \
fi
else
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
$(GCONFTOOL) --makefile-install-rule $$p; \
done \
fi
endif
endif
# Extra dist stuff
EXTRA_DIST = \
shell.error.xml \
$(schema_in_files) \
evolution-nognome.in \
evolution-icon.rc \
evolution.ico \
@ -246,8 +211,6 @@ endif
BUILT_SOURCES = $(error_DATA) $(ENUM_GENERATED)
CLEANFILES = $(BUILT_SOURCES)
DISTCLEANFILES = $(schema_DATA)
dist-hook:
cd $(distdir); rm -f $(BUILT_SOURCES)

408
shell/apps_evolution_shell.schemas.in
View File

@ -1,408 +0,0 @@
<gconfschemafile>
<schemalist>
<!-- Evolution config version -->
<schema>
<key>/schemas/apps/evolution/version</key>
<applyto>/apps/evolution/version</applyto>
<owner>evolution</owner>
<type>string</type>
<default></default>
<locale name="C">
<short>Configuration version</short>
<long>The configuration version of Evolution, with major/minor/configuration level (for example "2.6.0").</long>
</locale>
</schema>
<!-- last upgraded-from version, if still present -->
<schema>
<key>/schemas/apps/evolution/last_version</key>
<applyto>/apps/evolution/last_version</applyto>
<owner>evolution</owner>
<type>string</type>
<default></default>
<locale name="C">
<short>Last upgraded configuration version</short>
<long>The last upgraded configuration version of Evolution, with major/minor/configuration level (for example "2.6.0").</long>
</locale>
</schema>
<!-- Development warning dialog -->
<schema>
<key>/schemas/apps/evolution/shell/skip_warning_dialog</key>
<applyto>/apps/evolution/shell/skip_warning_dialog</applyto>
<owner>evolution</owner>
<type>bool</type>
<default>false</default>
<locale name="C">
<short>Skip development warning dialog</short>
<long>Whether the warning dialog in development versions of Evolution is skipped.</long>
</locale>
</schema>
<!-- Initial attachment view (icon or list) -->
<schema>
<key>/schemas/apps/evolution/shell/attachment_view</key>
<applyto>/apps/evolution/shell/attachment_view</applyto>
<owner>evolution</owner>
<type>int</type>
<default>0</default>
<locale name="C">
<short>Initial attachment view</short>
<long>Initial view for attachment bar widgets.
"0" is Icon View, "1" is List View.</long>
</locale>
</schema>
<!-- Offline Mode -->
<schema>
<key>/schemas/apps/evolution/shell/start_offline</key>
<applyto>/apps/evolution/shell/start_offline</applyto>
<owner>evolution</owner>
<type>bool</type>
<default>false</default>
<locale name="C">
<short>Start in offline mode</short>
<long> Whether Evolution will start up in offline mode instead of online mode.
</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/shell/offline/folder_paths</key>
<applyto>/apps/evolution/shell/offline/folder_paths</applyto>
<owner>evolution</owner>
<type>list</type>
<list_type>string</list_type>
<default>[]</default>
<locale name="C">
<short>List of paths for the folders to be synchronized to disk for offline usage</short>
</locale>
</schema>
<!-- View defaults -->
<schema>
<key>/schemas/apps/evolution/shell/view_defaults/window_y</key>
<applyto>/apps/evolution/shell/view_defaults/window_y</applyto>
<owner>evolution</owner>
<type>int</type>
<default>0</default>
<locale name="C">
<short>Default window Y coordinate</short>
<long>The default Y coordinate for the main window.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/shell/view_defaults/window_x</key>
<applyto>/apps/evolution/shell/view_defaults/window_x</applyto>
<owner>evolution</owner>
<type>int</type>
<default>0</default>
<locale name="C">
<short>Default window X coordinate</short>
<long>The default X coordinate for the main window.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/shell/view_defaults/window_width</key>
<applyto>/apps/evolution/shell/view_defaults/window_width</applyto>
<owner>evolution</owner>
<type>int</type>
<default>640</default>
<locale name="C">
<short>Default window width</short>
<long>The default width for the main window, in pixels.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/shell/view_defaults/window_height</key>
<applyto>/apps/evolution/shell/view_defaults/window_height</applyto>
<owner>evolution</owner>
<type>int</type>
<default>480</default>
<locale name="C">
<short>Default window height</short>
<long>The default height for the main window, in pixels.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/shell/view_defaults/window_maximized</key>
<applyto>/apps/evolution/shell/view_defaults/window_maximized</applyto>
<owner>evolution</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>Default window state</short>
<long>Whether or not the window should be maximized.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/shell/view_defaults/buttons_visible</key>
<applyto>/apps/evolution/shell/view_defaults/buttons_visible</applyto>
<owner>evolution</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>Window buttons are visible</short>
<long>Whether the window buttons should be visible.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/shell/view_defaults/buttons_style</key>
<applyto>/apps/evolution/shell/view_defaults/buttons_style</applyto>
<owner>evolution</owner>
<type>string</type>
<default>toolbar</default>
<locale name="C">
<short>Window button style</short>
<long>The style of the window buttons. Can be "text", "icons", "both", "toolbar". If "toolbar" is set, the style of the buttons is determined by the GNOME toolbar setting.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/shell/view_defaults/toolbar_visible</key>
<applyto>/apps/evolution/shell/view_defaults/toolbar_visible</applyto>
<owner>evolution</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>Toolbar is visible</short>
<long>Whether the toolbar should be visible.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/shell/view_defaults/sidebar_visible</key>
<applyto>/apps/evolution/shell/view_defaults/sidebar_visible</applyto>
<owner>evolution</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>Sidebar is visible</short>
<long>Whether the sidebar should be visible.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/shell/view_defaults/statusbar_visible</key>
<applyto>/apps/evolution/shell/view_defaults/statusbar_visible</applyto>
<owner>evolution</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>Statusbar is visible</short>
<long>Whether the status bar should be visible.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/shell/view_defaults/component_id</key>
<applyto>/apps/evolution/shell/view_defaults/component_id</applyto>
<owner>evolution</owner>
<type>string</type>
<default>mail</default>
<locale name="C">
<short>ID or alias of the component to be shown by default at start-up.</short>
<long>ID or alias of the component to be shown by default at start-up.</long>
</locale>
</schema>
<!-- Folder bar -->
<schema>
<key>/schemas/apps/evolution/shell/view_defaults/folder_bar/width</key>
<applyto>/apps/evolution/shell/view_defaults/folder_bar/width</applyto>
<owner>evolution</owner>
<type>int</type>
<default>200</default>
<locale name="C">
<short>Default sidebar width</short>
<long>The default width for the sidebar, in pixels.</long>
</locale>
</schema>
<!-- Network config defaults -->
<schema>
<key>/schemas/apps/evolution/shell/network_config/proxy_type</key>
<applyto>/apps/evolution/shell/network_config/proxy_type</applyto>
<owner>evolution</owner>
<type>int</type>
<default>0</default>
<locale name="C">
<short>Proxy configuration mode</short>
<long>Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 representing "use system settings", "no proxy", "use manual proxy configuration" and "use proxy configuration provided in the autoconfig url" respectively.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/shell/network_config/http_port</key>
<applyto>/apps/evolution/shell/network_config/http_port</applyto>
<owner>evolution</owner>
<type>int</type>
<default>0</default>
<locale name="C">
<short>HTTP proxy port</short>
<long>The port on the machine defined by "/apps/evolution/shell/network_config/http_host" that you proxy through.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/shell/network_config/http_host</key>
<applyto>/apps/evolution/shell/network_config/http_host</applyto>
<owner>evolution</owner>
<type>string</type>
<default></default>
<locale name="C">
<short>HTTP proxy host name</short>
<long>The machine name to proxy HTTP through.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/shell/network_config/secure_port</key>
<applyto>/apps/evolution/shell/network_config/secure_port</applyto>
<owner>evolution</owner>
<type>int</type>
<default>0</default>
<locale name="C">
<short>Secure HTTP proxy port</short>
<long>The port on the machine defined by "/apps/evolution/shell/network_config/secure_host" that you proxy through.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/shell/network_config/secure_host</key>
<applyto>/apps/evolution/shell/network_config/secure_host</applyto>
<owner>evolution</owner>
<type>string</type>
<default></default>
<locale name="C">
<short>Secure HTTP proxy host name</short>
<long>The machine name to proxy secure HTTP through.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/shell/network_config/socks_port</key>
<applyto>/apps/evolution/shell/network_config/socks_port</applyto>
<owner>evolution</owner>
<type>int</type>
<default>0</default>
<locale name="C">
<short>SOCKS proxy port</short>
<long>The port on the machine defined by "/apps/evolution/shell/network_config/socks_host" that you proxy through.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/shell/network_config/socks_host</key>
<applyto>/apps/evolution/shell/network_config/socks_host</applyto>
<owner>evolution</owner>
<type>string</type>
<default></default>
<locale name="C">
<short>SOCKS proxy host name</short>
<long>The machine name to proxy socks through.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/shell/network_config/use_http_proxy</key>
<applyto>/apps/evolution/shell/network_config/use_http_proxy</applyto>
<owner>evolution</owner>
<type>bool</type>
<default>false</default>
<locale name="C">
<short>Use HTTP proxy</short>
<long>Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/shell/network_config/use_authentication</key>
<applyto>/apps/evolution/shell/network_config/use_authentication</applyto>
<owner>evolution</owner>
<type>bool</type>
<default>false</default>
<locale name="C">
<short>Authenticate proxy server connections</short>
<long>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.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/shell/network_config/authentication_user</key>
<applyto>/apps/evolution/shell/network_config/authentication_user</applyto>
<owner>evolution</owner>
<type>string</type>
<default></default>
<locale name="C">
<short>HTTP proxy username</short>
<long>Username to pass as authentication when doing HTTP proxying.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/shell/network_config/authentication_password</key>
<applyto>/apps/evolution/shell/network_config/authentication_password</applyto>
<owner>evolution</owner>
<type>string</type>
<default></default>
<locale name="C">
<short>HTTP proxy password</short>
<long>Password to pass as authentication when doing HTTP proxying.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/shell/network_config/ignore_hosts</key>
<applyto>/apps/evolution/shell/network_config/ignore_hosts</applyto>
<owner>evolution</owner>
<type>list</type>
<list_type>string</list_type>
<default>[]</default>
<locale name="C">
<short>Non-proxy hosts</short>
<long>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).</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/shell/network_config/autoconfig_url</key>
<applyto>/apps/evolution/shell/network_config/autoconfig_url</applyto>
<owner>evolution</owner>
<type>string</type>
<default></default>
<locale name="C">
<short>Automatic proxy configuration URL</short>
<long>URL that provides proxy configuration values.</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/evolution/shell/express_mode</key>
<applyto>/apps/evolution/shell/express_mode</applyto>
<owner>evolution</owner>
<type>bool</type>
<default>false</default>
<locale name="C">
<short>Enable express mode</short>
<long>Flag that enables a much simplified user interface.</long>
</locale>
</schema>
</schemalist>
</gconfschemafile>

2
shell/e-shell-migrate.c
View File

@ -744,7 +744,7 @@ shell_migrate_get_version (EShell *shell,
string = g_settings_get_string (settings, "version");
if (string != NULL) {
/* Since 1.4.0 we've kept the version key in GConf. */
/* Since 1.4.0 we've kept the version key in GSettings. */
sscanf (string, "%d.%d.%d", major, minor, micro);
g_free (string);
}

2
shell/e-shell-window-actions.c
View File

@ -2359,7 +2359,7 @@ e_shell_window_update_search_menu (EShellWindow *shell_window)
shell_view = e_shell_window_get_shell_view (shell_window, view_name);
/* Check for a NULL shell view before proceeding. This can
* happen if the initial view name from GConf is unrecognized.
* happen if the initial view name from GSettings is unrecognized.
* Without this we would crash at E_SHELL_VIEW_GET_CLASS(). */
g_return_if_fail (shell_view != NULL);

10
shell/e-shell-window.c
View File

@ -1030,9 +1030,9 @@ e_shell_window_init (EShellWindow *shell_window)
* #EShellWindow into "safe mode" if detects the previous Evolution
* session crashed.
*
* The initial view for the window is determined by GConf key
* <filename>/apps/evolution/shell/view_defaults/component_id</filename>.
* Or, if the GConf key is not set or can't be read, the first view
* The initial view for the window is determined by GSettings key
* <filename>/org/gnome/evolution/shell/default-component-id</filename>.
* Or, if the GSettings key is not set or can't be read, the first view
* in the switcher is used.
*
* Returns: a new #EShellWindow
@ -1326,8 +1326,8 @@ e_shell_window_get_active_view (EShellWindow *shell_window)
* the entire content of @shell_window to change. This is typically
* called as a result of the user clicking one of the switcher buttons.
*
* The name of the newly activated shell view is also written to GConf key
* <filename>/apps/evolution/shell/view_defaults/component_id</filename>.
* The name of the newly activated shell view is also written to GSettings key
* <filename>/org/gnome/evolution/shell/default-component-id</filename>.
* This makes the active shell view persistent across Evolution sessions.
* It also causes new shell windows created within the current Evolution
* session to open to the most recently selected shell view.

4
shell/e-shell.c
View File

@ -1239,7 +1239,7 @@ e_shell_init (EShell *shell)
G_CALLBACK (shell_notify_online_cb), NULL);
/* XXX Do this after creating the EShellSettings instance,
* otherwise the GConf bindings will not get set up. */
* otherwise the GSettings bindings will not get set up. */
e_shell_settings_install_property_for_key (
"start-offline",
@ -1474,7 +1474,7 @@ e_shell_create_shell_window (EShell *shell,
view_name = e_shell_get_canonical_name (shell, view_name);
/* EShellWindow initializes its active view from a GConf key,
/* EShellWindow initializes its active view from a GSetting key,
* so set the key ahead of time to control the intial view. */
if (view_name != NULL) {
GSettings *settings;

5
shell/main.c
View File

@ -30,8 +30,6 @@
#include <glib-unix.h>
#endif
#include <dbus/dbus-glib.h>
#if HAVE_CLUTTER
#include <clutter-gtk/clutter-gtk.h>
#include <mx/mx.h>
@ -497,9 +495,6 @@ main (gint argc,
g_type_init ();
/* this is to initialize threading for dbus-glib used by GConf */
dbus_g_thread_init ();
/* do not require Gtk+ for --force-shutdown */
if (argc == 2 && argv[1] && g_str_equal (argv[1], "--force-shutdown")) {
shell_force_shutdown ();