1999-03-22 Jonathan Blandford <jrb@redhat.com>

* gdesktop-init.c (gdesktop_init): Do what the documentation says.

gnome/ChangeLog

@@ -1,3 +1,11 @@
+1999-03-23  Jonathan Blandford  <jrb@redhat.com>
+
+	* gscreen.c (panel_tree_drag_motion): lets try to cut down on the flickers.
+
+1999-03-22  Jonathan Blandford  <jrb@redhat.com>
+
+	* gdesktop-init.c (gdesktop_init): Do what the documentation says.
+
 1999-03-20  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
 	* gdesktop-init.c (desktop_load_init_from): New file that loads

gnome/gdesktop-init.c

@@ -44,16 +44,21 @@ desktop_load_init_from (const char *file)
 		if (strcmp (type, "url") == 0){
 			int  used;
 			char *icon = NULL, *url;
+			char *icon2 = NULL;
 			
 			url = gnome_config_get_string ("url");
 			icon = gnome_config_get_string_with_default ("icon=", &used);
 			if (!icon)
-				icon = g_concat_dir_and_file (ICONDIR, "gnome-http-url.png");
+				icon2 = g_concat_dir_and_file (ICONDIR, "gnome-http-url.png");
-			
+			else {
+				icon2 = gnome_pixmap_file (icon);
+				if (!icon2)
+					icon2 = g_concat_dir_and_file (ICONDIR, "gnome-http-url.png");
+			}
 			if (url && *url){
 				char *filename = g_concat_dir_and_file (desktop_directory, key);
 													
-				desktop_create_url (filename, title, url, icon);
+				desktop_create_url (filename, title, url, icon2);
 
 				g_free (filename);
 			}
@@ -61,6 +66,7 @@ desktop_load_init_from (const char *file)
 			if (url)
 				g_free (url);
 			g_free (icon);
+			g_free (icon2);
 		}
 		g_free (title);
 		g_free (file_and_section);
@@ -125,11 +131,12 @@ gdesktop_init (void)
 	char *dir;
 
 	desktop_init_at (DESKTOP_INIT_DIR);
-	
-	dir = gnome_util_home_file ("desktop-init");
-	desktop_init_at (dir);
-	g_free (dir);
 
+	dir = gnome_libdir_file ("desktop-links");
+	if (dir) {
+		desktop_init_at (dir);
+		g_free (dir);
+	}
 	gmount_setup_devices ();
 	gprint_setup_devices ();
 }