[Xfce4-commits] <terminal:master> Use utilities-terminal for the icon name.

[Nick Schermer]

Updating branch refs/heads/master
         to fc05290ca4a0149a9660ece0bb9e2265e977f3b3 (commit)
       from 07af38bf454e6b161114f0cd7da9b115df6e81f5 (commit)

commit fc05290ca4a0149a9660ece0bb9e2265e977f3b3
Author: Nick Schermer <nick at xfce.org>
Date:   Tue Feb 16 10:46:59 2010 +0100

    Use utilities-terminal for the icon name.

 Terminal.desktop.in.in      |    2 +-
 Terminal.glade              |    7 +++----
 terminal/main.c             |    5 +++--
 terminal/terminal-dialogs.c |    9 +++++++--
 terminal/terminal-stock.c   |    4 +++-
 terminal/terminal-stock.h   |    2 +-
 6 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/Terminal.desktop.in.in b/Terminal.desktop.in.in
index 67347e0..22c05d1 100644
--- a/Terminal.desktop.in.in
+++ b/Terminal.desktop.in.in
@@ -4,7 +4,7 @@ _Name=Terminal
 _Comment=Terminal Emulator
 _GenericName=Terminal Emulator
 Exec=@PACKAGE_EXEC@
-Icon=Terminal
+Icon=utilities-terminal
 Terminal=false
 Type=Application
 Categories=GTK;System;TerminalEmulator;Utility;
diff --git a/Terminal.glade b/Terminal.glade
index 0091a0c..f4ed117 100644
--- a/Terminal.glade
+++ b/Terminal.glade
@@ -105,7 +105,7 @@
   </object>
   <object class="XfceTitledDialog" id="dialog">
     <property name="title" translatable="yes">Terminal Preferences</property>
-    <property name="icon_name">Terminal</property>
+    <property name="icon_name">gtk-preferences</property>
     <property name="type_hint">normal</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
@@ -1978,15 +1978,14 @@ when double clicking:</property>
     </data>
   </object>
   <object class="GtkAdjustment" id="background-darkness">
-    <property name="lower">0</property>
     <property name="upper">1</property>
     <property name="step_increment">0.01</property>
-    <property name="page_increment">0.1</property>
+    <property name="page_increment">0.10000000000000001</property>
   </object>
   <object class="GtkSizeGroup" id="sizegroup1">
     <widgets>
-      <widget name="style-label"/>
       <widget name="opacity-label"/>
+      <widget name="style-label"/>
     </widgets>
   </object>
 </interface>
diff --git a/terminal/main.c b/terminal/main.c
index 6e710a3..cf78da2 100644
--- a/terminal/main.c
+++ b/terminal/main.c
@@ -117,6 +117,7 @@ main (int argc, char **argv)
   gint             nargc;
   gint             n;
   gchar           *name;
+  gboolean         has_util_icon;
 
   /* install required signal handlers */
   signal (SIGPIPE, SIG_IGN);
@@ -234,10 +235,10 @@ main (int argc, char **argv)
   gtk_accelerator_set_default_mod_mask (modifiers | GDK_MOD4_MASK);
 
   /* register our stock icons */
-  terminal_stock_init ();
+  has_util_icon = terminal_stock_init ();
 
   /* set default window icon */
-  gtk_window_set_default_icon_name ("Terminal");
+  gtk_window_set_default_icon_name (has_util_icon ? "utilities-terminal" : "Terminal");
 
   app = g_object_new (TERMINAL_TYPE_APP, NULL);
 
diff --git a/terminal/terminal-dialogs.c b/terminal/terminal-dialogs.c
index c6850f2..3a243b8 100644
--- a/terminal/terminal-dialogs.c
+++ b/terminal/terminal-dialogs.c
@@ -67,10 +67,15 @@ terminal_dialogs_show_about (GtkWindow *parent)
     NULL,
   };
 
-  GdkPixbuf *logo;
+  GdkPixbuf    *logo = NULL;
+  GtkIconTheme *theme;
 
   /* try to load the about logo */
-  logo = gdk_pixbuf_new_from_file_at_size (DATADIR "/icons/hicolor/scalable/apps/Terminal.svg", 168, 168, NULL);
+  theme = gtk_icon_theme_get_default ();
+  if (gtk_icon_theme_has_icon (theme, "utilities-terminal"))
+    logo = gtk_icon_theme_load_icon (theme, "utilities-terminal", 128, GTK_ICON_LOOKUP_FORCE_SVG, NULL);
+  if (logo == NULL)
+    logo = gdk_pixbuf_new_from_file_at_size (DATADIR "/icons/hicolor/scalable/apps/Terminal.svg", 128, 128, NULL);
 
   /* set dialog hook on gtk versions older then 2.18 */
 #if !GTK_CHECK_VERSION (2, 18, 0)
diff --git a/terminal/terminal-stock.c b/terminal/terminal-stock.c
index fbd1d8e..0a455e6 100644
--- a/terminal/terminal-stock.c
+++ b/terminal/terminal-stock.c
@@ -60,7 +60,7 @@ static const TerminalStockIcon terminal_stock_icons[] =
  *
  * This function sets up the terminal stock icons.
  **/
-void
+gboolean
 terminal_stock_init (void)
 {
   GtkIconTheme   *icon_theme;
@@ -113,6 +113,8 @@ terminal_stock_init (void)
   /* cleanup */
   g_object_unref (G_OBJECT (icon_factory));
   gtk_icon_source_free (icon_source);
+
+  return gtk_icon_theme_has_icon (icon_theme, "utilities-terminal");
 }
 
 
diff --git a/terminal/terminal-stock.h b/terminal/terminal-stock.h
index acdd30a..ba3b1d2 100644
--- a/terminal/terminal-stock.h
+++ b/terminal/terminal-stock.h
@@ -31,7 +31,7 @@ G_BEGIN_DECLS
 #define TERMINAL_STOCK_SHOWMENU     "terminal-showmenu"
 #define TERMINAL_STOCK_COMPOSE      "terminal-compose"
 
-void terminal_stock_init (void);
+gboolean terminal_stock_init (void);
 
 G_END_DECLS