Mercurial > pidgin.yaz
diff libpurple/protocols/sametime/sametime.c @ 26054:68f4edb42f39
propagate from branch 'im.pidgin.pidgin' (head e36b0b63962b9c710ecd798a529e1d2b78d7879a)
to branch 'im.pidgin.pidgin.vv' (head bb0c02f78281c46db41ef3efba2896a2edad4441)
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Mon, 15 Dec 2008 08:39:08 +0000 |
| parents | 25e2ab1fff1d 508e57943440 |
| children | f0c2e27c7ae7 |
line wrap: on
line diff
--- a/libpurple/protocols/sametime/sametime.c Sun Dec 14 23:43:52 2008 +0000 +++ b/libpurple/protocols/sametime/sametime.c Mon Dec 15 08:39:08 2008 +0000 @@ -158,7 +158,7 @@ blist_choice_LOCAL = 1, /**< local only */ blist_choice_MERGE = 2, /**< merge from server */ blist_choice_STORE = 3, /**< merge from and save to server */ - blist_choice_SYNCH = 4, /**< sync with server */ + blist_choice_SYNCH = 4 /**< sync with server */ }; @@ -514,6 +514,11 @@ idle_len = time(NULL) - idle; ugly_idle_len = ((time(NULL) * 1000) - idle) / 1000; + if(idle > ugly_idle_len) + ugly_idle_len = 0; + else + ugly_idle_len = (ugly_idle_len - idle) / 1000; + /* what's the deal here? Well, good clients are smart enough to publish their idle time by using an attribute to indicate that