# HG changeset patch
# User William Pitcock <nenolod@atheme-project.org>
# Date 1183515609 18000
# Node ID 2d91fa378e4581e86b53e7c931716d9e8f118ad6
# Parent  f4971c7d6384c8e0bf722a05605c291e673f7a5b# Parent  3298ebb6f5db64e9228fa4551452d48512e369d4
Automated merge with ssh://hg.atheme.org//hg/audacious

diff -r f4971c7d6384 -r 2d91fa378e45 AUTHORS
--- a/AUTHORS	Tue Jul 03 21:20:01 2007 -0500
+++ b/AUTHORS	Tue Jul 03 21:20:09 2007 -0500
@@ -4,6 +4,7 @@
 --------------------------------------------
 
 George Averill <nhjm449@gmail.com>
+Michael Färber <0102@gmx.at>
 Giacomo Lozito <james@develia.org>
 William Pitcock <nenolod@sacredspiral.co.uk>
 Derek Pomery <nemo@m8y.org>
@@ -23,7 +24,7 @@
 Greek              - Kouzinopoulos Haris
                      Stavros Giannouris
                      Stathis Kamperis
-Italian		   - Diego Petteno
+Italian            - Diego Petteno
 Japanese           - Dai
 
 -
@@ -90,7 +91,7 @@
 Japanese             - Takeshi Aihana <aihana@gnome.gr.jp>
 Korean               - DongCheon Park <dcpark@kaist.ac.kr>
 Lithuanian           - Rimas Kudelis <rq@akl.lt>
-Macedonian 	     - Arangel Angov <ufo@linux.net.mk>
+Macedonian           - Arangel Angov <ufo@linux.net.mk>
 Polish               - Jacek Wolszczak <shutdownrunner@o2.pl>
 Romanian             - Liviu Danicel <liviu.danicel@spymac.com>
 Russian              - Pavlo Bohmat <bohm@ukr.net>
diff -r f4971c7d6384 -r 2d91fa378e45 src/audacious/ui_credits.c
--- a/src/audacious/ui_credits.c	Tue Jul 03 21:20:01 2007 -0500
+++ b/src/audacious/ui_credits.c	Tue Jul 03 21:20:09 2007 -0500
@@ -78,6 +78,7 @@
     "Kiyoshi Aman",
     "Luca Barbato",
     "Daniel Barkalow",
+    "Michael Färber",
     "Shay Green",
     "Giacomo Lozito",
     "William Pitcock",
diff -r f4971c7d6384 -r 2d91fa378e45 src/audacious/ui_skinned_textbox.c
--- a/src/audacious/ui_skinned_textbox.c	Tue Jul 03 21:20:01 2007 -0500
+++ b/src/audacious/ui_skinned_textbox.c	Tue Jul 03 21:20:09 2007 -0500
@@ -717,19 +717,22 @@
 
     priv->is_scrollable = ui_skinned_textbox_should_scroll(textbox);
 
-    if (!priv->is_scrollable && !priv->font && length <= wl) {
+    if (priv->is_scrollable) {
+        if(!cfg.twoway_scroll) {
+            pixmaptext = g_strdup_printf("%s *** ", priv->pixmap_text);
+            length += 5;
+        } else
+            pixmaptext = g_strdup(priv->pixmap_text);
+    } else
+    if (!priv->font && length <= wl) {
         gint pad = wl - length;
         gchar *padchars = g_strnfill(pad, ' ');
 
         pixmaptext = g_strconcat(priv->pixmap_text, padchars, NULL);
         g_free(padchars);
         length += pad;
-    } else {
-        if(!cfg.twoway_scroll && priv->is_scrollable)
-            pixmaptext = g_strdup_printf("%s *** ", priv->pixmap_text);
-        else
-            pixmaptext = g_strdup(priv->pixmap_text);
-    }
+    } else
+        pixmaptext = g_strdup(priv->pixmap_text);
 
     if (priv->is_scrollable) {
         if (priv->scroll_enabled && !priv->scroll_timeout) {