Mercurial > pidgin.yaz
diff pidgin/gtkconv.c @ 19478:b2578b2d4bc4
Remove X11 specifics from configure.ac. Allows to build against native, non-X11 Quartz
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Mon, 27 Aug 2007 22:45:15 +0000 |
| parents | 74befdcd0454 |
| children | b66909a58e5f 4da3c8618c24 2fda71133800 7f8cf35fc99b |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Mon Aug 27 22:20:13 2007 +0000 +++ b/pidgin/gtkconv.c Mon Aug 27 22:45:15 2007 +0000 @@ -4535,15 +4535,16 @@ gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(gtkconv->infopane), rend, "markup", CONV_TEXT_COLUMN, NULL); g_object_set(rend, "ypad", 0, "yalign", 0.5, NULL); +#if GTK_CHECK_VERSION(2, 6, 0) + g_object_set(rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL); +#endif + + rend = gtk_cell_renderer_pixbuf_new(); gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(gtkconv->infopane), rend, FALSE); gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(gtkconv->infopane), rend, "pixbuf", CONV_PROTOCOL_ICON_COLUMN, NULL); g_object_set(rend, "xalign", 0.0, "xpad", 3, "ypad", 0, NULL); -#if GTK_CHECK_VERSION(2, 6, 0) - g_object_set(rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL); -#endif - rend = gtk_cell_renderer_pixbuf_new(); gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(gtkconv->infopane), rend, FALSE); gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(gtkconv->infopane), rend, "pixbuf", CONV_EMBLEM_COLUMN, NULL);