diff options
| -rw-r--r-- | data/org.gnome.nautilus.gschema.xml | 5 | ||||
| -rw-r--r-- | src/nautilus-global-preferences.h | 9 | ||||
| -rw-r--r-- | src/nautilus-mime-actions.c | 21 | ||||
| -rw-r--r-- | src/nautilus-preferences-window.c | 16 | ||||
| -rw-r--r-- | src/resources/ui/nautilus-preferences-window.ui | 76 |
5 files changed, 2 insertions, 125 deletions
diff --git a/data/org.gnome.nautilus.gschema.xml b/data/org.gnome.nautilus.gschema.xml index 2dbc0c2ff..56e1e1558 100644 --- a/data/org.gnome.nautilus.gschema.xml +++ b/data/org.gnome.nautilus.gschema.xml @@ -125,11 +125,6 @@ <summary>Type of click used to launch/open files</summary> <description>Possible values are “single” to launch files on a single click, or “double” to launch them on a double click.</description> </key> - <key name="executable-text-activation" enum="org.gnome.nautilus.ActivationChoice"> - <default>'display'</default> - <summary>What to do with executable text files when activated</summary> - <description>What to do with executable text files when they are activated (single or double clicked). Possible values are “launch” to launch them as programs, and “display” to display them as text files.</description> - </key> <key type="b" name="install-mime-activation"> <default>true</default> <summary>Show the package installer for unknown MIME types</summary> diff --git a/src/nautilus-global-preferences.h b/src/nautilus-global-preferences.h index 952bd7ba4..052eef7f7 100644 --- a/src/nautilus-global-preferences.h +++ b/src/nautilus-global-preferences.h @@ -51,9 +51,6 @@ typedef enum /* Drag and drop preferences */ #define NAUTILUS_PREFERENCES_OPEN_FOLDER_ON_DND_HOVER "open-folder-on-dnd-hover" -/* Activating executable text files */ -#define NAUTILUS_PREFERENCES_EXECUTABLE_TEXT_ACTIVATION "executable-text-activation" - /* Installing new packages when unknown mime type activated */ #define NAUTILUS_PREFERENCES_INSTALL_MIME_ACTIVATION "install-mime-activation" @@ -110,12 +107,6 @@ enum NAUTILUS_CLICK_POLICY_DOUBLE }; -enum -{ - NAUTILUS_EXECUTABLE_TEXT_LAUNCH, - NAUTILUS_EXECUTABLE_TEXT_DISPLAY, -}; - typedef enum { NAUTILUS_SPEED_TRADEOFF_ALWAYS, diff --git a/src/nautilus-mime-actions.c b/src/nautilus-mime-actions.c index bd9068db0..3df76df09 100644 --- a/src/nautilus-mime-actions.c +++ b/src/nautilus-mime-actions.c @@ -594,26 +594,7 @@ out: static ActivationAction get_default_executable_text_file_action (void) { - int preferences_value; - - preferences_value = g_settings_get_enum (nautilus_preferences, - NAUTILUS_PREFERENCES_EXECUTABLE_TEXT_ACTIVATION); - switch (preferences_value) - { - case NAUTILUS_EXECUTABLE_TEXT_LAUNCH: - { - return ACTIVATION_ACTION_LAUNCH; - } - - case NAUTILUS_EXECUTABLE_TEXT_DISPLAY: - { - return ACTIVATION_ACTION_OPEN_IN_APPLICATION; - } - - default: - return ACTIVATION_ACTION_OPEN_IN_APPLICATION; - } - + return ACTIVATION_ACTION_OPEN_IN_APPLICATION; } static ActivationAction diff --git a/src/nautilus-preferences-window.c b/src/nautilus-preferences-window.c index 58504823d..ad52289ed 100644 --- a/src/nautilus-preferences-window.c +++ b/src/nautilus-preferences-window.c @@ -81,18 +81,6 @@ static const char * const click_behavior_components[] = static const char * const click_behavior_values[] = {"single", "double", NULL}; -static const char * const executable_text_components[] = -{ - "scripts_execute_radiobutton", "scripts_view_radiobutton", - NULL -}; - -static const char * const executable_text_values[] = -{ - "launch", "display", - NULL -}; - static const char * const recursive_search_components[] = { "search_recursive_only_this_computer_radiobutton", "search_recursive_all_locations_radiobutton", "search_recursive_never_radiobutton", NULL @@ -482,10 +470,6 @@ static void nautilus_preferences_window_setup(GtkBuilder *builder, builder, nautilus_preferences, (const char **) click_behavior_components, NAUTILUS_PREFERENCES_CLICK_POLICY, (const char **) click_behavior_values); bind_builder_radio (builder, nautilus_preferences, - (const char **) executable_text_components, - NAUTILUS_PREFERENCES_EXECUTABLE_TEXT_ACTIVATION, - (const char **) executable_text_values); - bind_builder_radio (builder, nautilus_preferences, (const char **) recursive_search_components, NAUTILUS_PREFERENCES_RECURSIVE_SEARCH, (const char **) speed_tradeoff_values); diff --git a/src/resources/ui/nautilus-preferences-window.ui b/src/resources/ui/nautilus-preferences-window.ui index 754ee508a..2b23fd82c 100644 --- a/src/resources/ui/nautilus-preferences-window.ui +++ b/src/resources/ui/nautilus-preferences-window.ui @@ -593,80 +593,6 @@ </packing> </child> <child> - <object class="GtkBox" id="vbox7"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label_executable_text_files"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Executable Text Files</property> - <property name="xalign">0</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - <accessibility> - <relation type="label-for" target="vbox7"/> - </accessibility> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="scripts_view_radiobutton"> - <property name="label" translatable="yes">_Display them</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">start</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - <property name="group">scripts_execute_radiobutton</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="scripts_execute_radiobutton"> - <property name="label" translatable="yes">_Run them</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">start</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - <property name="group">scripts_view_radiobutton</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> - </packing> - </child> - <accessibility> - <relation type="labelled-by" target="label_executable_text_files"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="vbox7-atkobject"> - <property name="AtkObject::accessible-role">panel</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> <object class="GtkBox" id="vbox8"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -735,7 +661,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> </object> |