Mercurial > pidgin.yaz
view Makefile.am @ 15114:4a8c368df4ea
[gaim-migrate @ 17899]
Some touchups:
* If one of the parallel connection attempts fails immediately (i.e.
does not time out) then don't cancel the other one.
* Make sure we don't continue on to step 2 of the peer connection
process after we kick off the parallel gaim_proxy_connects(). It
looks like this would happen most of the time, because the
connect_timeout_timer would be added for the verified ip, so it
would NOT be added for the client ip, and so we wouldn't hit the
"return" call because it happens to be in the same block as the
second gaim_timeout_add() call.
* Add the connection timeout timer even if the gaim_proxy_connect() to
the verified ip returns NULL for some crazy reason.
I didn't actually test any of this. I should probably do that when
I get home.
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Wed, 06 Dec 2006 01:29:59 +0000 |
parents | 0c96d5d774d7 |
children | 5fe8042783c1 |
line wrap: on
line source
EXTRA_DIST = \ COPYRIGHT \ ChangeLog.API \ ChangeLog.win32 \ Doxyfile.in \ HACKING \ Makefile.mingw \ PLUGIN_HOWTO \ PROGRAMMING_NOTES \ README.SVN \ README.dbus \ README.mingw \ gaim.pc.in \ gaim.spec.in \ gaim.apspec.in \ gaim.desktop.in \ gaim.service.in \ gaim-installer.nsi \ intltool-extract.in \ intltool-merge.in \ intltool-update.in \ config.h.mingw \ po/Makefile.mingw noinst_HEADERS = config.h pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gaim.pc if ENABLE_DBUS dbus_servicedir=$(DBUS_SERVICES_DIR) dbus_service_DATA=gaim.service endif dist-hook: gaim.spec cp gaim.spec $(distdir) rm $(distdir)/config.h distcheck-hook: libgaim/plugins/perl/common/Gaim.pm gtk/plugins/perl/common/GtkUI.pm # cp libgaim/plugins/perl/common/Gaim.pm $(distdir)/libgaim/plugins/perl/common appsdir = $(datadir)/applications apps_in_files = gaim.desktop.in apps_DATA = $(apps_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ if ENABLE_GTK GTK_DIR=gtk endif if ENABLE_GNT GNT_DIR=console endif SUBDIRS = libgaim doc $(GNT_DIR) $(GTK_DIR) m4macros po docs: Doxyfile if HAVE_DOXYGEN @echo "Running doxygen..." @doxygen else @echo "doxygen was not found during configure. Aborting." @echo; endif # perl's MakeMaker uninstall foo doesn't work well with DESTDIR set, which # breaks "make distcheck" unless we ignore perl things distuninstallcheck_listfiles = \ find . -type f -print | grep -v perl | grep -v Gaim.3pm DISTCLEANFILES= gaim.desktop libgaim/gconf/gaim.schemas intltool-extract \ intltool-merge intltool-update