? INSTALL
? compile
? depcomp
? install-sh
? missing
? help/uk/Makefile
? help/uk/Makefile.in
? help/uk/gnome-terminal-uk.omf.out
? help/uk/omf_timestamp
? src/skey/testskey
Index: src/gnome-terminal.glade2
===================================================================
RCS file: /cvs/gnome/gnome-terminal/src/gnome-terminal.glade2,v
retrieving revision 1.55
diff -u -p -r1.55 gnome-terminal.glade2
--- src/gnome-terminal.glade2	21 Sep 2005 16:37:59 -0000	1.55
+++ src/gnome-terminal.glade2	19 Nov 2005 02:55:06 -0000
@@ -1184,72 +1184,6 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkHBox" id="hbox3">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">12</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="profile-icon-label">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Profile _icon:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">profile-icon-entry</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkAlignment" id="alignment28">
-			      <property name="visible">True</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xscale">0</property>
-			      <property name="yscale">1</property>
-			      <property name="top_padding">0</property>
-			      <property name="bottom_padding">0</property>
-			      <property name="left_padding">0</property>
-			      <property name="right_padding">0</property>
-
-			      <child>
-				<widget class="GnomeIconEntry" id="profile-icon-entry">
-				  <property name="visible">True</property>
-				  <property name="browse_dialog_title" translatable="yes">Choose A Profile Icon</property>
-				  <property name="max_saved">10</property>
-				</widget>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
 			<widget class="GtkTable" id="table19">
 			  <property name="visible">True</property>
 			  <property name="n_rows">5</property>
Index: src/gnome-terminal.schemas.in
===================================================================
RCS file: /cvs/gnome/gnome-terminal/src/gnome-terminal.schemas.in,v
retrieving revision 1.41
diff -u -p -r1.41 gnome-terminal.schemas.in
--- src/gnome-terminal.schemas.in	19 Sep 2005 09:31:27 -0000	1.41
+++ src/gnome-terminal.schemas.in	19 Nov 2005 02:55:07 -0000
@@ -417,20 +417,6 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/gnome-terminal/profiles/Default/icon</key>
-      <applyto>/apps/gnome-terminal/profiles/Default/icon</applyto>
-      <owner>gnome-terminal</owner>
-      <type>string</type>
-      <default>gnome-terminal.png</default>
-      <locale name="C">
-         <short>Icon for terminal window</short>
-         <long>
-          Icon to use for tabs/windows containing this profile.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
       <key>/schemas/apps/gnome-terminal/profiles/Default/palette</key>
       <applyto>/apps/gnome-terminal/profiles/Default/palette</applyto>
       <owner>gnome-terminal</owner>
Index: src/profile-editor.c
===================================================================
RCS file: /cvs/gnome/gnome-terminal/src/profile-editor.c,v
retrieving revision 1.54
diff -u -p -r1.54 profile-editor.c
--- src/profile-editor.c	19 Sep 2005 08:38:18 -0000	1.54
+++ src/profile-editor.c	19 Nov 2005 02:55:08 -0000
@@ -78,8 +78,6 @@ static void       profile_editor_update_
                                                               TerminalProfile *profile);
 static void       profile_editor_update_visible_name         (GtkWidget       *editor,
                                                               TerminalProfile *profile);
-static void       profile_editor_update_icon                 (GtkWidget       *editor,
-                                                              TerminalProfile *profile);
 static void       profile_editor_update_cursor_blink         (GtkWidget       *editor,
                                                               TerminalProfile *profile);
 static void       profile_editor_update_default_show_menubar (GtkWidget       *editor,
@@ -251,9 +249,6 @@ profile_changed (TerminalProfile        
   if (mask->visible_name)
     profile_editor_update_visible_name (editor, profile);
 
-  if (mask->icon_file)
-    profile_editor_update_icon (editor, profile);
-  
   if (mask->cursor_blink)
     profile_editor_update_cursor_blink (editor, profile);
 
@@ -363,20 +358,6 @@ visible_name_changed (GtkWidget       *e
 }
 
 static void
-icon_changed (GtkWidget       *icon_entry,
-              TerminalProfile *profile)
-{
-  char *filename;
-
-  filename = gnome_icon_entry_get_filename (GNOME_ICON_ENTRY (icon_entry));
-
-  /* NULL filename happens here to unset */
-  terminal_profile_set_icon_file (profile, filename);
-  
-  g_free (filename);
-}
-
-static void
 cursor_blink_toggled (GtkWidget       *checkbutton,
                       TerminalProfile *profile)
 {
@@ -979,12 +960,6 @@ terminal_profile_edit (TerminalProfile *
                         G_CALLBACK (visible_name_changed),
                         profile);
 
-      w = glade_xml_get_widget (xml, "profile-icon-entry");
-      profile_editor_update_icon (editor, profile);
-      g_signal_connect (G_OBJECT (w), "changed",
-                        G_CALLBACK (icon_changed),
-                        profile);
-      
       w = glade_xml_get_widget (xml, "blink-cursor-checkbutton");
       profile_editor_update_cursor_blink (editor, profile);
       g_signal_connect (G_OBJECT (w), "toggled",
@@ -1434,9 +1409,6 @@ profile_editor_update_sensitivity (GtkWi
   
   set_insensitive (editor, "profile-name-entry",
                    mask->visible_name);
-
-  set_insensitive (editor, "profile-icon-entry",
-                   mask->icon_file);
   
   set_insensitive (editor, "blink-cursor-checkbutton",
                    mask->cursor_blink);
@@ -1544,29 +1516,6 @@ profile_editor_update_visible_name (GtkW
 
   entry_set_text_if_changed (GTK_ENTRY (w),
                              terminal_profile_get_visible_name (profile));
-}
-
-static void
-profile_editor_update_icon (GtkWidget       *editor,
-                            TerminalProfile *profile)
-{
-  GtkWidget *w;
-  char *current_filename;
-  const char *profile_filename;
-  
-  w = profile_editor_get_widget (editor, "profile-icon-entry");
-
-  current_filename = gnome_icon_entry_get_filename (GNOME_ICON_ENTRY (w));
-
-  profile_filename = terminal_profile_get_icon_file (profile);
-  
-  if (current_filename && profile_filename &&
-      strcmp (current_filename, profile_filename) == 0)
-    return;
-
-  g_free (current_filename);
-  
-  gnome_icon_entry_set_filename (GNOME_ICON_ENTRY (w), profile_filename);
 }
 
 static void
Index: src/terminal-profile.c
===================================================================
RCS file: /cvs/gnome/gnome-terminal/src/terminal-profile.c,v
retrieving revision 1.33
diff -u -p -r1.33 terminal-profile.c
--- src/terminal-profile.c	19 Aug 2005 20:51:06 -0000	1.33
+++ src/terminal-profile.c	19 Nov 2005 02:55:10 -0000
@@ -57,7 +57,6 @@
 #define KEY_UPDATE_RECORDS "update_records"
 #define KEY_USE_CUSTOM_COMMAND "use_custom_command"
 #define KEY_CUSTOM_COMMAND "custom_command"
-#define KEY_ICON "icon"
 #define KEY_PALETTE "palette"
 #define KEY_X_FONT "x_font"
 #define KEY_BACKGROUND_TYPE "background_type"
@@ -97,9 +96,6 @@ struct _TerminalProfilePrivate
   TerminalExitAction exit_action;
   char *custom_command;
 
-  char *icon_file;
-  GdkPixbuf *icon;
-
   GdkColor palette[TERMINAL_PALETTE_SIZE];
 
   char *x_font;
@@ -113,7 +109,6 @@ struct _TerminalProfilePrivate
 
   PangoFontDescription *font;
   
-  guint icon_load_failed : 1;
   guint background_load_failed : 1;
   
   guint cursor_blink : 1;
@@ -279,7 +274,6 @@ 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");
   memcpy (profile->priv->palette,
           terminal_palette_linux,
           TERMINAL_PALETTE_SIZE * sizeof (GdkColor));
@@ -346,9 +340,6 @@ terminal_profile_finalize (GObject *obje
   g_free (profile->priv->name);
   g_free (profile->priv->title);
   g_free (profile->priv->profile_dir);
-  g_free (profile->priv->icon_file);
-  if (profile->priv->icon)
-    g_object_unref (G_OBJECT (profile->priv->icon));
   g_free (profile->priv->x_font);
 
   g_free (profile->priv->background_image_file);
@@ -971,96 +962,6 @@ terminal_profile_set_custom_command (Ter
   g_free (key);
 }
 
-const char*
-terminal_profile_get_icon_file (TerminalProfile *profile)
-{
-  g_return_val_if_fail (TERMINAL_IS_PROFILE (profile), NULL);
-  
-  return profile->priv->icon_file;
-}
-
-GdkPixbuf*
-terminal_profile_get_icon (TerminalProfile *profile)
-{
-  g_return_val_if_fail (TERMINAL_IS_PROFILE (profile), NULL);
-  
-  if (profile->priv->icon == NULL &&
-      !profile->priv->icon_load_failed)
-    {
-      GdkPixbuf *pixbuf;
-      GError *err;
-      char *filename;
-
-      filename = gnome_program_locate_file (gnome_program_get (),
-                                            /* FIXME should I use APP_PIXMAP? */
-                                            GNOME_FILE_DOMAIN_PIXMAP,
-                                            profile->priv->icon_file,
-                                            TRUE, NULL);
-
-      if (filename == NULL)
-        {
-          g_printerr (_("Could not find an icon called \"%s\" for terminal profile \"%s\"\n"),
-                      profile->priv->icon_file,
-                      terminal_profile_get_visible_name (profile));
-
-          profile->priv->icon_load_failed = TRUE;
-          
-          goto out;
-        }
-      
-      err = NULL;
-      pixbuf = gdk_pixbuf_new_from_file (filename, &err);
-
-      if (pixbuf == NULL)
-        {
-          g_printerr (_("Failed to load icon \"%s\" for terminal profile \"%s\": %s\n"),
-                      filename,
-                      terminal_profile_get_visible_name (profile),
-                      err->message);
-          g_error_free (err);
-
-          g_free (filename);
-
-          profile->priv->icon_load_failed = TRUE;
-          
-          goto out;
-        }
-
-      profile->priv->icon = pixbuf;
-
-      g_free (filename);
-    }
-
- out:
-  return profile->priv->icon;
-}
-
-void
-terminal_profile_set_icon_file (TerminalProfile *profile,
-                                const char      *filename)
-{
-  char *key;
-
-  RETURN_IF_NOTIFYING (profile);
-  
-  key = gconf_concat_dir_and_key (profile->priv->profile_dir,
-                                  KEY_ICON);
-
-  if (filename)
-    {
-      gconf_client_set_string (profile->priv->conf,
-                               key,
-                               filename,
-                               NULL);
-    }
-  else
-    {
-      gconf_client_unset (profile->priv->conf, key, NULL);
-    }
-
-  g_free (key);
-}
-
 gboolean
 terminal_profile_get_is_default (TerminalProfile *profile)
 {
@@ -1696,35 +1597,6 @@ set_custom_command (TerminalProfile *pro
 }
 
 static gboolean
-set_icon_file (TerminalProfile *profile,
-               const char      *candidate_file)
-{
-  if (candidate_file &&
-      strcmp (profile->priv->icon_file, candidate_file) == 0)
-    return FALSE;
-  
-  if (candidate_file != NULL)
-    {
-      
-      g_free (profile->priv->icon_file);
-      profile->priv->icon_file = g_strdup (candidate_file);
-
-      if (profile->priv->icon != NULL)
-        {
-          g_object_unref (G_OBJECT (profile->priv->icon));
-          profile->priv->icon = NULL;
-        }
-
-      profile->priv->icon_load_failed = FALSE; /* try again */
-
-      return TRUE;
-    }
-  /* otherwise just leave the old filename */
-  
-  return FALSE;
-}
-
-static gboolean
 set_palette (TerminalProfile *profile,
              const char      *candidate_str)
 {  
@@ -1980,7 +1852,6 @@ terminal_profile_update (TerminalProfile
   UPDATE_BOOLEAN (KEY_UPDATE_RECORDS,       update_records);
   UPDATE_BOOLEAN (KEY_USE_CUSTOM_COMMAND,   use_custom_command);
   UPDATE_STRING  (KEY_CUSTOM_COMMAND,       custom_command);
-  UPDATE_STRING  (KEY_ICON,                 icon_file);
   UPDATE_STRING  (KEY_PALETTE,              palette);
   UPDATE_STRING  (KEY_X_FONT,               x_font);
   UPDATE_STRING  (KEY_BACKGROUND_TYPE,      background_type);
@@ -2126,7 +1997,6 @@ else if (strcmp (key, KName) == 0)      
      UPDATE_BOOLEAN (KEY_UPDATE_RECORDS,         update_records,         FALSE);
      UPDATE_BOOLEAN (KEY_USE_CUSTOM_COMMAND,     use_custom_command,     FALSE);
      UPDATE_STRING  (KEY_CUSTOM_COMMAND,         custom_command,         NULL);
-     UPDATE_STRING  (KEY_ICON,                   icon_file,              NULL);
      UPDATE_STRING  (KEY_PALETTE,                palette,                NULL);
      UPDATE_STRING  (KEY_X_FONT,                 x_font,                 NULL);
      UPDATE_STRING  (KEY_BACKGROUND_TYPE,        background_type,        NULL);
@@ -2774,14 +2644,6 @@ terminal_profile_create (TerminalProfile
                                   KEY_CUSTOM_COMMAND);
   gconf_client_set_string (base_profile->priv->conf,
                            key, base_profile->priv->custom_command,
-                           &err);
-  BAIL_OUT_CHECK ();
-
-  g_free (key);
-  key = gconf_concat_dir_and_key (profile_dir,
-                                  KEY_ICON);
-  gconf_client_set_string (base_profile->priv->conf,
-                           key, base_profile->priv->icon_file,
                            &err);
   BAIL_OUT_CHECK ();
 
Index: src/terminal-profile.h
===================================================================
RCS file: /cvs/gnome/gnome-terminal/src/terminal-profile.h,v
retrieving revision 1.23
diff -u -p -r1.23 terminal-profile.h
--- src/terminal-profile.h	2 Jul 2005 00:06:55 -0000	1.23
+++ src/terminal-profile.h	19 Nov 2005 02:55:10 -0000
@@ -53,7 +53,6 @@ typedef struct
   unsigned int update_records : 1;
   unsigned int use_custom_command : 1;
   unsigned int custom_command : 1;
-  unsigned int icon_file : 1;
   unsigned int is_default : 1;
   unsigned int palette : 1;
   unsigned int x_font : 1;
@@ -167,8 +166,6 @@ gboolean                  terminal_profi
 gboolean                  terminal_profile_get_use_custom_command   (TerminalProfile *profile);
 const char*               terminal_profile_get_custom_command       (TerminalProfile *profile);
 
-const char*               terminal_profile_get_icon_file            (TerminalProfile *profile);
-GdkPixbuf*                terminal_profile_get_icon                 (TerminalProfile *profile);
 gboolean                  terminal_profile_get_is_default           (TerminalProfile *profile);
 void                      terminal_profile_get_palette              (TerminalProfile *profile,
                                                                      GdkColor        *colors);
@@ -226,8 +223,6 @@ void terminal_profile_set_use_custom_com
 void terminal_profile_set_custom_command       (TerminalProfile          *profile,
                                                 const char               *command);
 
-void terminal_profile_set_icon_file            (TerminalProfile          *profile,
-                                                const char               *filename);
 void terminal_profile_set_is_default           (TerminalProfile          *profile,
                                                 gboolean                  setting);
 void terminal_profile_set_palette              (TerminalProfile *profile,
Index: src/terminal-screen.c
===================================================================
RCS file: /cvs/gnome/gnome-terminal/src/terminal-screen.c,v
retrieving revision 1.105
diff -u -p -r1.105 terminal-screen.c
--- src/terminal-screen.c	20 Sep 2005 12:14:37 -0000	1.105
+++ src/terminal-screen.c	19 Nov 2005 02:55:12 -0000
@@ -509,7 +509,6 @@ reread_profile (TerminalScreen *screen)
        * update_on_realize
        */
       terminal_window_update_scrollbar (screen->priv->window, screen);
-      terminal_window_update_icon (screen->priv->window);
       terminal_window_update_geometry (screen->priv->window);
     }
   
Index: src/terminal-window.c
===================================================================
RCS file: /cvs/gnome/gnome-terminal/src/terminal-window.c,v
retrieving revision 1.110
diff -u -p -r1.110 terminal-window.c
--- src/terminal-window.c	3 Oct 2005 15:53:36 -0000	1.110
+++ src/terminal-window.c	19 Nov 2005 02:55:14 -0000
@@ -1668,7 +1668,6 @@ terminal_window_set_active (TerminalWind
   window->priv->active_term = screen;
 
   terminal_window_update_geometry (window);
-  terminal_window_update_icon (window);
   
   /* Override menubar setting if it wasn't restored from session */
   if (window->priv->use_default_menubar_visibility)
@@ -1882,41 +1881,6 @@ terminal_window_update_scrollbar (Termin
     }
 
   g_object_unref (G_OBJECT (scrollbar));
-}
-
-void
-terminal_window_update_icon (TerminalWindow *window)
-{
-  GdkPixbuf *new_icon;
-  TerminalProfile *profile;
-
-  if (window->priv->active_term == NULL)
-    {
-      gtk_window_set_icon (GTK_WINDOW (window), NULL);
-      return;
-    }
-
-  profile = terminal_screen_get_profile (window->priv->active_term);
-  if (profile == NULL)
-    {
-      gtk_window_set_icon (GTK_WINDOW (window), NULL);
-      return;
-    }
-  
-  new_icon = terminal_profile_get_icon (profile);
-  
-  if (window->priv->icon != new_icon)
-    {
-      if (new_icon)
-        g_object_ref (G_OBJECT (new_icon));
-
-      if (window->priv->icon)
-        g_object_unref (G_OBJECT (window->priv->icon));
-
-      window->priv->icon = new_icon;
-
-      gtk_window_set_icon (GTK_WINDOW (window), window->priv->icon);
-    }
 }
 
 void
Index: src/terminal-window.h
===================================================================
RCS file: /cvs/gnome/gnome-terminal/src/terminal-window.h,v
retrieving revision 1.10
diff -u -p -r1.10 terminal-window.h
--- src/terminal-window.h	9 May 2004 06:06:10 -0000	1.10
+++ src/terminal-window.h	19 Nov 2005 02:55:14 -0000
@@ -78,7 +78,6 @@ int    terminal_window_get_screen_count 
 
 void terminal_window_update_scrollbar (TerminalWindow *window,
                                        TerminalScreen *screen);
-void terminal_window_update_icon      (TerminalWindow *window);
 void terminal_window_update_geometry  (TerminalWindow *window);
 void terminal_window_set_size         (TerminalWindow *window,
                                        TerminalScreen *screen,
Index: src/terminal.c
===================================================================
RCS file: /cvs/gnome/gnome-terminal/src/terminal.c,v
retrieving revision 1.84
diff -u -p -r1.84 terminal.c
--- src/terminal.c	18 Sep 2005 08:19:25 -0000	1.84
+++ src/terminal.c	19 Nov 2005 02:55:17 -0000
@@ -518,14 +518,6 @@ struct poptOption options[] = {  
     NULL, NULL
   },
   {
-    "icon",
-    '\0',
-    POPT_ARG_STRING | POPT_ARGFLAG_DOC_HIDDEN,
-    NULL,
-    OPTION_COMPAT,
-    NULL, NULL
-  },  
-  {
     "termname",
     '\0',
     POPT_ARG_STRING | POPT_ARGFLAG_DOC_HIDDEN,
@@ -697,34 +689,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,
@@ -1562,6 +1526,23 @@ slowly_and_stupidly_obtain_timestamp (Di
 	return event.xproperty.time;
 }
 
+static void terminal_icon_changed (GtkIconTheme *icon_theme, gpointer data)
+{
+  GdkPixbuf *pixbuf;
+
+  pixbuf = gtk_icon_theme_load_icon (icon_theme, "utilities-terminal",
+				     48, GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
+  if (pixbuf == NULL)
+    pixbuf = gtk_icon_theme_load_icon (icon_theme, "gnome-terminal",
+				       48, GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
+
+  if (pixbuf != NULL)
+    {
+      gtk_window_set_default_icon (pixbuf);
+      g_object_unref (pixbuf);
+    }
+}
+
 int
 main (int argc, char **argv)
 {
@@ -1581,6 +1562,7 @@ main (int argc, char **argv)
   GnomeClient *sm_client;
   OptionParsingResults *results;
   GnomeProgram *program;
+  GtkIconTheme *icon_theme;
 
   reqs[0].module_info = LIBGNOMEUI_MODULE;
 
@@ -1706,7 +1688,10 @@ main (int argc, char **argv)
   g_strfreev (argv_copy);
   argv_copy = NULL;
 
-  set_default_icon (TERM_DATADIR"/pixmaps/gnome-terminal.png");
+  icon_theme = gtk_icon_theme_get_default ();
+  terminal_icon_changed (icon_theme, NULL);
+  g_signal_connect (G_OBJECT (icon_theme), "changed",
+		    G_CALLBACK (terminal_icon_changed), NULL);
  
   g_assert (results->post_execute_args == NULL);
   
