# HG changeset patch
# User William Pitcock <nenolod@atheme-project.org>
# Date 1183614548 18000
# Node ID 13f8e30f335f296806e002fb9124df308858bdee
# Parent  df71b1cef70ada249e0e0e91a0754de23a0a69e8# Parent  048fa5c2b1dbf576a25aa0e5d872bc6af4264b40
Automated merge with ssh://hg.atheme.org//hg/audacious

diff -r df71b1cef70a -r 13f8e30f335f src/audacious/ui_main.c
--- a/src/audacious/ui_main.c	Thu Jul 05 00:48:53 2007 -0500
+++ b/src/audacious/ui_main.c	Thu Jul 05 00:49:08 2007 -0500
@@ -2835,7 +2835,6 @@
 
     mainwin_info = ui_skinned_textbox_new(SKINNED_WINDOW(mainwin)->fixed, mainwin_bg, SKINNED_WINDOW(mainwin)->gc, 112, 27,
                              153, 1, SKIN_TEXT);
-    gtk_fixed_put(GTK_FIXED(SKINNED_WINDOW(mainwin)->fixed), mainwin_info, 112, 27);
     ui_skinned_textbox_set_scroll(mainwin_info, cfg.autoscroll);
     ui_skinned_textbox_set_xfont(mainwin_info, cfg.mainwin_use_xfont, cfg.mainwin_font);
     g_signal_connect(mainwin_info, "double-clicked", mainwin_info_double_clicked_cb, NULL);
@@ -2843,13 +2842,12 @@
 
     mainwin_othertext = ui_skinned_textbox_new(SKINNED_WINDOW(mainwin)->fixed, mainwin_bg, SKINNED_WINDOW(mainwin)->gc, 112, 43,
                              153, 1, SKIN_TEXT);
-    gtk_fixed_put(GTK_FIXED(SKINNED_WINDOW(mainwin)->fixed), mainwin_othertext, 112, 43);
+
     mainwin_rate_text = ui_skinned_textbox_new(SKINNED_WINDOW(mainwin)->fixed, mainwin_bg, SKINNED_WINDOW(mainwin)->gc, 111, 43, 15,
                              0, SKIN_TEXT);
-    gtk_fixed_put(GTK_FIXED(SKINNED_WINDOW(mainwin)->fixed), mainwin_rate_text, 111, 43);
+
     mainwin_freq_text = ui_skinned_textbox_new(SKINNED_WINDOW(mainwin)->fixed, mainwin_bg, SKINNED_WINDOW(mainwin)->gc, 156, 43, 10,
                             0, SKIN_TEXT);
-    gtk_fixed_put(GTK_FIXED(SKINNED_WINDOW(mainwin)->fixed), mainwin_freq_text, 156, 43);
 
     mainwin_menurow =
         create_menurow(&mainwin_wlist, mainwin_bg, SKINNED_WINDOW(mainwin)->gc, 10, 22, 304,
diff -r df71b1cef70a -r 13f8e30f335f src/audacious/ui_skinned_textbox.c
--- a/src/audacious/ui_skinned_textbox.c	Thu Jul 05 00:48:53 2007 -0500
+++ b/src/audacious/ui_skinned_textbox.c	Thu Jul 05 00:49:08 2007 -0500
@@ -167,6 +167,8 @@
     textbox->fixed = fixed;
     textbox->double_size = FALSE;
 
+    gtk_fixed_put(GTK_FIXED(textbox->fixed), GTK_WIDGET(textbox), textbox->x, textbox->y);
+
     return GTK_WIDGET(textbox);
 }
 
@@ -283,15 +285,15 @@
 
                 if(textbox->pixmap_width - textbox->offset > textbox->width){ // case1
                     cw1 = textbox->width;
-                    gdk_draw_drawable(textbox->img, textbox->gc, textbox->pixmap, textbox->offset, 0,
+                    gdk_draw_drawable(obj, textbox->gc, textbox->pixmap, textbox->offset, 0,
                                       0, 0, cw1, textbox->height);
                 }
                 else { // case 2
                     cw1 = textbox->pixmap_width - textbox->offset;
-                    gdk_draw_drawable(textbox->img, textbox->gc, textbox->pixmap, textbox->offset, 0,
+                    gdk_draw_drawable(obj, textbox->gc, textbox->pixmap, textbox->offset, 0,
                                       0, 0, cw1, textbox->height);
                     cw2 = textbox->width - cw1;
-                    gdk_draw_drawable(textbox->img, textbox->gc, textbox->pixmap, 0, 0, cw1, 0, cw2, textbox->height);
+                    gdk_draw_drawable(obj, textbox->gc, textbox->pixmap, 0, 0, cw1, 0, cw2, textbox->height);
                 }
 
             }
@@ -486,7 +488,7 @@
     textbox->redraw = TRUE;
     textbox->text = str_to_utf8(text);
     textbox->scroll_back = FALSE;
-    //gtk_widget_queue_draw(GTK_WIDGET(textbox));
+    gtk_widget_queue_draw(GTK_WIDGET(textbox));
 }
 
 static void textbox_generate_xfont_pixmap(UiSkinnedTextbox *textbox, const gchar *pixmaptext) {
@@ -707,7 +709,7 @@
         }
 
         textbox->offset = 0;
-        //gtk_widget_queue_draw(GTK_WIDGET(textbox));
+        gtk_widget_queue_draw(GTK_WIDGET(textbox));
     }
 }