Fixed bug 4355: Built-in bookmarks icons change after first view

	Also reduced the number of times that refresh_bookmarks_menu
	is called since it was showing up in some profiling.

	* libnautilus-extensions/nautilus-bookmark.h:
	* libnautilus-extensions/nautilus-bookmark.c:
	(nautilus_bookmark_initialize_class), (nautilus_bookmark_set_name),
	(bookmark_file_changed_callback): Split the "changed" signal into
	"appearance_changed" and "content_changed". "appearance_changed" is
	emitted only if the name or icon change. "content_changed" is emitted
	if the URI changes.

	* src/nautilus-bookmark-list.c: (insert_bookmark_internal):
	Connect to both appearance_changed and content_changed.

	* src/nautilus-window-menus.c: (bookmark_holder_new):
	Refresh menu only on appearance_changed, not content_changed.

	* data/static_bookmarks.xml: Added "i-web" as icon name for
	all the built-in bookmarks, since this is the icon they will
	end up with after being visited. (Now, visiting a built-in
	bookmark will not cause a refresh of the bookmarks menu.)

1 files changed, 38 insertions, 38 deletions

diff --git a/data/static_bookmarks.xml b/data/static_bookmarks.xml
index a0580ac60..b23131046 100644
--- a/data/static_bookmarks.xml
+++ b/data/static_bookmarks.xml
@@ -1,54 +1,54 @@
 <?xml version="1.0"?>
 <bookmarks>
   <folder _name="Software">
-        <bookmark _name="Allaire" uri="http://services.eazel.com/redirect?http://ad.doubleclick.net/clk%3b2508286%3b5488574%3bx?http://allaire11.allaire.com/download/ordercd.cfm"/>		
-        <bookmark _name="Borland" uri="http://services.eazel.com/redirect?http://www.borland.com/kylix/"/>
-        <bookmark _name="Eazel" uri="http://services.eazel.com/redirect?http://www.eazel.com"/>
-        <bookmark _name="MandrakeSoft" uri="http://services.eazel.com/redirect?http://mandrakesoft.com/"/>
-        <bookmark _name="Netraverse" uri="http://services.eazel.com/redirect?http://www.netraverse.com"/>
-        <bookmark _name="Red Hat" uri="http://services.eazel.com/redirect?http://www.redhat.com"/>
-        <bookmark _name="Sun StarOffice" uri="http://services.eazel.com/redirect?http://www.sun.com/products/staroffice/"/>
-        <bookmark _name="Zero-Knowledge" uri="http://services.eazel.com/redirect?http://www.zeroknowledge.com"/>
+        <bookmark _name="Allaire" icon_name="i-web" uri="http://services.eazel.com/redirect?http://ad.doubleclick.net/clk%3b2508286%3b5488574%3bx?http://allaire11.allaire.com/download/ordercd.cfm"/>		
+        <bookmark _name="Borland" icon_name="i-web" uri="http://services.eazel.com/redirect?http://www.borland.com/kylix/"/>
+        <bookmark _name="Eazel" icon_name="i-web" uri="http://services.eazel.com/redirect?http://www.eazel.com"/>
+        <bookmark _name="MandrakeSoft" icon_name="i-web" uri="http://services.eazel.com/redirect?http://mandrakesoft.com/"/>
+        <bookmark _name="Netraverse" icon_name="i-web" uri="http://services.eazel.com/redirect?http://www.netraverse.com"/>
+        <bookmark _name="Red Hat" icon_name="i-web" uri="http://services.eazel.com/redirect?http://www.redhat.com"/>
+        <bookmark _name="Sun StarOffice" icon_name="i-web" uri="http://services.eazel.com/redirect?http://www.sun.com/products/staroffice/"/>
+        <bookmark _name="Zero-Knowledge" icon_name="i-web" uri="http://services.eazel.com/redirect?http://www.zeroknowledge.com"/>
   </folder>
   <folder _name="Hardware">
-        <bookmark _name="Compaq" uri="http://services.eazel.com/redirect?http://www.compaq.com/products/software/linux/"/>
-        <bookmark _name="CNET Computers.com" uri="http://services.eazel.com/redirect?http://chkpt.zdnet.com/chkpt/hudc02290/computers.cnet.com/hardware/0-1016.html"/>
-        <bookmark _name="Dell" uri="http://services.eazel.com/redirect?http://www.dell.com/linux/"/>
-        <bookmark _name="Penguin Computing" uri="http://services.eazel.com/redirect?http://www.penguincomputing.com/?vid=eazel"/>
-        <bookmark _name="ZDNet Linux Hardware Database" uri="http://services.eazel.com/redirect?http://chkpt.zdnet.com/chkpt/hud002290/lhd.zdnet.com"/>
+        <bookmark _name="Compaq" icon_name="i-web" uri="http://services.eazel.com/redirect?http://www.compaq.com/products/software/linux/"/>
+        <bookmark _name="CNET Computers.com" icon_name="i-web" uri="http://services.eazel.com/redirect?http://chkpt.zdnet.com/chkpt/hudc02290/computers.cnet.com/hardware/0-1016.html"/>
+        <bookmark _name="Dell" icon_name="i-web" uri="http://services.eazel.com/redirect?http://www.dell.com/linux/"/>
+        <bookmark _name="Penguin Computing" icon_name="i-web" uri="http://services.eazel.com/redirect?http://www.penguincomputing.com/?vid=eazel"/>
+        <bookmark _name="ZDNet Linux Hardware Database" icon_name="i-web" uri="http://services.eazel.com/redirect?http://chkpt.zdnet.com/chkpt/hud002290/lhd.zdnet.com"/>
   </folder>
   <folder _name="News and Media">
-         <bookmark _name="Binary Freedom" uri="http://services.eazel.com/redirect?http://www.binaryfreedom.com/"/>
-         <bookmark _name="CNET Linux Center" uri="http://services.eazel.com/redirect?http://chkpt.zdnet.com/chkpt/hudc02290/linux.cnet.com/linux/0-1518529-7-3378110.html"/>
-         <bookmark _name="LinuxOrbit.com" uri="http://services.eazel.com/redirect?http://www.linuxorbit.com"/>
-         <bookmark _name="Linux Weekly News" uri="http://services.eazel.com/redirect?http://www.lwn.net"/>
-         <bookmark _name="O'Reilly" uri="http://services.eazel.com/redirect?http://www.eazel.oreillynet.com"/>
-         <bookmark _name="OSDN" uri="http://services.eazel.com/redirect?http://www.osdn.com"/>
-         <bookmark _name="ZDNet Linux Resource Center" uri="http://services.eazel.com/redirect?http://chkpt.zdnet.com/chkpt/hud0022900/linux.zdnet.com"/>
+         <bookmark _name="Binary Freedom" icon_name="i-web" uri="http://services.eazel.com/redirect?http://www.binaryfreedom.com/"/>
+         <bookmark _name="CNET Linux Center" icon_name="i-web" uri="http://services.eazel.com/redirect?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://services.eazel.com/redirect?http://www.linuxorbit.com"/>
+         <bookmark _name="Linux Weekly News" icon_name="i-web" uri="http://services.eazel.com/redirect?http://www.lwn.net"/>
+         <bookmark _name="O'Reilly" icon_name="i-web" uri="http://services.eazel.com/redirect?http://www.eazel.oreillynet.com"/>
+         <bookmark _name="OSDN" icon_name="i-web" uri="http://services.eazel.com/redirect?http://www.osdn.com"/>
+         <bookmark _name="ZDNet Linux Resource Center" icon_name="i-web" uri="http://services.eazel.com/redirect?http://chkpt.zdnet.com/chkpt/hud0022900/linux.zdnet.com"/>
   </folder>
   <folder _name="Web Services">
-         <bookmark _name="CollabNet" uri="http://services.eazel.com/redirect?http://www.collab.net/community/"/>
-         <bookmark _name="Covalent" uri="http://services.eazel.com/redirect?http://www.covalent.com"/>
-         <bookmark _name="Rackspace" uri="http://services.eazel.com/redirect?http://www.rackspace.com"/>
-         <bookmark _name="Red Hat Network" uri="http://services.eazel.com/redirect?http://www.redhat.com/network/"/>
-         <bookmark _name="SourceForge" uri="http://services.eazel.com/redirect?http://www.sourceforge.net"/>
+         <bookmark _name="CollabNet" icon_name="i-web" uri="http://services.eazel.com/redirect?http://www.collab.net/community/"/>
+         <bookmark _name="Covalent" icon_name="i-web" uri="http://services.eazel.com/redirect?http://www.covalent.com"/>
+         <bookmark _name="Rackspace" icon_name="i-web" uri="http://services.eazel.com/redirect?http://www.rackspace.com"/>
+         <bookmark _name="Red Hat Network" icon_name="i-web" uri="http://services.eazel.com/redirect?http://www.redhat.com/network/"/>
+         <bookmark _name="SourceForge" icon_name="i-web" uri="http://services.eazel.com/redirect?http://www.sourceforge.net"/>
   </folder>
   <folder _name="International">
-         <bookmark _name="Conectiva" uri="http://services.eazel.com/redirect?http://en.conectiva.com/"/>
-         <bookmark _name="Linux One" uri="http://services.eazel.com/redirect?http://www.linuxone.co.kr/english2/eng/main.htm"/>
-         <bookmark _name="Open Source Asia" uri="http://www.opensourceasia.com/English/what_e.html"/>
-         <bookmark _name="RedFlag Linux" uri="http://services.eazel.com/redirect?http://www.redflag-linux.com/english/index.html"/>
-         <bookmark _name="Sun Wah Linux" uri="http://services.eazel.com/redirect?http://www.sw-linux.com/nonflash_front.htm"/>
+         <bookmark _name="Conectiva" icon_name="i-web" uri="http://services.eazel.com/redirect?http://en.conectiva.com/"/>
+         <bookmark _name="Linux One" icon_name="i-web" uri="http://services.eazel.com/redirect?http://www.linuxone.co.kr/english2/eng/main.htm"/>
+         <bookmark _name="Open Source Asia" icon_name="i-web" uri="http://www.opensourceasia.com/English/what_e.html"/>
+         <bookmark _name="RedFlag Linux" icon_name="i-web" uri="http://services.eazel.com/redirect?http://www.redflag-linux.com/english/index.html"/>
+         <bookmark _name="Sun Wah Linux" icon_name="i-web" uri="http://services.eazel.com/redirect?http://www.sw-linux.com/nonflash_front.htm"/>
   </folder>
   <folder _name="Linux Resources">
-         <bookmark _name="Debian.org" uri="http://services.eazel.com/redirect?http://www.debian.org"/>
-         <bookmark _name="Freshmeat.net" uri="http://services.eazel.com/redirect?http://www.freshmeat.net"/>
-         <bookmark _name="GNOME.org" uri="http://services.eazel.com/redirect?http://www.gnome.org"/>
-         <bookmark _name="GNU.org" uri="http://services.eazel.com/redirect?http://www.gnu.org"/>
-         <bookmark _name="Linux Online" uri="http://services.eazel.com/redirect?http://www.linux.org"/>
-         <bookmark _name="Linux Documentation Project" uri="http://services.eazel.com/redirect?http://www.linuxdoc.org"/>
-         <bookmark _name="LinuxNewbie.org" uri="http://services.eazel.com/redirect?http://www.linuxnewbie.org"/>
-         <bookmark _name="OpenOffice" uri="http://services.eazel.com/redirect?http://www.openoffice.org"/>
+         <bookmark _name="Debian.org" icon_name="i-web" uri="http://services.eazel.com/redirect?http://www.debian.org"/>
+         <bookmark _name="Freshmeat.net" icon_name="i-web" uri="http://services.eazel.com/redirect?http://www.freshmeat.net"/>
+         <bookmark _name="GNOME.org" icon_name="i-web" uri="http://services.eazel.com/redirect?http://www.gnome.org"/>
+         <bookmark _name="GNU.org" icon_name="i-web" uri="http://services.eazel.com/redirect?http://www.gnu.org"/>
+         <bookmark _name="Linux Online" icon_name="i-web" uri="http://services.eazel.com/redirect?http://www.linux.org"/>
+         <bookmark _name="Linux Documentation Project" icon_name="i-web" uri="http://services.eazel.com/redirect?http://www.linuxdoc.org"/>
+         <bookmark _name="LinuxNewbie.org" icon_name="i-web" uri="http://services.eazel.com/redirect?http://www.linuxnewbie.org"/>
+         <bookmark _name="OpenOffice" icon_name="i-web" uri="http://services.eazel.com/redirect?http://www.openoffice.org"/>
   </folder>
 </bookmarks>