Mercurial > pidgin
annotate src/protocols/toc/Makefile.am @ 10654:f2e86683cafc
[gaim-migrate @ 12182]
sf patch #1152664, from Richard Laager
This patches does three things:
First, it uses aliases in file transfer messages
whenever possible.
Second, it fixes the case where file transfer
completion messages are not showing for MSN.
Third, it makes the wording more consistent:
Canceled is used to describe cases when the file
transfer was actively canceled by either party.
Failed is used otherwise. Aborted is no longer
used at all. Previously, aborted was used in
some places while failed was used under the
same circumstances in other places. Also,
in the file transfer box, canceled was used in
one place for remotely or locally canceled
files while in another place in the same box
canceled was only used for locally canceled
files (failed was used for remotely canceled
files).
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sun, 06 Mar 2005 00:23:54 +0000 |
| parents | 6b1ecf40f3ba |
| children |
| rev | line source |
|---|---|
|
6198
fcc28f5dd0c8
[gaim-migrate @ 6684]
Herman Bloggs <hermanator12002@yahoo.com>
parents:
4202
diff
changeset
|
1 EXTRA_DIST = \ |
|
fcc28f5dd0c8
[gaim-migrate @ 6684]
Herman Bloggs <hermanator12002@yahoo.com>
parents:
4202
diff
changeset
|
2 PROTOCOL \ |
|
fcc28f5dd0c8
[gaim-migrate @ 6684]
Herman Bloggs <hermanator12002@yahoo.com>
parents:
4202
diff
changeset
|
3 Makefile.mingw |
|
2287
1a1d68e12a86
[gaim-migrate @ 2297]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
2086
diff
changeset
|
4 |
| 2086 | 5 pkgdir = $(libdir)/gaim |
| 6 | |
|
4202
59751fe608c5
[gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents:
3411
diff
changeset
|
7 TOCSOURCES = toc.c |
|
59751fe608c5
[gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents:
3411
diff
changeset
|
8 |
|
59751fe608c5
[gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents:
3411
diff
changeset
|
9 AM_CFLAGS = $(st) |
|
59751fe608c5
[gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents:
3411
diff
changeset
|
10 |
|
2894
44140dae2865
[gaim-migrate @ 2907]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
2341
diff
changeset
|
11 libtoc_la_LDFLAGS = -module -avoid-version |
| 2086 | 12 |
| 13 if STATIC_TOC | |
| 14 | |
| 8082 | 15 st = -DGAIM_STATIC_PRPL |
| 2086 | 16 noinst_LIBRARIES = libtoc.a |
|
4202
59751fe608c5
[gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents:
3411
diff
changeset
|
17 libtoc_a_SOURCES = $(TOCSOURCES) |
|
59751fe608c5
[gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents:
3411
diff
changeset
|
18 libtoc_a_CFLAGS = $(AM_CFLAGS) |
|
3411
5df423e0bca8
[gaim-migrate @ 3430]
Christian Hammond <chipx86@chipx86.com>
parents:
2894
diff
changeset
|
19 |
| 2086 | 20 else |
| 21 | |
| 22 st = | |
|
4202
59751fe608c5
[gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents:
3411
diff
changeset
|
23 pkg_LTLIBRARIES = libtoc.la |
|
59751fe608c5
[gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents:
3411
diff
changeset
|
24 libtoc_la_SOURCES = $(TOCSOURCES) |
| 2086 | 25 |
| 26 endif | |
|
4202
59751fe608c5
[gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents:
3411
diff
changeset
|
27 |
|
59751fe608c5
[gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents:
3411
diff
changeset
|
28 AM_CPPFLAGS = \ |
|
59751fe608c5
[gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents:
3411
diff
changeset
|
29 -I$(top_srcdir)/src \ |
|
6371
8f94cce8faa5
[gaim-migrate @ 6876]
Christian Hammond <chipx86@chipx86.com>
parents:
6360
diff
changeset
|
30 $(GLIB_CFLAGS) \ |
|
4202
59751fe608c5
[gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents:
3411
diff
changeset
|
31 $(DEBUG_CFLAGS) |
