Changeset 12648


Ignore:
Timestamp:
Aug 8, 2011, 4:02:37 PM (10 years ago)
Author:
jordan
Message:

(trunk gtk) remove an unnecessary GTK_CHECK_VERSION(2,10,0) check now that the minimum gtk+ version's been bumped

Location:
trunk/gtk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/gtk/main.c

    r12639 r12648  
    639639        { "version",    '\0', 0, G_OPTION_ARG_NONE,
    640640          &showversion, _( "Show version number and exit" ), NULL },
    641 #ifdef STATUS_ICON_SUPPORTED
    642641        { "minimized",  'm', 0, G_OPTION_ARG_NONE,
    643642          &startminimized,
    644643          _( "Start minimized in notification area" ), NULL },
    645 #endif
    646644        { "config-dir", 'g', 0, G_OPTION_ARG_FILENAME, &configDir,
    647645          _( "Where to look for configuration files" ), NULL },
  • trunk/gtk/tr-icon.c

    r12639 r12648  
    3131
    3232#define ICON_NAME "transmission"
    33 
    34 #ifndef STATUS_ICON_SUPPORTED
    35 gpointer gtr_icon_new( TrCore * core UNUSED ) { return NULL; }
    36 void gtr_icon_refresh( gpointer vicon UNUSED ) { }
    37 #else
    3833
    3934#ifdef HAVE_LIBAPPINDICATOR
     
    139134}
    140135
    141 #ifdef HAVE_LIBAPPINDICATOR
    142136gpointer
    143137gtr_icon_new( TrCore * core)
    144138{
     139#ifdef HAVE_LIBAPPINDICATOR
    145140    GtkWidget * w;
    146141    const char * icon_name = getIconName( );
     
    151146    g_object_set_qdata( G_OBJECT( indicator ), get_core_quark( ), core );
    152147    return indicator;
    153 }
    154148#else
    155 gpointer
    156 gtr_icon_new( TrCore * core )
    157 {
    158149    const char * icon_name = getIconName( );
    159150    GtkStatusIcon * icon = gtk_status_icon_new_from_icon_name( icon_name );
     
    162153    g_object_set_qdata( G_OBJECT( icon ), get_core_quark( ), core );
    163154    return icon;
     155#endif
    164156}
    165 
    166 #endif
    167 
    168 #endif
  • trunk/gtk/tr-icon.h

    r11709 r12648  
    1717#include "tr-core.h"
    1818
    19 #if GTK_CHECK_VERSION( 2,10,0 )
    20  #define STATUS_ICON_SUPPORTED
    21 #endif
    22 
    2319gpointer  gtr_icon_new      ( TrCore * core );
    2420void      gtr_icon_refresh  ( gpointer );
Note: See TracChangeset for help on using the changeset viewer.