Changeset 4967

Timestamp:

Feb 7, 2008, 8:02:06 PM (14 years ago)

Author:

charles

Message:

(gtk) #376: Use freedesktop icon spec

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• gtk/Makefile.am (modified) (2 diffs)
• gtk/actions.c (modified) (2 diffs)
• gtk/icons (added)
• gtk/icons/Makefile.am (added)
• gtk/icons/hicolor_apps_16x16_transmission.png (added)
• gtk/icons/hicolor_apps_16x16_transmission.svg (added)
• gtk/icons/hicolor_apps_22x22_transmission.png (added)
• gtk/icons/hicolor_apps_22x22_transmission.svg (added)
• gtk/icons/hicolor_apps_24x24_transmission.png (added)
• gtk/icons/hicolor_apps_32x32_transmission.png (added)
• gtk/icons/hicolor_apps_32x32_transmission.svg (added)
• gtk/icons/hicolor_apps_48x48_transmission.png (added)
• gtk/icons/hicolor_apps_scalable_transmission.svg (added)
• gtk/logo.h (deleted)
• gtk/main.c (modified) (2 diffs)
• gtk/tr_icon.c (modified) (1 diff)

trunk/configure.ac

@@ -243 +243 @@
                  wx/images/Makefile
                  gtk/Makefile
+                 gtk/icons/Makefile
                  po/Makefile.in])
 

trunk/gtk/Makefile.am

@@ +1 @@
+SUBDIRS = icons
+
 AM_CPPFLAGS = \
     -I$(top_srcdir) \
@@ -18 +20 @@
     ipc.h \
     lock.h \
-    logo.h \
     makemeta-ui.h \
     msgwin.h \

trunk/gtk/actions.c

@@ -20 +20 @@
 #include "tr_prefs.h"
 #include "lock.h"
-#include "logo.h"
 
 #define UNUSED G_GNUC_UNUSED
@@ -163 +162 @@
 const BuiltinIconInfo my_builtin_icons [] =
 {
-    { tr_icon_logo, "transmission-logo" },
     { tr_icon_lock, "transmission-lock" }
 };

trunk/gtk/main.c

@@ -278 +278 @@
     gtk_ui_manager_add_ui_from_string (myUIManager, fallback_ui_file, -1, NULL);
     gtk_ui_manager_ensure_update (myUIManager);
-    gtk_window_set_default_icon_name ( "transmission-logo" );
+    gtk_window_set_default_icon_name ( "transmission" );
 
     argfiles = checkfilenames( argc-1, argv+1 );
@@ -902 +902 @@
         "website", "http://www.transmissionbt.com/",
         "copyright",_("Copyright 2005-2008 The Transmission Project"),
-        "logo-icon-name", "transmission-logo",
+        "logo-icon-name", "transmission",
 #ifdef SHOW_LICENSE
         "license", LICENSE,

trunk/gtk/tr_icon.c

@@ -89 +89 @@
 {
     guint id;
-    GtkStatusIcon * icon = gtk_status_icon_new_from_stock ("transmission-logo");
+    GtkStatusIcon * icon = gtk_status_icon_new_from_stock ("transmission");
     g_signal_connect( icon, "activate", G_CALLBACK( activated ), NULL );
     g_signal_connect( icon, "popup-menu", G_CALLBACK( popup ), NULL );