[nautilus] all: Remove preferences about sound previewing
- From: Vincent Untz <vuntz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] all: Remove preferences about sound previewing
- Date: Tue, 30 Aug 2011 16:18:28 +0000 (UTC)
commit db72d73b3cd58493b1b8878a52ff8a9f5d350602
Author: Vincent Untz <vuntz gnome org>
Date: Tue Aug 30 16:43:58 2011 +0200
all: Remove preferences about sound previewing
The code was removed, so no need to keep the preference.
https://bugzilla.gnome.org/show_bug.cgi?id=657718
libnautilus-private/nautilus-global-preferences.h | 1 -
libnautilus-private/nautilus.convert | 1 -
.../org.gnome.nautilus.gschema.xml.in | 6 --
src/nautilus-file-management-properties.c | 5 -
src/nautilus-file-management-properties.ui | 92 --------------------
5 files changed, 0 insertions(+), 105 deletions(-)
---
diff --git a/libnautilus-private/nautilus-global-preferences.h b/libnautilus-private/nautilus-global-preferences.h
index 8a9af8e..89cd8ed 100644
--- a/libnautilus-private/nautilus-global-preferences.h
+++ b/libnautilus-private/nautilus-global-preferences.h
@@ -158,7 +158,6 @@ typedef enum
#define NAUTILUS_PREFERENCES_SHOW_DIRECTORY_ITEM_COUNTS "show-directory-item-counts"
#define NAUTILUS_PREFERENCES_SHOW_IMAGE_FILE_THUMBNAILS "show-image-thumbnails"
#define NAUTILUS_PREFERENCES_IMAGE_FILE_THUMBNAIL_LIMIT "thumbnail-limit"
-#define NAUTILUS_PREFERENCES_PREVIEW_SOUND "preview-sound"
typedef enum
{
diff --git a/libnautilus-private/nautilus.convert b/libnautilus-private/nautilus.convert
index 5850477..af11103 100644
--- a/libnautilus-private/nautilus.convert
+++ b/libnautilus-private/nautilus.convert
@@ -14,7 +14,6 @@ mouse-forward-button = /apps/nautilus/preferences/mouse_forward_button
mouse-back-button = /apps/nautilus/preferences/mouse_back_button
show-image-thumbnails = /apps/nautilus/preferences/show_image_thumbnails
thumbnail-limit = /apps/nautilus/preferences/thumbnail_limit
-preview-sound = /apps/nautilus/preferences/preview_sound
show-advanced-permissions = /apps/nautilus/preferences/show_advanced_permissions
sort-directories-first = /apps/nautilus/preferences/sort_directories_first
default-sort-order = /apps/nautilus/icon_view/default_sort_order
diff --git a/libnautilus-private/org.gnome.nautilus.gschema.xml.in b/libnautilus-private/org.gnome.nautilus.gschema.xml.in
index 178ba82..592565c 100644
--- a/libnautilus-private/org.gnome.nautilus.gschema.xml.in
+++ b/libnautilus-private/org.gnome.nautilus.gschema.xml.in
@@ -145,12 +145,6 @@
<_summary>Maximum image size for thumbnailing</_summary>
<_description>Images over this size (in bytes) won't be thumbnailed. The purpose of this setting is to avoid thumbnailing large images that may take a long time to load or use lots of memory.</_description>
</key>
- <key name="preview-sound" enum="org.gnome.nautilus.SpeedTradeoff">
- <aliases><alias value='local_only' target='local-only'/></aliases>
- <default>'local-only'</default>
- <_summary>Whether to preview sounds when mousing over an icon</_summary>
- <_description>Speed tradeoff for when to preview a sound file when mousing over a files icon. If set to "always" then always plays the sound, even if the file is on a remote server. If set to "local-only" then only plays previews on local file systems. If set to "never" then it never previews sound.</_description>
- </key>
<key name="show-advanced-permissions" type="b">
<default>false</default>
<_summary>Show advanced permissions in the file property dialog</_summary>
diff --git a/src/nautilus-file-management-properties.c b/src/nautilus-file-management-properties.c
index e7ff1c1..29ee700 100644
--- a/src/nautilus-file-management-properties.c
+++ b/src/nautilus-file-management-properties.c
@@ -49,7 +49,6 @@
#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_DATE_FORMAT_WIDGET "date_format_combobox"
#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_PREVIEW_TEXT_WIDGET "preview_text_combobox"
#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_PREVIEW_IMAGE_WIDGET "preview_image_combobox"
-#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_PREVIEW_SOUND_WIDGET "preview_sound_combobox"
#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_PREVIEW_FOLDER_WIDGET "preview_folder_combobox"
/* bool preferences */
@@ -778,10 +777,6 @@ nautilus_file_management_properties_dialog_setup (GtkBuilder *builder, GtkWindow
NAUTILUS_PREFERENCES_SHOW_IMAGE_FILE_THUMBNAILS,
(const char **) preview_values);
bind_builder_enum (builder, nautilus_preferences,
- NAUTILUS_FILE_MANAGEMENT_PROPERTIES_PREVIEW_SOUND_WIDGET,
- NAUTILUS_PREFERENCES_PREVIEW_SOUND,
- (const char **) preview_values);
- bind_builder_enum (builder, nautilus_preferences,
NAUTILUS_FILE_MANAGEMENT_PROPERTIES_PREVIEW_FOLDER_WIDGET,
NAUTILUS_PREFERENCES_SHOW_DIRECTORY_ITEM_COUNTS,
(const char **) preview_values);
diff --git a/src/nautilus-file-management-properties.ui b/src/nautilus-file-management-properties.ui
index 4ebfdc4..cf327b6 100644
--- a/src/nautilus-file-management-properties.ui
+++ b/src/nautilus-file-management-properties.ui
@@ -1500,98 +1500,6 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="vbox12">
- <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="label20">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Sound Files</b></property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment12">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkBox" id="vbox22">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkBox" id="hbox22">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="preview_label_3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Preview _sound files:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">preview_sound_combobox</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="preview_sound_combobox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="model">model9</property>
- <child>
- <object class="GtkCellRendererText" id="renderer9"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </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="vbox13">
<property name="visible">True</property>
<property name="can_focus">False</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
