Mercurial > pidgin

changeset 24295:7ed27ecdab51

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '1cb1b4ee3379b50280fbc97f2c889a43cd7c8c41' and '8a14c1d90381baa3c31adeedee7f673d58d66304'
author Ka-Hing Cheung <khc@hxbc.us>
date Sat, 25 Oct 2008 18:29:21 +0000
parents e39cafdbe089 (current diff) aeb287e5d232 (diff)
children 9ebd288d7b77
files pidgin/pixmaps/buddy_icons/qq/Makefile.am pidgin/pixmaps/buddy_icons/qq/Makefile.mingw pidgin/pixmaps/buddy_icons/qq/qq_1.png pidgin/pixmaps/buddy_icons/qq/qq_10.png pidgin/pixmaps/buddy_icons/qq/qq_100.png pidgin/pixmaps/buddy_icons/qq/qq_11.png pidgin/pixmaps/buddy_icons/qq/qq_12.png pidgin/pixmaps/buddy_icons/qq/qq_13.png pidgin/pixmaps/buddy_icons/qq/qq_14.png pidgin/pixmaps/buddy_icons/qq/qq_15.png pidgin/pixmaps/buddy_icons/qq/qq_16.png pidgin/pixmaps/buddy_icons/qq/qq_17.png pidgin/pixmaps/buddy_icons/qq/qq_18.png pidgin/pixmaps/buddy_icons/qq/qq_19.png pidgin/pixmaps/buddy_icons/qq/qq_2.png pidgin/pixmaps/buddy_icons/qq/qq_20.png pidgin/pixmaps/buddy_icons/qq/qq_21.png pidgin/pixmaps/buddy_icons/qq/qq_22.png pidgin/pixmaps/buddy_icons/qq/qq_23.png pidgin/pixmaps/buddy_icons/qq/qq_24.png pidgin/pixmaps/buddy_icons/qq/qq_25.png pidgin/pixmaps/buddy_icons/qq/qq_26.png pidgin/pixmaps/buddy_icons/qq/qq_27.png pidgin/pixmaps/buddy_icons/qq/qq_28.png pidgin/pixmaps/buddy_icons/qq/qq_29.png pidgin/pixmaps/buddy_icons/qq/qq_3.png pidgin/pixmaps/buddy_icons/qq/qq_30.png pidgin/pixmaps/buddy_icons/qq/qq_31.png pidgin/pixmaps/buddy_icons/qq/qq_32.png pidgin/pixmaps/buddy_icons/qq/qq_33.png pidgin/pixmaps/buddy_icons/qq/qq_34.png pidgin/pixmaps/buddy_icons/qq/qq_35.png pidgin/pixmaps/buddy_icons/qq/qq_36.png pidgin/pixmaps/buddy_icons/qq/qq_37.png pidgin/pixmaps/buddy_icons/qq/qq_38.png pidgin/pixmaps/buddy_icons/qq/qq_39.png pidgin/pixmaps/buddy_icons/qq/qq_4.png pidgin/pixmaps/buddy_icons/qq/qq_40.png pidgin/pixmaps/buddy_icons/qq/qq_41.png pidgin/pixmaps/buddy_icons/qq/qq_42.png pidgin/pixmaps/buddy_icons/qq/qq_43.png pidgin/pixmaps/buddy_icons/qq/qq_44.png pidgin/pixmaps/buddy_icons/qq/qq_45.png pidgin/pixmaps/buddy_icons/qq/qq_46.png pidgin/pixmaps/buddy_icons/qq/qq_47.png pidgin/pixmaps/buddy_icons/qq/qq_48.png pidgin/pixmaps/buddy_icons/qq/qq_49.png pidgin/pixmaps/buddy_icons/qq/qq_5.png pidgin/pixmaps/buddy_icons/qq/qq_50.png pidgin/pixmaps/buddy_icons/qq/qq_51.png pidgin/pixmaps/buddy_icons/qq/qq_52.png pidgin/pixmaps/buddy_icons/qq/qq_53.png pidgin/pixmaps/buddy_icons/qq/qq_54.png pidgin/pixmaps/buddy_icons/qq/qq_55.png pidgin/pixmaps/buddy_icons/qq/qq_56.png pidgin/pixmaps/buddy_icons/qq/qq_57.png pidgin/pixmaps/buddy_icons/qq/qq_58.png pidgin/pixmaps/buddy_icons/qq/qq_59.png pidgin/pixmaps/buddy_icons/qq/qq_6.png pidgin/pixmaps/buddy_icons/qq/qq_60.png pidgin/pixmaps/buddy_icons/qq/qq_61.png pidgin/pixmaps/buddy_icons/qq/qq_62.png pidgin/pixmaps/buddy_icons/qq/qq_63.png pidgin/pixmaps/buddy_icons/qq/qq_64.png pidgin/pixmaps/buddy_icons/qq/qq_65.png pidgin/pixmaps/buddy_icons/qq/qq_66.png pidgin/pixmaps/buddy_icons/qq/qq_67.png pidgin/pixmaps/buddy_icons/qq/qq_68.png pidgin/pixmaps/buddy_icons/qq/qq_69.png pidgin/pixmaps/buddy_icons/qq/qq_7.png pidgin/pixmaps/buddy_icons/qq/qq_70.png pidgin/pixmaps/buddy_icons/qq/qq_71.png pidgin/pixmaps/buddy_icons/qq/qq_72.png pidgin/pixmaps/buddy_icons/qq/qq_73.png pidgin/pixmaps/buddy_icons/qq/qq_74.png pidgin/pixmaps/buddy_icons/qq/qq_75.png pidgin/pixmaps/buddy_icons/qq/qq_76.png pidgin/pixmaps/buddy_icons/qq/qq_77.png pidgin/pixmaps/buddy_icons/qq/qq_78.png pidgin/pixmaps/buddy_icons/qq/qq_79.png pidgin/pixmaps/buddy_icons/qq/qq_8.png pidgin/pixmaps/buddy_icons/qq/qq_80.png pidgin/pixmaps/buddy_icons/qq/qq_81.png pidgin/pixmaps/buddy_icons/qq/qq_82.png pidgin/pixmaps/buddy_icons/qq/qq_83.png pidgin/pixmaps/buddy_icons/qq/qq_84.png pidgin/pixmaps/buddy_icons/qq/qq_85.png pidgin/pixmaps/buddy_icons/qq/qq_86.png pidgin/pixmaps/buddy_icons/qq/qq_87.png pidgin/pixmaps/buddy_icons/qq/qq_88.png pidgin/pixmaps/buddy_icons/qq/qq_89.png pidgin/pixmaps/buddy_icons/qq/qq_9.png pidgin/pixmaps/buddy_icons/qq/qq_90.png pidgin/pixmaps/buddy_icons/qq/qq_91.png pidgin/pixmaps/buddy_icons/qq/qq_92.png pidgin/pixmaps/buddy_icons/qq/qq_93.png pidgin/pixmaps/buddy_icons/qq/qq_94.png pidgin/pixmaps/buddy_icons/qq/qq_95.png pidgin/pixmaps/buddy_icons/qq/qq_96.png pidgin/pixmaps/buddy_icons/qq/qq_97.png pidgin/pixmaps/buddy_icons/qq/qq_98.png pidgin/pixmaps/buddy_icons/qq/qq_99.png pidgin/pixmaps/status/11/scalable/available.svg pidgin/pixmaps/status/11/scalable/away.svg pidgin/pixmaps/status/11/scalable/busy.svg pidgin/pixmaps/status/11/scalable/chat.svg pidgin/pixmaps/status/11/scalable/extended-away.svg pidgin/pixmaps/status/11/scalable/invisible.svg pidgin/pixmaps/status/11/scalable/offline.svg pidgin/pixmaps/status/11/scalable/person.svg pidgin/pixmaps/status/16/scalable/available.svg pidgin/pixmaps/status/16/scalable/away.svg pidgin/pixmaps/status/16/scalable/busy.svg pidgin/pixmaps/status/16/scalable/chat.svg pidgin/pixmaps/status/16/scalable/extended-away.svg pidgin/pixmaps/status/16/scalable/invisible.svg pidgin/pixmaps/status/16/scalable/log-in.svg pidgin/pixmaps/status/16/scalable/log-out.svg pidgin/pixmaps/status/16/scalable/message-pending.svg pidgin/pixmaps/status/16/scalable/offline.svg pidgin/pixmaps/status/16/scalable/person.svg pidgin/pixmaps/status/22/scalable/available.svg pidgin/pixmaps/status/22/scalable/away.svg pidgin/pixmaps/status/22/scalable/busy.svg pidgin/pixmaps/status/22/scalable/chat.svg pidgin/pixmaps/status/22/scalable/extended-away.svg pidgin/pixmaps/status/22/scalable/log-in.svg pidgin/pixmaps/status/22/scalable/log-out.svg pidgin/pixmaps/status/22/scalable/offline.svg pidgin/pixmaps/status/22/scalable/person.svg pidgin/pixmaps/status/22/scalable/sign-off.svg pidgin/pixmaps/status/22/scalable/sign-on.svg pidgin/pixmaps/status/32/scalable/available.svg pidgin/pixmaps/status/32/scalable/away.svg pidgin/pixmaps/status/32/scalable/busy.svg pidgin/pixmaps/status/32/scalable/chat.svg pidgin/pixmaps/status/32/scalable/extended-away.svg pidgin/pixmaps/status/32/scalable/log-in.svg pidgin/pixmaps/status/32/scalable/log-out.svg pidgin/pixmaps/status/32/scalable/offline.svg pidgin/pixmaps/status/32/scalable/person.svg pidgin/pixmaps/tray/16/scalable/tray-away.svg pidgin/pixmaps/tray/16/scalable/tray-busy.svg pidgin/pixmaps/tray/16/scalable/tray-connecting.svg pidgin/pixmaps/tray/16/scalable/tray-extended-away.svg pidgin/pixmaps/tray/16/scalable/tray-invisible.svg pidgin/pixmaps/tray/16/scalable/tray-message.svg pidgin/pixmaps/tray/16/scalable/tray-offline.svg pidgin/pixmaps/tray/16/scalable/tray-online.svg pidgin/pixmaps/tray/22/scalable/tray-away.svg pidgin/pixmaps/tray/22/scalable/tray-busy.svg pidgin/pixmaps/tray/22/scalable/tray-extended-away.svg pidgin/pixmaps/tray/22/scalable/tray-invisible.svg pidgin/pixmaps/tray/22/scalable/tray-message-new.svg pidgin/pixmaps/tray/22/scalable/tray-offline.svg pidgin/pixmaps/tray/22/scalable/tray-online.svg share/ca-certs/Makefile.am
diffstat 3 files changed, 50 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/share/ca-certs/Makefile.am	Sat Oct 25 14:33:54 2008 +0000
+++ b/share/ca-certs/Makefile.am	Sat Oct 25 18:29:21 2008 +0000
@@ -3,6 +3,7 @@
 		CAcert_Class3.pem \
 		Equifax_Secure_CA.pem \
 		GTE_CyberTrust_Global_Root.pem \
+		Microsoft_Internet_Authority.pem \
 		Microsoft_Secure_Server_Authority.pem \
 		StartCom_Free_SSL_CA.pem \
 		Verisign_RSA_Secure_Server_CA.pem \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/ca-certs/Microsoft_Internet_Authority.pem	Sat Oct 25 18:29:21 2008 +0000
@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIECzCCA3SgAwIBAgIEBAAD/jANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJV
+UzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMScwJQYDVQQLEx5HVEUgQ3liZXJU
+cnVzdCBTb2x1dGlvbnMsIEluYy4xIzAhBgNVBAMTGkdURSBDeWJlclRydXN0IEds
+b2JhbCBSb290MB4XDTA2MDQxOTE0MzUwMFoXDTA5MDQxOTIzNTkwMFowJzElMCMG
+A1UEAxMcTWljcm9zb2Z0IEludGVybmV0IEF1dGhvcml0eTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBALUIbk0YdsTXnGPswqx8d/Ntrsjy8Wau8cKHBGBu
+KZwAZe5qW+QOU4gRxiKbM/trspEu1lObU77PVtiZSqFQMkXOYNLhlq1a/eqh68RJ
+Jxxev9KWmfppQ388ONqhi8wziHoXc66RUCiqabp751dbmwnnTN6GfIR952Zg+ab1
+wmGL3o7B1efCMCI9LIMKsId16yHiXKbTBHuWnkAe4Qx2BMAgoJQQ21EbTBhyvCfd
+EiRdOdYo1OTe2xih4JUPmXf7xPNDjMCrpjEJ8woxgCnH12z7PNPqwrhnFe/6808t
+axy4iNgObXcZS3ERcZBA9RFT1z3onQ2E2plkaBPmZQPiZu0CAwEAAaOCAXAwggFs
+MEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6Ly93d3cucHVibGljLXRydXN0LmNvbS9j
+Z2ktYmluL0NSTC8yMDE4L2NkcC5jcmwwHQYDVR0OBBYEFDNf3Q+3nFzO7ofdcHCL
+X33PIry5MFQGA1UdIARNMEswSQYKKoZIhvhjAQIBBTA7MDkGCCsGAQUFBwIBFi1o
+dHRwOi8vd3d3LnB1YmxpYy10cnVzdC5jb20vQ1BTL09tbmlSb290Lmh0bWwwgYkG
+A1UdIwSBgTB/oXmkdzB1MQswCQYDVQQGEwJVUzEYMBYGA1UEChMPR1RFIENvcnBv
+cmF0aW9uMScwJQYDVQQLEx5HVEUgQ3liZXJUcnVzdCBTb2x1dGlvbnMsIEluYy4x
+IzAhBgNVBAMTGkdURSBDeWJlclRydXN0IEdsb2JhbCBSb290ggIBpTAOBgNVHQ8B
+Af8EBAMCAYYwEgYDVR0TAQH/BAgwBgEB/wIBAjANBgkqhkiG9w0BAQUFAAOBgQBj
+SQlU7cXbnngZAIOa4zci+1Z2XFTTyOFc/Tfc0qU/xVWPZPBJdx2UVk2yCwmIHFBY
+OJSQC+7Kn7GE5nE3rBAyBrnB0oymBcBeD8tT3B4B31jHfnFgsC9UYin9uJN144+e
+tbzOegUg4qaNApAaWGre3YY7ALn1y/6XgqIEIEZcCQ==
+-----END CERTIFICATE-----
--- a/share/ca-certs/Microsoft_Secure_Server_Authority.pem	Sat Oct 25 14:33:54 2008 +0000
+++ b/share/ca-certs/Microsoft_Secure_Server_Authority.pem	Sat Oct 25 18:29:21 2008 +0000
@@ -1,28 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIIE1TCCA72gAwIBAgIKYSsApAADAAAAFDANBgkqhkiG9w0BAQUFADAnMSUwIwYD
-VQQDExxNaWNyb3NvZnQgSW50ZXJuZXQgQXV0aG9yaXR5MB4XDTA2MDQyMTE5MTEw
-NFoXDTA5MDQxOTIzNTkwMFowgYsxEzARBgoJkiaJk/IsZAEZFgNjb20xGTAXBgoJ
+MIIFEzCCA/ugAwIBAgIKYQVOAQADAAAAHDANBgkqhkiG9w0BAQUFADAnMSUwIwYD
+VQQDExxNaWNyb3NvZnQgSW50ZXJuZXQgQXV0aG9yaXR5MB4XDTA3MDkyODIyMDYz
+N1oXDTA5MDQxOTIzNTkwMFowgYsxEzARBgoJkiaJk/IsZAEZFgNjb20xGTAXBgoJ
 kiaJk/IsZAEZFgltaWNyb3NvZnQxFDASBgoJkiaJk/IsZAEZFgRjb3JwMRcwFQYK
 CZImiZPyLGQBGRYHcmVkbW9uZDEqMCgGA1UEAxMhTWljcm9zb2Z0IFNlY3VyZSBT
 ZXJ2ZXIgQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-syn2tJzCJKsQy98cYrzBT0qMSqTMibRel34u64jqd1GKP9cRMHagyNLZIb1rv8NZ
-XPdf2uI8hGc4lxRh4iprbFPOZSiHQIyq9zoqLS7Bh/KnqnRX4CCntCQbWVa/s5c5
-FbGD5XG5AvA8sjn56WPotYLGeWrSZ/k2bcH9YgvQ2Yrt8t1VxPQciSuX82KSn2Kx
-xxJKgQtAgZpyekR5QdIUUvQsEAPaCfWRsF/OMQoyc4UeAxAELavr2vlq869ye3Fu
-f3fUhVEk8kxtiVPYWYBTAhWts62pEwaKGPteMsGnvbX+BRgIwc55vfs6KWXxnBUL
-9Q8BfQQLbT8nQe7hO4XXMQIDAQABo4IBnDCCAZgwEgYDVR0TAQH/BAgwBgEB/wIB
-ATAdBgNVHQ4EFgQUp08F+9GOQVM3lcpL4UMfWutNzVAwCwYDVR0PBAQDAgGGMBIG
-CSsGAQQBgjcVAQQFAgMDAAMwIwYJKwYBBAGCNxUCBBYEFMnAnEM4ke3T6fpSclUI
-g7XN8o57MBkGCSsGAQQBgjcUAgQMHgoAUwB1AGIAQwBBMB8GA1UdIwQYMBaAFDNf
-3Q+3nFzO7ofdcHCLX33PIry5MGYGA1UdHwRfMF0wW6BZoFeGNGh0dHA6Ly9jcmwu
-bWljcm9zb2Z0LmNvbS9wa2kvbXNjb3JwL2NybC9tc3d3dygzKS5jcmyGH2h0dHA6
-Ly9jb3JwcGtpL2NybC9tc3d3dygzKS5jcmwweQYIKwYBBQUHAQEEbTBrMDwGCCsG
-AQUFBzAChjBodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vcGtpL21zY29ycC9tc3d3
-dygzKS5jcnQwKwYIKwYBBQUHMAKGH2h0dHA6Ly9jb3JwcGtpL2FpYS9tc3d3dygz
-KS5jcnQwDQYJKoZIhvcNAQEFBQADggEBAIJDQpkqhodC3ZmKPB4dTveoFCpuc4C0
-qdXPLggvRiTnQJP/SRdnfQwkaulDS3771zWo3fO1/tTiCmVvtU4LNbISpQmrz41q
-AP2QIUl/d4Fjiaz0qchNxmTRlVLGsTrwkMMkOh9MUQEcNyk9RuGepf/1+66qeEnx
-eCgK09yIcbgdE9ffk5ueTX7TNfgoNZO9ORnRS1p7nra3b0Wi1kdGqDmbpw7We+M8
-6B8VpPa0QaofgRdl2dzOijd7hGN+cgRNMvdGpRxzkaWUA52rBOrEVyJLu2IUksPV
-0Q/0ZZMNZXJh8MmWW/o8ebQZJQshN5p4M7HiUN/cZ2onnrdZSpIwyAU=
+xcCphW3RnMyuq1EAwlSsUghQUuCSQAaeFBTro1qbeCJEALHQGrXg8SMnY9Om64WG
+PnB9HhOb1LTOdkMVx6a3GU0mcv+LkefcW/CewIMfDXPoeGA4ULmY9wbraPwJY8Ba
+H3PAvOVSTJ0k9ZX6tXjE0D/214kn0+ZN+Y+ZwoqFC5/lgQyUxxgfVA0FsR/NDNF6
+keBsoNz2vPghAsruLhkON+5KGQo0o+T+XcJ7xNs7eJR7MWZn2rNCM1J+qrR0o2vG
+vz8QBSKogUXiPRXYVkNSkBEFZqGvEob1pDwC5fJEP71J6xEJHsSe0pcaa637RU04
+4BsjRHqJE3Rrlurb6Fc8vQIDAQABo4IB2jCCAdYwEgYDVR0TAQH/BAgwBgEB/wIB
+ATAdBgNVHQ4EFgQUmY+l9x6Bb/p5wvAWP7JUsQhoR1UwCwYDVR0PBAQDAgGGMBIG
+CSsGAQQBgjcVAQQFAgMEAAQwIwYJKwYBBAGCNxUCBBYEFBOB4Tms57aqAqhuDUms
+pmqjrALsMBkGCSsGAQQBgjcUAgQMHgoAUwB1AGIAQwBBMB8GA1UdIwQYMBaAFDNf
+3Q+3nFzO7ofdcHCLX33PIry5MIGjBgNVHR8EgZswgZgwgZWggZKggY+GNmh0dHA6
+Ly9tc2NybC5taWNyb3NvZnQuY29tL3BraS9tc2NvcnAvY3JsL21zd3d3KDMpLmNy
+bIY0aHR0cDovL2NybC5taWNyb3NvZnQuY29tL3BraS9tc2NvcnAvY3JsL21zd3d3
+KDMpLmNybIYfaHR0cDovL2NvcnBwa2kvY3JsL21zd3d3KDMpLmNybDB5BggrBgEF
+BQcBAQRtMGswPAYIKwYBBQUHMAKGMGh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9w
+a2kvbXNjb3JwL21zd3d3KDMpLmNydDArBggrBgEFBQcwAoYfaHR0cDovL2NvcnBw
+a2kvYWlhL21zd3d3KDMpLmNydDANBgkqhkiG9w0BAQUFAAOCAQEARSzU1qmSJczv
+IiFrscxgYtzXekBWgm2rYVIqN996H5ZfMDaso0tZXmhWo0zX0z0r0H+IIGtJ+4D9
+t6dMTpB26jV/5EtMbtQu48ryCkMHBKNtCn7pQ5Mq2gqjq84KrVUlBFfPT4z4+Hqp
+Q6gVghMggWNtiujdHh7w4ja3OqHkFZTX/wUSTb+BtH+GBZKYAGU6duakb3D0piFu
+W5W6gZ4j15R12ys3ZYTKThZjW5blolA0lzuCSghoSfJHRA4jChIzDNojkf7OxqJw
+yFl8+++iZwTiulCTgOucJxGCT1tEEwdfX2c+XKyJIS/d5Ndtk91WEWU+TzqX9ZT4
+SAMJpIZ1pg==
 -----END CERTIFICATE-----