Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-terminal/ChangeLog,v
retrieving revision 1.555
diff -u -p -B -r1.555 ChangeLog
--- ChangeLog	17 May 2006 22:10:04 -0000	1.555
+++ ChangeLog	24 May 2006 12:47:56 -0000
@@ -1,3 +1,16 @@
+2006-05-24  Steve Frécinaux  <steve@istique.net>
+
+	Adaptation to Icon Naming Specification
+	http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
+
+	* gnome-terminal.desktop.in.in: use utilities-terminal icon from theme.
+
+	* src/terminal.c: ditto.
+	
+	* src/terminal-profile.c: ditto.
+	
+	* src/Makefile.am: ditto, and don't install the old gnome-terminal icon.
+
 2006-05-17  Behdad Esfahbod  <behdad@gnome.org>
 
 	* NEWS: updated.
Index: gnome-terminal.desktop.in.in
===================================================================
RCS file: /cvs/gnome/gnome-terminal/gnome-terminal.desktop.in.in,v
retrieving revision 1.8
diff -u -p -B -r1.8 gnome-terminal.desktop.in.in
--- gnome-terminal.desktop.in.in	30 Jan 2006 04:01:37 -0000	1.8
+++ gnome-terminal.desktop.in.in	24 May 2006 12:47:56 -0000
@@ -4,7 +4,7 @@ _Name=Terminal
 _Comment=Use the command line
 TryExec=gnome-terminal
 Exec=gnome-terminal
-Icon=gnome-terminal.png
+Icon=utilities-terminal
 Type=Application
 X-GNOME-DocPath=gnome-terminal/index.html
 X-GNOME-Bugzilla-Bugzilla=GNOME
Index: src/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-terminal/src/Makefile.am,v
retrieving revision 1.43
diff -u -p -B -r1.43 Makefile.am
--- src/Makefile.am	12 Jan 2006 16:46:59 -0000	1.43
+++ src/Makefile.am	24 May 2006 12:47:56 -0000
@@ -61,13 +61,9 @@ schemadir   = @GCONF_SCHEMA_FILE_DIR@
 schema_in_files = gnome-terminal.schemas.in
 schema_DATA = gnome-terminal.schemas
 
-icondir = $(datadir)/pixmaps
-icon_DATA = gnome-terminal.png
-
 CLEANFILES = gnome-terminal.schemas
 
 EXTRA_DIST =				\
-	$(icon_DATA)			\
 	$(glade_DATA)			\
 	$(schema_DATA)			\
 	$(schema_in_files)		\
Index: src/gnome-terminal.png
===================================================================
RCS file: src/gnome-terminal.png
diff -N src/gnome-terminal.png
Binary files /tmp/cvsSgjg4O and /dev/null differ
Index: src/terminal-profile.c
===================================================================
RCS file: /cvs/gnome/gnome-terminal/src/terminal-profile.c,v
retrieving revision 1.37
diff -u -p -B -r1.37 terminal-profile.c
--- src/terminal-profile.c	20 Jan 2006 18:05:37 -0000	1.37
+++ src/terminal-profile.c	24 May 2006 12:47:57 -0000
@@ -281,7 +281,7 @@ terminal_profile_init (TerminalProfile *
   profile->priv->allow_bold = TRUE;
   profile->priv->word_chars = g_strdup ("");
   profile->priv->custom_command = g_strdup ("");
-  profile->priv->icon_file = g_strdup ("gnome-terminal.png");
+  profile->priv->icon_file = g_strdup ("utilities-terminal");
   memcpy (profile->priv->palette,
           terminal_palette_linux,
           TERMINAL_PALETTE_SIZE * sizeof (GdkColor));
Index: src/terminal.c
===================================================================
RCS file: /cvs/gnome/gnome-terminal/src/terminal.c,v
retrieving revision 1.96
diff -u -p -B -r1.96 terminal.c
--- src/terminal.c	2 Apr 2006 12:21:12 -0000	1.96
+++ src/terminal.c	24 May 2006 12:47:58 -0000
@@ -698,34 +698,6 @@ ensure_top_tab (OptionParsingResults *re
   return it;
 }
 
-static void
-set_default_icon (const char *filename)
-{
-  GdkPixbuf *pixbuf;
-  GError *err;
-  GList *list;
-  
-  err = NULL;
-  pixbuf = gdk_pixbuf_new_from_file (filename, &err);
-
-  if (pixbuf == NULL)
-    {
-      g_printerr (_("Could not load icon \"%s\": %s\n"),
-                  filename, err->message);
-      g_error_free (err);
-
-      return;
-    }
-
-  list = NULL;
-  list = g_list_prepend (list, pixbuf);
-
-  gtk_window_set_default_icon_list (list);
-
-  g_list_free (list);
-  g_object_unref (G_OBJECT (pixbuf));
-}
-
 static InitialWindow*
 add_new_window (OptionParsingResults *results,
                 const char           *profile,
@@ -1709,7 +1681,7 @@ main (int argc, char **argv)
   g_strfreev (argv_copy);
   argv_copy = NULL;
 
-  set_default_icon (TERM_DATADIR"/pixmaps/gnome-terminal.png");
+  gtk_window_set_default_icon_name ("utilities-terminal");
  
   g_assert (results->post_execute_args == NULL);
   
