Changeset 10657 for trunk/gtk/icons.c

Timestamp:

May 18, 2010, 8:55:14 PM (12 years ago)

Author:

charles

Message:

(trunk gtk) and while we're on the subject, fix more tab damage

File:

• trunk/gtk/icons.c (modified) (11 diffs)

trunk/gtk/icons.c

@@ -80 +80 @@
 
 static IconCache *
-icon_cache_new (GtkWidget * for_widget,
-                int         icon_size)
+icon_cache_new (GtkWidget * for_widget, int icon_size)
 {
     IconCache * icon_cache;
-        
+
     g_return_val_if_fail( for_widget != NULL, NULL );
-        
+
     icon_cache = g_new0( IconCache, 1 );
     icon_cache->icon_theme = gtk_icon_theme_get_for_screen( gtk_widget_get_screen( for_widget ));
     icon_cache->icon_size = get_size_in_pixels( for_widget, icon_size );
     icon_cache->cache = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_object_unref);
-        
+
     g_hash_table_insert( icon_cache->cache, (void*)VOID_PIXBUF_KEY, create_void_pixbuf( icon_cache->icon_size, icon_cache->icon_size ));
-        
+
     return icon_cache;
 }
@@ -102 +101 @@
 {
     const char * key = NULL;
-        
+
     if ( G_IS_THEMED_ICON( icon )) {
         char ** icon_names;
         char  * name;
-        
+
         g_object_get( icon, "names", &icon_names, NULL );
         name = g_strjoinv( ",", icon_names );
-                
+
         key = get_static_string( name );
-                
+
         g_free( name );
-        g_strfreev( icon_names );       
+        g_strfreev( icon_names );
     }
     else if ( G_IS_FILE_ICON( icon )) {
@@ -121 +120 @@
         file = g_file_icon_get_file( G_FILE_ICON( icon ));
         filename = g_file_get_path( file );
-                
+
         key = get_static_string( filename );
-                
+
         g_free( filename );
         g_object_unref( file );
     }
-        
+
     return key;
 }
@@ -133 +132 @@
 
 static GdkPixbuf *
-get_themed_icon_pixbuf( GThemedIcon  *icon,
-                        int           size,
-                        GtkIconTheme *icon_theme )
+get_themed_icon_pixbuf( GThemedIcon   * icon,
+                        int             size,
+                        GtkIconTheme  * icon_theme )
 {
     char        ** icon_names = NULL;
@@ -163 +162 @@
 
 static GdkPixbuf *
-get_file_icon_pixbuf( GFileIcon *icon,
-                      int        size )
+get_file_icon_pixbuf( GFileIcon * icon, int size )
 {
     GFile     * file;
     char      * filename;
     GdkPixbuf * pixbuf;
-        
+
     file = g_file_icon_get_file( icon );
     filename = g_file_get_path( file );
@@ -175 +173 @@
     g_free( filename );
     g_object_unref( file );
-        
-    return pixbuf;
-}
-
-
-static GdkPixbuf *
-_get_icon_pixbuf( GIcon        *icon,
-                  int           size,
-                  GtkIconTheme *theme )
+
+    return pixbuf;
+}
+
+
+static GdkPixbuf *
+_get_icon_pixbuf( GIcon * icon, int size, GtkIconTheme * theme )
 {
     if ( icon == NULL )
@@ -196 +192 @@
 
 static GdkPixbuf *
-icon_cache_get_mime_type_icon( IconCache  * icon_cache,
-                               const char * mime_type )
+icon_cache_get_mime_type_icon( IconCache * icon_cache, const char * mime_type )
 {
     GIcon      * icon;
@@ -205 +200 @@
     icon = g_content_type_get_icon( mime_type );
     key = _icon_cache_get_icon_key( icon );
-        
+
     if (key == NULL)
         key = VOID_PIXBUF_KEY;
@@ -221 +216 @@
 
     g_object_unref( G_OBJECT( icon ) );
-        
+
     return pixbuf;
 }
@@ -228 +223 @@
 
 static GdkPixbuf *
-icon_cache_get_mime_type_icon( IconCache  * icon_cache,
-                               const char * mime_type )
+icon_cache_get_mime_type_icon( IconCache * icon_cache, const char * mime_type )
 {
     GdkPixbuf  * pixbuf;
@@ -275 +269 @@
         case GTK_ICON_SIZE_DIALOG:          n = 6; break;
         default /*GTK_ICON_SIZE_INVALID*/:  n = 0; break;
-    }   
+    }
 
     if( icon_cache[n] == NULL )