Mercurial > pidgin.yaz
changeset 13887:7d3256b253ec
[gaim-migrate @ 16368]
Minor tweaks to Makefile and some other things.
committer: Tailor Script <tailor@pidgin.im>
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Wed, 28 Jun 2006 18:50:33 +0000 |
| parents | 90eb736b4c26 |
| children | 9d66969a2e32 |
| files | console/Makefile console/gntconv.c console/gntui.c console/libgnt/Makefile console/libgnt/test/Makefile |
| diffstat | 5 files changed, 21 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/console/Makefile Wed Jun 28 16:01:42 2006 +0000 +++ b/console/Makefile Wed Jun 28 18:50:33 2006 +0000 @@ -1,4 +1,5 @@ -CFLAGS=`pkg-config --cflags gaim gobject-2.0` -g -I./libgnt/ +CC=gcc +CFLAGS=`pkg-config --cflags gaim gobject-2.0` -g -I./libgnt/ -Wall LDFLAGS=`pkg-config --libs gaim gobject-2.0 libxml-2.0` -lncursesw -L./libgnt/ -lgnt -pg GG_SOURCES = \
--- a/console/gntconv.c Wed Jun 28 16:01:42 2006 +0000 +++ b/console/gntconv.c Wed Jun 28 18:50:33 2006 +0000 @@ -180,27 +180,31 @@ { GGConv *ggconv = g_hash_table_lookup(ggconvs, conv); char *strip; - char *name; g_return_if_fail(ggconv != NULL); strip = gaim_markup_strip_html(message); - if (alias && *alias) - name = g_strdup_printf("%s: ", alias); - else if (who && *who) - name = g_strdup_printf("%s: ", who); - else - name = g_strdup(""); - gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv), - name, GNT_TEXT_FLAG_BOLD); + if (flags & (GAIM_MESSAGE_SEND | GAIM_MESSAGE_RECV)) + { + char *name; + if (alias && *alias) + name = g_strdup_printf("%s: ", alias); + else if (who && *who) + name = g_strdup_printf("%s: ", who); + else + name = g_strdup(""); + + gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv), + name, GNT_TEXT_FLAG_BOLD); + g_free(name); + } gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv), strip, 0); gnt_text_view_next_line(GNT_TEXT_VIEW(ggconv->tv)); gnt_text_view_scroll(GNT_TEXT_VIEW(ggconv->tv), 0); g_free(strip); - g_free(name); } static void
--- a/console/gntui.c Wed Jun 28 16:01:42 2006 +0000 +++ b/console/gntui.c Wed Jun 28 18:50:33 2006 +0000 @@ -1,4 +1,6 @@ #include "gntui.h" +#include "gntblist.h" +#include "gntconv.h" void init_gnt_ui() {
--- a/console/libgnt/Makefile Wed Jun 28 16:01:42 2006 +0000 +++ b/console/libgnt/Makefile Wed Jun 28 18:50:33 2006 +0000 @@ -1,4 +1,5 @@ -CFLAGS=`pkg-config --cflags gobject-2.0` -g +CC=gcc +CFLAGS=`pkg-config --cflags gobject-2.0` -g -Wall LDFLAGS=`pkg-config --libs gobject-2.0` -lncursesw -pg HEADERS = \