[Gaim-commits] SF.net SVN: gaim: [16368] trunk/console

[<sa...@us...>]

Revision: 16368
Author:   sadrul
Date:     2006-06-28 11:50:33 -0700 (Wed, 28 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16368&view=rev

Log Message:
-----------
Minor tweaks to Makefile and some other things.

Modified Paths:
--------------
    trunk/console/Makefile
    trunk/console/gntconv.c
    trunk/console/gntui.c
    trunk/console/libgnt/Makefile
    trunk/console/libgnt/test/Makefile
Modified: trunk/console/Makefile
===================================================================
--- trunk/console/Makefile	2006-06-28 17:28:06 UTC (rev 16367)
+++ trunk/console/Makefile	2006-06-28 18:50:33 UTC (rev 16368)
@@ -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 = \

Modified: trunk/console/gntconv.c
===================================================================
--- trunk/console/gntconv.c	2006-06-28 17:28:06 UTC (rev 16367)
+++ trunk/console/gntconv.c	2006-06-28 18:50:33 UTC (rev 16368)
@@ -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("");
 
+	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),
-			name, GNT_TEXT_FLAG_BOLD);
-	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

Modified: trunk/console/gntui.c
===================================================================
--- trunk/console/gntui.c	2006-06-28 17:28:06 UTC (rev 16367)
+++ trunk/console/gntui.c	2006-06-28 18:50:33 UTC (rev 16368)
@@ -1,4 +1,6 @@
 #include "gntui.h"
+#include "gntblist.h"
+#include "gntconv.h"
 
 void init_gnt_ui()
 {

Modified: trunk/console/libgnt/Makefile
===================================================================
--- trunk/console/libgnt/Makefile	2006-06-28 17:28:06 UTC (rev 16367)
+++ trunk/console/libgnt/Makefile	2006-06-28 18:50:33 UTC (rev 16368)
@@ -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 = \

Modified: trunk/console/libgnt/test/Makefile
===================================================================
--- trunk/console/libgnt/test/Makefile	2006-06-28 17:28:06 UTC (rev 16367)
+++ trunk/console/libgnt/test/Makefile	2006-06-28 18:50:33 UTC (rev 16368)
@@ -1,3 +1,4 @@
+CC=gcc
 CFLAGS=`pkg-config --cflags gobject-2.0` -g -I../
 LDFLAGS=`pkg-config --libs gobject-2.0` -lncursesw -pg -lgnt -L../
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.