# HG changeset patch
# User nenolod
# Date 1166465069 28800
# Node ID 9d38094655dfa251cab324629fcfffe0a5b6a588
# Parent  ac8a7d286616d527db0b656b68555abb39542473
[svn] - fix the positioning of an assertion to a place where it would actually
  be useful
- gdk_color_alloc -> gdk_colormap_alloc_color
- gdk_window_get_colormap -> gdk_drawable_get_colormap

diff -r ac8a7d286616 -r 9d38094655df ChangeLog
--- a/ChangeLog	Mon Dec 18 09:56:52 2006 -0800
+++ b/ChangeLog	Mon Dec 18 10:04:29 2006 -0800
@@ -1,3 +1,17 @@
+2006-12-18 17:56:52 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [3331]
+  - gdk_image_destroy -> g_object_unref
+  - gdk_gc_destroy -> g_object_unref
+  - gdk_pixbuf_render_to_drawable -> gdk_draw_pixbuf
+  
+  trunk/audacious/equalizer.c               |    8 ++++----
+  trunk/audacious/mainwin.c                 |   10 +++++-----
+  trunk/audacious/ui_playlist.c             |    2 +-
+  trunk/audacious/widgets/playlist_slider.c |    2 +-
+  trunk/audacious/widgets/skin.c            |   12 ++++++------
+  5 files changed, 17 insertions(+), 17 deletions(-)
+
+
 2006-12-18 17:43:42 +0000  William Pitcock <nenolod@nenolod.net>
   revision [3329]
   - remove deprecated symbol warnings for gdk_draw_pixmap
diff -r ac8a7d286616 -r 9d38094655df audacious/widgets/skin.c
--- a/audacious/widgets/skin.c	Mon Dec 18 09:56:52 2006 -0800
+++ b/audacious/widgets/skin.c	Mon Dec 18 10:04:29 2006 -0800
@@ -476,11 +476,11 @@
     gint i;
 
     g_return_if_fail(text != NULL);
+    g_return_if_fail(GDK_IS_WINDOW(playlistwin->window));
 
     /* Get the first line of text */
     gi = gdk_drawable_get_image(text, 0, 0, 152, 6);
-    cm = gdk_window_get_colormap(playlistwin->window);
-    g_return_if_fail(GDK_IS_WINDOW(playlistwin->window));
+    cm = gdk_drawable_get_colormap(playlistwin->window);
 
     for (i = 0; i < 6; i++) {
         GdkColor c;
@@ -1190,8 +1190,8 @@
             if (len >= 2)
                 color->blue = hex_chars_to_int(*ptr, *(ptr + 1));
 
-            gdk_color_alloc(gdk_window_get_colormap(playlistwin->window),
-                            color);
+            gdk_colormap_alloc_color(gdk_drawable_get_colormap(playlistwin->window),
+                            color, TRUE, TRUE);
             g_free(value);
         }
         if (filename)