Bug#261031: nautilus: Please backport always_use_browser
preference option from 2.7.2 for Sarge
Michael Banck
Michael Banck <mbanck@debian.org>, 261031@bugs.debian.org
Fri, 23 Jul 2004 12:40:51 +0200
--VS++wcV0S1rZb1Fb
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Package: nautilus
Version: 2.6.3b-1
Severity: wishlist
Tags: patch
In nautilus-2.7.2, a preference option to always use the browser
(instead of spatial mode) has been added. It would be nice if we could
have this for Sarge, as a lot of users seem to have requested it and
upstream acknowledged it.
I've extracted the changeset from CVS and attached it. However, I did
not test the patch yet. I guess I could do that if you require so.
cheers,
Michael
-- System Information:
Debian Release: testing/unstable
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.7-1-686
Locale: LANG=POSIX, LC_CTYPE=de_DE.ISO-8859-15@euro
Versions of packages nautilus depends on:
ii capplets 1:2.6.1-9 configuration applets for GNOME 2
ii libart-2.0-2 2.3.16-5 Library of functions for 2D graphi
ii libatk1.0-0 1.6.1-2 The ATK accessibility toolkit
ii libaudiofile0 0.2.6-4 Open-source version of SGI's audio
ii libbonobo2-0 2.6.2-4 Bonobo CORBA interfaces library
ii libbonoboui2-0 2.6.1-1 The Bonobo UI library
ii libc6 2.3.2.ds1-13 GNU C Library: Shared libraries an
ii libeel2-2 2.6.2-1 Eazel Extensions Library (for GNOM
ii libesd0 0.2.29-1 Enlightened Sound Daemon - Shared
ii libexif10 0.6.9-1 The EXIF library allows you to par
ii libgail-common 1.4.1-1 GNOME Accessibility Implementation
ii libgail17 1.4.1-1 GNOME Accessibility Implementation
ii libgconf2-4 2.6.2-1 GNOME configuration database syste
ii libglade2-0 1:2.4.0-1 Library to load .glade files at ru
ii libglib2.0-0 2.4.2-1 The GLib library of C routines
ii libgnome-desktop-2 2.6.1-2 Utility library for loading .deskt
ii libgnome2-0 2.6.1-8 The GNOME 2 library - runtime file
ii libgnomecanvas2-0 2.6.1.1-2 A powerful object-oriented display
ii libgnomeui-0 2.6.1.1-3 The GNOME 2 libraries (User Interf
ii libgnomevfs2-0 2.6.1.1-4 The GNOME virtual file-system libr
ii libgtk2.0-0 2.4.3-3 The GTK+ graphical user interface
ii libice6 4.3.0.dfsg.1-6 Inter-Client Exchange library
ii libjpeg62 6b-9 The Independent JPEG Group's JPEG
ii libnautilus2-2 2.6.3b-1 libraries for nautilus components
ii liborbit2 1:2.10.2-1.1 libraries for ORBit2 - a CORBA ORB
ii libpango1.0-0 1.4.0-4 Layout and rendering of internatio
ii libpopt0 1.7-4 lib for parsing cmdline parameters
ii librsvg2-2 2.7.2-2 SAX-based renderer library for SVG
ii libsm6 4.3.0.dfsg.1-6 X Window System Session Management
ii libstartup-notification0 0.6-2 library for program launch feedbac
ii libx11-6 4.3.0.dfsg.1-6 X Window System protocol client li
ii libxml2 2.6.11-1 GNOME XML library
ii nautilus-data 2.6.3b-1 data files for nautilus
ii shared-mime-info 0.14-1.1 FreeDesktop.org shared MIME databa
ii xlibs 4.3.0.dfsg.1-6 X Window System client libraries m
ii zlib1g 1:1.2.1.1-3 compression library - runtime
-- no debconf information
--VS++wcV0S1rZb1Fb
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=diff
2004-06-01 Dave Camp <dave@novell.com>
* src/nautilus-file-management-properties.c:
(nautilus_file_management_properties_dialog_setup):
* src/nautilus-file-management-properties.glade: Add an
"always open in browser windows" option to the prefs dialog.
Please stop yelling at me.
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-file-management-properties.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- nautilus/src/nautilus-file-management-properties.c 2004/04/28 06:12:18 1.14
+++ nautilus/src/nautilus-file-management-properties.c 2004/06/01 19:54:26 1.15
@@ -64,6 +64,7 @@
#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_FOLDERS_FIRST_WIDGET "sort_folders_first_checkbutton"
#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_COMPACT_LAYOUT_WIDGET "compact_layout_checkbutton"
#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_LABELS_BESIDE_ICONS_WIDGET "labels_beside_icons_checkbutton"
+#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ALWAYS_USE_BROWSER_WIDGET "always_use_browser_checkbutton"
#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_TRASH_CONFIRM_WIDGET "trash_confirm_checkbutton"
#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_TRASH_DELETE_WIDGET "trash_delete_checkbutton"
#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_OPEN_NEW_WINDOW_WIDGET "new_window_checkbutton"
@@ -536,6 +537,9 @@
NAUTILUS_FILE_MANAGEMENT_PROPERTIES_FOLDERS_FIRST_WIDGET,
NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST);
eel_preferences_glade_connect_bool (xml_dialog,
+ NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ALWAYS_USE_BROWSER_WIDGET,
+ NAUTILUS_PREFERENCES_ALWAYS_USE_BROWSER);
+ eel_preferences_glade_connect_bool (xml_dialog,
NAUTILUS_FILE_MANAGEMENT_PROPERTIES_TRASH_CONFIRM_WIDGET,
NAUTILUS_PREFERENCES_CONFIRM_TRASH);
eel_preferences_glade_connect_bool (xml_dialog,
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-file-management-properties.glade,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nautilus/src/nautilus-file-management-properties.glade 2004/05/13 20:45:11 1.11
+++ nautilus/src/nautilus-file-management-properties.glade 2004/06/01 19:54:26 1.12
@@ -12,6 +12,11 @@
<property name="modal">False</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
@@ -33,6 +38,7 @@
<property name="label">gtk-help</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="response_id">-11</property>
</widget>
</child>
@@ -45,6 +51,7 @@
<property name="label">gtk-close</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="response_id">-7</property>
</widget>
</child>
@@ -304,6 +311,7 @@
<property name="label" translatable="yes">Sort _folders before files</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -322,6 +330,7 @@
<property name="label" translatable="yes">Show hidden and _backup files</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -530,6 +539,7 @@
<property name="label" translatable="yes">_Use compact layout</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -548,6 +558,7 @@
<property name="label" translatable="yes">_Text beside icons</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -837,6 +848,7 @@
<property name="label" translatable="yes">Show _only folders</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -968,6 +980,7 @@
<property name="label" translatable="yes">_Single click to activate items</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -986,6 +999,7 @@
<property name="label" translatable="yes">_Double click to activate items</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -997,6 +1011,25 @@
<property name="fill">False</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkCheckButton" id="always_use_browser_checkbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Always open in _browser windows</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -1086,6 +1119,7 @@
<property name="label" translatable="yes">_Run executable text files when they are clicked</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -1104,6 +1138,7 @@
<property name="label" translatable="yes">_View executable text files when they are clicked</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -1123,6 +1158,7 @@
<property name="label" translatable="yes">_Ask each time</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -1223,6 +1259,7 @@
<property name="label" translatable="yes">Ask before _emptying the Trash or deleting files</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -1241,6 +1278,7 @@
<property name="label" translatable="yes">I_nclude a Delete command that bypasses Trash</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
--VS++wcV0S1rZb1Fb--