Mercurial > pidgin
annotate libpurple/gconf/Makefile.am @ 24476:3d6fe79753c3
This should fix another crash I've seen. We weren't correctly
cancelling the proxy connect when we destroyed the servconn
because we were only calling msn_servconn_disconnect() if we
had actually connected.
So always call msn_servconn_disconnect() from msn_servconn_destroy()
and let the disconnect function deal with only closing stuff that
is actually open.
Here's the backtrace:
#0 0x0000000000000000 in ?? ()
#1 0x00000000005f95e0 in connect_cb (data=0x2ab92ef6e7b0, source=7, error_message=0x0)
at servconn.c:185
#2 0x000000000056e7da in purple_proxy_connect_data_connected (connect_data=0x2ab92ef70260)
at proxy.c:598
#3 0x000000000056e90d in socket_ready_cb (data=0x2ab92ef70260, source=7, cond=PURPLE_INPUT_WRITE)
at proxy.c:657
#4 0x00000000004db70c in pidgin_io_invoke (source=0x2ab92ee4be50, condition=G_IO_OUT,
data=0x2ab92dfd3130) at gtkeventloop.cc:79
In frame 1, servconn is not valid (it has already been freed)
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Tue, 18 Nov 2008 07:32:23 +0000 |
parents | 309c1478b457 |
children | f7d03842b9c9 |
rev | line source |
---|---|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1 schemadir = @GCONF_SCHEMA_FILE_DIR@ |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
2 |
15910
88d626a179a6
Rename our schemas file and update the url handler to point to the
Mark Doliner <mark@kingant.net>
parents:
15373
diff
changeset
|
3 EXTRA_DIST = purple.schemas.in |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
4 |
15910
88d626a179a6
Rename our schemas file and update the url handler to point to the
Mark Doliner <mark@kingant.net>
parents:
15373
diff
changeset
|
5 schema_in_files = purple.schemas.in |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
6 schema_DATA = $(schema_in_files:.schemas.in=.schemas) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
7 @INTLTOOL_SCHEMAS_RULE@ |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
8 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
9 if GCONF_SCHEMAS_INSTALL |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
10 install-data-local: |
16141
309c1478b457
Suppress useless gconf messages. Hopefully I haven't introduced a bashism here.
Richard Laager <rlaager@wiktel.com>
parents:
15910
diff
changeset
|
11 GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 2>&1 | \ |
309c1478b457
Suppress useless gconf messages. Hopefully I haven't introduced a bashism here.
Richard Laager <rlaager@wiktel.com>
parents:
15910
diff
changeset
|
12 grep -v "^WARNING: failed to install schema" | grep -v "^Attached schema" 1>&2 |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
13 else |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
14 install-data-local: |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
15 endif |