Index: zephyr.c
===================================================================
--- zephyr.c	(revision ddbbcffae8064f4d266a9735a16225e4feef1a3c)
+++ zephyr.c	(revision d4927a70549407fe7f56b4ae1d3949663a370205)
@@ -23,5 +23,5 @@
 {
   if (input != NULL)
-    return owl_strdup(input);
+    return g_strdup(input);
   else
     return owl_sprintf("%s/%s", owl_global_get_homedir(&g), name);
@@ -292,11 +292,11 @@
     if ((tmp = strtok(start, ",\n\r")) == NULL)
       continue;
-    subs[count].zsub_class = owl_strdup(tmp);
+    subs[count].zsub_class = g_strdup(tmp);
     if ((tmp=strtok(NULL, ",\n\r")) == NULL)
       continue;
-    subs[count].zsub_classinst = owl_strdup(tmp);
+    subs[count].zsub_classinst = g_strdup(tmp);
     if ((tmp = strtok(NULL, " \t\n\r")) == NULL)
       continue;
-    subs[count].zsub_recipient = owl_strdup(tmp);
+    subs[count].zsub_recipient = g_strdup(tmp);
 
     /* if it started with '-' then add it to the global punt list, and
@@ -337,7 +337,7 @@
   count=0;
 
-  subs[count].zsub_class=owl_strdup("message");
-  subs[count].zsub_classinst=owl_strdup("*");
-  subs[count].zsub_recipient=owl_strdup("%me%");
+  subs[count].zsub_class=g_strdup("message");
+  subs[count].zsub_classinst=g_strdup("*");
+  subs[count].zsub_recipient=g_strdup("%me%");
   count++;
 
@@ -400,6 +400,6 @@
       }
 
-      subs[count].zsub_class = owl_strdup("login");
-      subs[count].zsub_recipient = owl_strdup("*");
+      subs[count].zsub_class = g_strdup("login");
+      subs[count].zsub_recipient = g_strdup("*");
       subs[count].zsub_classinst = long_zuser(buffer);
 
@@ -483,5 +483,5 @@
   /* If there's no message here, just run along now */
   if (n->z_message_len == 0)
-    return(owl_strdup(""));
+    return(g_strdup(""));
 
   count=save=0;
@@ -491,5 +491,5 @@
       if (count==j) {
 	/* just found the end of the field we're looking for */
-	return(owl_strdup(n->z_message+save));
+	return(g_strdup(n->z_message+save));
       } else {
 	save=i+1;
@@ -502,5 +502,5 @@
   }
 
-  return(owl_strdup(""));
+  return(g_strdup(""));
 }
 
@@ -511,5 +511,5 @@
   /* If there's no message here, just run along now */
   if (n->z_message_len == 0)
-    return(owl_strdup(""));
+    return(g_strdup(""));
 
   count=save=0;
@@ -534,10 +534,10 @@
   }
 
-  return(owl_strdup(""));
+  return(g_strdup(""));
 }
 #else
 char *owl_zephyr_get_field(void *n, int j)
 {
-  return(owl_strdup(""));
+  return(g_strdup(""));
 }
 char *owl_zephyr_get_field_as_utf8(void *n, int j)
@@ -578,5 +578,5 @@
   /* don't let ping messages have a body */
   if (!strcasecmp(n->z_opcode, "ping")) {
-    return(owl_strdup(""));
+    return(g_strdup(""));
   }
 
@@ -804,16 +804,16 @@
 
       memset(&zw, 0, sizeof(zw));
-      zw.class = owl_strdup(retnotice->z_class);
-      zw.inst  = owl_strdup(retnotice->z_class_inst);
+      zw.class = g_strdup(retnotice->z_class);
+      zw.inst  = g_strdup(retnotice->z_class_inst);
       realm = strchr(retnotice->z_recipient, '@');
       if(realm) {
-        zw.realm = owl_strdup(realm + 1);
+        zw.realm = g_strdup(realm + 1);
       } else {
-        zw.realm = owl_strdup(owl_zephyr_get_realm());
+        zw.realm = g_strdup(owl_zephyr_get_realm());
       }
-      zw.opcode = owl_strdup(retnotice->z_opcode);
-      zw.zsig   = owl_strdup("");
+      zw.opcode = g_strdup(retnotice->z_opcode);
+      zw.zsig   = g_strdup("");
       owl_list_create(&(zw.recips));
-      owl_list_append_element(&(zw.recips), owl_strdup(tmp));
+      owl_list_append_element(&(zw.recips), g_strdup(tmp));
 
       owl_log_outgoing_zephyr_error(&zw, buff);
@@ -870,5 +870,5 @@
     to=owl_zephyr_smartstripped_user(owl_message_get_sender(m));
   } else {
-    to=owl_strdup(owl_message_get_sender(m));
+    to=g_strdup(owl_message_get_sender(m));
   }
 
@@ -934,5 +934,5 @@
     result = owl_sprintf("%s: Hidden or not logged in\n", myuser);
   } else {
-    result = owl_strdup("");
+    result = g_strdup("");
     for (; numlocs; numlocs--) {
       ZGetLocations(&locations, &one);
@@ -950,5 +950,5 @@
   return result;
 #else
-  return owl_strdup("");
+  return g_strdup("");
 #endif
 }
@@ -1132,7 +1132,7 @@
   ret=ZRetrieveSubscriptions(0, &num);
   if (ret==ZERR_TOOMANYSUBS) {
-    return(owl_strdup("Zephyr: too many subscriptions\n"));
+    return(g_strdup("Zephyr: too many subscriptions\n"));
   } else if (ret || (num <= 0)) {
-    return(owl_strdup("Zephyr: error retriving subscriptions\n"));
+    return(g_strdup("Zephyr: error retriving subscriptions\n"));
   }
 
@@ -1143,5 +1143,5 @@
       ZFlushSubscriptions();
       g_string_free(buf, true);
-      return owl_strdup("Error while getting subscriptions\n");
+      return g_strdup("Error while getting subscriptions\n");
     } else {
       /* g_string_append_printf would be backwards. */
@@ -1158,5 +1158,5 @@
   return g_string_free(buf, false);
 #else
-  return(owl_strdup("Zephyr not available"));
+  return(g_strdup("Zephyr not available"));
 #endif
 }
@@ -1185,5 +1185,5 @@
   char *out, *ptr;
 
-  out=owl_strdup(in);
+  out=g_strdup(in);
   ptr=strchr(out, '@');
   if (ptr) {
@@ -1201,5 +1201,5 @@
 {
   if (strchr(in, '@')) {
-    return(owl_strdup(in));
+    return(g_strdup(in));
   }
   return(owl_sprintf("%s@%s", in, owl_zephyr_get_realm()));
@@ -1215,5 +1215,5 @@
   char *slash, *dot, *realm, *out;
 
-  out = owl_strdup(in);
+  out = g_strdup(in);
 
   /* bail immeaditly if we don't have to do any work */
