Mercurial > pidgin
diff libgaim/protocols/jabber/jabber.c @ 14391:6e89bfd2b33f
[gaim-migrate @ 17098]
I don't think PRPLs should need to make sure that proto_data is
valid in the set_idle() callback. Some of my idle changes on the
23rd added that requirement. This removes the requirement to
make things the way they were before.
I'm also reverting SVN revision 17005 from faceprint and 17009
from marv_sf. Those revisions fixed the PRPLs so they wouldn't
crash if set_idle() was called before the acocunt was fully
connected. But that shouldn't be needed any more.
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Thu, 31 Aug 2006 09:02:10 +0000 |
| parents | 8a2b571f9990 |
| children | 14fb08103914 |
line wrap: on
line diff
--- a/libgaim/protocols/jabber/jabber.c Thu Aug 31 06:39:20 2006 +0000 +++ b/libgaim/protocols/jabber/jabber.c Thu Aug 31 09:02:10 2006 +0000 @@ -1040,14 +1040,13 @@ return g_strdup_printf("gaim%x", js->next_id++); } -/* + static void jabber_idle_set(GaimConnection *gc, int idle) { JabberStream *js = gc->proto_data; js->idle = idle ? time(NULL) - idle : idle; } -*/ static const char *jabber_list_icon(GaimAccount *a, GaimBuddy *b) { @@ -1848,7 +1847,7 @@ jabber_send_typing, /* send_typing */ jabber_buddy_get_info, /* get_info */ jabber_presence_send, /* set_away */ - NULL, /* set_idle */ + jabber_idle_set, /* set_idle */ NULL, /* change_passwd */ jabber_roster_add_buddy, /* add_buddy */ NULL, /* add_buddies */