Mercurial > pidgin
comparison libpurple/prpl.c @ 24952:bcad7dc4b453
propagate from branch 'im.pidgin.pidgin' (head 633ffe234af48ead3631ae62e23840b4438fcf5f)
to branch 'im.pidgin.maiku.vv' (head 5585b8e919d9adb0eb491c714768027e81f1918c)
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Thu, 06 Nov 2008 03:20:05 +0000 |
| parents | 551a462b346a 785db7300ef2 |
| children | d68924f1265f |
comparison
equal
deleted
inserted
replaced
| 24951:94224a5563db | 24952:bcad7dc4b453 |
|---|---|
| 21 * | 21 * |
| 22 */ | 22 */ |
| 23 #include "internal.h" | 23 #include "internal.h" |
| 24 #include "conversation.h" | 24 #include "conversation.h" |
| 25 #include "debug.h" | 25 #include "debug.h" |
| 26 #include "network.h" | |
| 26 #include "notify.h" | 27 #include "notify.h" |
| 27 #include "prpl.h" | 28 #include "prpl.h" |
| 28 #include "request.h" | 29 #include "request.h" |
| 29 #include "util.h" | 30 #include "util.h" |
| 30 | 31 |
| 315 { | 316 { |
| 316 PurplePlugin *prpl; | 317 PurplePlugin *prpl; |
| 317 PurplePluginProtocolInfo *prpl_info; | 318 PurplePluginProtocolInfo *prpl_info; |
| 318 | 319 |
| 319 if (purple_status_is_online(new_status) && | 320 if (purple_status_is_online(new_status) && |
| 320 purple_account_is_disconnected(account)) | 321 purple_account_is_disconnected(account) && |
| 322 purple_network_is_available()) | |
| 321 { | 323 { |
| 322 purple_account_connect(account); | 324 purple_account_connect(account); |
| 323 return; | 325 return; |
| 324 } | 326 } |
| 325 | 327 |