gnome-terminal r2495 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Wed Mar 19 18:14:05 2008
New Revision: 2495
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2495&view=rev

Log:
No need to store the icon.


Modified:
   trunk/src/terminal-window.c

Modified: trunk/src/terminal-window.c
==============================================================================
--- trunk/src/terminal-window.c	(original)
+++ trunk/src/terminal-window.c	Wed Mar 19 18:14:05 2008
@@ -63,7 +63,6 @@
   GtkWidget *notebook;
   guint terms;
   TerminalScreen *active_term;
-  GdkPixbuf *icon;
   GtkClipboard *clipboard;
   int old_char_width;
   int old_char_height;
@@ -1397,11 +1396,6 @@
   TerminalWindow *window = TERMINAL_WINDOW (object);
   TerminalWindowPrivate *priv = window->priv;
 
-  if (priv->icon)
-    {
-      g_object_unref (G_OBJECT (priv->icon));
-    }
-
   g_free (priv->startup_id);
 
   G_OBJECT_CLASS (terminal_window_parent_class)->finalize (object);
@@ -2068,36 +2062,17 @@
 terminal_window_update_icon (TerminalWindow *window)
 {
   TerminalWindowPrivate *priv = window->priv;
-  GdkPixbuf *new_icon;
   TerminalProfile *profile;
 
-  if (priv->active_term == NULL)
+  if (priv->active_term == NULL ||
+      !(profile = terminal_screen_get_profile (priv->active_term)))
     {
       gtk_window_set_icon (GTK_WINDOW (window), NULL);
       return;
     }
 
-  profile = terminal_screen_get_profile (priv->active_term);
-  if (profile == NULL)
-    {
-      gtk_window_set_icon (GTK_WINDOW (window), NULL);
-      return;
-    }
-  
-  new_icon = terminal_profile_get_icon (profile);
-  
-  if (priv->icon != new_icon)
-    {
-      if (new_icon)
-        g_object_ref (G_OBJECT (new_icon));
-
-      if (priv->icon)
-        g_object_unref (G_OBJECT (priv->icon));
-
-      priv->icon = new_icon;
-
-      gtk_window_set_icon (GTK_WINDOW (window), priv->icon);
-    }
+  gtk_window_set_icon (GTK_WINDOW (window),
+                       terminal_profile_get_icon (profile));
 }
 
 void