Changeset 10563

Timestamp:

May 1, 2010, 3:32:54 AM (11 years ago)

Author:

charles

Message:

(1.93 gtk) backport #3179 "gtk+ client should use the 24-pixel-wide icon in the system tray"

Location:

branches/1.9x/gtk

Files:

• Makefile.am (modified) (1 diff)
• actions.c (modified) (2 diffs)
• logo-24.h (added)
• logo-48.h (moved) (moved from branches/1.9x/gtk/logo.h) (1 diff)

branches/1.9x/gtk/Makefile.am

@@ -47 +47 @@
     file-list.h \
     lock.h \
-    logo.h \
+    logo-24.h \
+    logo-48.h \
     makemeta-ui.h \
     msgwin.h \

branches/1.9x/gtk/actions.c

@@ -24 +24 @@
 #include "lock.h"
 
-#include "logo.h"
+#include "logo-24.h"
+#include "logo-48.h"
 #include "ratio-icon.h"
 #include "options-icon.h"
@@ -145 +146 @@
 static const BuiltinIconInfo my_fallback_icons[] =
 {
-    { tr_icon_logo, WINDOW_ICON         },
-    { tr_icon_logo, TRAY_ICON           },
-    { tr_icon_logo, NOTIFICATION_ICON   },
-    { tr_icon_lock, "transmission-lock" },
-    { options_icon, "options"           },
-    { blue_turtle,  "alt-speed-on"      },
-    { grey_turtle,  "alt-speed-off"     },
-    { ratio_icon,   "ratio"             }
+    { tr_icon_logo_48, WINDOW_ICON         },
+    { tr_icon_logo_24, TRAY_ICON           },
+    { tr_icon_logo_48, NOTIFICATION_ICON   },
+    { tr_icon_lock,   "transmission-lock" },
+    { options_icon,   "options"           },
+    { blue_turtle,    "alt-speed-on"      },
+    { grey_turtle,    "alt-speed-off"     },
+    { ratio_icon,     "ratio"             }
 };
 

branches/1.9x/gtk/logo-48.h

@@ -5 +5 @@
 #endif
 #ifdef __GNUC__
-static const guint8 tr_icon_logo[] __attribute__ ( ( __aligned__ ( 4 ) ) )
+static const guint8 tr_icon_logo_48[] __attribute__ ( ( __aligned__ ( 4 ) ) )
     =
 #else
-static const guint8 tr_icon_logo[] =
+static const guint8 tr_icon_logo_48[] =
 #endif
     { ""