gnome-terminal r2527 - in trunk: . src

[chpe svn gnome org]

Author: chpe
Date: Mon Mar 31 22:41:26 2008
New Revision: 2527
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2527&view=rev

Log:
Use the utilities-terminal icon from icon theme. Bug #126081 and bug #342804.


Removed:
   trunk/src/gnome-terminal.png
Modified:
   trunk/gnome-terminal.desktop.in.in
   trunk/src/Makefile.am
   trunk/src/gnome-terminal.schemas.in
   trunk/src/terminal-profile.c
   trunk/src/terminal-window.c
   trunk/src/terminal.c
   trunk/src/terminal.h

Modified: trunk/gnome-terminal.desktop.in.in
==============================================================================
--- trunk/gnome-terminal.desktop.in.in	(original)
+++ trunk/gnome-terminal.desktop.in.in	Mon Mar 31 22:41:26 2008
@@ -4,7 +4,7 @@
 _Comment=Use the command line
 TryExec=gnome-terminal
 Exec=gnome-terminal
-Icon=gnome-terminal
+Icon=utilities-terminal
 Type=Application
 X-GNOME-DocPath=gnome-terminal/index.html
 X-GNOME-Bugzilla-Bugzilla=GNOME

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Mon Mar 31 22:41:26 2008
@@ -54,9 +54,6 @@
 schema_in_files = gnome-terminal.schemas.in
 schema_DATA = gnome-terminal.schemas
 
-icondir = $(datadir)/pixmaps
-icon_DATA = gnome-terminal.png
-
 uidir = $(pkgdatadir)
 ui_DATA = \
 	terminal.ui

Modified: trunk/src/gnome-terminal.schemas.in
==============================================================================
--- trunk/src/gnome-terminal.schemas.in	(original)
+++ trunk/src/gnome-terminal.schemas.in	Mon Mar 31 22:41:26 2008
@@ -405,7 +405,7 @@
       <applyto>/apps/gnome-terminal/profiles/Default/icon</applyto>
       <owner>gnome-terminal</owner>
       <type>string</type>
-      <default>gnome-terminal.png</default>
+      <default></default>
       <locale name="C">
          <short>Icon for terminal window</short>
          <long>

Modified: trunk/src/terminal-profile.c
==============================================================================
--- trunk/src/terminal-profile.c	(original)
+++ trunk/src/terminal-profile.c	Mon Mar 31 22:41:26 2008
@@ -256,7 +256,7 @@
   priv->allow_bold = TRUE;
   priv->word_chars = g_strdup ("");
   priv->custom_command = g_strdup ("");
-  priv->icon_file = g_strdup ("gnome-terminal.png");
+  priv->icon_file = NULL;
   memcpy (priv->palette,
           terminal_palette_linux,
           TERMINAL_PALETTE_SIZE * sizeof (GdkColor));
@@ -1025,6 +1025,9 @@
   g_return_val_if_fail (TERMINAL_IS_PROFILE (profile), NULL);
 
   priv = profile->priv;
+  if (!priv->icon_file || !priv->icon_file[0])
+    return NULL;
+  
   if (priv->icon == NULL &&
       !priv->icon_load_failed)
     {
@@ -1753,7 +1756,8 @@
 {
   TerminalProfilePrivate *priv = profile->priv;
   
-  if (candidate_file &&
+  if (priv->icon_file &&
+      candidate_file &&
       strcmp (priv->icon_file, candidate_file) == 0)
     return FALSE;
   
@@ -2829,7 +2833,7 @@
   key = gconf_concat_dir_and_key (profile_dir,
                                   KEY_ICON);
   gconf_client_set_string (base_priv->conf,
-                           key, base_priv->icon_file,
+                           key, base_priv->icon_file ? base_priv->icon_file : "",
                            &err);
   BAIL_OUT_CHECK ();
 

Modified: trunk/src/terminal-window.c
==============================================================================
--- trunk/src/terminal-window.c	(original)
+++ trunk/src/terminal-window.c	Mon Mar 31 22:41:26 2008
@@ -2065,7 +2065,8 @@
   TerminalProfile *profile;
 
   if (priv->active_term == NULL ||
-      !(profile = terminal_screen_get_profile (priv->active_term)))
+      !(profile = terminal_screen_get_profile (priv->active_term)) ||
+      terminal_profile_get_icon_file (profile) == NULL)
     {
       gtk_window_set_icon (GTK_WINDOW (window), NULL);
       return;
@@ -2686,7 +2687,7 @@
 			 "license", license_text,
 			 "wrap-license", TRUE,
 			 "translator-credits", _("translator-credits"),
-			 "logo-icon-name", "gnome-terminal",
+			 "logo-icon-name", GNOME_TERMINAL_ICON_NAME,
 			 NULL);
   g_free (license_text);
 }

Modified: trunk/src/terminal.c
==============================================================================
--- trunk/src/terminal.c	(original)
+++ trunk/src/terminal.c	Mon Mar 31 22:41:26 2008
@@ -296,34 +296,6 @@
   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,
@@ -1281,7 +1253,7 @@
   g_strfreev (argv_copy);
   argv_copy = NULL;
 
-  set_default_icon (TERM_DATADIR"/pixmaps/gnome-terminal.png");
+  gtk_window_set_default_icon_name (GNOME_TERMINAL_ICON_NAME);
  
   g_assert (parsing_results->post_execute_args == NULL);
   

Modified: trunk/src/terminal.h
==============================================================================
--- trunk/src/terminal.h	(original)
+++ trunk/src/terminal.h	Mon Mar 31 22:41:26 2008
@@ -34,6 +34,8 @@
 
 #include "terminal-screen.h"
 
+#define GNOME_TERMINAL_ICON_NAME "utilities-terminal"
+             
 typedef struct _TerminalApp TerminalApp;
 
 TerminalApp* terminal_app_get (void);