From 94daae3dba8e86e88f69320bc82795fe660ec9cd Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 15 Jun 2012 09:04:08 +0200 Subject: Remove the last remaining usage of GConf --- modules/addressbook/Makefile.am | 35 - .../apps_evolution_addressbook.schemas.in | 155 ---- modules/backup-restore/evolution-backup-tool.c | 61 +- modules/bogofilter/Makefile.am | 34 - modules/bogofilter/evolution-bogofilter.schemas.in | 20 - modules/calendar/Makefile.am | 30 - .../calendar/apps_evolution_calendar.schemas.in | 839 --------------------- modules/calendar/e-cal-shell-settings.c | 37 +- modules/mail/e-mail-config-format-html.c | 61 +- modules/mail/e-mail-config-web-view.c | 2 +- modules/mail/e-mail-shell-settings.c | 9 - modules/mail/em-composer-prefs.c | 2 +- modules/mail/em-mailer-prefs.c | 62 +- modules/mail/em-mailer-prefs.h | 2 - modules/mailto-handler/Makefile.am | 34 - ...-evolution-mail-prompts-checkdefault.schemas.in | 16 - modules/spamassassin/Makefile.am | 34 - modules/spamassassin/evolution-spamassassin.c | 4 - .../spamassassin/evolution-spamassassin.schemas.in | 33 - 19 files changed, 119 insertions(+), 1351 deletions(-) delete mode 100644 modules/addressbook/apps_evolution_addressbook.schemas.in delete mode 100644 modules/bogofilter/evolution-bogofilter.schemas.in delete mode 100644 modules/calendar/apps_evolution_calendar.schemas.in delete mode 100644 modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in delete mode 100644 modules/spamassassin/evolution-spamassassin.schemas.in (limited to 'modules') diff --git a/modules/addressbook/Makefile.am b/modules/addressbook/Makefile.am index f02d942b69..533a4bbb9a 100644 --- a/modules/addressbook/Makefile.am +++ b/modules/addressbook/Makefile.am @@ -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: diff --git a/modules/addressbook/apps_evolution_addressbook.schemas.in b/modules/addressbook/apps_evolution_addressbook.schemas.in deleted file mode 100644 index cf9f098e90..0000000000 --- a/modules/addressbook/apps_evolution_addressbook.schemas.in +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - /schemas/apps/evolution/addressbook/completion/uris - /apps/evolution/addressbook/completion/uris - evolution-addressbook - string - - - EFolderList XML for the list of completion URIs - EFolderList XML for the list of completion URIs. - - - - - /schemas/apps/evolution/addressbook/completion/minimum_query_length - /apps/evolution/addressbook/completion/minimum_query_length - evolution-addressbook - int - 3 - - Autocomplete length - The number of characters that must be typed before Evolution will attempt to autocomplete. - - - - - /schemas/apps/evolution/addressbook/completion/show_address - /apps/evolution/addressbook/completion/show_address - evolution-addressbook - bool - false - - Show autocompleted name with an address - Whether force showing the mail address with the name of the autocompleted contact in the entry. - - - - - - - /schemas/apps/evolution/addressbook/select_names/last_used_uri - /apps/evolution/addressbook/select_names/last_used_uri - evolution-addressbook - string - - - URI for the folder last used in the select names dialog - URI for the folder last used in the select names dialog. - - - - - - - /schemas/apps/evolution/addressbook/display/layout - /apps/evolution/addressbook/display/layout - evolution-addressbook - int - 0 - - Contact layout style - - 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. - - - - - - /schemas/apps/evolution/addressbook/display/primary_addressbook - /apps/evolution/addressbook/display/primary_addressbook - evolution-addressbook - string - - - Primary address book - - The UID of the selected (or "primary") address book in the - sidebar of the "Contacts" view. - - - - - - /schemas/apps/evolution/addressbook/display/hpane_position - /apps/evolution/addressbook/display/hpane_position - evolution-addressbook - int - 200 - - Contact preview pane position (horizontal) - - Position of the contact preview pane when oriented horizontally. - - - - - - /schemas/apps/evolution/addressbook/display/vpane_position - /apps/evolution/addressbook/display/vpane_position - evolution-addressbook - int - 400 - - Contact preview pane position (vertical) - - Position of the contact preview pane when oriented vertically. - - - - - - /schemas/apps/evolution/addressbook/display/show_preview - /apps/evolution/addressbook/display/show_preview - evolution-addressbook - bool - true - - Show preview pane - Whether to show the preview pane. - - - - - /schemas/apps/evolution/addressbook/display/preview_show_maps - /apps/evolution/addressbook/display/preview_show_maps - evolution-addressbook - bool - false - - Show maps - Whether to show maps in preview pane. - - - - - /schemas/apps/evolution/addressbook/display/address_formatting - /apps/evolution/addressbook/display/address_formatting - evolution-addressbook - bool - true - - Enable address formatting - Whether addresses should be formatted according to standard in their destination country. - - - - - diff --git a/modules/backup-restore/evolution-backup-tool.c b/modules/backup-restore/evolution-backup-tool.c index 7d1caaf948..d09efa3628 100644 --- a/modules/backup-restore/evolution-backup-tool.c +++ b/modules/backup-restore/evolution-backup-tool.c @@ -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 DCONF_DUMP_FILE_EDS, + e_get_user_data_dir (), EVOUSERDATADIR_MAGIC); replace_in_file ( - EVOLUTION_DIR GCONF_DUMP_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); diff --git a/modules/bogofilter/Makefile.am b/modules/bogofilter/Makefile.am index 225e2a47c7..aaa72f977d 100644 --- a/modules/bogofilter/Makefile.am +++ b/modules/bogofilter/Makefile.am @@ -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 diff --git a/modules/bogofilter/evolution-bogofilter.schemas.in b/modules/bogofilter/evolution-bogofilter.schemas.in deleted file mode 100644 index e313eb9ffc..0000000000 --- a/modules/bogofilter/evolution-bogofilter.schemas.in +++ /dev/null @@ -1,20 +0,0 @@ - - - - - /schemas/apps/evolution/mail/junk/bogofilter/unicode - /apps/evolution/mail/junk/bogofilter/unicode - evolution-bogofilter - bool - true - - Convert mail messages to Unicode - - Convert message text to Unicode UTF-8 to unify spam/ham tokens - coming from different character sets. - - - - - - diff --git a/modules/calendar/Makefile.am b/modules/calendar/Makefile.am index 43465f39fe..0bcc72cfde 100644 --- a/modules/calendar/Makefile.am +++ b/modules/calendar/Makefile.am @@ -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 diff --git a/modules/calendar/apps_evolution_calendar.schemas.in b/modules/calendar/apps_evolution_calendar.schemas.in deleted file mode 100644 index c34852ed4e..0000000000 --- a/modules/calendar/apps_evolution_calendar.schemas.in +++ /dev/null @@ -1,839 +0,0 @@ - - - - - - - /schemas/apps/evolution/calendar/display/primary_calendar - /apps/evolution/calendar/display/primary_calendar - evolution-calendar - string - - - Primary calendar - - The UID of the selected (or "primary") calendar in the - sidebar of the "Calendar" view. - - - - - - /schemas/apps/evolution/calendar/display/timezone - /apps/evolution/calendar/display/timezone - evolution-calendar - string - UTC - - Timezone - The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like "America/New York". - - - - - /schemas/apps/evolution/calendar/display/use_system_timezone - /apps/evolution/calendar/display/use_system_timezone - evolution-calendar - bool - true - - Use system timezone - Use the system timezone instead of the timezone selected - in Evolution. - - - - - /schemas/apps/evolution/calendar/display/day_second_zone - /apps/evolution/calendar/display/day_second_zone - evolution-calendar - string - - - The second timezone for a Day View - Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key. - - - - - /schemas/apps/evolution/calendar/display/day_second_zones - /apps/evolution/calendar/display/day_second_zones - evolution-calendar - list - string - [] - - Recently used second time zones in a Day View - List of recently used second time zones in a Day View. - - - - - /schemas/apps/evolution/calendar/display/day_second_zones_max - /apps/evolution/calendar/display/day_second_zones_max - evolution-calendar - int - 5 - - Maximum number of recently used timezones to remember. - Maximum number of recently used timezones to remember in a 'day_second_zones' list. - - - - - /schemas/apps/evolution/calendar/display/use_24hour_format - /apps/evolution/calendar/display/use_24hour_format - evolution-calendar - bool - false - - Twenty four hour time format - Whether to show times in twenty four hour format instead of using am/pm. - - - - - /schemas/apps/evolution/calendar/display/show_role - /apps/evolution/calendar/display/show_role - evolution-calendar - bool - true - - Show Role field in the event/task/meeting editor - Whether to show role field in the event/task/meeting editor - - - - - /schemas/apps/evolution/calendar/display/show_status - /apps/evolution/calendar/display/show_status - evolution-calendar - bool - false - - Show status field in the event/task/meeting editor - Whether to show status field in the event/task/meeting editor - - - - - /schemas/apps/evolution/calendar/display/show_type - /apps/evolution/calendar/display/show_type - evolution-calendar - bool - false - - Show type field in the event/task/meeting editor - Whether to show type field in the event/task/meeting editor - - - - - /schemas/apps/evolution/calendar/display/show_rsvp - /apps/evolution/calendar/display/show_rsvp - evolution-calendar - bool - false - - Show RSVP field in the event/task/meeting editor - Whether to show RSVP field in the event/task/meeting editor - - - - - /schemas/apps/evolution/calendar/display/show_timezone - /apps/evolution/calendar/display/show_timezone - evolution-calendar - bool - false - - Show timezone field in the event/meeting editor - Whether to show timezone field in the event/meeting editor - - - - - /schemas/apps/evolution/calendar/display/show_categories - /apps/evolution/calendar/display/show_categories - evolution-calendar - bool - false - - Show categories field in the event/meeting/task editor - Whether to show categories field in the event/meeting editor - - - - - /schemas/apps/evolution/calendar/display/week_start_day - /apps/evolution/calendar/display/week_start_day - evolution-calendar - int - 1 - - Week start - Weekday the week starts on, from Sunday (0) to Saturday (6). - - - - - /schemas/apps/evolution/calendar/display/day_start_hour - /apps/evolution/calendar/display/day_start_hour - evolution-calendar - int - 9 - - Workday start hour - Hour the workday starts on, in twenty four hour format, 0 to 23. - - - - - /schemas/apps/evolution/calendar/display/day_start_minute - /apps/evolution/calendar/display/day_start_minute - evolution-calendar - int - 0 - - Workday start minute - Minute the workday starts on, 0 to 59. - - - - - /schemas/apps/evolution/calendar/display/day_end_hour - /apps/evolution/calendar/display/day_end_hour - evolution-calendar - int - 17 - - Workday end hour - Hour the workday ends on, in twenty four hour format, 0 to 23. - - - - - /schemas/apps/evolution/calendar/display/day_end_minute - /apps/evolution/calendar/display/day_end_minute - evolution-calendar - int - 0 - - Workday end minute - Minute the workday ends on, 0 to 59. - - - - - /schemas/apps/evolution/calendar/display/time_divisions - /apps/evolution/calendar/display/time_divisions - evolution-calendar - int - 30 - - Time divisions - Intervals shown in Day and Work Week views, in minutes. - - - - - /schemas/apps/evolution/calendar/display/hpane_position - /apps/evolution/calendar/display/hpane_position - evolution-calendar - int - 400 - - Horizontal pane position - Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels. - - - - - /schemas/apps/evolution/calendar/display/vpane_position - /apps/evolution/calendar/display/vpane_position - evolution-calendar - int - 150 - - Vertical pane position - Position of the vertical pane, between the view and the date navigator calendar and task list when not in the month view, in pixels. - - - - - /schemas/apps/evolution/calendar/display/month_hpane_position - /apps/evolution/calendar/display/month_hpane_position - evolution-calendar - int - 32000 - - Month view horizontal pane position - Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels. - - - - - /schemas/apps/evolution/calendar/display/month_vpane_position - /apps/evolution/calendar/display/month_vpane_position - evolution-calendar - int - 150 - - Month view vertical pane position - Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels. - - - - /schemas/apps/evolution/calendar/display/date_navigator_pane_position - /apps/evolution/calendar/display/date_navigator_pane_position - evolution-calendar - int - 150 - - Month view vertical pane position - Position of the vertical pane, between the calendar lists and the date navigator calendar. - - - - - /schemas/apps/evolution/calendar/display/memo_layout - /apps/evolution/calendar/display/memo_layout - int - 0 - - Memo layout style - - 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. - - - - - - /schemas/apps/evolution/calendar/display/show_memo_preview - /apps/evolution/calendar/display/show_memo_preview - evolution-calendar - bool - true - - Show the memo preview pane - - If "true", show the memo preview pane in the main window. - - - - - - /schemas/apps/evolution/calendar/display/memo_hpane_position - /apps/evolution/calendar/display/memo_hpane_position - evolution-calendar - int - 200 - - Memo preview pane position (horizontal) - - Position of the task preview pane when oriented horizontally. - - - - - - /schemas/apps/evolution/calendar/display/memo_vpane_position - /apps/evolution/calendar/display/memo_vpane_position - evolution-calendar - int - 400 - - Memo preview pane position (vertical) - - Position of the memo preview pane when oriented vertically. - - - - - - /schemas/apps/evolution/calendar/display/task_layout - /apps/evolution/calendar/display/task_layout - int - 0 - - Task layout style - - 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. - - - - - - /schemas/apps/evolution/calendar/display/show_task_preview - /apps/evolution/calendar/display/show_task_preview - evolution-calendar - bool - true - - Show the task preview pane - - If "true", show the task preview pane in the main window. - - - - - - /schemas/apps/evolution/calendar/display/task_hpane_position - /apps/evolution/calendar/display/task_hpane_position - evolution-calendar - int - 200 - - Task preview pane position (horizontal) - - Position of the task preview pane when oriented horizontally. - - - - - - /schemas/apps/evolution/calendar/display/task_vpane_position - /apps/evolution/calendar/display/task_vpane_position - evolution-calendar - int - 400 - - Task preview pane position (vertical) - - Position of the task preview pane when oriented vertically. - - - - - - /schemas/apps/evolution/calendar/display/compress_weekend - /apps/evolution/calendar/display/compress_weekend - evolution-calendar - bool - true - - Compress weekends in month view - Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday. - - - - - /schemas/apps/evolution/calendar/display/show_event_end - /apps/evolution/calendar/display/show_event_end - evolution-calendar - bool - true - - Show appointment end times in week and month views - Whether to display the end time of events in the week and month views. - - - - - /schemas/apps/evolution/calendar/display/working_days - /apps/evolution/calendar/display/working_days - evolution-calendar - int - 62 - - Work days - Days on which the start and end of work hours should be indicated. - - - - - /schemas/apps/evolution/calendar/display/marcus_bains_line - /apps/evolution/calendar/display/marcus_bains_line - evolution-calendar - bool - true - - Marcus Bains Line - Whether to draw the Marcus Bains Line (line at current time) in the calendar. - - - - - /schemas/apps/evolution/calendar/display/marcus_bains_color_dayview - /apps/evolution/calendar/display/marcus_bains_color_dayview - evolution-calendar - string - #ff0000 - - Marcus Bains Line Color - Day View - Color to draw the Marcus Bains line in the Day View. - - - - - /schemas/apps/evolution/calendar/display/marcus_bains_color_timebar - /apps/evolution/calendar/display/marcus_bains_color_timebar - evolution-calendar - string - #ff0000 - - Marcus Bains Line Color - Time bar - Color to draw the Marcus Bains Line in the Time bar (empty for default). - - - - - /schemas/apps/evolution/calendar/display/recur_events_italic - /apps/evolution/calendar/display/recur_events_italic - evolution-calendar - bool - false - - Recurrent Events in Italic - Show days with recurrent events in italic font in bottom left calendar. - - - - - - - /schemas/apps/evolution/calendar/memos/primary_memos - /apps/evolution/calendar/memos/primary_memos - evolution-calendar - string - - - Primary memo list - - The UID of the selected (or "primary") memo list in the - sidebar of the "Memos" view. - - - - - - - - /schemas/apps/evolution/calendar/tasks/primary_tasks - /apps/evolution/calendar/tasks/primary_tasks - evolution-calendar - string - - - Primary task list - - The UID of the selected (or "primary") task list in the - sidebar of the "Tasks" view. - - - - - - /schemas/apps/evolution/calendar/tasks/hide_completed - /apps/evolution/calendar/tasks/hide_completed - evolution-calendar - bool - false - - Hide completed tasks - Whether to hide completed tasks in the tasks view. - - - - - /schemas/apps/evolution/calendar/tasks/hide_completed_units - /apps/evolution/calendar/tasks/hide_completed_units - evolution-calendar - string - days - - Hide task units - Units for determining when to hide tasks, "minutes", "hours" or "days". - - - - - /schemas/apps/evolution/calendar/tasks/hide_completed_value - /apps/evolution/calendar/tasks/hide_completed_value - evolution-calendar - int - 1 - - Hide task value - Number of units for determining when to hide tasks. - - - - - - - /schemas/apps/evolution/calendar/tasks/colors/due_today - /apps/evolution/calendar/tasks/colors/due_today - evolution-calendar - string - #1e90ff - - Tasks due today color - Background color of tasks that are due today, in "#rrggbb" format. - - - - - /schemas/apps/evolution/calendar/tasks/colors/overdue - /apps/evolution/calendar/tasks/colors/overdue - evolution-calendar - string - #ff0000 - - Overdue tasks color - Background color of tasks that are overdue, in "#rrggbb" format. - - - - - - - /schemas/apps/evolution/calendar/prompts/confirm_delete - /apps/evolution/calendar/prompts/confirm_delete - evolution-calendar - bool - true - - Ask for confirmation when deleting items - Whether to ask for confirmation when deleting an appointment or task. - - - - - /schemas/apps/evolution/calendar/prompts/confirm_purge - /apps/evolution/calendar/prompts/confirm_purge - evolution-calendar - bool - true - - Confirm expunge - Whether to ask for confirmation when expunging appointments and tasks. - - - - - /schemas/apps/evolution/calendar/other/use_default_reminder - /apps/evolution/calendar/other/use_default_reminder - evolution-calendar - bool - false - - Default appointment reminder - Whether to set a default reminder for appointments. - - - - - /schemas/apps/evolution/calendar/other/default_reminder_interval - /apps/evolution/calendar/other/default_reminder_interval - evolution-calendar - int - 15 - - Default reminder value - Number of units for determining a default reminder. - - - - - /schemas/apps/evolution/calendar/other/default_reminder_units - /apps/evolution/calendar/other/default_reminder_units - evolution-calendar - string - minutes - - Default reminder units - Units for a default reminder, "minutes", "hours" or "days". - - - - - /schemas/apps/evolution/calendar/other/use_ba_reminder - /apps/evolution/calendar/other/use_ba_reminder - evolution-calendar - bool - false - - Birthday and anniversary reminder - - Whether to set a reminder for birthdays and anniversaries. - - - - - - /schemas/apps/evolution/calendar/other/ba_reminder_interval - /apps/evolution/calendar/other/ba_reminder_interval - evolution-calendar - int - 15 - - Birthday and anniversary reminder value - - Number of units for determining a birthday or anniversary reminder. - - - - - - /schemas/apps/evolution/calendar/other/ba_reminder_units - /apps/evolution/calendar/other/ba_reminder_units - evolution-calendar - string - minutes - - Birthday and anniversary reminder units - - Units for a birthday or anniversary reminder, "minutes", "hours" - or "days". - - - - - - /schemas/apps/evolution/calendar/display/show_week_numbers - /apps/evolution/calendar/display/show_week_numbers - evolution-calendar - bool - false - - Show week numbers in Day View, Work Week View, and Date Navigator - Whether to show week numbers in various places in the Calendar. - - - - - /schemas/apps/evolution/calendar/display/month_scroll_by_week - /apps/evolution/calendar/display/month_scroll_by_week - evolution-calendar - bool - true - - Scroll Month View by a week - Whether to scroll a Month View by a week, not by a month. - - - - - - - /schemas/apps/evolution/calendar/notify/last_notification_time - /apps/evolution/calendar/notify/last_notification_time - evolution-calendar - int - -1 - - Last reminder time - Time the last reminder ran, in time_t. - - - - - /schemas/apps/evolution/calendar/notify/calendars - /apps/evolution/calendar/notify/calendars - evolution-calendar - list - string - [] - - Calendars to run reminders for - - - - - /schemas/apps/evolution/calendar/notify/programs - /apps/evolution/calendar/notify/programs - evolution-calendar - list - string - [] - - Reminder programs - Programs that are allowed to be run by reminders. - - - - - /schemas/apps/evolution/calendar/notify/notify_with_tray - /apps/evolution/calendar/notify/notify_with_tray - evolution-calendar - bool - false - - Show display reminders in notification tray - Whether or not to use the notification tray for display reminders. - - - - - /schemas/apps/evolution/calendar/publish/uris - /apps/evolution/calendar/publish/uris - evolution-calendar - list - string - [] - - Free/busy server URLs - List of server URLs for free/busy publishing. - - - - - /schemas/apps/evolution/calendar/publish/template - /apps/evolution/calendar/publish/template - evolution-calendar - string - - - Free/busy template URL - The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain. - - - - - /schemas/apps/evolution/calendar/audio_dir - /apps/evolution/calendar/audio_dir - evolution-calendar - string - - - Save directory for reminder audio - - Directory for saving reminder audio files - - - - - - /schemas/apps/evolution/calendar/display/error_timeout - /apps/evolution/calendar/display/error_timeout - evolution-calendar - int - 60 - - Amount of time in seconds the error should be shown on the status bar. - Amount of time in seconds the error should be shown on the status bar. - - - - - /schemas/apps/evolution/calendar/display/error_level - /apps/evolution/calendar/display/error_level - evolution-calendar - int - 0 - - Level beyond which the message should be logged. - This can have three possible values. 0 for errors. 1 for warnings. - 2 for debug messages. - - - - - diff --git a/modules/calendar/e-cal-shell-settings.c b/modules/calendar/e-cal-shell-settings.c index e160d18810..ade121d9c7 100644 --- a/modules/calendar/e-cal-shell-settings.c +++ b/modules/calendar/e-cal-shell-settings.c @@ -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 ( diff --git a/modules/mail/e-mail-config-format-html.c b/modules/mail/e-mail-config-format-html.c index a764e7d729..4b53d2dc28 100644 --- a/modules/mail/e-mail-config-format-html.c +++ b/modules/mail/e-mail-config-format-html.c @@ -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); diff --git a/modules/mail/e-mail-config-web-view.c b/modules/mail/e-mail-config-web-view.c index 12e75dfbdf..2099511d62 100644 --- a/modules/mail/e-mail-config-web-view.c +++ b/modules/mail/e-mail-config-web-view.c @@ -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"); diff --git a/modules/mail/e-mail-shell-settings.c b/modules/mail/e-mail-shell-settings.c index 8243f79e3a..3b0c6b59c6 100644 --- a/modules/mail/e-mail-shell-settings.c +++ b/modules/mail/e-mail-shell-settings.c @@ -25,8 +25,6 @@ #include "e-mail-shell-settings.h" -#include - #include #include @@ -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", diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c index 647e7892be..58700f26b1 100644 --- a/modules/mail/em-composer-prefs.c +++ b/modules/mail/em-composer-prefs.c @@ -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); diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c index 9262ff8bb0..b2381b2cf2 100644 --- a/modules/mail/em-mailer-prefs.c +++ b/modules/mail/em-mailer-prefs.c @@ -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; - - 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); + /* 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); + } } } - 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) { diff --git a/modules/mail/em-mailer-prefs.h b/modules/mail/em-mailer-prefs.h index d672d2cc9b..4466e166e8 100644 --- a/modules/mail/em-mailer-prefs.h +++ b/modules/mail/em-mailer-prefs.h @@ -24,7 +24,6 @@ #define EM_MAILER_PREFS_H #include -#include #include #include @@ -57,7 +56,6 @@ struct _EMMailerPrefs { GtkVBox parent_object; GtkBuilder *builder; - GConfClient *gconf; GSettings *settings; /* General tab */ diff --git a/modules/mailto-handler/Makefile.am b/modules/mailto-handler/Makefile.am index f4349cf3fb..e33a120a47 100644 --- a/modules/mailto-handler/Makefile.am +++ b/modules/mailto-handler/Makefile.am @@ -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 diff --git a/modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in b/modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in deleted file mode 100644 index cdcaf7892a..0000000000 --- a/modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in +++ /dev/null @@ -1,16 +0,0 @@ - - - - /schemas/apps/evolution/mail/prompts/checkdefault - /apps/evolution/mail/prompts/checkdefault - evolution-mail - bool - true - - Check whether Evolution is the default mailer - Every time Evolution starts, check whether or not it is the default mailer. - - - - - diff --git a/modules/spamassassin/Makefile.am b/modules/spamassassin/Makefile.am index cb8f5778fa..8475660319 100644 --- a/modules/spamassassin/Makefile.am +++ b/modules/spamassassin/Makefile.am @@ -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 diff --git a/modules/spamassassin/evolution-spamassassin.c b/modules/spamassassin/evolution-spamassassin.c index 7f595caf32..275e921398 100644 --- a/modules/spamassassin/evolution-spamassassin.c +++ b/modules/spamassassin/evolution-spamassassin.c @@ -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 ( diff --git a/modules/spamassassin/evolution-spamassassin.schemas.in b/modules/spamassassin/evolution-spamassassin.schemas.in deleted file mode 100644 index b344d1bffd..0000000000 --- a/modules/spamassassin/evolution-spamassassin.schemas.in +++ /dev/null @@ -1,33 +0,0 @@ - - - - - /schemas/apps/evolution/mail/junk/sa/local_only - /apps/evolution/mail/junk/sa/local_only - evolution-spamassassin - bool - true - - Use only local spam tests. - - Use only the local spam tests (no DNS). - - - - - - /schemas/apps/evolution/mail/junk/sa/use_daemon - /apps/evolution/mail/junk/sa/use_daemon - evolution-spamassassin - bool - true - - Use SpamAssassin daemon and client - - Use SpamAssassin daemon and client (spamc/spamd). - - - - - - -- cgit v1.2.3