diff options
| author | Dave Camp <dave@ximian.com> | 2002-03-24 16:49:49 +0000 |
|---|---|---|
| committer | Dave Camp <campd@src.gnome.org> | 2002-03-24 16:49:49 +0000 |
| commit | 161b60aeb90df47f4d88f0b6952b3dbf6a00345c (patch) | |
| tree | 5af16294d5cf901f1da75d1fb96932a24e908191 | |
| parent | fa83d4c7db4cb2902f3c4294b51f33a678e8f3f7 (diff) | |
| download | nautilus-161b60aeb90df47f4d88f0b6952b3dbf6a00345c.tar.gz | |
Remove references to the "Use Emacs-style keyboard shortcuts" preference.
2002-03-24 Dave Camp <dave@ximian.com>
* libnautilus-private/nautilus-entry.c: (nautilus_entry_init):
* libnautilus-private/nautilus-global-preferences.c:
* libnautilus-private/nautilus-global-preferences.h:
* src/nautilus-preferences-dialog.c: Remove references to the
"Use Emacs-style keyboard shortcuts" preference.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-entry.c | 9 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-global-preferences.c | 4 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-global-preferences.h | 3 | ||||
| -rw-r--r-- | src/nautilus-preferences-dialog.c | 9 |
5 files changed, 8 insertions, 25 deletions
@@ -1,3 +1,11 @@ +2002-03-24 Dave Camp <dave@ximian.com> + + * libnautilus-private/nautilus-entry.c: (nautilus_entry_init): + * libnautilus-private/nautilus-global-preferences.c: + * libnautilus-private/nautilus-global-preferences.h: + * src/nautilus-preferences-dialog.c: Remove references to the + "Use Emacs-style keyboard shortcuts" preference. + 2002-03-24 John Fleck <jfleck@inkstain.net> * src/nautilus-shell-ui.xml diff --git a/libnautilus-private/nautilus-entry.c b/libnautilus-private/nautilus-entry.c index 93ecf2235..bb0b5495d 100644 --- a/libnautilus-private/nautilus-entry.c +++ b/libnautilus-private/nautilus-entry.c @@ -58,14 +58,6 @@ static GObjectClass *parent_class = NULL; static GtkEditableClass *parent_editable_interface = NULL; static void -emacs_shortcuts_preference_changed_callback (gpointer callback_data) -{ - NautilusEntry *entry; - - entry = NAUTILUS_ENTRY (callback_data); -} - -static void nautilus_entry_init (NautilusEntry *entry) { GtkWidget *widget; @@ -76,7 +68,6 @@ nautilus_entry_init (NautilusEntry *entry) entry->details->user_edit = TRUE; nautilus_undo_set_up_nautilus_entry_for_undo (entry); - emacs_shortcuts_preference_changed_callback (entry); } GtkWidget * diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c index 9131d1bcb..e5ca05982 100644 --- a/libnautilus-private/nautilus-global-preferences.c +++ b/libnautilus-private/nautilus-global-preferences.c @@ -426,10 +426,6 @@ static const PreferenceDefault preference_defaults[] = { PREFERENCE_BOOLEAN, GINT_TO_POINTER (FALSE) }, - { NAUTILUS_PREFERENCES_USE_EMACS_SHORTCUTS, - PREFERENCE_BOOLEAN, - GINT_TO_POINTER (FALSE) - }, /* FIXME bugzilla.gnome.org 41245: Saved in pixels instead of in %? */ { NAUTILUS_PREFERENCES_SIDEBAR_WIDTH, PREFERENCE_INTEGER, diff --git a/libnautilus-private/nautilus-global-preferences.h b/libnautilus-private/nautilus-global-preferences.h index 37e75fc0b..85957babf 100644 --- a/libnautilus-private/nautilus-global-preferences.h +++ b/libnautilus-private/nautilus-global-preferences.h @@ -36,9 +36,6 @@ G_BEGIN_DECLS /* How wide the sidebar is (or how wide it will be when expanded) */ #define NAUTILUS_PREFERENCES_SIDEBAR_WIDTH "preferences/sidebar_width" -/* Text fields */ -#define NAUTILUS_PREFERENCES_USE_EMACS_SHORTCUTS "preferences/use_emacs_shortcuts" - /* Window options */ #define NAUTILUS_PREFERENCES_WINDOW_ALWAYS_NEW "preferences/window_always_new" diff --git a/src/nautilus-preferences-dialog.c b/src/nautilus-preferences-dialog.c index 4b27df619..b3c2852ed 100644 --- a/src/nautilus-preferences-dialog.c +++ b/src/nautilus-preferences-dialog.c @@ -114,15 +114,6 @@ static EelPreferencesItemDescription windows_and_desktop_items[] = { N_("Include a Delete command that bypasses Trash"), EEL_PREFERENCE_ITEM_BOOLEAN }, - /* FIXME: This group clearly doesn't belong in Windows & - * Desktop, but there's no obviously-better place for it and - * it probably doesn't deserve a pane of its own. - */ - { N_("Keyboard Shortcuts"), - NAUTILUS_PREFERENCES_USE_EMACS_SHORTCUTS, - N_("Use Emacs-style keyboard shortcuts in text fields"), - EEL_PREFERENCE_ITEM_BOOLEAN - }, { NULL } }; |