Mercurial > pidgin.yaz
changeset 25551:27246e507099
merge of '02901ee49b228d1bf519032a6422667d6805d0c1'
and '4c47d17a1c346e09e1035574170c3028a99dd7c3'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Fri, 21 Sep 2007 00:25:16 +0000 |
| parents | de4914b5e45c (diff) 8067ba21fdd0 (current diff) |
| children | f0e32b734ef7 |
| files | |
| diffstat | 3 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/media.h Thu Sep 20 19:26:42 2007 +0000 +++ b/libpurple/media.h Fri Sep 21 00:25:16 2007 +0000 @@ -87,7 +87,7 @@ GstElement *purple_media_get_audio_pipeline(PurpleMedia *media); PurpleConnection *purple_media_get_connection(PurpleMedia *media); -const char *purple_media_get_screenname(media); +const char *purple_media_get_screenname(PurpleMedia *media); void purple_media_ready(PurpleMedia *media); void purple_media_accept(PurpleMedia *media); void purple_media_reject(PurpleMedia *media);
--- a/libpurple/protocols/silc/Makefile.am Thu Sep 20 19:26:42 2007 +0000 +++ b/libpurple/protocols/silc/Makefile.am Fri Sep 21 00:25:16 2007 +0000 @@ -25,7 +25,7 @@ noinst_LIBRARIES = libsilcpurple_la_SOURCES = $(SILCSOURCES) -libsilcpurple_la_LIBADD = $(GLIB_LIBS) $(SILC_LIBS) +libsilcpurple_la_LIBADD = $(GLIB_LIBS) $(SILC_LIBS) $(FARSIGHT_LIBS) endif @@ -33,4 +33,5 @@ -I$(top_srcdir)/libpurple \ -I$(top_builddir)/libpurple \ $(GLIB_CFLAGS) \ + $(FARSIGHT_CFLAGS) \ $(DEBUG_CFLAGS)