Changeset f8a138c

Timestamp:

Sep 19, 2013, 6:48:11 PM (10 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:

• functions.c (modified) (1 diff)
• zephyr.c (modified) (1 diff)

functions.c

@@ -1472 +1472 @@
         owl_fmtext_append_normal(&fm, "\n");
         owl_fmtext_appendf_normal(&fm, "  Port      : %i\n", ntohs(n->z_port));
+        owl_fmtext_appendf_normal(&fm, "  Charset   : %s\n", owl_zephyr_get_charsetstr(n));
         owl_fmtext_appendf_normal(&fm, "  Auth      : %s\n", owl_zephyr_get_authstr(n));
 

zephyr.c

@@ -1105 +1105 @@
   g_free(filename);
 }
+
+#ifdef HAVE_LIBZEPHYR
+const char *owl_zephyr_get_charsetstr(const ZNotice_t *n)
+{
+#ifdef ZCHARSET_UTF_8
+  return ZCharsetToString(n->z_charset);
+#else
+  return "";
+#endif
+}
+#else
+const char *owl_zephyr_get_charsetstr(const void *n)
+{
+  return "";
+}
+#endif
 
 /* return auth string */