annotate gaim.desktop.in @ 14089:10e8eb6a4910

[gaim-migrate @ 16712] Pretty large commit here. Basically I got sick of having to verify that gc is still valid on all the callback functions for gaim_proxy_connect(). The fix for this for gaim_proxy_connect() to return something that allows the connection attempt to be canceled. It's not quite there yet, but this is a good first step. I changed gaim_proxy_connect() to return a reference to a new GaimProxyConnectInfo (this used to be called PHB). Eventually this can be passed to a function that'll cancel the connection attempt. I also decided to add an error_cb instead of using connect_cb and passing a file descriptor of -1. And proxy.c will also pass an error message to callers which should explain the reason that the connection attempt failed. Oh, and proxy.c now never calls gaim_connection_error() committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sat, 12 Aug 2006 10:12:43 +0000
parents 5adc0c9da9f3
children 346faf2a5acd
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
13179
5adc0c9da9f3 [gaim-migrate @ 15542]
Richard Laager <rlaager@wiktel.com>
parents:
diff changeset
1 [Desktop Entry]
5adc0c9da9f3 [gaim-migrate @ 15542]
Richard Laager <rlaager@wiktel.com>
parents:
diff changeset
2 Encoding=UTF-8
5adc0c9da9f3 [gaim-migrate @ 15542]
Richard Laager <rlaager@wiktel.com>
parents:
diff changeset
3 _Name=Gaim Internet Messenger
5adc0c9da9f3 [gaim-migrate @ 15542]
Richard Laager <rlaager@wiktel.com>
parents:
diff changeset
4 _GenericName=Internet Messenger
5adc0c9da9f3 [gaim-migrate @ 15542]
Richard Laager <rlaager@wiktel.com>
parents:
diff changeset
5 _Comment=Send instant messages over multiple protocols
5adc0c9da9f3 [gaim-migrate @ 15542]
Richard Laager <rlaager@wiktel.com>
parents:
diff changeset
6 Exec=gaim
5adc0c9da9f3 [gaim-migrate @ 15542]
Richard Laager <rlaager@wiktel.com>
parents:
diff changeset
7 Icon=gaim.png
5adc0c9da9f3 [gaim-migrate @ 15542]
Richard Laager <rlaager@wiktel.com>
parents:
diff changeset
8 StartupNotify=true
5adc0c9da9f3 [gaim-migrate @ 15542]
Richard Laager <rlaager@wiktel.com>
parents:
diff changeset
9 Terminal=false
5adc0c9da9f3 [gaim-migrate @ 15542]
Richard Laager <rlaager@wiktel.com>
parents:
diff changeset
10 Type=Application
5adc0c9da9f3 [gaim-migrate @ 15542]
Richard Laager <rlaager@wiktel.com>
parents:
diff changeset
11 Categories=Application;Network;