annotate share/ca-certs/Makefile.mingw @ 32307:4c046f6564cd

Change the heuristic we use for setting od->icq. We used to set it to true any time the username contained only digits. Now we set it to try if account->protocol_id is prpl-icq. This means we're now relying on the user to tell us whether their account is AIM or ICQ... and I think that's fine. The reason for this change is that we/AOL apparently allow the user to login to ICQ accounts by entering their email address. This means we're no longer able to look at the username to determine whether it's an AIM name or an ICQ name. This was a problem because we were trying to format the spacing/capitalization in the username if the name was an icq email address, which resulted in an annoying popup error at login. Fixes #13883. It's probably safe for this to go into im.pidgin.pidgin (maybe after the pending release), but I really don't want to keep changing the 2.x.y branch. I think we need to move on to 3.x.y.
author Mark Doliner <mark@kingant.net>
date Mon, 09 May 2011 04:42:52 +0000
parents 78c64f7c598f
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
19504
d5ecaf5bce93 Fix the win32 build for the cert SoC branch merge.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
diff changeset
1 #
d5ecaf5bce93 Fix the win32 build for the cert SoC branch merge.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
diff changeset
2 # Makefile.mingw
d5ecaf5bce93 Fix the win32 build for the cert SoC branch merge.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
diff changeset
3 #
d5ecaf5bce93 Fix the win32 build for the cert SoC branch merge.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
diff changeset
4 # Description: Makefile for win32 (mingw) version of Pidgin ca-certs
d5ecaf5bce93 Fix the win32 build for the cert SoC branch merge.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
diff changeset
5 #
d5ecaf5bce93 Fix the win32 build for the cert SoC branch merge.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
diff changeset
6
d5ecaf5bce93 Fix the win32 build for the cert SoC branch merge.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
diff changeset
7 PIDGIN_TREE_TOP := ../..
d5ecaf5bce93 Fix the win32 build for the cert SoC branch merge.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
diff changeset
8 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
d5ecaf5bce93 Fix the win32 build for the cert SoC branch merge.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
diff changeset
9
d5ecaf5bce93 Fix the win32 build for the cert SoC branch merge.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
diff changeset
10 datadir := $(PIDGIN_INSTALL_DIR)
23338
dd21962a8a1d re-Fix win32 build.
Daniel Atallah <daniel.atallah@gmail.com>
parents: 23337
diff changeset
11 -include ./Makefile.am.mingw
19504
d5ecaf5bce93 Fix the win32 build for the cert SoC branch merge.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
diff changeset
12 cacertsdir := $(PIDGIN_INSTALL_DIR)/ca-certs
d5ecaf5bce93 Fix the win32 build for the cert SoC branch merge.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
diff changeset
13
23962
78c64f7c598f Some Makefile cleanups to remove generated files from Lee Roach. Fixes #6609.
Daniel Atallah <daniel.atallah@gmail.com>
parents: 23338
diff changeset
14 .PHONY: install clean
19504
d5ecaf5bce93 Fix the win32 build for the cert SoC branch merge.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
diff changeset
15
23337
a7711cdafa6b Fix win32 build.
Daniel Atallah <daniel.atallah@gmail.com>
parents: 19504
diff changeset
16 install: ./Makefile.am.mingw
19504
d5ecaf5bce93 Fix the win32 build for the cert SoC branch merge.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
diff changeset
17 if test '$(cacerts_DATA)'; then \
d5ecaf5bce93 Fix the win32 build for the cert SoC branch merge.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
diff changeset
18 mkdir -p $(cacertsdir); \
d5ecaf5bce93 Fix the win32 build for the cert SoC branch merge.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
diff changeset
19 cp $(cacerts_DATA) $(cacertsdir); \
d5ecaf5bce93 Fix the win32 build for the cert SoC branch merge.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
diff changeset
20 fi;
d5ecaf5bce93 Fix the win32 build for the cert SoC branch merge.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
diff changeset
21
23962
78c64f7c598f Some Makefile cleanups to remove generated files from Lee Roach. Fixes #6609.
Daniel Atallah <daniel.atallah@gmail.com>
parents: 23338
diff changeset
22 clean:
78c64f7c598f Some Makefile cleanups to remove generated files from Lee Roach. Fixes #6609.
Daniel Atallah <daniel.atallah@gmail.com>
parents: 23338
diff changeset
23 rm -f ./Makefile.am.mingw
78c64f7c598f Some Makefile cleanups to remove generated files from Lee Roach. Fixes #6609.
Daniel Atallah <daniel.atallah@gmail.com>
parents: 23338
diff changeset
24
23337
a7711cdafa6b Fix win32 build.
Daniel Atallah <daniel.atallah@gmail.com>
parents: 19504
diff changeset
25 ./Makefile.am.mingw: ./Makefile.am
a7711cdafa6b Fix win32 build.
Daniel Atallah <daniel.atallah@gmail.com>
parents: 19504
diff changeset
26 sed -e 's/^if\ INSTALL_SSL_CERTIFICATES/ifeq (\$$(INSTALL_SSL_CERTIFICATES), 1)/' ./Makefile.am > $@
23338
dd21962a8a1d re-Fix win32 build.
Daniel Atallah <daniel.atallah@gmail.com>
parents: 23337
diff changeset
27