Mercurial > pidgin.yaz
comparison libpurple/util.c @ 32295:dc120ca9f523
propagate from branch 'im.pidgin.pidgin' (head bfb757dfe6b2549ab37a9b19f78f5f1f2f9df0cd)
to branch 'im.pidgin.pidgin.next.major' (head fc195a83f896d038c367b1e92cc1bebd7e8246ab)
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 21 Mar 2011 05:45:22 +0000 |
| parents | 73b005a20d06 |
| children | 0d4702446530 |
comparison
equal
deleted
inserted
replaced
| 31855:62dc884f2dec | 32295:dc120ca9f523 |
|---|---|
| 4939 buf[j] = '\0'; | 4939 buf[j] = '\0'; |
| 4940 | 4940 |
| 4941 return buf; | 4941 return buf; |
| 4942 } | 4942 } |
| 4943 | 4943 |
| 4944 const char *_purple_oscar_convert(const char *act, const char *protocol) | |
| 4945 { | |
| 4946 if (act && purple_strequal(protocol, "prpl-oscar")) { | |
| 4947 int i; | |
| 4948 for (i = 0; act[i] != '\0'; i++) | |
| 4949 if (!isdigit(act[i])) | |
| 4950 return "prpl-aim"; | |
| 4951 return "prpl-icq"; | |
| 4952 } | |
| 4953 return protocol; | |
| 4954 } | |
| 4955 | |
| 4956 void purple_restore_default_signal_handlers(void) | 4944 void purple_restore_default_signal_handlers(void) |
| 4957 { | 4945 { |
| 4958 #ifndef _WIN32 | 4946 #ifndef _WIN32 |
| 4959 #ifdef HAVE_SIGNAL_H | 4947 #ifdef HAVE_SIGNAL_H |
| 4960 signal(SIGHUP, SIG_DFL); /* 1: terminal line hangup */ | 4948 signal(SIGHUP, SIG_DFL); /* 1: terminal line hangup */ |