Changeset 5787ccc


Ignore:
Timestamp:
Jul 19, 2011, 3:32:25 AM (10 years ago)
Author:
GitHub Merge Button <merge-button@github.com>
Parents:
fa180a3 (diff), d8f22b6 (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.
Message:
Merge d8f22b65abfc43c50c273302ba9cffe7dc383ed0 into fa180a3e29ecef2a60831689e626652afe399964
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • aim.c

    r2770be99 rff7449e  
    10641064  g_free(wrapmsg);
    10651065  g_free(nz_screenname);
     1066  g_free(realmsg);
    10661067
    10671068  return(1);
    10681069
    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);
     1070  /* TODO: Multipart? See history from before 1.8 release. */
    10941071}
    10951072
  • fmtext.c

    r2560529 rd8f22b6  
    686686         * but zwgc seems to be smarter about some screw cases than I am
    687687         */
     688        g_free(buff);
    688689        owl_fmtext_append_attr(f, "@", curattrs, curcolor, OWL_COLOR_DEFAULT);
    689690        txtptr++;
  • functions.c

    r99ac28a r837bd81  
    24552455  /* if it already exists then go with it.  This lets users override */
    24562456  if (owl_global_get_filter(&g, filtname)) {
    2457     return(g_strdup(filtname));
     2457    return filtname;
    24582458  }
    24592459
Note: See TracChangeset for help on using the changeset viewer.