annotate src/protocols/gg/Makefile.am @ 14089:10e8eb6a4910

[gaim-migrate @ 16712] Pretty large commit here. Basically I got sick of having to verify that gc is still valid on all the callback functions for gaim_proxy_connect(). The fix for this for gaim_proxy_connect() to return something that allows the connection attempt to be canceled. It's not quite there yet, but this is a good first step. I changed gaim_proxy_connect() to return a reference to a new GaimProxyConnectInfo (this used to be called PHB). Eventually this can be passed to a function that'll cancel the connection attempt. I also decided to add an error_cb instead of using connect_cb and passing a file descriptor of -1. And proxy.c will also pass an error message to callers which should explain the reason that the connection attempt failed. Oh, and proxy.c now never calls gaim_connection_error() committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sat, 12 Aug 2006 10:12:43 +0000
parents cafb9a4b206f
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
13671
cafb9a4b206f [gaim-migrate @ 16073]
Richard Laager <rlaager@wiktel.com>
parents: 13626
diff changeset
1 EXTRA_DIST = \
cafb9a4b206f [gaim-migrate @ 16073]
Richard Laager <rlaager@wiktel.com>
parents: 13626
diff changeset
2 Makefile.mingw \
cafb9a4b206f [gaim-migrate @ 16073]
Richard Laager <rlaager@wiktel.com>
parents: 13626
diff changeset
3 lib/common.c \
cafb9a4b206f [gaim-migrate @ 16073]
Richard Laager <rlaager@wiktel.com>
parents: 13626
diff changeset
4 lib/compat.h \
cafb9a4b206f [gaim-migrate @ 16073]
Richard Laager <rlaager@wiktel.com>
parents: 13626
diff changeset
5 lib/COPYING \
cafb9a4b206f [gaim-migrate @ 16073]
Richard Laager <rlaager@wiktel.com>
parents: 13626
diff changeset
6 lib/dcc.c \
cafb9a4b206f [gaim-migrate @ 16073]
Richard Laager <rlaager@wiktel.com>
parents: 13626
diff changeset
7 lib/events.c \
cafb9a4b206f [gaim-migrate @ 16073]
Richard Laager <rlaager@wiktel.com>
parents: 13626
diff changeset
8 lib/http.c \
cafb9a4b206f [gaim-migrate @ 16073]
Richard Laager <rlaager@wiktel.com>
parents: 13626
diff changeset
9 lib/libgadu.c \
cafb9a4b206f [gaim-migrate @ 16073]
Richard Laager <rlaager@wiktel.com>
parents: 13626
diff changeset
10 lib/libgadu-config.h \
cafb9a4b206f [gaim-migrate @ 16073]
Richard Laager <rlaager@wiktel.com>
parents: 13626
diff changeset
11 lib/libgadu.h \
cafb9a4b206f [gaim-migrate @ 16073]
Richard Laager <rlaager@wiktel.com>
parents: 13626
diff changeset
12 lib/obsolete.c \
cafb9a4b206f [gaim-migrate @ 16073]
Richard Laager <rlaager@wiktel.com>
parents: 13626
diff changeset
13 lib/pubdir50.c \
cafb9a4b206f [gaim-migrate @ 16073]
Richard Laager <rlaager@wiktel.com>
parents: 13626
diff changeset
14 lib/pubdir.c
2393
a7ecfd3f7714 [gaim-migrate @ 2406]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
15
a7ecfd3f7714 [gaim-migrate @ 2406]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
16 pkgdir = $(libdir)/gaim
a7ecfd3f7714 [gaim-migrate @ 2406]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
17
4202
59751fe608c5 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 4051
diff changeset
18 GGSOURCES = \
13626
fa7313d125ac [gaim-migrate @ 16013]
Evan Schoenberg <evan.s@dreskin.net>
parents: 13317
diff changeset
19 gg-utils.h \
fa7313d125ac [gaim-migrate @ 16013]
Evan Schoenberg <evan.s@dreskin.net>
parents: 13317
diff changeset
20 gg-utils.c \
11414
d5599677bf32 [gaim-migrate @ 13651]
Bartoz Oler <bartosz@pidgin.im>
parents: 11366
diff changeset
21 confer.h \
d5599677bf32 [gaim-migrate @ 13651]
Bartoz Oler <bartosz@pidgin.im>
parents: 11366
diff changeset
22 confer.c \
d5599677bf32 [gaim-migrate @ 13651]
Bartoz Oler <bartosz@pidgin.im>
parents: 11366
diff changeset
23 search.h \
d5599677bf32 [gaim-migrate @ 13651]
Bartoz Oler <bartosz@pidgin.im>
parents: 11366
diff changeset
24 search.c \
d5599677bf32 [gaim-migrate @ 13651]
Bartoz Oler <bartosz@pidgin.im>
parents: 11366
diff changeset
25 buddylist.h \
d5599677bf32 [gaim-migrate @ 13651]
Bartoz Oler <bartosz@pidgin.im>
parents: 11366
diff changeset
26 buddylist.c \
d5599677bf32 [gaim-migrate @ 13651]
Bartoz Oler <bartosz@pidgin.im>
parents: 11366
diff changeset
27 gg.h \
4202
59751fe608c5 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 4051
diff changeset
28 gg.c
59751fe608c5 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 4051
diff changeset
29
59751fe608c5 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 4051
diff changeset
30 AM_CFLAGS = $(st)
59751fe608c5 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 4051
diff changeset
31
10889
2cc05a9e944d [gaim-migrate @ 12597]
Stu Tomlinson <stu@nosnilmot.com>
parents: 8082
diff changeset
32 libgg_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
2393
a7ecfd3f7714 [gaim-migrate @ 2406]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
33
a7ecfd3f7714 [gaim-migrate @ 2406]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
34 if STATIC_GG
a7ecfd3f7714 [gaim-migrate @ 2406]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
35
13317
41747a38a1a8 [gaim-migrate @ 15686]
Richard Laager <rlaager@wiktel.com>
parents: 11414
diff changeset
36 st = -DGAIM_STATIC_PRPL $(GADU_CFLAGS)
2393
a7ecfd3f7714 [gaim-migrate @ 2406]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
37 noinst_LIBRARIES = libgg.a
11360
cf15c1cdcfbd [gaim-migrate @ 13582]
Bartoz Oler <bartosz@pidgin.im>
parents: 10889
diff changeset
38 pkg_LTLIBRARIES =
2393
a7ecfd3f7714 [gaim-migrate @ 2406]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
39
4202
59751fe608c5 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 4051
diff changeset
40 libgg_a_SOURCES = $(GGSOURCES)
59751fe608c5 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 4051
diff changeset
41 libgg_a_CFLAGS = $(AM_CFLAGS)
13317
41747a38a1a8 [gaim-migrate @ 15686]
Richard Laager <rlaager@wiktel.com>
parents: 11414
diff changeset
42 libgg_a_LIBADD = $(GADU_LIBS)
3411
5df423e0bca8 [gaim-migrate @ 3430]
Christian Hammond <chipx86@chipx86.com>
parents: 2894
diff changeset
43
2393
a7ecfd3f7714 [gaim-migrate @ 2406]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
44 else
a7ecfd3f7714 [gaim-migrate @ 2406]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
45
13317
41747a38a1a8 [gaim-migrate @ 15686]
Richard Laager <rlaager@wiktel.com>
parents: 11414
diff changeset
46 st = $(GADU_CFLAGS)
2393
a7ecfd3f7714 [gaim-migrate @ 2406]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
47 pkg_LTLIBRARIES = libgg.la
11360
cf15c1cdcfbd [gaim-migrate @ 13582]
Bartoz Oler <bartosz@pidgin.im>
parents: 10889
diff changeset
48 noinst_LIBRARIES =
2393
a7ecfd3f7714 [gaim-migrate @ 2406]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
49
4202
59751fe608c5 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 4051
diff changeset
50 libgg_la_SOURCES = $(GGSOURCES)
13317
41747a38a1a8 [gaim-migrate @ 15686]
Richard Laager <rlaager@wiktel.com>
parents: 11414
diff changeset
51 libgg_la_LIBADD = $(GADU_LIBS)
2393
a7ecfd3f7714 [gaim-migrate @ 2406]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
52
a7ecfd3f7714 [gaim-migrate @ 2406]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
53 endif
4202
59751fe608c5 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 4051
diff changeset
54
59751fe608c5 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 4051
diff changeset
55 AM_CPPFLAGS = \
59751fe608c5 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 4051
diff changeset
56 -I$(top_srcdir)/src \
13317
41747a38a1a8 [gaim-migrate @ 15686]
Richard Laager <rlaager@wiktel.com>
parents: 11414
diff changeset
57 $(GLIB_CFLAGS) \
41747a38a1a8 [gaim-migrate @ 15686]
Richard Laager <rlaager@wiktel.com>
parents: 11414
diff changeset
58 $(DEBUG_CFLAGS)
11360
cf15c1cdcfbd [gaim-migrate @ 13582]
Bartoz Oler <bartosz@pidgin.im>
parents: 10889
diff changeset
59