Changeset 9356


Ignore:
Timestamp:
Oct 22, 2009, 2:17:52 AM (13 years ago)
Author:
charles
Message:

(1.7x) backports for 1.76: gtk client failed to build on systems with a modern version of glib but older version of gtk

Location:
branches/1.7x
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.7x/NEWS

    r9355 r9356  
    33  * Fix manpage errors
    44  * Use automake's "quieter builds" rule when available
     5==== GTK+ ====
     6  * Fix 1.61 build failure if a new version of glib, but old version of gtk, is installed
    57
    68=== Transmission 1.75 (2009/09/13) ===
  • branches/1.7x/gtk/icons.c

    r8891 r9356  
    1010
    1111#ifdef HAVE_GIO
     12 #if GTK_CHECK_VERSION( 2, 12, 0 )
     13   #define USE_GIO_ICONS
     14 #endif
     15#endif
     16
     17#ifdef USE_GIO_ICONS
    1218 #include <gio/gio.h>
    1319#endif
     
    1521#define VOID_PIXBUF_KEY "void-pixbuf"
    1622
    17 #ifdef HAVE_GIO
     23#ifdef USE_GIO_ICONS
    1824static const char *
    1925get_static_string( const char *s )
     
    9197}
    9298
    93 #ifdef HAVE_GIO
     99#ifdef USE_GIO_ICONS
    94100static const char *
    95101_icon_cache_get_icon_key( GIcon * icon )
     
    216222}
    217223
    218 #else /* HAVE_GIO */
     224#else /* USE_GIO_ICONS */
    219225
    220226static GdkPixbuf *
     
    276282get_mime_type_from_filename( const char * file G_GNUC_UNUSED )
    277283{
    278 #ifdef HAVE_GIO
     284#ifdef USE_GIO_ICONS
    279285    char * tmp = g_content_type_guess( file, NULL, 0, NULL );
    280286    const char * ret = get_static_string( tmp );
Note: See TracChangeset for help on using the changeset viewer.