GNOME.org
 

[Nautilus-list] some patches

Hi,

I noticed we have some patches in the specfile not in our branch (for
no good reason). Anyhow, may as well go ahead and submit these patches
for review.

Here is what they do:

 - change the default bookmarks. Some of this is adding Red Hat
   links. I'm not sure what the other changes are; ask jrb.

 - change throbber to point to GNOME help, not Eazel

 - remove the "searching for trash" dialog. search for trash is no
   longer expensive. the dialog was sort of confusing anyhow.

 - remove the "you are running as root" dialog. the main problem is
   that this appeared for every single Nautilus window you opened. 
   kind of annoying. Also, we only had this for gmc since we didn't 
   really trust gmc to avoid e.g. deleting your filesystem. 
   I guess we are trusting Nautilus. ;-) so there should be no 
   need to warn about it.

I'm not listing two patches, one is the background hack that involves
gnome-libs changes, Owen already posted that IIRC, the other changes
the default for the theme preference from "default" to "redhat" theme,
which I assume is not an appropriate change for upstream. ;-)

Havoc


--- nautilus-1.0.4-snapshot/data/static_bookmarks.xml.bookmarks	Sun Jul  8 01:45:22 2001
+++ nautilus-1.0.4-snapshot/data/static_bookmarks.xml	Tue Jul 24 15:56:28 2001
@@ -1,56 +1,32 @@
 <?xml version="1.0"?>
 <bookmarks>
-  <folder _name="Software">
-        <bookmark _name="Allaire" icon_name="i-web" uri="http://ad.doubleclick.net/clk%3b2508286%3b5488574%3bx?http://allaire11.allaire.com/download/ordercd.cfm"/>		
-        <bookmark _name="Borland" icon_name="i-web" uri="http://www.borland.com/kylix/"/>
-        <bookmark _name="Eazel" icon_name="i-web" uri="http://www.eazel.com"/>
-        <bookmark _name="MandrakeSoft" icon_name="i-web" uri="http://mandrakesoft.com/"/>
-        <bookmark _name="Netraverse" icon_name="i-web" uri="http://www.netraverse.com"/>
-        <bookmark _name="Red Hat" icon_name="i-web" uri="http://www.redhat.com"/>
-        <bookmark _name="Sun StarOffice" icon_name="i-web" uri="http://www.sun.com/products/staroffice/"/>
-        <bookmark _name="Zero-Knowledge" icon_name="i-web" uri="http://www.zeroknowledge.com"/>
-  </folder>
-  <folder _name="Hardware">
-        <bookmark _name="Compaq" icon_name="i-web" uri="http://www.compaq.com/products/software/linux/"/>
-        <bookmark _name="CNET Computers.com" icon_name="i-web" uri="http://chkpt.zdnet.com/chkpt/hudc02290/computers.cnet.com/hardware/0-1016.html"/>
-        <bookmark _name="Dell" icon_name="i-web" uri="http://www.dell.com/linux/"/>
-        <bookmark _name="Penguin Computing" icon_name="i-web" uri="http://www.penguincomputing.com/?vid=eazel"/>
-        <bookmark _name="ZDNet Linux Hardware Database" icon_name="i-web" uri="http://chkpt.zdnet.com/chkpt/hud002290/lhd.zdnet.com"/>
+  <folder _name="Red Hat, Inc.">
+        <bookmark _name="Red Hat, Inc." uri="http://www.redhat.com/"/>
+        <bookmark _name="Red Hat Network" uri="http://www.redhat.com/network/"/>
+	<bookmark _name="Red Hat Support" uri="http://www.redhat.com/apps/support/"/>
+	<bookmark _name="Red Hat Training" uri="http://www.redhat.com/training/"/>
+	<bookmark _name="Red Hat Products" uri="http://www.redhat.com/products/"/>
+	<bookmark _name="Red Hat Developer Network" uri="http://www.redhat.com/devnet/"/>
   </folder>
   <folder _name="News and Media">
-         <bookmark _name="Binary Freedom" icon_name="i-web" uri="http://www.binaryfreedom.com/"/>
-         <bookmark _name="CNET Linux Center" icon_name="i-web" uri="http://chkpt.zdnet.com/chkpt/hudc02290/linux.cnet.com/linux/0-1518529-7-3378110.html"/>
-         <bookmark _name="LinuxOrbit.com" icon_name="i-web" uri="http://www.linuxorbit.com"/>
-         <bookmark _name="Linux Weekly News" icon_name="i-web" uri="http://www.lwn.net"/>
-         <bookmark _name="O'Reilly" icon_name="i-web" uri="http://www.eazel.oreillynet.com"/>
-         <bookmark _name="OSDN" icon_name="i-web" uri="http://www.osdn.com"/>
-         <bookmark _name="ZDNet Linux Resource Center" icon_name="i-web" uri="http://chkpt.zdnet.com/chkpt/hud0022900/linux.zdnet.com"/>
-  </folder>
-  <folder _name="Web Services">
-         <bookmark _name="CollabNet" icon_name="i-web" uri="http://www.collab.net/community/"/>
-         <bookmark _name="Covalent" icon_name="i-web" uri="http://www.covalent.com"/>
-         <bookmark _name="Rackspace" icon_name="i-web" uri="http://www.rackspace.com"/>
-         <bookmark _name="Red Hat Network" icon_name="i-web" uri="http://www.redhat.com/network/"/>
-         <bookmark _name="SourceForge" icon_name="i-web" uri="http://www.sourceforge.net"/>
-  </folder>
-  <folder _name="International">
-         <bookmark _name="Conectiva" icon_name="i-web" uri="http://en.conectiva.com/"/>
-         <bookmark _name="Linux One" icon_name="i-web" uri="http://www.linuxone.co.kr/english2/eng/main.htm"/>
-         <bookmark _name="Open Source Asia" icon_name="i-web" uri="http://www.opensourceasia.com"/>
-         <bookmark _name="RedFlag Linux" icon_name="i-web" uri="http://www.redflag-linux.com/english/index.html"/>
-         <bookmark _name="Sun Wah Linux" icon_name="i-web" uri="http://www.sw-linux.com/nonflash_front.htm"/>
-  </folder>
-  <folder _name="Linux Resources">
-         <bookmark _name="Debian.org" icon_name="i-web" uri="http://www.debian.org"/>
-         <bookmark _name="Freshmeat.net" icon_name="i-web" uri="http://www.freshmeat.net"/>
-         <bookmark _name="GNOME.org" icon_name="i-web" uri="http://www.gnome.org"/>
-         <bookmark _name="GNU.org" icon_name="i-web" uri="http://www.gnu.org"/>
-         <bookmark _name="Linux Online" icon_name="i-web" uri="http://www.linux.org"/>
-         <bookmark _name="Linux Documentation Project" icon_name="i-web" uri="http://www.linuxdoc.org"/>
-         <bookmark _name="LinuxNewbie.org" icon_name="i-web" uri="http://www.linuxnewbie.org"/>
-         <bookmark _name="OpenOffice" icon_name="i-web" uri="http://www.openoffice.org"/>
+        <bookmark _name="LinuxOrbit.com" uri="http://www.linuxorbit.com"/>
+        <bookmark _name="Linux Today" uri="http://www.linuxtoday.com"/>
+        <bookmark _name="Linux Weekly News" uri="http://www.lwn.net"/>
+        <bookmark _name="O'Reilly" uri="http://www.oreillynet.com"/>
+        <bookmark _name="OSDN" uri="http://www.osdn.com"/>
+        <bookmark _name="Slashdot.org" uri="http://slashdot.org"/>
+        <bookmark _name="ZDNet Linux Resource Center" uri="http://chkpt.zdnet.com/chkpt/hud0022900/linux.zdnet.com"/>
+  </folder>
+  <folder _name="Free Software Resources">
+        <bookmark _name="Debian" uri="http://www.debian.org"/>
+        <bookmark _name="freedesktop.org" uri="http://www.freedesktop.org"/>
+        <bookmark _name="Freshmeat" uri="http://www.freshmeat.net"/>
+        <bookmark _name="GNOME" uri="http://www.gnome.org"/>
+        <bookmark _name="GNU Project" uri="http://www.gnu.org"/>
+        <bookmark _name="KDE" uri="http://www.kde.org"/>
+        <bookmark _name="Linux Online" uri="http://www.linux.org"/>
+        <bookmark _name="Linux Documentation Project" uri="http://www.linuxdoc.org"/>
+        <bookmark _name="Mozilla" uri="http://www.mozilla.org"/>
+        <bookmark _name="OpenOffice" uri="http://www.openoffice.org"/>
   </folder>
 </bookmarks>
-
-
-

--- nautilus-1.0.3/icons/crux_eggplant/crux_eggplant.xml.new_theme	Fri Mar  2 02:23:25 2001
+++ nautilus-1.0.3/icons/crux_eggplant/crux_eggplant.xml	Thu May 10 12:06:53 2001
@@ -16,6 +16,6 @@
 
   <desktop background_tile_image="./backgrounds/background_pattern.png"/>
   <zoom_control number_v_offset="-6" number_h_offset="0" digit_width="6"/>
-  <throbber frame_count="30" url="http://www.eazel.com"/>
+  <throbber frame_count="30" url="file:/usr/share/doc/HTML/index.html"/>
   <icon-images default_theme="arlo"/>
 </theme>
--- nautilus-1.0.3/icons/crux_teal/crux_teal.xml.new_theme	Mon Apr 30 22:42:05 2001
+++ nautilus-1.0.3/icons/crux_teal/crux_teal.xml	Thu May 10 12:06:53 2001
@@ -14,5 +14,5 @@
            
   <desktop background_tile_image="./backgrounds/background_pattern.png" />
   <zoom_control number_v_offset="-6" number_h_offset="0" digit_width="6"/>
-  <throbber frame_count="30" url="http://www.eazel.com"/>
+  <throbber frame_count="30" url="file:/usr/share/doc/HTML/index.html"/>
 </theme>
--- nautilus-1.0.3/icons/default.xml.new_theme	Wed Feb 28 01:08:56 2001
+++ nautilus-1.0.3/icons/default.xml	Thu May 10 12:06:53 2001
@@ -20,10 +20,10 @@
  <icon highlight_background_color="rgb:0000/0000/0000"
        highlight_text_color="rgb:FFFF/FFFF/FFFF"
        text_fill_color="rgb:FFFF/FFFF/FFFF"/>
-  
+ 
  <thumbnails frame_offsets="3,3,6,6"/>
-  
- <throbber frame_count="30" url="http://www.eazel.com"; delay="75"/>
+ 
+ <throbber frame_count="30" url="file:/usr/share/doc/HTML/index.html" delay="75"/>
   
  <zoom_control number_v_offset="-6" number_h_offset="-2" digit_width="6"/>
  
--- nautilus-1.0.3/eazel-logos/default.xml.new_theme	Thu May 10 12:55:16 2001
+++ nautilus-1.0.3/eazel-logos/default.xml	Thu May 10 12:52:18 2001
@@ -23,7 +23,7 @@
   
  <thumbnails frame_offsets="3,3,6,6"/>
   
- <throbber frame_count="15" url="http://www.eazel.com"; delay="75"/>
+ <throbber frame_count="15" url="file:/usr/share/doc/HTML/index.html" delay="75"/>
   
  <zoom_control number_v_offset="-6" number_h_offset="-2" digit_width="6"/>
  

--- nautilus-1.0.3/libnautilus-private/nautilus-trash-directory.c.no-dialog	Thu May 10 14:45:43 2001
+++ nautilus-1.0.3/libnautilus-private/nautilus-trash-directory.c	Thu May 10 14:46:23 2001
@@ -60,35 +60,6 @@
 				   nautilus_trash_directory,
 				   NAUTILUS_TYPE_MERGED_DIRECTORY)
 
-#define TRASH_SEARCH_TIMED_WAIT_DELAY 20000
-
-static int pending_find_directory_count = 0;
-
-static void
-find_directory_start (void)
-{
-	if (pending_find_directory_count == 0) {
-		eel_timed_wait_start_with_duration (TRASH_SEARCH_TIMED_WAIT_DELAY,
-							 NULL,
-							 add_volume,
-							 _("Searching Disks"),
-							 _("Nautilus is searching your disks for trash folders."),
-							  NULL);
-	}
-
-	++pending_find_directory_count;
-}
-
-static void
-find_directory_end (void)
-{
-	--pending_find_directory_count;
-
-	if (pending_find_directory_count == 0) {
-		eel_timed_wait_stop (NULL, add_volume);
-	}
-}
-
 static void
 find_directory_callback (GnomeVFSAsyncHandle *handle,
 			 GList *results,
@@ -107,8 +78,6 @@
 	g_assert (trash_volume->real_directory == NULL);
 	g_assert (trash_volume->handle == handle);
 
-	find_directory_end ();
-	
 	/* We are done with the async. I/O. */
 	trash_volume->handle = NULL;
 
@@ -184,7 +153,6 @@
 	vfs_uri_as_list.prev = NULL;
 
 	/* Search for Trash directories but don't create new ones. */
-	find_directory_start ();
 	gnome_vfs_async_find_directory
 		(&trash_volume->handle, &vfs_uri_as_list, 
 		 GNOME_VFS_DIRECTORY_KIND_TRASH, FALSE, TRUE, 0777,
@@ -239,7 +207,6 @@
 	
 	if (trash_volume->handle != NULL) {
 		gnome_vfs_async_cancel (trash_volume->handle);
-		find_directory_end ();
 	}
 	if (trash_volume->real_directory != NULL) {
 		nautilus_merged_directory_remove_real_directory

Index: src/nautilus-application.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-application.c,v
retrieving revision 1.155.2.1
diff -u -p -r1.155.2.1 nautilus-application.c
--- src/nautilus-application.c	2001/07/18 16:38:17	1.155.2.1
+++ src/nautilus-application.c	2001/07/30 18:34:55
@@ -469,12 +469,14 @@ nautilus_application_startup (NautilusAp
 
 	num_failures = 0;
 
+#if 0
 	/* Perform check for nautilus being run as super user */
 	if (!(kill_shell || restart_shell)) {
 		if (!confirm_ok_to_run_as_root ()) {
 			return;
 		}
 	}
+#endif
 
 	/* Check the user's ~/.nautilus directories and post warnings
 	 * if there are problems.
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]