Changeset 8003

Timestamp:

Mar 3, 2009, 5:58:25 PM (14 years ago)

Author:

charles

Message:

(trunk gtk) #628: tweak r7996 a little bit to play nicer on older versions of gtk+

Location:

trunk/gtk

Files:

• icons.c (modified) (5 diffs)
• torrent-cell-renderer.c (modified) (5 diffs)

trunk/gtk/icons.c

@@ -4 +4 @@
  */
 
+#include <string.h> /* strcmp */
 #include <glib.h>
 #include <gtk/gtk.h>
@@ -9 +10 @@
 
 #ifdef HAVE_GIO
-
-#include <gio/gio.h>
+ #include <gio/gio.h>
+#endif
 
 #define VOID_PIXBUF_KEY "void-pixbuf"
@@ -97 +98 @@
 }
 
+#ifdef HAVE_GIO
 static const char *
 _icon_cache_get_icon_key( GIcon * icon )
@@ -218 +220 @@
     return pixbuf;
 }
+
+#else /* HAVE_GIO */
+
+static GdkPixbuf *
+icon_cache_get_mime_type_icon( IconCache  * icon_cache,
+                               const char * mime_type )
+{
+    GdkPixbuf  * pixbuf;
+    const char * stock_name;
+
+    if( !strcmp( mime_type, DIRECTORY_MIME_TYPE ) )
+        stock_name = GTK_STOCK_DIRECTORY;
+    else
+        stock_name = GTK_STOCK_FILE;
+
+    pixbuf = g_hash_table_lookup( icon_cache->cache, stock_name );
+
+    if( pixbuf != NULL )
+    {
+        g_object_ref( pixbuf );
+        return pixbuf;
+    }
+
+    pixbuf = gtk_icon_theme_load_icon( icon_cache->icon_theme,
+                                       stock_name,
+                                       icon_cache->icon_size,
+                                       0, NULL );
+    g_hash_table_insert( icon_cache->cache, (gpointer) stock_name, g_object_ref( pixbuf ));
+    return pixbuf;
+}
+
+#endif
 
 
@@ -245 +279 @@
 
 const char * 
-get_mime_type_from_filename( const char *file )
-{
+get_mime_type_from_filename( const char * file G_GNUC_UNUSED )
+{
+#ifdef HAVE_GIO
     return get_static_string( g_content_type_guess( file, NULL, 0, NULL ));
-}
-
 #else
-
-GdkPixbuf * 
-get_mime_type_icon( const char   * mime_type,
-                    GtkIconSize    icon_size,
-                    GtkWidget    * for_widget )
-{
-    return NULL;
-}                    
-
-
-const char * 
-get_mime_type_from_filename( const char *file )
-{
     return "uncertain";
-}
-
 #endif
+}

trunk/gtk/torrent-cell-renderer.c

@@ -12 +12 @@
 
 #include "assert.h"
+#include <string.h> /* strcmp */
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
@@ -365 +366 @@
     /* cleanup */
     g_free( status );
+    g_object_unref( icon );
 }
 
@@ -427 +429 @@
     g_free( status );
     g_free( progress );
+    g_object_unref( icon );
 }
 
@@ -556 +559 @@
     /* cleanup */
     g_free( status );
+    g_object_unref( icon );
 }
 
@@ -664 +668 @@
     g_free( status );
     g_free( progress );
+    g_object_unref( icon );
 }