From: Mark D. <the...@us...> - 2006-03-03 05:54:38
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23130 Modified Files: gtkstatusbox.c Log Message: sf patch #1431281, from Sadrul Habib Chowdhury "This displays the status-text in the dropdown-store in the same line with the text when the small-buddy list is being used. This makes it consistent with the cellview." Index: gtkstatusbox.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkstatusbox.c,v retrieving revision 1.112 retrieving revision 1.113 diff -u -d -p -r1.112 -r1.113 --- gtkstatusbox.c 1 Mar 2006 05:57:36 -0000 1.112 +++ gtkstatusbox.c 3 Mar 2006 05:54:34 -0000 1.113 @@ -1104,10 +1104,12 @@ gtk_gaim_status_box_add(GtkGaimStatusBox } else { + gboolean show_buddy_icons; + GtkStyle *style; char aa_color[8]; gchar *escaped_title, *escaped_desc; - GtkStyle *style; + show_buddy_icons = gaim_prefs_get_bool("/gaim/gtk/blist/show_buddy_icons"); style = gtk_widget_get_style(GTK_WIDGET(status_box)); snprintf(aa_color, sizeof(aa_color), "#%02x%02x%02x", style->text_aa[GTK_STATE_NORMAL].red >> 8, @@ -1116,8 +1118,10 @@ gtk_gaim_status_box_add(GtkGaimStatusBox escaped_title = g_markup_escape_text(title, -1); escaped_desc = g_markup_escape_text(desc, -1); - text = g_strdup_printf("%s\n<span color=\"%s\" size=\"smaller\">%s</span>", - escaped_title, aa_color, escaped_desc); + text = g_strdup_printf("%s%s<span color=\"%s\" size=\"smaller\">%s</span>", + escaped_title, + show_buddy_icons ? "\n" : " - ", + aa_color, escaped_desc); g_free(escaped_title); g_free(escaped_desc); } |