Changeset 10547


Ignore:
Timestamp:
Apr 29, 2010, 3:39:29 PM (11 years ago)
Author:
charles
Message:

(trunk gtk) #3179 "GTK+ Client should use the 24-pixel-wide icon in the system tray" -- fixed in trunk for 2.00

Location:
trunk/gtk
Files:
1 added
2 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/gtk/Makefile.am

    r10435 r10547  
    4949    file-list.h \
    5050    lock.h \
    51     logo.h \
     51    logo-24.h \
     52    logo-48.h \
    5253    makemeta-ui.h \
    5354    msgwin.h \
  • trunk/gtk/actions.c

    r10490 r10547  
    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"
     
    144145static const BuiltinIconInfo my_fallback_icons[] =
    145146{
    146     { tr_icon_logo, WINDOW_ICON         },
    147     { tr_icon_logo, TRAY_ICON           },
    148     { tr_icon_logo, NOTIFICATION_ICON   },
    149     { tr_icon_lock, "transmission-lock" },
    150     { options_icon, "options"           },
    151     { blue_turtle,  "alt-speed-on"      },
    152     { grey_turtle,  "alt-speed-off"     },
    153     { ratio_icon,   "ratio"             }
     147    { tr_icon_logo_48,  WINDOW_ICON          },
     148    { tr_icon_logo_24,  TRAY_ICON            },
     149    { tr_icon_logo_48,  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"              }
    154155};
    155156
  • trunk/gtk/logo-48.h

    r10536 r10547  
    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.