Changeset f8a138c


Ignore:
Timestamp:
Sep 19, 2013, 6:48:11 PM (8 years ago)
Author:
Anders Kaseorg <andersk@mit.edu>
Parents:
41064be (diff), c55930e (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 c55930eba586a550d319a68566c23352ce56ea84 into 41064be8e484a638bef23474f173491cd87969b3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • functions.c

    rca1fb26a rc55930e  
    14721472        owl_fmtext_append_normal(&fm, "\n");
    14731473        owl_fmtext_appendf_normal(&fm, "  Port      : %i\n", ntohs(n->z_port));
     1474        owl_fmtext_appendf_normal(&fm, "  Charset   : %s\n", owl_zephyr_get_charsetstr(n));
    14741475        owl_fmtext_appendf_normal(&fm, "  Auth      : %s\n", owl_zephyr_get_authstr(n));
    14751476
  • zephyr.c

    r441fd42 rc55930e  
    11051105  g_free(filename);
    11061106}
     1107
     1108#ifdef HAVE_LIBZEPHYR
     1109const char *owl_zephyr_get_charsetstr(const ZNotice_t *n)
     1110{
     1111#ifdef ZCHARSET_UTF_8
     1112  return ZCharsetToString(n->z_charset);
     1113#else
     1114  return "";
     1115#endif
     1116}
     1117#else
     1118const char *owl_zephyr_get_charsetstr(const void *n)
     1119{
     1120  return "";
     1121}
     1122#endif
    11071123
    11081124/* return auth string */
Note: See TracChangeset for help on using the changeset viewer.