# HG changeset patch
# User nenolod
# Date 1166465347 28800
# Node ID 41e60e045e9e6b75baf77709abc701e06dbcaaaf
# Parent  9d38094655dfa251cab324629fcfffe0a5b6a588
[svn] - gtk_timeout_add -> g_timeout_add
- gtk_timeout_remove -> g_source_remove

diff -r 9d38094655df -r 41e60e045e9e ChangeLog
--- a/ChangeLog	Mon Dec 18 10:04:29 2006 -0800
+++ b/ChangeLog	Mon Dec 18 10:09:07 2006 -0800
@@ -1,3 +1,14 @@
+2006-12-18 18:04:29 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [3333]
+  - 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
+  
+  trunk/audacious/widgets/skin.c |    8 ++++----
+  1 file changed, 4 insertions(+), 4 deletions(-)
+
+
 2006-12-18 17:56:52 +0000  William Pitcock <nenolod@nenolod.net>
   revision [3331]
   - gdk_image_destroy -> g_object_unref
diff -r 9d38094655df -r 41e60e045e9e audacious/widgets/playlist_list.c
--- a/audacious/widgets/playlist_list.c	Mon Dec 18 10:04:29 2006 -0800
+++ b/audacious/widgets/playlist_list.c	Mon Dec 18 10:09:07 2006 -0800
@@ -412,7 +412,7 @@
             if (!pl->pl_auto_drag_up) {
                 pl->pl_auto_drag_up = TRUE;
                 pl->pl_auto_drag_up_tag =
-                    gtk_timeout_add(100, playlist_list_auto_drag_up_func, pl);
+                    g_timeout_add(100, playlist_list_auto_drag_up_func, pl);
             }
         }
         else if (pl->pl_auto_drag_up)
@@ -423,7 +423,7 @@
             if (!pl->pl_auto_drag_down) {
                 pl->pl_auto_drag_down = TRUE;
                 pl->pl_auto_drag_down_tag =
-                    gtk_timeout_add(100, playlist_list_auto_drag_down_func,
+                    g_timeout_add(100, playlist_list_auto_drag_down_func,
                                     pl);
             }
         }
diff -r 9d38094655df -r 41e60e045e9e audacious/widgets/textbox.c
--- a/audacious/widgets/textbox.c	Mon Dec 18 10:04:29 2006 -0800
+++ b/audacious/widgets/textbox.c	Mon Dec 18 10:09:07 2006 -0800
@@ -429,12 +429,12 @@
         if (tb->tb_scroll_enabled && !tb->tb_timeout_tag) {
             gint tag;
             tag = TEXTBOX_SCROLL_SMOOTH_TIMEOUT;
-            tb->tb_timeout_tag = gtk_timeout_add(tag, textbox_scroll, tb);
+            tb->tb_timeout_tag = g_timeout_add(tag, textbox_scroll, tb);
         }
     }
     else {
         if (tb->tb_timeout_tag) {
-            gtk_timeout_remove(tb->tb_timeout_tag);
+            g_source_remove(tb->tb_timeout_tag);
             tb->tb_timeout_tag = 0;
         }
         tb->tb_offset = 0;
@@ -491,13 +491,13 @@
             tb->tb_timeout_tag = 0;
 	}
 
-        tb->tb_timeout_tag = gtk_timeout_add(tag, textbox_scroll, tb);
+        tb->tb_timeout_tag = g_timeout_add(tag, textbox_scroll, tb);
     }
     else
     {
         if (tb->tb_timeout_tag)
         {
-            gtk_timeout_remove(tb->tb_timeout_tag);
+            g_source_remove(tb->tb_timeout_tag);
             tb->tb_timeout_tag = 0;
         }