# HG changeset patch
# User nenolod
# Date 1166464612 28800
# Node ID ac8a7d286616d527db0b656b68555abb39542473
# Parent  48c8ecbfb28264482112a5d3304ed1e65feb0e23
[svn] - gdk_image_destroy -> g_object_unref
- gdk_gc_destroy -> g_object_unref
- gdk_pixbuf_render_to_drawable -> gdk_draw_pixbuf

diff -r 48c8ecbfb282 -r ac8a7d286616 ChangeLog
--- a/ChangeLog	Mon Dec 18 09:43:42 2006 -0800
+++ b/ChangeLog	Mon Dec 18 09:56:52 2006 -0800
@@ -1,3 +1,13 @@
+2006-12-18 17:43:42 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [3329]
+  - remove deprecated symbol warnings for gdk_draw_pixmap
+  
+  trunk/audacious/widgets/playlist_list.c |    4 ++--
+  trunk/audacious/widgets/skin.c          |    4 ++--
+  trunk/audacious/widgets/textbox.c       |   12 ++++++------
+  3 files changed, 10 insertions(+), 10 deletions(-)
+
+
 2006-12-18 16:44:33 +0000  William Pitcock <nenolod@nenolod.net>
   revision [3327]
   - patch to add a scrolling voiceprint to the mini visualizer.
diff -r 48c8ecbfb282 -r ac8a7d286616 audacious/equalizer.c
--- a/audacious/equalizer.c	Mon Dec 18 09:43:42 2006 -0800
+++ b/audacious/equalizer.c	Mon Dec 18 09:56:52 2006 -0800
@@ -356,8 +356,8 @@
                 img2 = create_dblsize_image(img);
                 gdk_draw_image(equalizerwin_bg_x2, equalizerwin_gc,
                                img2, 0, 0, 0, 0, 550, 232);
-                gdk_image_destroy(img2);
-                gdk_image_destroy(img);
+                g_object_unref(img2);
+                g_object_unref(img);
             }
             else {
                 for (wl = equalizerwin_wlist; wl; wl = g_list_next(wl)) {
@@ -371,8 +371,8 @@
                                        equalizerwin_gc, img2, 0, 0,
                                        w->x << 1, w->y << 1, w->width << 1,
                                        w->height << 1);
-                        gdk_image_destroy(img2);
-                        gdk_image_destroy(img);
+                        g_object_unref(img2);
+                        g_object_unref(img);
                         w->redraw = FALSE;
                     }
                 }
diff -r 48c8ecbfb282 -r ac8a7d286616 audacious/mainwin.c
--- a/audacious/mainwin.c	Mon Dec 18 09:43:42 2006 -0800
+++ b/audacious/mainwin.c	Mon Dec 18 09:56:52 2006 -0800
@@ -791,8 +791,8 @@
                                0, 0, bmp_active_skin->properties.mainwin_width * 2,
                                cfg.player_shaded ? MAINWIN_SHADED_HEIGHT *
                                2 : bmp_active_skin->properties.mainwin_height * 2);
-                gdk_image_destroy(img2x);
-                gdk_image_destroy(img);
+                g_object_unref(img2x);
+                g_object_unref(img);
             }
 
             gdk_window_clear(mainwin->window);
@@ -821,8 +821,8 @@
                     gdk_draw_image(mainwin_bg_x2, mainwin_gc,
                                    img2x, 0, 0, w->x << 1, w->y << 1,
                                    width << 1, height << 1);
-                    gdk_image_destroy(img2x);
-                    gdk_image_destroy(img);
+                    g_object_unref(img2x);
+                    g_object_unref(img);
                     gdk_window_clear_area(mainwin->window, w->x << 1,
                                           w->y << 1, width << 1,
                                           height << 1);
@@ -2775,7 +2775,7 @@
         pattern.pixel = 0;
         gdk_gc_set_foreground(gc, &pattern);
         gdk_draw_rectangle(nullmask, gc, TRUE, 0, 0, 20, 20);
-        gdk_gc_destroy(gc);
+        g_object_unref(gc);
         gtk_widget_shape_combine_mask(mainwin, nullmask, 0, 0);
 
         gdk_window_set_hints(mainwin->window, 0, 0, 0, 0, 0, 0,
diff -r 48c8ecbfb282 -r ac8a7d286616 audacious/ui_playlist.c
--- a/audacious/ui_playlist.c	Mon Dec 18 09:43:42 2006 -0800
+++ b/audacious/ui_playlist.c	Mon Dec 18 09:56:52 2006 -0800
@@ -502,7 +502,7 @@
     gdk_gc_set_foreground(gc, &pattern);
     gdk_draw_rectangle(playlistwin_mask, gc, TRUE, 0, 0,
                        playlistwin_get_width(), playlistwin_get_height());
-    gdk_gc_destroy(gc);
+    g_object_unref(gc);
 
     gtk_widget_shape_combine_mask(playlistwin, playlistwin_mask, 0, 0);
 }
diff -r 48c8ecbfb282 -r ac8a7d286616 audacious/widgets/playlist_slider.c
--- a/audacious/widgets/playlist_slider.c	Mon Dec 18 09:43:42 2006 -0800
+++ b/audacious/widgets/playlist_slider.c	Mon Dec 18 09:56:52 2006 -0800
@@ -57,7 +57,7 @@
                            ps->ps_back_image, 0, 0,
                            ps->ps_widget.x,
                            ps->ps_widget.y + ps->ps_prev_y, 8, 18);
-        gdk_image_destroy(ps->ps_back_image);
+        g_object_unref(ps->ps_back_image);
     }
 
     ps->ps_prev_y = y;
diff -r 48c8ecbfb282 -r ac8a7d286616 audacious/widgets/skin.c
--- a/audacious/widgets/skin.c	Mon Dec 18 09:43:42 2006 -0800
+++ b/audacious/widgets/skin.c	Mon Dec 18 09:56:52 2006 -0800
@@ -323,8 +323,8 @@
         return NULL;
     }
 
-    gdk_pixbuf_render_to_drawable(pixbuf, pixmap, mainwin_gc, 0, 0, 0, 0,
-                                  width, height, GDK_RGB_DITHER_MAX, 0, 0);
+    gdk_draw_pixbuf(pixmap, mainwin_gc, pixbuf, 0, 0, 0, 0, width, height,
+		    GDK_RGB_DITHER_MAX, 0, 0);
     g_object_unref(pixbuf);
 
     return pixmap;
@@ -436,7 +436,7 @@
     pattern.pixel = 1;
     gdk_gc_set_foreground(gc, &pattern);
     gdk_draw_rectangle(ret, gc, TRUE, 0, 0, w, h);
-    gdk_gc_destroy(gc);
+    g_object_unref(gc);
 
     return ret;
 }
@@ -503,7 +503,7 @@
             }
         }
     }
-    gdk_image_destroy(gi);
+    g_object_unref(gi);
 }
 
 gboolean
@@ -1274,7 +1274,7 @@
     if (!created_mask)
         gdk_draw_rectangle(mask, gc, TRUE, 0, 0, width, height);
 
-    gdk_gc_destroy(gc);
+    g_object_unref(gc);
 
     return mask;
 }
@@ -1635,7 +1635,7 @@
     for (i = 0; i < 19; i++)
         colors[i] = gdk_image_get_pixel(img, 0, i);
 
-    gdk_image_destroy(img);
+    g_object_unref(img);
 }