Mercurial > pidgin
changeset 15607:3f10bd32ef1c
merge of '12c5fcf0819724b3304461672fc4bd1ebf0a8287'
and 'e485e0b2753d7eb36ce2f7abf8a6eb040cae49b7'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sat, 10 Feb 2007 01:14:57 +0000 |
| parents | b74030931888 (current diff) b03021cef5cb (diff) |
| children | 02d64952a55e b74a3bec8dcb |
| files | |
| diffstat | 6 files changed, 22 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYRIGHT Sat Feb 10 01:10:15 2007 +0000 +++ b/COPYRIGHT Sat Feb 10 01:14:57 2007 +0000 @@ -245,6 +245,7 @@ Havoc Pennington Ted Percival Eduardo Pérez +Matt Perry Celso Pinto Joao Luís Marques Pinto Aleksander Piotrowski
--- a/configure.ac Sat Feb 10 01:10:15 2007 +0000 +++ b/configure.ac Sat Feb 10 01:14:57 2007 +0000 @@ -1978,6 +1978,7 @@ console/plugins/Makefile po/Makefile.in gaim.pc + gaim-uninstalled.pc gaim.spec ])
--- a/console/libgnt/gnt.pc.in Sat Feb 10 01:10:15 2007 +0000 +++ b/console/libgnt/gnt.pc.in Sat Feb 10 01:14:57 2007 +0000 @@ -2,11 +2,12 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ +datarootdir=@datarootdir@ datadir=@datadir@ sysconfdir=@sysconfdir@ Name: LibGNT -Description: Gaim Ncurses Toolkit is a collection of curses-widgets. +Description: Glib Ncurses Toolkit is a collection of curses-widgets. Version: @VERSION@ Requires: glib-2.0 Cflags: -I${includedir}/gnt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gaim-uninstalled.pc.in Sat Feb 10 01:14:57 2007 +0000 @@ -0,0 +1,14 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ +datarootdir=@datarootdir@ +datadir=@datadir@ +sysconfdir=@sysconfdir@ + +Name: Gaim +Description: Gaim is a GTK2-based instant messenger application. +Version: @VERSION@ +Requires: glib-2.0 +Cflags: -I${pc_top_builddir}/${pcfiledir}/libpurple -I${pc_top_builddir}/${pcfiledir}/pidgin +Libs: ${pc_top_builddir}/${pcfiledir}/libpurple/libpurple.la
--- a/gaim.pc.in Sat Feb 10 01:10:15 2007 +0000 +++ b/gaim.pc.in Sat Feb 10 01:14:57 2007 +0000 @@ -2,6 +2,7 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ +datarootdir=@datarootdir@ datadir=@datadir@ sysconfdir=@sysconfdir@
--- a/pidgin/gtkconv.c Sat Feb 10 01:10:15 2007 +0000 +++ b/pidgin/gtkconv.c Sat Feb 10 01:14:57 2007 +0000 @@ -4932,7 +4932,9 @@ /* TODO: These colors should not be hardcoded so log.c can use them */ - if (flags & GAIM_MESSAGE_SYSTEM) { + if (flags & GAIM_MESSAGE_RAW) { + gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), message, gtk_font_options_all); + } else if (flags & GAIM_MESSAGE_SYSTEM) { g_snprintf(buf2, sizeof(buf2), "<FONT %s><FONT SIZE=\"2\"><!--(%s) --></FONT><B>%s</B></FONT>", sml_attrib ? sml_attrib : "", mdate, displaying); @@ -4952,8 +4954,6 @@ sml_attrib ? sml_attrib : "", displaying); gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf2, gtk_font_options_all); - } else if (flags & GAIM_MESSAGE_RAW) { - gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), displaying, gtk_font_options_all); } else { char *new_message = g_memdup(displaying, length); char *alias_escaped = (alias ? g_markup_escape_text(alias, strlen(alias)) : g_strdup(""));