Fix typo. The gtk.immodules file had never been included in my

[~andy/gtk] / gtk / gtkfilesystemwin32.c

diff --git a/gtk/gtkfilesystemwin32.c b/gtk/gtkfilesystemwin32.c
index 75a5bc6a4804b9ca09d583e1c79139a458cfc828..9062888df06041ae2fed6acf5c66ef7afa012871 100644 (file)
--- a/gtk/gtkfilesystemwin32.c
+++ b/gtk/gtkfilesystemwin32.c
@@ -20,6 +20,7 @@
  */
 
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkfilesystem.h"
 #include "gtkfilesystemwin32.h"
 #include "gtkintl.h"
@@ -966,13 +967,14 @@ extract_icon (const char* filename)
           if (GetDIBits (hdc, ii.hbmColor, 0, 1, NULL, (BITMAPINFO *)&bmi, DIB_RGB_COLORS))
            {
                gchar *pixels, *bits;
-               gint    rowstride, x, y, w = bmi.bi.biWidth, h = bmi.bi.biHeight;
+               gint rowstride, x, y, w = bmi.bi.biWidth, h = bmi.bi.biHeight;
+               gboolean no_alpha;
 
-               bmi.bi.biBitCount = 24;
+               bmi.bi.biBitCount = 32;
                bmi.bi.biCompression = BI_RGB;
                bmi.bi.biHeight = -h;
                pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, w, h);
-               bits = g_malloc (4 * w * h);
+               bits = g_malloc0 (4 * w * h);
 
                /* color data */
                if (!GetDIBits (hdc, ii.hbmColor, 0, h, bits, (BITMAPINFO *)&bmi, DIB_RGB_COLORS))
@@ -980,35 +982,40 @@ extract_icon (const char* filename)
 
                pixels = gdk_pixbuf_get_pixels (pixbuf);
                rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+               no_alpha = TRUE;
                for (y = 0; y < h; y++)
                  {
                    for (x = 0; x < w; x++)
                      {
-                         pixels[2] = bits[(x+y*w) * 3];
-                         pixels[1] = bits[(x+y*w) * 3 + 1];
-                         pixels[0] = bits[(x+y*w) * 3 + 2];
+                         pixels[2] = bits[(x+y*w) * 4];
+                         pixels[1] = bits[(x+y*w) * 4 + 1];
+                         pixels[0] = bits[(x+y*w) * 4 + 2];
+                         pixels[3] = bits[(x+y*w) * 4 + 3];
+                         if (no_alpha && pixels[3] > 0) no_alpha = FALSE;
                          pixels += 4;
                      }
                    pixels += (w * 4 - rowstride);
                  }
-               /* transparency */
-               if (!GetDIBits (hdc, ii.hbmMask, 0, h, bits, (BITMAPINFO *)&bmi, DIB_RGB_COLORS))
-                 g_warning(G_STRLOC ": Failed to get dibits");
-               pixels = gdk_pixbuf_get_pixels (pixbuf);
-               for (y = 0; y < h; y++)
-                 {
-                   for (x = 0; x < w; x++)
-                     {
-                         pixels[3] = 255 - bits[(x + y * w) * 3];
+               /* mask */
+               if (no_alpha) {
+                 if (!GetDIBits (hdc, ii.hbmMask, 0, h, bits, (BITMAPINFO *)&bmi, DIB_RGB_COLORS))
+                   g_warning(G_STRLOC ": Failed to get dibits");
+                 pixels = gdk_pixbuf_get_pixels (pixbuf);
+                 for (y = 0; y < h; y++)
+                   {
+                     for (x = 0; x < w; x++)
+                       {
+                         pixels[3] = 255 - bits[(x + y * w) * 4];
                          pixels += 4;
-                     }
-                   pixels += (w * 4 - rowstride);
-                 }
+                       }
+                     pixels += (w * 4 - rowstride);
+                   }
                
-               /* release temporary resources */
-               g_free (bits);
-               if (!DeleteObject (ii.hbmColor) || !DeleteObject (ii.hbmMask))
-                 g_warning(G_STRLOC ": Leaking Icon Bitmaps ?");
+                 /* release temporary resources */
+                 g_free (bits);
+                 if (!DeleteObject (ii.hbmColor) || !DeleteObject (ii.hbmMask))
+                   g_warning(G_STRLOC ": Leaking Icon Bitmaps ?");
+               }
            }
          else
            g_warning(G_STRLOC ": GetDIBits () failed, %s", g_win32_error_message (GetLastError ()));
@@ -1022,7 +1029,7 @@ extract_icon (const char* filename)
         g_warning(G_STRLOC ": DestroyIcon failed");
     }
   else
-    g_print ("ExtractAssociatedIcon(%s) failed: %s\n", filename, g_win32_error_message (GetLastError ()));
+    g_warning (G_STRLOC ":ExtractAssociatedIcon(%s) failed: %s", filename, g_win32_error_message (GetLastError ()));
 
   return pixbuf;
 }
@@ -1100,7 +1107,8 @@ gtk_file_system_win32_render_icon (GtkFileSystem     *file_system,
     }
   else if (g_file_test (filename, G_FILE_TEST_IS_DIR))
     {
-      if (0 == strcmp (g_get_home_dir(), filename))
+      const gchar *home = g_get_home_dir ();
+      if (home != NULL && 0 == strcmp (home, filename))
         icon_set = gtk_style_lookup_icon_set (widget->style, GTK_STOCK_HOME);
       else
         icon_set = gtk_style_lookup_icon_set (widget->style, GTK_STOCK_DIRECTORY);