Changeset 10563


Ignore:
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:
1 added
2 edited
1 moved

Legend:

Unmodified
Added
Removed
  • branches/1.9x/gtk/Makefile.am

    r10133 r10563  
    4747    file-list.h \
    4848    lock.h \
    49     logo.h \
     49    logo-24.h \
     50    logo-48.h \
    5051    makemeta-ui.h \
    5152    msgwin.h \
  • branches/1.9x/gtk/actions.c

    r9989 r10563  
    2424#include "lock.h"
    2525
    26 #include "logo.h"
     26#include "logo-24.h"
     27#include "logo-48.h"
    2728#include "ratio-icon.h"
    2829#include "options-icon.h"
     
    145146static const BuiltinIconInfo my_fallback_icons[] =
    146147{
    147     { tr_icon_logo, WINDOW_ICON         },
    148     { tr_icon_logo, TRAY_ICON           },
    149     { tr_icon_logo, NOTIFICATION_ICON   },
    150     { tr_icon_lock, "transmission-lock" },
    151     { options_icon, "options"           },
    152     { blue_turtle,  "alt-speed-on"      },
    153     { grey_turtle,  "alt-speed-off"     },
    154     { ratio_icon,   "ratio"             }
     148    { tr_icon_logo_48, WINDOW_ICON         },
     149    { tr_icon_logo_24, TRAY_ICON           },
     150    { tr_icon_logo_48, NOTIFICATION_ICON   },
     151    { tr_icon_lock,   "transmission-lock" },
     152    { options_icon,   "options"           },
     153    { blue_turtle,    "alt-speed-on"      },
     154    { grey_turtle,    "alt-speed-off"     },
     155    { ratio_icon,     "ratio"             }
    155156};
    156157
  • branches/1.9x/gtk/logo-48.h

    r10451 r10563  
    55#endif
    66#ifdef __GNUC__
    7 static const guint8 tr_icon_logo[] __attribute__ ( ( __aligned__ ( 4 ) ) )
     7static const guint8 tr_icon_logo_48[] __attribute__ ( ( __aligned__ ( 4 ) ) )
    88    =
    99#else
    10 static const guint8 tr_icon_logo[] =
     10static const guint8 tr_icon_logo_48[] =
    1111#endif
    1212    { ""
Note: See TracChangeset for help on using the changeset viewer.