- Timestamp:
- Jun 22, 2013, 9:49:39 PM (11 years ago)
- Parents:
- 96d80e9 (diff), 33501b2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
aim.c
r33501b2 r8258ea5 1 #include <stdio.h>2 #include <stdio.h>3 #include <sys/stat.h>4 1 #include "owl.h" 5 2 … … 710 707 { 711 708 aim_clientready(sess, fr->conn); 712 owl_function_debugmsg("conninitdone_admin: initializ tion done for admin connection");709 owl_function_debugmsg("conninitdone_admin: initialization done for admin connection"); 713 710 return(1); 714 711 } … … 839 836 params = va_arg(ap, struct aim_icbmparameters *); 840 837 va_end(ap); 841 842 owl_function_debugmsg("faimtest_icbmparaminfo: ICBM Parameters: maxchannel = %d, default flags = 0x%08x, max msg len = %d, max sender evil = %f, max rec iever evil = %f, min msg interval = %u",838 839 owl_function_debugmsg("faimtest_icbmparaminfo: ICBM Parameters: maxchannel = %d, default flags = 0x%08x, max msg len = %d, max sender evil = %f, max receiver evil = %f, min msg interval = %u", 843 840 params->maxchan, params->flags, params->maxmsglen, ((float)params->maxsenderwarn)/10.0, ((float)params->maxrecverwarn)/10.0, params->minmsginterval); 844 841 … … 1064 1061 g_free(wrapmsg); 1065 1062 g_free(nz_screenname); 1063 g_free(realmsg); 1066 1064 1067 1065 return(1); 1068 1066 1069 owl_function_debugmsg("faimtest_parse_incoming_im_chan1: icbm: message: %s\n", realmsg); 1070 1071 if (args->icbmflags & AIM_IMFLAGS_MULTIPART) { 1072 aim_mpmsg_section_t *sec; 1073 int z; 1074 1075 owl_function_debugmsg("faimtest_parse_incoming_im_chan1: icbm: multipart: this message has %d parts\n", args->mpmsg.numparts); 1076 1077 for (sec = args->mpmsg.parts, z = 0; sec; sec = sec->next, z++) { 1078 if ((sec->charset == 0x0000) || (sec->charset == 0x0003) || (sec->charset == 0xffff)) { 1079 owl_function_debugmsg("faimtest_parse_incoming_im_chan1: icbm: multipart: part %d: charset 0x%04x, subset 0x%04x, msg = %s\n", z, sec->charset, sec->charsubset, sec->data); 1080 } else { 1081 owl_function_debugmsg("faimtest_parse_incoming_im_chan1: icbm: multipart: part %d: charset 0x%04x, subset 0x%04x, binary or UNICODE data\n", z, sec->charset, sec->charsubset); 1082 } 1083 } 1084 } 1085 1086 if (args->icbmflags & AIM_IMFLAGS_HASICON) { 1087 /* aim_send_im(sess, userinfo->sn, AIM_IMFLAGS_BUDDYREQ, "You have an icon"); */ 1088 owl_function_debugmsg("faimtest_parse_incoming_im_chan1: icbm: their icon: iconstamp = %ld, iconlen = 0x%08x, iconsum = 0x%04x\n", args->iconstamp, args->iconlen, args->iconsum); 1089 } 1090 1091 g_free(realmsg); 1092 1093 return(1); 1067 /* TODO: Multipart? See history from before 1.8 release. */ 1094 1068 } 1095 1069 … … 1852 1826 fd = event_source->fds->pdata[i]; 1853 1827 fd->fd = cur->fd; 1854 fd->events |= G_IO_IN | G_IO_HUP | G_IO_ERR;1828 fd->events = G_IO_IN | G_IO_HUP | G_IO_ERR; 1855 1829 if (cur->status & AIM_CONN_STATUS_INPROGRESS) { 1856 /* Yes, we're checking writable sockets here. Without it, AIM 1857 login is really slow. */ 1830 /* AIM login requires checking writable sockets. See aim_select. */ 1858 1831 fd->events |= G_IO_OUT; 1859 1832 } … … 1891 1864 { 1892 1865 owl_aim_event_source *event_source = (owl_aim_event_source*)source; 1893 truncate_pollfd_list(event_source, 0); 1894 g_ptr_array_free(event_source->fds, TRUE); 1866 /* Don't remove the GPollFDs. We are being finalized, so they'll be removed 1867 * for us. Moreover, glib will fire asserts if g_source_remove_poll is called 1868 * on a source which has been destroyed (which occurs when g_source_remove is 1869 * called on it). */ 1870 owl_ptr_array_free(event_source->fds, g_free); 1895 1871 } 1896 1872
Note: See TracChangeset
for help on using the changeset viewer.