Code to display URL icons on the desktop as the urls.

ChangeLog

@@ -1,3 +1,8 @@
+1999-01-30  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gtkedit/gtkedit.c: Hack to get a string defined in a macro into
+	the catalog file.
+
 1999-02-02  Tuomas Kuosmanen  <tigert@gimp.org>
 
 	* new_icons/gnome-core.png: New icon for core files. Someone 

gnome/ChangeLog

@@ -1,3 +1,12 @@
+1999-02-05  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gicon.c (gicon_get_url_image): Return an image for url types.
+	(gicon_init): Load the url image.
+
+	* gdesktop.c (desktop_icon_info_new): Use an URL image for
+	desktop-urls.   Use the url as the caption for those icons. 
+	
+
 1999-02-04  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
 	* gdesktop.c (desktop_icon_info_open): Run "execute" if the file

gnome/Makefile.in

@@ -172,11 +172,13 @@ FileManager-impl.c: FileManager.h
 
 EXTRA_DIST = gnome.TODO layout gmc.gnorba mc.keys.in.in	gimp.image.desktop 
 
+DISTGNOME_NEW = \
+	gimp.image.desktop application.x-gnumeric.desktop
+
 DISTGNOME = \
 	Makefile.in ChangeLog $(EXTRA_DIST) $(CORBA_SOURCES) \
 	$(PIXMAPS) $(ICONS) $(GNOMESRCS) $(GNOMEHDRS) $(DISTGNOME_NEW)
-DISTGNOME_NEW = \
-	gimp.image.desktop application.x-gnumeric.desktop
+
 .c.o:
 	$(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
 

gnome/gdesktop.c

@@ -1345,21 +1345,31 @@ desktop_icon_info_new (char *filename, char *url, int user_pos, int auto_pos, in
 	char *full_name;
 	GdkImlibImage *icon_im;
 	GtkSignalFunc text_changed_func;
-
+	char *caption;
+	
 	/* Create the icon structure */
 
 	full_name = g_concat_dir_and_file (desktop_directory, filename);
 	fe = file_entry_from_file (full_name);
-	icon_im = gicon_get_icon_for_file_speed (desktop_directory, fe, FALSE);
 
 	dii = g_new (DesktopIconInfo, 1);
-	dii->dicon = desktop_icon_new (icon_im, filename);
 	dii->x = 0;
 	dii->y = 0;
 	dii->slot = -1;
+
+	if (url){
+		dii->url = g_strdup (url);
+		icon_im = gicon_get_url_image ();
+		caption = url;
+	} else {
+		dii->url = NULL;
+		icon_im = gicon_get_icon_for_file_speed (desktop_directory, fe, FALSE);
+		caption = filename;
+	}
+	
+	dii->dicon = desktop_icon_new (icon_im, caption);
 	dii->filename = g_strdup (filename);
 	dii->selected = FALSE;
-	dii->url = g_strdup (url);
 	
 	file_entry_free (fe);
 	g_free (full_name);

gnome/gicon.c

@@ -31,6 +31,7 @@ static GdkImlibImage *icon_view_sock;
 static GdkImlibImage *icon_view_char_dev;
 static GdkImlibImage *icon_view_block_dev;
 static GdkImlibImage *icon_view_stalled;
+static GdkImlibImage *icon_view_url;
 
 /* Our UID and GID */
 static uid_t our_uid;
@@ -69,6 +70,7 @@ gicon_init (void)
 	icon_view_char_dev   = gicon_stock_load	("i-chardev.png");
 	icon_view_block_dev  = gicon_stock_load	("i-blockdev.png");
 	icon_view_stalled    = gicon_stock_load ("i-stalled.png");
+	icon_view_url        = gicon_stock_load ("gnome-http-url.png");
 	
 	if (icon_view_directory  == NULL ||
 	    icon_view_dirclosed  == NULL ||
@@ -79,6 +81,7 @@ gicon_init (void)
 	    icon_view_sock       == NULL ||
 	    icon_view_char_dev   == NULL ||
 	    icon_view_block_dev  == NULL ||
+	    icon_view_url        == NULL ||
 	    icon_view_stalled    == NULL){
 		message (1, _("Error"), _("Default set of icons not found, check your installation"));
 		exit (1);
@@ -166,6 +169,12 @@ gnome_file_entry_color (file_entry *fe)
 	return icon_view_regular;
 }
 
+GdkImlibImage *
+gicon_get_url_image ()
+{
+	return icon_view_url;
+}
+
 /**
  * gicon_get_icon_for_file:
  *

gnome/gicon.h

@@ -5,6 +5,7 @@ GdkImlibImage *gicon_get_by_filename            (char *fname);
 GdkImlibImage *gicon_stock_load                 (char *basename);
 GdkImlibImage *gicon_get_icon_for_file          (char *directory, file_entry *fe);
 GdkImlibImage *gicon_get_icon_for_file_speed    (char *directory, file_entry *fe, gboolean do_quick);
+GdkImlibImage *gicon_get_url_image              ();
 
 char *gicon_image_to_name (GdkImlibImage *image);
 void gicon_init (void);