diff options
| author | jacob berkman <jacob@ximian.com> | 2002-05-16 23:18:14 +0000 |
|---|---|---|
| committer | Jacob Berkman <jberkman@src.gnome.org> | 2002-05-16 23:18:14 +0000 |
| commit | c05eb45ed0152ac1375342d17979091047f650ed (patch) | |
| tree | c5521ad4e7d8f60f39935103f77960d180a584fc | |
| parent | 3902821faa47be2c0e97c88cab746931ee7ec75e (diff) | |
| download | gnome-control-center-c05eb45ed0152ac1375342d17979091047f650ed.tar.gz | |
add a key to turn off some behaviour
2002-05-16 jacob berkman <jacob@ximian.com>
* schemas/apps_gnome_settings_daemon_default_editor.schemas: add a
key to turn off some behaviour
* capplets/Makefile.am (always_built_SUBDIRS):
* configure.in: re-add default-applications
fixes #78037
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | capplets/Makefile.am | 2 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | schemas/Makefile.am | 3 | ||||
| -rw-r--r-- | schemas/apps_gnome_settings_daemon_default_editor.schemas | 15 |
5 files changed, 29 insertions, 2 deletions
@@ -1,3 +1,13 @@ +2002-05-16 jacob berkman <jacob@ximian.com> + + * schemas/apps_gnome_settings_daemon_default_editor.schemas: add a + key to turn off some behaviour + + * capplets/Makefile.am (always_built_SUBDIRS): + * configure.in: re-add default-applications + + fixes #78037 + 2002-05-14 Seth Nickell <snickell@stanford.edu> * Makefile.am: diff --git a/capplets/Makefile.am b/capplets/Makefile.am index 40db82e45..a01c2711c 100644 --- a/capplets/Makefile.am +++ b/capplets/Makefile.am @@ -1,6 +1,6 @@ always_built_SUBDIRS = \ common accessibility \ - desktop-links font \ + default-applications desktop-links font \ background keyboard mouse sound \ file-types theme-switcher ui-properties \ keybindings network diff --git a/configure.in b/configure.in index f77465275..d4ed6712e 100644 --- a/configure.in +++ b/configure.in @@ -197,6 +197,7 @@ libwindow-settings/Makefile capplets/Makefile capplets/common/Makefile capplets/background/Makefile +capplets/default-applications/Makefile capplets/desktop-links/Makefile capplets/file-types/Makefile capplets/file-types/libuuid/Makefile diff --git a/schemas/Makefile.am b/schemas/Makefile.am index 1f9a017b7..4cf8b8b0d 100644 --- a/schemas/Makefile.am +++ b/schemas/Makefile.am @@ -1,6 +1,7 @@ schemadir = @GCONF_SCHEMA_FILE_DIR@ schema_DATA = \ - apps_gnome_settings_daemon_screensaver.schemas + apps_gnome_settings_daemon_screensaver.schemas \ + apps_gnome_settings_daemon_default_editor.schemas schema_source_data = $(foreach file, $(schema_DATA), $(srcdir)/$(file)) diff --git a/schemas/apps_gnome_settings_daemon_default_editor.schemas b/schemas/apps_gnome_settings_daemon_default_editor.schemas new file mode 100644 index 000000000..80dd3301e --- /dev/null +++ b/schemas/apps_gnome_settings_daemon_default_editor.schemas @@ -0,0 +1,15 @@ +<?xml version="1.0"?> +<gconfschemafile> + <schemalist> + <schema> + <applyto>/apps/gnome_settings_daemon/editor/sync_text_types</applyto> + <key>/schemas/apps/gnome_settings_daemon/editor/sync_text_types</key> + <type>bool</type> + <default>true</default> + <locale name="C"> + <short>Sync text/plain and text/* handlers</short> + <long>If true, the mime handlers for text/plain and text/* will be kept in sync</long> + </locale> + </schema> + </schemalist> +</gconfschemafile> |