HGKeeper

Pull a bunch of bugfix only changes to im.pidgin.pidgin.2.3.1,
release-2.3.1
2007-12-01, Stu Tomlinson

267c34cfb7fc

Parents 19db9cbb33be
Children 4ce31581a004

Pull a bunch of bugfix only changes to im.pidgin.pidgin.2.3.1,
hopefully I didn't get any string changes in here so we can
release off this branch without requiring a new freeze.

applied changes from 19db9cbb33be6b1ee81115f2ec70f630269c92f4
through f0049ba2b2298d2379451c6152966c88d65271e3

applied changes from d731028483beaf239cd344e962c1a32638943883
through d731028483beaf239cd344e962c1a32638943883

applied changes from d731028483beaf239cd344e962c1a32638943883
through d731028483beaf239cd344e962c1a32638943883

applied changes from 463242c8c94709caaec5d86a68792c915fdd0537
through 463242c8c94709caaec5d86a68792c915fdd0537

applied changes from c77aee16184e888f78cd2e43d89ecb6202938d9b
through 30553187b82f795a4c65a0bf7f1e7e6c3fc4ff57

applied changes from 30553187b82f795a4c65a0bf7f1e7e6c3fc4ff57
through b1278944ccaa36c30b7f00edf5b79dc38347c931

applied changes from 41c1eba01a2c9fe574f5c3b0c4a2a6ee0c9955b0
through 83367f8f60af4ebb6636d5aa3e3eed63fc7e49b8

applied changes from 83367f8f60af4ebb6636d5aa3e3eed63fc7e49b8
through cf65b89d71f0a142ac21a919ced9f163b4bc7251

applied changes from cf65b89d71f0a142ac21a919ced9f163b4bc7251
through 55decf7b3893d1f4798d2a966b93eb9f08858f67

applied changes from 88390766d9b581d7a7e2e3b6156437c5bef76e93
through a00ff8e1a342a8326627d51728ad97699740c945

applied changes from a00ff8e1a342a8326627d51728ad97699740c945
through c55dabf731ea4d3fcb287e43b157062eb2d425fa

applied changes from c55dabf731ea4d3fcb287e43b157062eb2d425fa
through b576470ab9bee5e0b1c48de1e78e3e6234254cdb

applied changes from b576470ab9bee5e0b1c48de1e78e3e6234254cdb
through 5865eb4a45b2c059f8cd82ebd88bcca28ec72bd7

applied changes from 489cfa53e2320aa6522e293f3f3e3a058b9dad26
through 489cfa53e2320aa6522e293f3f3e3a058b9dad26

applied changes from cfebb2730668c41870ff696f157ddd68175aa0f3
through e7f1ca64fe26b46544c0f64f082c81a0a9e96f5f

applied changes from 87a81ecce720018f2f6c6d2983c0259ae3c88814
through 72fffff81de35e7d400bf8b8fb18ba7ed84a6b8c

applied changes from f5e03381162836652532f1495162df4868b7b8cb
through 48faf08abe024b6ad491a1145e309b36fceda249

applied changes from cd4038a435bd39cc62244d5614b8d94ad689d8bf
through d03ce5e2bc3aaa6ee963e1ebced007175aaa099f

applied changes from d03ce5e2bc3aaa6ee963e1ebced007175aaa099f
through f5e03381162836652532f1495162df4868b7b8cb

applied changes from 9e52f5f3fa15ac341c185f72558447f3ff263337
through 727439d778b7d7f40aa0230cb9be26765e8d50a9

applied changes from cd4038a435bd39cc62244d5614b8d94ad689d8bf
through 37d10660345bc1f2092492296caa8deaf84744b4

applied changes from d5c8358a1cdfe381e834ab7f86a9e1fb6835e65f
through 41b4d75b70555daf78b3c5701a59453027ca57e7

applied changes from 41b4d75b70555daf78b3c5701a59453027ca57e7
through fb945a0cab270a5eaf15d294b8706714e22742c1

applied changes from fb945a0cab270a5eaf15d294b8706714e22742c1
through 680ead8ac23fbdc99bd7178248a4cdf0bec54307

applied changes from 41b4d75b70555daf78b3c5701a59453027ca57e7
through 29f8aed19e209a53a63c57cf872bc9f446d84aeb

applied changes from 2996670bdeb36ac63658ea4760a8a1f2e362e703
through 7595eff42168a97a13aec5a68f05916a862b22df

applied changes from 1273d64fc47b82be9ff2bca00d14e37199bcc026
through bd625d93706896fbd570aee9b3d53ceb38241a12

applied changes from c27700a33779f1f8f380b0ed0a62756be4b6f17c
through a66a55b8836e3241bcc5772e499aa7c85d7bef88

applied changes from ed49703095cc1bf4f1938ef4cebcc2d906f5d911
through ae553a7b1f48faebd22d107832f5827460d5d656

3 files changed, 4 insertions(+), 4 deletions(-)

+2 -2

configure.ac

+1 -1

gntmain.c

+1 -1

gntwm.c

~~--- a/configure.ac Fri Nov 23 04:04:33 2007 +0000~~

+++ b/configure.ac Sat Dec 01 14:08:02 2007 +0000

@@ -27,8 +27,8 @@

m4_define([gnt_lt_current], [3])

m4_define([gnt_major_version], [2])

m4_define([gnt_minor_version], [3])

~~-m4_define([gnt_micro_version], [0])~~

~~-m4_define([gnt_version_suffix], [])~~

+m4_define([gnt_micro_version], [1])

+m4_define([gnt_version_suffix], [devel])

m4_define([gnt_version],

[gnt_major_version.gnt_minor_version.gnt_micro_version])

m4_define([gnt_display_version], gnt_version[]m4_ifdef([gnt_version_suffix],[gnt_version_suffix]))

~~--- a/gntmain.c Fri Nov 23 04:04:33 2007 +0000~~

+++ b/gntmain.c Sat Dec 01 14:08:02 2007 +0000

@@ -21,7 +21,7 @@

*/

#define _GNU_SOURCE

~~-#if defined(__APPLE__) || defined(__unix__)~~

+#if (defined(__APPLE__) || defined(__unix__)) && !defined(__FreeBSD__)

#define _XOPEN_SOURCE_EXTENDED

#endif

~~--- a/gntwm.c Fri Nov 23 04:04:33 2007 +0000~~

+++ b/gntwm.c Sat Dec 01 14:08:02 2007 +0000