Changeset ddbbcffa

Timestamp:

Feb 11, 2011, 4:31:42 PM (14 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

d4927a7

Parents:

35b6eb9

git-author:

Anders Kaseorg <andersk@mit.edu> (08/27/09 00:52:41)

git-committer:

Anders Kaseorg <andersk@mit.edu> (02/11/11 16:31:42)

Message:

Replace owl_free with g_free.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Reviewed-by: Karl Ramm <kcr@mit.edu>

Files:

• aim.c (modified) (7 diffs)
• buddy.c (modified) (2 diffs)
• cmd.c (modified) (10 diffs)
• commands.c (modified) (14 diffs)
• context.c (modified) (1 diff)
• dict.c (modified) (2 diffs)
• editwin.c (modified) (6 diffs)
• filter.c (modified) (4 diffs)
• filterelement.c (modified) (3 diffs)
• fmtext.c (modified) (14 diffs)
• functions.c (modified) (47 diffs)
• global.c (modified) (6 diffs)
• history.c (modified) (2 diffs)
• keybinding.c (modified) (3 diffs)
• keymap.c (modified) (4 diffs)
• list.c (modified) (1 diff)
• logging.c (modified) (10 diffs)
• message.c (modified) (16 diffs)
• msgwin.c (modified) (2 diffs)
• owl.c (modified) (3 diffs)
• perlconfig.c (modified) (7 diffs)
• perlglue.xs (modified) (11 diffs)
• popexec.c (modified) (2 diffs)
• popwin.c (modified) (1 diff)
• regex.c (modified) (3 diffs)
• select.c (modified) (3 diffs)
• style.c (modified) (3 diffs)
• tester.c (modified) (12 diffs)
• text.c (modified) (2 diffs)
• util.c (modified) (10 diffs)
• variable.c (modified) (6 diffs)
• view.c (modified) (1 diff)
• viewwin.c (modified) (3 diffs)
• zbuddylist.c (modified) (3 diffs)
• zephyr.c (modified) (29 diffs)
• zwrite.c (modified) (12 diffs)

aim.c

@@ -203 +203 @@
   buff=owl_sprintf("Logged in to AIM as %s", screenname);
   owl_function_adminmsg("", buff);
-  owl_free(buff);
+  g_free(buff);
 
   owl_function_debugmsg("Successful AIM login for %s", screenname);
@@ -292 +292 @@
   ret=aim_im_sendch1_ext(owl_global_get_aimsess(&g), &args);
 
-  owl_free(encoded);
+  g_free(encoded);
 
   return(ret);
@@ -356 +356 @@
                         NULL, NULL, 0,
                         "us-ascii", foo, len);
-  owl_free(foo);
+  g_free(foo);
 
   /*
@@ -1054 +1054 @@
   if (args->icbmflags & AIM_IMFLAGS_AWAY) owl_message_set_attribute(m, "isauto", "");
   owl_global_messagequeue_addmsg(&g, m);
-  owl_free(stripmsg);
-  owl_free(wrapmsg);
-  owl_free(nz_screenname);
+  g_free(stripmsg);
+  g_free(wrapmsg);
+  g_free(nz_screenname);
 
   return(1);
@@ -1082 +1082 @@
   }
 
-  owl_free(realmsg);
+  g_free(realmsg);
 
   return(1);
@@ -1195 +1195 @@
   owl_function_debugmsg("parse_oncoming sn: %s idle: %i", userinfo->sn, userinfo->idletime);
     
-  owl_free(nz_screenname);
+  g_free(nz_screenname);
   
   /*
@@ -1227 +1227 @@
   nz_screenname=owl_aim_normalize_screenname(userinfo->sn);
   owl_buddylist_offgoing(owl_global_get_buddylist(&g), nz_screenname);
-  owl_free(nz_screenname);
+  g_free(nz_screenname);
 
   if (userinfo->present & AIM_USERINFO_PRESENT_IDLE) {

buddy.c

@@ -66 +66 @@
 void owl_buddy_cleanup(owl_buddy *b)
 {
-  if (b->name) owl_free(b->name);
+  if (b->name) g_free(b->name);
 }
 
@@ -72 +72 @@
 {
   owl_buddy_cleanup(b);
-  owl_free(b);
+  g_free(b);
 }

cmd.c

@@ -44 +44 @@
 void owl_cmddict_namelist_cleanup(owl_list *l)
 {
-  owl_list_cleanup(l, owl_free);
+  owl_list_cleanup(l, g_free);
 }
 
@@ -60 +60 @@
   owl_cmd * newcmd = g_new(owl_cmd, 1);
   if(owl_cmd_create_from_template(newcmd, cmd) < 0) {
-    owl_free(newcmd);
+    g_free(newcmd);
     return -1;
   }
@@ -91 +91 @@
   argv=owl_parseline(tmpbuff, &argc);
   if (argc < 0) {
-    owl_free(tmpbuff);
+    g_free(tmpbuff);
     owl_function_makemsg("Unbalanced quotes");
     return NULL;
@@ -98 +98 @@
   if (argc < 1) {
     owl_parse_delete(argv, argc);
-    owl_free(tmpbuff);
+    g_free(tmpbuff);
     return NULL;
   }
@@ -105 +105 @@
 
   owl_parse_delete(argv, argc);
-  owl_free(tmpbuff);
+  g_free(tmpbuff);
   return retval;
 }
@@ -153 +153 @@
 void owl_cmd_cleanup(owl_cmd *cmd)
 {
-  if (cmd->name) owl_free(cmd->name);
-  if (cmd->summary) owl_free(cmd->summary);
-  if (cmd->usage) owl_free(cmd->usage);
-  if (cmd->description) owl_free(cmd->description);
-  if (cmd->cmd_aliased_to) owl_free(cmd->cmd_aliased_to);
+  if (cmd->name) g_free(cmd->name);
+  if (cmd->summary) g_free(cmd->summary);
+  if (cmd->usage) g_free(cmd->usage);
+  if (cmd->description) g_free(cmd->description);
+  if (cmd->cmd_aliased_to) g_free(cmd->cmd_aliased_to);
   if (cmd->cmd_perl) owl_perlconfig_cmd_cleanup(cmd);
 }
@@ -164 +164 @@
 {
   owl_cmd_cleanup(cmd);
-  owl_free(cmd);
+  g_free(cmd);
 }
 
@@ -188 +188 @@
       newcmd = owl_sprintf("%s %s", cmd->cmd_aliased_to, cmdbuffargs);
       rv = owl_function_command(newcmd);
-      owl_free(newcmd);
+      g_free(newcmd);
     } 
     alias_recurse_depth--;
@@ -280 +280 @@
     owl_fmtext_append_normal(fm, indent);
     owl_fmtext_append_normal(fm, "\n");
-    owl_free(indent);
+    g_free(indent);
   } else {
     owl_fmtext_append_bold(fm, "\nSYNOPSIS\n");
@@ -294 +294 @@
     owl_fmtext_append_normal(fm, indent);
     owl_fmtext_append_normal(fm, "\n");
-    owl_free(indent);
+    g_free(indent);
   }
 

commands.c

@@ -1247 +1247 @@
   filename=owl_util_makepath(argv[1]);
   owl_function_dump(filename);
-  owl_free(filename);
+  g_free(filename);
   return(NULL);
 }
@@ -1288 +1288 @@
   }
   owl_function_nextmsg_full(filter, skip_deleted, last_if_none);
-  if (filter) owl_free(filter);
+  if (filter) g_free(filter);
   return(NULL);
 }
@@ -1318 +1318 @@
   }
   owl_function_prevmsg_full(filter, skip_deleted, first_if_none);
-  if (filter) owl_free(filter);
+  if (filter) g_free(filter);
   return(NULL);
 }
@@ -1357 +1357 @@
   if (filtname) {
     owl_function_change_currentview_filter(filtname);
-    owl_free(filtname);
+    g_free(filtname);
   }
 
 done:
-  owl_free(tmp_argv);
+  g_free(tmp_argv);
 
   return NULL;
@@ -1683 +1683 @@
       } else if (newbuff[i] != ' ') {
         owl_function_makemsg("Invalid arguments to 'multi' command.");    
-        owl_free(newbuff);
+        g_free(newbuff);
         return NULL;
       }
@@ -1691 +1691 @@
   for (i = 0; commands[i] != NULL; i++) {
     if (lastrv) {
-      owl_free(lastrv);
+      g_free(lastrv);
     }
     lastrv = owl_function_command(commands[i]);
   }
-  owl_free(newbuff);
+  g_free(newbuff);
   g_strfreev(commands);
   return lastrv;
@@ -2017 +2017 @@
  err:
   g_string_free(recip, true);
-  owl_free(message);
+  g_free(message);
   return NULL;
 }
@@ -2104 +2104 @@
       foo=owl_function_create_negative_filter(owl_view_get_filtname(owl_global_get_current_view(&g)));
       owl_function_change_currentview_filter(foo);
-      owl_free(foo);
+      g_free(foo);
       return(NULL);
     }
@@ -2129 +2129 @@
     owl_function_create_filter(argc, myargv);
     owl_function_change_currentview_filter("owl-dynamic");
-    owl_free(myargv);
+    g_free(myargv);
     return NULL;
   }
@@ -2264 +2264 @@
   if (filtname) {
     owl_function_change_currentview_filter(filtname);
-    owl_free(filtname);
+    g_free(filtname);
   }
   return NULL;
@@ -2279 +2279 @@
   longuser = long_zuser(argv[1]);
   filtname = owl_function_zuserfilt(longuser);
-  owl_free(longuser);
+  g_free(longuser);
   if (filtname) {
     owl_function_change_currentview_filter(filtname);
-    owl_free(filtname);
+    g_free(filtname);
   }
   return NULL;
@@ -2383 +2383 @@
   if (filtname) {
     (void) owl_function_color_filter(filtname, argv[2], (argc == 4 ? argv[3] : NULL));
-    owl_free(filtname);
+    g_free(filtname);
   }
   return NULL;
@@ -2486 +2486 @@
     text = owl_string_build_quoted("filter %q", argv[1]);
     owl_function_punt(text, unpunt);
-    owl_free(text);
+    g_free(text);
   } else {
     owl_function_punt(skiptokens(buff, 1), unpunt);
@@ -2576 +2576 @@
   if (argc==2) {
     owl_editwin *e = owl_function_start_password("AIM Password: ");
-    owl_editwin_set_cbdata(e, owl_strdup(argv[1]), owl_free);
+    owl_editwin_set_cbdata(e, owl_strdup(argv[1]), g_free);
     owl_editwin_set_callback(e, owl_callback_aimlogin);
     return(NULL);

context.c

@@ -69 +69 @@
   if (ctx->cursor)
     g_object_unref(ctx->cursor);
-  owl_free(ctx->keymap);
+  g_free(ctx->keymap);
   if (ctx->delete_cb)
     ctx->delete_cb(ctx);
-  owl_free(ctx);
+  g_free(ctx);
 }

dict.c

@@ -121 +121 @@
   found = _owl_dict_find_pos(d, k, &pos);
   if (!found) return(NULL);
-  owl_free(d->els[pos].k);
+  g_free(d->els[pos].k);
   v = d->els[pos].v;
   for (i=pos; i<d->size-1; i++) {
@@ -136 +136 @@
 
   for (i=0; i<d->size; i++) {
-    owl_free(d->els[i].k);
+    g_free(d->els[i].k);
     if (elefree) (elefree)(d->els[i].v);
   }
-  if (d->els) owl_free(d->els);
+  if (d->els) g_free(d->els);
 }
 

editwin.c

@@ -84 +84 @@
     g_object_unref(e->win);
   }
-  owl_free(e->buff);
+  g_free(e->buff);
   /* just in case someone forgot to clean up */
   while (e->excursions) {
@@ -91 +91 @@
   oe_destroy_cbdata(e);
 
-  owl_free(e);
+  g_free(e);
 }
 
@@ -306 +306 @@
   }
 
-  owl_free(e->buff);
+  g_free(e->buff);
   _owl_editwin_init(e, e->winlines, e->wincols, e->style, e->hist);
 
@@ -320 +320 @@
 
   if (locktext)
-    owl_free(locktext);
+    g_free(locktext);
 
   oe_set_index(e, lock);
@@ -388 +388 @@
 {
   oe_restore_excursion(e, x);
-  owl_free(x);
+  g_free(x);
 }
 
@@ -1073 +1073 @@
 
   if (p != NULL) {
-    owl_free(killbuf);
+    g_free(killbuf);
     memcpy(p, buf, len);
     p[len] = 0;

filter.c

@@ -115 +115 @@
 err:
   owl_filterelement_cleanup(fe);
-  owl_free(fe);
+  g_free(fe);
   return NULL;
 }
@@ -153 +153 @@
   if(op1) {
     owl_filterelement_cleanup(op1);
-    owl_free(op1);
+    g_free(op1);
   }
   return NULL;
@@ -245 +245 @@
                        owl_filter_get_name(b));
 
-  owl_free(buffa);
-  owl_free(buffb);
+  g_free(buffa);
+  g_free(buffb);
 
   return ret;
@@ -263 +263 @@
   if (f->root) {
     owl_filterelement_cleanup(f->root);
-    owl_free(f->root);
+    g_free(f->root);
   }
   if (f->name)
-    owl_free(f->name);
-  owl_free(f);
-}
+    g_free(f->name);
+  g_free(f);
+}

filterelement.c

@@ -94 +94 @@
       tf=1;
     }
-    owl_free(perlrv);
+    g_free(perlrv);
   }
   return tf;
@@ -216 +216 @@
   fe->field=owl_strdup(field);
   if(owl_regex_create(&(fe->re), re)) {
-    owl_free(fe->field);
+    g_free(fe->field);
     fe->field = NULL;
     return (-1);
@@ -325 +325 @@
 void owl_filterelement_cleanup(owl_filterelement *fe)
 {
-  if (fe->field) owl_free(fe->field);
+  if (fe->field) g_free(fe->field);
   if (fe->left) {
     owl_filterelement_cleanup(fe->left);
-    owl_free(fe->left);
+    g_free(fe->left);
   }
   if (fe->right) {
     owl_filterelement_cleanup(fe->right);
-    owl_free(fe->right);
+    g_free(fe->right);
   }
   owl_regex_cleanup(&(fe->re));

fmtext.c

@@ -73 +73 @@
     return;
   owl_fmtext_append_attr(f, buff, OWL_FMTEXT_ATTR_NONE, OWL_COLOR_DEFAULT, OWL_COLOR_DEFAULT);
-  owl_free(buff);
+  g_free(buff);
 }
 
@@ -644 +644 @@
       buff[ptr-txtptr]='\0';
       owl_fmtext_append_attr(f, buff, curattrs, curcolor, OWL_COLOR_DEFAULT);
-      owl_free(buff);
+      g_free(buff);
 
       /* update pointer to point at the @ */
@@ -685 +685 @@
         curattrs|=OWL_FMTEXT_ATTR_BOLD;
         txtptr+=6;
-        owl_free(buff);
+        g_free(buff);
         continue;
       } else if (!strcasecmp(buff, "@b")) {
@@ -694 +694 @@
         curattrs|=OWL_FMTEXT_ATTR_BOLD;
         txtptr+=3;
-        owl_free(buff);
+        g_free(buff);
         continue;
       } else if (!strcasecmp(buff, "@i")) {
@@ -703 +703 @@
         curattrs|=OWL_FMTEXT_ATTR_UNDERLINE;
         txtptr+=3;
-        owl_free(buff);
+        g_free(buff);
         continue;
       } else if (!strcasecmp(buff, "@italic")) {
@@ -712 +712 @@
         curattrs|=OWL_FMTEXT_ATTR_UNDERLINE;
         txtptr+=8;
-        owl_free(buff);
+        g_free(buff);
         continue;
       } else if (!strcasecmp(buff, "@")) {
@@ -720 +720 @@
         stacksize++;
         txtptr+=2;
-        owl_free(buff);
+        g_free(buff);
         continue;
 
@@ -728 +728 @@
                  && owl_global_get_hascolors(&g)
                  && owl_global_is_colorztext(&g)) {
-        owl_free(buff);
+        g_free(buff);
         txtptr+=7;
         tmpptr=strpbrk(txtptr, "@{[<()>]}");
@@ -746 +746 @@
           if (curcolor == OWL_COLOR_INVALID)
               curcolor = OWL_COLOR_DEFAULT;
-          owl_free(buff);
+          g_free(buff);
           txtptr=tmpptr+1;
           continue;
@@ -769 +769 @@
       buff[ptr-txtptr]='\0';
       owl_fmtext_append_attr(f, buff, curattrs, curcolor, OWL_COLOR_DEFAULT);
-      owl_free(buff);
+      g_free(buff);
 
       /* now deal with the closer */
@@ -780 +780 @@
         buff[1]='\0';
         owl_fmtext_append_attr(f, buff, curattrs, curcolor, OWL_COLOR_DEFAULT);
-        owl_free(buff);
+        g_free(buff);
         txtptr++;
         continue;
@@ -806 +806 @@
         buff[1]='\0';
         owl_fmtext_append_attr(f, buff, curattrs, curcolor, OWL_COLOR_DEFAULT);
-        owl_free(buff);
+        g_free(buff);
         txtptr++;
         continue;
@@ -816 +816 @@
       buff[ptr-txtptr+1]='\0';
       owl_fmtext_append_attr(f, buff, curattrs, curcolor, OWL_COLOR_DEFAULT);
-      owl_free(buff);
+      g_free(buff);
       txtptr=ptr+1;
       continue;
@@ -840 +840 @@
       if (text) {
         owl_fmtext_append_normal(f, text);
-        owl_free(text);
+        g_free(text);
       }
     } else if (elem) {

functions.c

@@ -32 +32 @@
   char *rv;
   rv=owl_function_command(cmdbuff);
-  if (rv) owl_free(rv);
+  if (rv) g_free(rv);
 }
 
@@ -89 +89 @@
   owl_fmtext_append_normal(&fm, "\n");
   owl_function_popless_fmtext(&fm);
-  owl_list_cleanup(&l, owl_free);
+  owl_list_cleanup(&l, g_free);
   owl_fmtext_cleanup(&fm);
 }
@@ -100 +100 @@
                           (int)(timer->time - time(NULL)));
   owl_fmtext_append_normal(fm, str);
-  owl_free(str);
+  g_free(str);
   if (timer->interval) {
     str = owl_sprintf(", repeat every %d seconds", timer->interval);
     owl_fmtext_append_normal(fm, str);
-    owl_free(str);
+    g_free(str);
   }
   owl_fmtext_append_normal(fm, "\n");
@@ -218 +218 @@
             char *result = owl_sprintf("%s%s", message, perlquickstart);
             owl_function_adminmsg("BarnOwl Quickstart", result);
-            owl_free(result);
-            owl_free(perlquickstart);
+            g_free(result);
+            g_free(perlquickstart);
             return;
         }
@@ -313 +313 @@
   s = owl_sprintf("----> %s\n", line);
   owl_editwin_set_locktext(e, s);
-  owl_free(s);
+  g_free(s);
 
   owl_editwin_set_cbdata(e, data, cleanup);
@@ -359 +359 @@
                               &owl_callback_aimwrite,
                               owl_strdup(to),
-                              owl_free);
-  owl_free(line);
+                              g_free);
+  g_free(line);
 }
 
@@ -447 +447 @@
   rv = call_filter(zcrypt, argv, owl_zwrite_get_message(z), &cryptmsg, &status);
 
-  owl_free(zcrypt);
+  g_free(zcrypt);
 
   if (rv || status) {
-    if(cryptmsg) owl_free(cryptmsg);
-    owl_free(old_msg);
+    if(cryptmsg) g_free(cryptmsg);
+    g_free(old_msg);
     owl_function_error("Error in zcrypt, possibly no key found.  Message not sent.");
     owl_function_beep();
@@ -476 +476 @@
 
   /* free the zwrite */
-  owl_free(cryptmsg);
+  g_free(cryptmsg);
 }
 
@@ -512 +512 @@
   }
 
-  owl_free(format_msg);
+  g_free(format_msg);
 }
 
@@ -540 +540 @@
     owl_function_error("Could not create AIM message");
   }
-  owl_free(format_msg);
+  g_free(format_msg);
 }
 
@@ -871 +871 @@
     path = owl_util_makepath(file);
     ret=owl_zephyr_loadsubs(path, 1);
-    owl_free(path);
+    g_free(path);
   }
 
@@ -993 +993 @@
   /* execute the commands in shutdown */
   ret = owl_perlconfig_execute("BarnOwl::Hooks::_shutdown();");
-  if (ret) owl_free(ret);
+  if (ret) g_free(ret);
 
   /* signal our child process, if any */
@@ -1327 +1327 @@
   while (owl_getline(&s, file))
     owl_fmtext_append_normal(&fm, s);
-  owl_free(s);
+  g_free(s);
 
   owl_function_popless_fmtext(&fm);
@@ -1466 +1466 @@
             strcat(tmpbuff, "...");
           }
-          owl_free(ptr);
+          g_free(ptr);
 
           for (j=0; j<strlen(tmpbuff); j++) {
@@ -1610 +1610 @@
   }
            
-  owl_free(buff);
+  g_free(buff);
 }
 
@@ -1883 +1883 @@
       owl_function_start_command(buff);
     }
-    owl_free(buff);
+    g_free(buff);
   }
 }
@@ -1900 +1900 @@
     result = owl_zephyr_zlocate(ptr, auth);
     owl_fmtext_append_normal(&fm, result);
-    owl_free(result);
-    owl_free(ptr);
+    g_free(result);
+    g_free(ptr);
   }
 
@@ -1916 +1916 @@
    if (rv) {
     owl_function_makemsg("%s", rv);
-    owl_free(rv);
+    g_free(rv);
   }
 }
@@ -2001 +2001 @@
     
     if (type == OWL_OUTPUT_RETURN) {
-      owl_free(newbuff);
+      g_free(newbuff);
       return out;
     } else if (type == OWL_OUTPUT_ADMINMSG) {
       owl_function_adminmsg(buff, out);
     }
-    owl_free(out);
-  }
-  owl_free(newbuff);
+    g_free(out);
+  }
+  g_free(newbuff);
   return NULL;
 }
@@ -2038 +2038 @@
       return perlout;
     }
-    owl_free(perlout);
+    g_free(perlout);
   }
   return NULL;
@@ -2247 +2247 @@
   buff = owl_sprintf("%s: %s", owl_filter_get_name(f), tmp);
   owl_function_popless_text(buff);
-  owl_free(buff);
-  owl_free(tmp);
+  g_free(buff);
+  g_free(tmp);
 }
 
@@ -2272 +2272 @@
     tmp = owl_filter_print(f);
     owl_fmtext_append_normal(&fm, tmp);
-    owl_free(tmp);
+    g_free(tmp);
   }
   owl_function_popless_fmtext(&fm);
@@ -2313 +2313 @@
     char *temp = g_utf8_strdown(filtname, -1);
     if (temp) {
-      owl_free(filtname);
+      g_free(filtname);
       filtname = temp;
     }
@@ -2341 +2341 @@
                               tmpinstance);
   }
-  owl_free(tmpclass);
-  owl_free(tmpinstance);
+  g_free(tmpclass);
+  g_free(tmpinstance);
 
   f = owl_filter_new_fromstring(filtname, buf->str);
@@ -2349 +2349 @@
     /* Couldn't make a filter for some reason. Return NULL. */
     owl_function_error("Error creating filter '%s'", filtname);
-    owl_free(filtname);
+    g_free(filtname);
     filtname = NULL;
     goto done;
@@ -2358 +2358 @@
 
 done:
-  owl_free(class);
+  g_free(class);
   if (instance) {
-    owl_free(instance);
+    g_free(instance);
   }
   return(filtname);
@@ -2380 +2380 @@
   shortuser = short_zuser(longuser);
   filtname = owl_sprintf("user-%s", shortuser);
-  owl_free(shortuser);
+  g_free(shortuser);
 
   /* if it already exists then go with it.  This lets users override */
@@ -2394 +2394 @@
       "recipient ^%q$ ) ) ) or ( ( class ^login$ ) and ( sender ^%q$ ) )",
       esclonguser, esclonguser, esclonguser);
-  owl_free(esclonguser);
+  g_free(esclonguser);
 
   f = owl_filter_new_fromstring(filtname, argbuff);
-  owl_free(argbuff);
+  g_free(argbuff);
 
   if (f == NULL) {
     /* Couldn't make a filter for some reason. Return NULL. */
     owl_function_error("Error creating filter '%s'", filtname);
-    owl_free(filtname);
+    g_free(filtname);
     return NULL;
   }
@@ -2439 +2439 @@
       "( sender ^%2$s$ and recipient ^%1$s$ ) ) )",
       escuser, owl_global_get_aim_screenname_for_filters(&g));
-  owl_free(escuser);
+  g_free(escuser);
 
   f = owl_filter_new_fromstring(filtname, argbuff);
-  owl_free(argbuff);
+  g_free(argbuff);
 
   if (f == NULL) {
     owl_function_error("Error creating filter '%s'", filtname);
-    owl_free(filtname);
+    g_free(filtname);
     return NULL;
   }
@@ -2473 +2473 @@
 
   argbuff = owl_string_build_quoted("type ^%q$", esctype);
-  owl_free(esctype);
+  g_free(esctype);
 
   f = owl_filter_new_fromstring(filtname, argbuff);
-  owl_free(argbuff);
+  g_free(argbuff);
 
   if (f == NULL) {
     owl_function_error("Error creating filter '%s'", filtname);
-    owl_free(filtname);
+    g_free(filtname);
     return NULL;
   }
@@ -2533 +2533 @@
   owl_string_append_quoted_arg(buf, ccs_quoted);
   g_string_append_c(buf, '$');
-  owl_free(ccs_quoted);
+  g_free(ccs_quoted);
 
   f = owl_filter_new_fromstring(filtname, buf->str);
@@ -2540 +2540 @@
   if (f == NULL) {
     owl_function_error("Error creating filter '%s'", filtname);
-    owl_free(filtname);
+    g_free(filtname);
     return NULL;
   }
@@ -2767 +2767 @@
     owl_fmtext_append_normal(&fm,str1);
     owl_fmtext_append_normal_color(&fm, str2, i, OWL_COLOR_DEFAULT);
-    owl_free(str1);
-     owl_free(str2);
+    g_free(str1);
+     g_free(str2);
   }
   
@@ -2790 +2790 @@
     quoted=owl_text_quote(class, OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
     owl_string_appendf_quoted(buf, "class ^(un)*%q(\\.d)*$", quoted);
-    owl_free(quoted);
+    g_free(quoted);
   }
   if (!strcmp(inst, "*")) {
@@ -2797 +2797 @@
     quoted=owl_text_quote(inst, OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
     owl_string_appendf_quoted(buf, " and instance ^(un)*%q(\\.d)*$", quoted);
-    owl_free(quoted);
+    g_free(quoted);
   }
   if (!strcmp(recip, "*")) {
@@ -2807 +2807 @@
     quoted=owl_text_quote(recip, OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
     owl_string_appendf_quoted(buf, " and recipient ^%q$", quoted);
-    owl_free(quoted);
+    g_free(quoted);
   }
 
@@ -3054 +3054 @@
       }
       owl_fmtext_appendf_normal(&fm, "  %-20.20s %-12.12s\n", owl_buddy_get_name(b), timestr);
-      owl_free(timestr);
+      g_free(timestr);
     }
   }
@@ -3107 +3107 @@
                                         location[x].tty,
                                         location[x].time);
-              owl_free(tmp);
+              g_free(tmp);
             }
             if (numlocs>=200) {
@@ -3115 +3115 @@
         }
       }
-      owl_list_cleanup(&anyone, owl_free);
+      owl_list_cleanup(&anyone, g_free);
     }
   }
@@ -3125 +3125 @@
       if (perlblist) {
         owl_fmtext_append_ztext(&fm, perlblist);
-        owl_free(perlblist);
+        g_free(perlblist);
       }
     }
@@ -3168 +3168 @@
     if (plaintext) {
       fputs(plaintext, file);
-      owl_free(plaintext);
+      g_free(plaintext);
     }
   }
@@ -3291 +3291 @@
   }
   file = fopen(path, "r");
-  owl_free(path);
+  g_free(path);
   if (!file) {
     if (!fail_silent) {
@@ -3304 +3304 @@
   }
 
-  owl_free(s);
+  g_free(s);
   fclose(file);
 }
@@ -3377 +3377 @@
   }
 
-  owl_free(buff);
+  g_free(buff);
 
   in_error--;
@@ -3396 +3396 @@
   owl_errqueue_append_err(owl_global_get_errqueue(&g), buff);
 
-  owl_free(buff);
-  owl_free(date);
+  g_free(buff);
+  g_free(date);
 }
 
@@ -3446 +3446 @@
   while (zaldptr) {
     ZFreeALD(zaldptr->data);
-    owl_free(zaldptr->data);
+    g_free(zaldptr->data);
     zaldptr = g_list_next(zaldptr);
   }
@@ -3461 +3461 @@
       *zaldlist = g_list_append(*zaldlist, zald);
     } else {
-      owl_free(zald);
-    }
-  }
-
-  owl_list_cleanup(&anyone, owl_free);
+      g_free(zald);
+    }
+  }
+
+  owl_list_cleanup(&anyone, g_free);
 #endif
 }

global.c

@@ -96 +96 @@
   cd = owl_sprintf("%s/%s", g->homedir, OWL_CONFIG_DIR);
   owl_global_set_confdir(g, cd);
-  owl_free(cd);
+  g_free(cd);
 
   owl_messagelist_create(&(g->msglist));
@@ -379 +379 @@
  */
 void owl_global_set_confdir(owl_global *g, const char *cd) {
-  owl_free(g->confdir);
+  g_free(g->confdir);
   g->confdir = owl_strdup(cd);
-  owl_free(g->startupfile);
+  g_free(g->startupfile);
   g->startupfile = owl_sprintf("%s/startup", cd);
 }
@@ -528 +528 @@
 
 void owl_global_set_startupargs(owl_global *g, int argc, char **argv) {
-  if (g->startupargs) owl_free(g->startupargs);
+  if (g->startupargs) g_free(g->startupargs);
   g->startupargs = g_strjoinv(" ", argv);
 }
@@ -564 +564 @@
   e->g->filterlist = g_list_remove(e->g->filterlist, e->f);
   owl_filter_delete(e->f);
-  owl_free(e);
+  g_free(e);
 }
 
@@ -699 +699 @@
   char *sn_escaped;
   g->aim_loggedin=1;
-  if (g->aim_screenname) owl_free(g->aim_screenname);
-  if (g->aim_screenname_for_filters) owl_free(g->aim_screenname_for_filters);
+  if (g->aim_screenname) g_free(g->aim_screenname);
+  if (g->aim_screenname_for_filters) g_free(g->aim_screenname_for_filters);
   g->aim_screenname=owl_strdup(screenname);
   sn_escaped = owl_text_quote(screenname, OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
   g->aim_screenname_for_filters = owl_arg_quote(sn_escaped);
-  owl_free(sn_escaped);
+  g_free(sn_escaped);
 }
 
@@ -967 +967 @@
     path = owl_sprintf("%s.%d", filename, getpid());
     fd = open(path, O_CREAT|O_WRONLY|O_EXCL, 0600);
-    owl_free(path);
+    g_free(path);
 
     if (fd >= 0)
       g->debug_file = fdopen(fd, "a");
 
-    owl_free(open_file);
+    g_free(open_file);
     open_file = owl_strdup(filename);
   }

history.c

@@ -53 +53 @@
   /* if partial is set, remove the first entry first */
   if (h->partial) {
-    owl_free(owl_list_get_element(&(h->hist), 0));
+    g_free(owl_list_get_element(&(h->hist), 0));
     owl_list_remove_element(&(h->hist), 0);
   }
@@ -64 +64 @@
   /* if we've reached the max history size, pop off the last element */
   if (size>OWL_HISTORYSIZE) {
-    owl_free(owl_list_get_element(&(h->hist), size-1));
+    g_free(owl_list_get_element(&(h->hist), size-1));
     owl_list_remove_element(&(h->hist), size-1);
   }

keybinding.c

@@ -50 +50 @@
     if (kb->keys[i] == ERR) {
       g_strfreev(ktokens);
-      owl_free(kb->keys);
+      g_free(kb->keys);
       return(-1);
     }
@@ -62 +62 @@
 void owl_keybinding_cleanup(owl_keybinding *kb)
 {
-  if (kb->keys) owl_free(kb->keys);
-  if (kb->desc) owl_free(kb->desc);
-  if (kb->command) owl_free(kb->command);
+  if (kb->keys) g_free(kb->keys);
+  if (kb->desc) g_free(kb->desc);
+  if (kb->command) g_free(kb->command);
 }
 
@@ -71 +71 @@
 {
   owl_keybinding_cleanup(kb);
-  owl_free(kb);
+  g_free(kb);
 }
 

keymap.c

@@ -22 +22 @@
 void owl_keymap_cleanup(owl_keymap *km)
 {
-  owl_free(km->name);
-  owl_free(km->desc);
+  g_free(km->name);
+  g_free(km->desc);
   owl_list_cleanup(&km->bindings, (void (*)(void *))owl_keybinding_delete);
 }
@@ -40 +40 @@
   if ((kb = g_new(owl_keybinding, 1)) == NULL) return(-1);
   if (0 != owl_keybinding_init(kb, keyseq, command, function_fn, desc)) {
-    owl_free(kb);
+    g_free(kb);
     return(-1);
   }
@@ -65 +65 @@
   if ((kb = g_new(owl_keybinding, 1)) == NULL) return(-1);
   if (0 != owl_keybinding_make_keys(kb, keyseq)) {
-    owl_free(kb);
+    g_free(kb);
     return(-1);
   }
@@ -225 +225 @@
 void owl_keyhandler_keymap_namelist_cleanup(owl_list *l)
 {
-  owl_list_cleanup(l, owl_free);
+  owl_list_cleanup(l, g_free);
 }
 

list.c

@@ -86 +86 @@
     }
   }
-  owl_free(l->list);
+  g_free(l->list);
 }

logging.c

@@ -79 +79 @@
     fprintf(file, "From: %s <%s>\n\n", owl_message_get_zsig(m), tmp);
     fprintf(file, "%s\n\n", owl_message_get_body(m));
-    owl_free(tmp);
+    g_free(tmp);
 }
 
@@ -142 +142 @@
       owl_log_append(m, filename);
 
-      owl_free(temp);
-      owl_free(cc->data);
+      g_free(temp);
+      g_free(cc->data);
       cc = g_list_delete_link(cc, cc);
     }
@@ -156 +156 @@
     temp2 = g_utf8_strdown(temp,-1);
     to = owl_sprintf("aim:%s", temp2);
-    owl_free(temp2);
-    owl_free(temp);
+    g_free(temp2);
+    g_free(temp);
   } else {
     to = owl_strdup("loopback");
@@ -164 +164 @@
   snprintf(filename, MAXPATHLEN, "%s/%s", logpath, to);
   owl_log_append(m, filename);
-  owl_free(to);
+  g_free(to);
 
   snprintf(filename, MAXPATHLEN, "%s/all", logpath);
   owl_log_append(m, filename);
-  owl_free(logpath);
+  g_free(logpath);
 }
 
@@ -200 +200 @@
   if (!file) {
     owl_function_error("Unable to open file for outgoing logging");
-    owl_free(logpath);
-    owl_free(tobuff);
+    g_free(logpath);
+    g_free(tobuff);
     return;
   }
@@ -211 +211 @@
 
   snprintf(filename, MAXPATHLEN, "%s/all", logpath);
-  owl_free(logpath);
+  g_free(logpath);
   file=fopen(filename, "a");
   if (!file) {
     owl_function_error("Unable to open file for outgoing logging");
-    owl_free(tobuff);
+    g_free(tobuff);
     return;
   }
@@ -224 +224 @@
   fclose(file);
 
-  owl_free(tobuff);
+  g_free(tobuff);
 }
 
@@ -270 +270 @@
     normalto = g_utf8_strdown(temp, -1);
     from=frombuff=owl_sprintf("aim:%s", normalto);
-    owl_free(normalto);
-    owl_free(temp);
+    g_free(normalto);
+    g_free(temp);
   } else if (owl_message_is_type_loopback(m)) {
     from=frombuff=owl_strdup("loopback");
@@ -302 +302 @@
       char* temp = g_utf8_strdown(frombuff, -1);
       if (temp) {
-        owl_free(frombuff);
+        g_free(frombuff);
         from = frombuff = temp;
       }
@@ -336 +336 @@
       }
 
-      owl_free(temp);
-      owl_free(cc->data);
+      g_free(temp);
+      g_free(cc->data);
       cc = g_list_delete_link(cc, cc);
     }
   }
 
-  owl_free(frombuff);
-  owl_free(logpath);
-}
+  g_free(frombuff);
+  g_free(logpath);
+}

message.c

@@ -68 +68 @@
     p=owl_list_get_element(&(m->attributes), i);
     if (owl_pair_get_key(p) == attrname) {
-      owl_free(owl_pair_get_value(p));
+      g_free(owl_pair_get_value(p));
       pair = p;
       break;
@@ -134 +134 @@
     }
     owl_fmtext_append_normal(fm, buff);
-    owl_free(buff);
+    g_free(buff);
   }
 }
@@ -611 +611 @@
       out = g_list_prepend(out, owl_strdup(user));
     }
-    owl_free(shortuser);
+    g_free(shortuser);
     user = strtok(NULL, " ");
   }
 
-  owl_free(recip);
-  owl_free(cc);
+  g_free(recip);
+  g_free(cc);
 
   return(out);
@@ -749 +749 @@
       /* Collapse any identical entries */
       while (cc->next && strcasecmp(cc->data, cc->next->data) == 0) {
-        owl_free(cc->data);
+        g_free(cc->data);
         cc = g_list_delete_link(cc, cc);
       }
@@ -756 +756 @@
       g_string_append(recips, tmp);
 
-      owl_free(tmp);
-      owl_free(cc->data);
+      g_free(tmp);
+      g_free(cc->data);
       cc = g_list_delete_link(cc, cc);
 
@@ -793 +793 @@
   
   /* save the time, we need to nuke the string saved by message_init */
-  if (m->timestr) owl_free(m->timestr);
+  if (m->timestr) g_free(m->timestr);
   m->time=n->z_time.tv_sec;
   m->timestr=owl_strdup(ctime(&(m->time)));
@@ -821 +821 @@
       tmp=owl_zephyr_get_field(n, 1);
       owl_message_set_attribute(m, "loginhost", tmp);
-      owl_free(tmp);
+      g_free(tmp);
 
       tmp=owl_zephyr_get_field(n, 3);
       owl_message_set_attribute(m, "logintty", tmp);
-      owl_free(tmp);
+      g_free(tmp);
     }
 
@@ -868 +868 @@
     tmp2=owl_util_stripnewlines(tmp);
     owl_message_set_body(m, tmp2);
-    owl_free(tmp2);
+    g_free(tmp2);
   } else {
     owl_message_set_body(m, tmp);
   }
-  owl_free(tmp);
+  g_free(tmp);
 
   /* if zcrypt is enabled try to decrypt the message */
@@ -891 +891 @@
 
     rv = call_filter(zcrypt, argv, owl_message_get_body(m), &out, &status);
-    owl_free(zcrypt);
+    g_free(zcrypt);
 
     if(!rv && !status) {
@@ -899 +899 @@
       }
       owl_message_set_body(m, out);
-      owl_free(out);
+      g_free(out);
     } else if(out) {
-      owl_free(out);
+      g_free(out);
     }
   }
@@ -957 +957 @@
   owl_function_debugmsg("create_pseudo_login: host is %s", host ? host : "");
   owl_message_set_hostname(m, host ? host : "");
-  owl_free(longuser);
+  g_free(longuser);
 }
 
@@ -978 +978 @@
     owl_message_set_recipient(m,
                               longzuser); /* only gets the first user, must fix */
-    owl_free(longzuser);
+    g_free(longzuser);
   }
   owl_message_set_opcode(m, owl_zwrite_get_opcode(z));
@@ -987 +987 @@
   replyline = owl_zwrite_get_replyline(z);
   owl_message_set_zwriteline(m, replyline);
-  owl_free(replyline);
+  g_free(replyline);
 
   owl_message_set_body(m, body);
@@ -1018 +1018 @@
   }
 #endif
-  if (m->timestr) owl_free(m->timestr);
+  if (m->timestr) g_free(m->timestr);
 
   /* free all the attributes */
@@ -1024 +1024 @@
   for (i=0; i<j; i++) {
     p=owl_list_get_element(&(m->attributes), i);
-    owl_free(owl_pair_get_value(p));
-    owl_free(p);
+    g_free(owl_pair_get_value(p));
+    g_free(p);
   }
 
@@ -1036 +1036 @@
 {
   owl_message_cleanup(m);
-  owl_free(m);
-}
+  g_free(m);
+}

msgwin.c

@@ -29 +29 @@
 void owl_msgwin_set_text_nocopy(owl_msgwin *msgwin, char *msg)
 {
-  owl_free(msgwin->msg);
+  g_free(msgwin->msg);
   msgwin->msg = msg;
   owl_window_dirty(msgwin->window);
@@ -36 +36 @@
 void owl_msgwin_cleanup(owl_msgwin *msgwin)
 {
-  owl_free(msgwin->msg);
+  g_free(msgwin->msg);
   msgwin->msg = NULL;
   if (msgwin->window) {

owl.c

@@ -437 +437 @@
 
   owl_function_log_err(err);
-  owl_free(err);
+  g_free(err);
 }
 
@@ -522 +522 @@
     char *tty = owl_util_get_default_tty();
     owl_global_set_tty(&g, tty);
-    owl_free(tty);
+    g_free(tty);
   }
 
@@ -558 +558 @@
   owl_function_debugmsg("startup: executing perl startup, if applicable");
   perlout = owl_perlconfig_execute("BarnOwl::Hooks::_startup();");
-  if (perlout) owl_free(perlout);
+  if (perlout) g_free(perlout);
 
   /* welcome message */

perlconfig.c

@@ -31 +31 @@
     char *escape = owl_escape_highbit(str);
     owl_function_error("Internal error! Non-UTF-8 string encountered:\n%s", escape);
-    owl_free(escape);
+    g_free(escape);
   }
   return ret;
@@ -69 +69 @@
     (void)hv_store(ret, key, strlen(key), to_sv(element), 0);
   }
-  owl_list_cleanup(&l, owl_free);
+  owl_list_cleanup(&l, g_free);
 
   return ret;
@@ -106 +106 @@
       ptr=owl_zephyr_get_field_as_utf8(owl_message_get_notice(m), i+1);
       av_push(av_zfields, owl_new_sv(ptr));
-      owl_free(ptr);
+      g_free(ptr);
     }
     (void)hv_store(h, "fields", strlen("fields"), newRV_noinc((SV*)av_zfields), 0);
@@ -159 +159 @@
   }
   hr = sv_bless(hr,stash);
-  owl_free(utype);
-  owl_free(blessas);
+  g_free(utype);
+  g_free(blessas);
   return hr;
 }
@@ -407 +407 @@
   av_unshift(inc, 1);
   av_store(inc, 0, owl_new_sv(path));
-  owl_free(path);
+  g_free(path);
 
   eval_pv("use BarnOwl;", FALSE);
@@ -464 +464 @@
                                            :"BarnOwl::_receive_msg_legacy_wrap", m);
   }
-  if (ptr) owl_free(ptr);
+  if (ptr) g_free(ptr);
 }
 
@@ -475 +475 @@
                                            :"BarnOwl::Hooks::_new_msg", m);
   }
-  if (ptr) owl_free(ptr);
+  if (ptr) g_free(ptr);
 }
 

perlglue.xs

@@ -49 +49 @@
                         }
                         rv = owl_function_command_argv(argv, items);
-                        owl_free(argv);
+                        g_free(argv);
                 }
                 RETVAL = rv;
@@ -56 +56 @@
                 RETVAL
         CLEANUP:
-                if (rv) owl_free(rv);
+                if (rv) g_free(rv);
 
 SV *
@@ -113 +113 @@
                 RETVAL
         CLEANUP:
-                if (rv) owl_free(rv);
+                if (rv) g_free(rv);
 
 const utf8 *
@@ -128 +128 @@
                 RETVAL
         CLEANUP:
-                owl_free(rv);
+                g_free(rv);
 
 const utf8 *
@@ -140 +140 @@
                 RETVAL
     CLEANUP:
-                if (rv) owl_free(rv);
+                if (rv) g_free(rv);
 
 void
@@ -324 +324 @@
         CLEANUP:
                 if (rv)
-                        owl_free(rv);
+                        g_free(rv);
 
 void
@@ -342 +342 @@
                 RETVAL = owl_new_av(&fl, (SV*(*)(const void*))owl_new_sv);
                 sv_2mortal((SV*)RETVAL);
-                owl_list_cleanup(&fl, owl_free);
+                owl_list_cleanup(&fl, g_free);
         }
         OUTPUT:
@@ -361 +361 @@
                 RETVAL
         CLEANUP:
-                owl_list_cleanup(&l, owl_free);
+                owl_list_cleanup(&l, g_free);
 
 
@@ -378 +378 @@
                 RETVAL
         CLEANUP:
-                owl_list_cleanup(&l, owl_free);
+                owl_list_cleanup(&l, g_free);
 
 
@@ -396 +396 @@
                 RETVAL
         CLEANUP:
-                owl_list_cleanup(&l, owl_free);
+                owl_list_cleanup(&l, g_free);
 
 void
@@ -610 +610 @@
                 RETVAL
         CLEANUP:
-                owl_free(region);
+                g_free(region);
 
 SV *

popexec.c

@@ -140 +140 @@
     owl_viewwin_append_text(pe->vwin, buf);
   }
-  owl_free(buf);
+  g_free(buf);
   
 }
@@ -179 +179 @@
   if (pe->refcount<=0) {
     owl_function_debugmsg("doing free of %p", pe);
-    owl_free(pe);
+    g_free(pe);
   }
 }

popwin.c

@@ -92 +92 @@
   g_object_unref(pw->content);
 
-  owl_free(pw);
+  g_free(pw);
 }
 

regex.c

@@ -28 +28 @@
     regerror(ret, NULL, buff1, LINE);
     owl_function_makemsg("Error in regular expression: %s", buff1);
-    owl_free(re->string);
+    g_free(re->string);
     re->string=NULL;
     return(-1);
@@ -42 +42 @@
   quoted=owl_text_quote(string, OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
   owl_regex_create(re, quoted);
-  owl_free(quoted);
+  g_free(quoted);
   return(0);
 }
@@ -87 +87 @@
 {
     if (re->string) {
-        owl_free(re->string);
+        g_free(re->string);
         regfree(&(re->re));
     }

select.c

@@ -38 +38 @@
       t->destroy(t);
     }
-    owl_free(t->name);
-    owl_free(t);
+    g_free(t->name);
+    g_free(t);
   }
 }
@@ -128 +128 @@
         if (d->destroy)
           d->destroy(d);
-        owl_free(d);
+        g_free(d);
       }
     }
@@ -323 +323 @@
         a->destroy(a);
       }
-      owl_free(a);
+      g_free(a);
     }
   }

style.c

@@ -80 +80 @@
   owl_fmtext_cleanup(&with_tabs);
 
-  owl_free(indent);
+  g_free(indent);
   if(sv)
     SvREFCNT_dec(sv);
@@ -94 +94 @@
 void owl_style_cleanup(owl_style *s)
 {
-  if (s->name) owl_free(s->name);
+  if (s->name) g_free(s->name);
   SvREFCNT_dec(s->perlobj);
 }
@@ -101 +101 @@
 {
   owl_style_cleanup(s);
-  owl_free(s);
+  g_free(s);
 }

tester.c

@@ -134 +134 @@
       char *__value = (expr);                            \
       FAIL_UNLESS((desc), !strcmp((expected), __value)); \
-      owl_free(__value);                                 \
+      g_free(__value);                                 \
     } while (0)
 
@@ -191 +191 @@
                   !strcmp(__argv[0], unquoted));        \
       owl_parse_delete(__argv, __argc);                 \
-      owl_free(__quoted);                               \
+      g_free(__quoted);                         \
     } while (0)
 
@@ -258 +258 @@
   FAIL_UNLESS("get_keys result val",0==strcmp("c",owl_list_get_element(&l,2)));
 
-  owl_list_cleanup(&l, owl_free);
+  owl_list_cleanup(&l, g_free);
   owl_dict_cleanup(&d, NULL);
 
@@ -557 +557 @@
   FAIL_UNLESS("lines corrected truncated",
               str && !strcmp(str, "1\n2\n3\n"));
-  owl_free(str);
+  g_free(str);
 
   owl_fmtext_clear(&fm2);
@@ -564 +564 @@
   FAIL_UNLESS("lines corrected truncated",
               str && !strcmp(str, "1\n2\n3\n4\n"));
-  owl_free(str);
+  g_free(str);
 
   /* Test owl_fmtext_truncate_cols. */
@@ -579 +579 @@
                                   "56789\n"
                                   "567890"));
-  owl_free(str);
+  g_free(str);
 
   owl_fmtext_clear(&fm1);
@@ -592 +592 @@
               str && !strcmp(str, "    123456"
                                   "5678      "));
-  owl_free(str);
+  g_free(str);
 
   /* Test owl_fmtext_expand_tabs. */
@@ -605 +605 @@
               str && !strcmp(str, "12      1234567 1\n"
                                   "12345678        1"));
-  owl_free(str);
+  g_free(str);
 
   owl_fmtext_clear(&fm2);
@@ -614 +614 @@
               str && !strcmp(str, "12     1234567 1\n"
                                   "12345678       1"));
-  owl_free(str);
+  g_free(str);
 
   /* Test owl_fmtext_search. */
@@ -683 +683 @@
 
  out:
-  owl_free(filtstr);
+  g_free(filtstr);
   return failed;
 }
@@ -708 +708 @@
   if (filtname)
     owl_global_remove_filter(&g, filtname);
-  owl_free(filtname);
+  g_free(filtname);
   return failed;
 }
@@ -732 +732 @@
   if (filtname)
     owl_global_remove_filter(&g, filtname);
-  owl_free(filtname);
+  g_free(filtname);
   return failed;
 }

text.c

@@ -6 +6 @@
 
 /* Returns a copy of 'in' with each line indented 'n'
- * characters. Result must be freed with owl_free. */
+ * characters. Result must be freed with g_free. */
 char *owl_text_indent(const char *in, int n)
 {
@@ -107 +107 @@
 
   out2=owl_text_substitute(out, "&lt;", "<");
-  owl_free(out);
+  g_free(out);
   out=owl_text_substitute(out2, "&gt;", ">");
-  owl_free(out2);
+  g_free(out2);
   out2=owl_text_substitute(out, "&amp;", "&");
-  owl_free(out);
+  g_free(out);
   out=owl_text_substitute(out2, "&quot;", "\"");
-  owl_free(out2);
+  g_free(out2);
   out2=owl_text_substitute(out, "&nbsp;", " ");
-  owl_free(out);
+  g_free(out);
   out=owl_text_substitute(out2, "&ensp;", "  ");
-  owl_free(out2);
+  g_free(out2);
   out2=owl_text_substitute(out, "&emsp;", "   ");
-  owl_free(out);
+  g_free(out);
   out=owl_text_substitute(out2, "&endash;", "--");
-  owl_free(out2);
+  g_free(out2);
   out2=owl_text_substitute(out, "&emdash;", "---");
-  owl_free(out);
+  g_free(out);
 
   return(out2);

util.c

@@ -178 +178 @@
     /* TODO: when we move to requiring glib 2.22+, use
      * g_ptr_array_new_with_free_func. */
-    g_ptr_array_foreach(argv, (GFunc)owl_free, NULL);
+    g_ptr_array_foreach(argv, (GFunc)g_free, NULL);
     g_ptr_array_free(argv, true);
     *argc = -1;
@@ -262 +262 @@
 
 /* Returns a quoted version of arg suitable for placing in a
- * command-line. Result should be freed with owl_free. */
+ * command-line. Result should be freed with g_free. */
 char *owl_arg_quote(const char *arg)
 {
@@ -293 +293 @@
 
 /* hooks for doing memory allocation et. al. in owl */
-
-void owl_free(void *ptr)
-{
-  g_free(ptr);
-}
 
 char *owl_strdup(const char *s1)
@@ -372 +367 @@
     out=owl_strdup(tmp);
     if (!strncmp(out, "/dev/", 5)) {
-      owl_free(out);
+      g_free(out);
       out=owl_strdup(tmp+5);
     }
@@ -400 +395 @@
 
   out=owl_strdup(ptr1);
-  owl_free(tmp);
+  g_free(tmp);
   return(out);
 }
@@ -484 +479 @@
     owl_function_error("Cannot open %s (for writing): %s",
                        actual_filename, strerror(errno));
-    owl_free(newfile);
+    g_free(newfile);
     fclose(old);
     free(actual_filename);
@@ -495 +490 @@
     unlink(newfile);
     fclose(new);
-    owl_free(newfile);
+    g_free(newfile);
     fclose(old);
     free(actual_filename);
@@ -506 +501 @@
     else
       numremoved++;
-  owl_free(buf);
+  g_free(buf);
 
   fclose(new);
@@ -516 +511 @@
     if (link(actual_filename, backupfile) != 0) {
       owl_function_error("Cannot link %s: %s", backupfile, strerror(errno));
-      owl_free(backupfile);
+      g_free(backupfile);
       unlink(newfile);
-      owl_free(newfile);
+      g_free(newfile);
       return -1;
     }
-    owl_free(backupfile);
+    g_free(backupfile);
   }
 
@@ -531 +526 @@
 
   unlink(newfile);
-  owl_free(newfile);
+  g_free(newfile);
 
   g_free(actual_filename);

variable.c

@@ -559 +559 @@
 
 void owl_variable_update(owl_variable *var, const char *summary, const char *desc) {
-  if(var->summary) owl_free(var->summary);
+  if(var->summary) g_free(var->summary);
   var->summary = owl_strdup(summary);
-  if(var->description) owl_free(var->description);
+  if(var->description) g_free(var->description);
   var->description = owl_strdup(desc);
 }
@@ -569 +569 @@
   if(old) {
     owl_variable_update(old, summ, desc);
-    if(old->pval_default) owl_free(old->pval_default);
+    if(old->pval_default) g_free(old->pval_default);
     old->pval_default = owl_strdup(initval);
   } else {
@@ -639 +639 @@
 void owl_variable_dict_namelist_cleanup(owl_list *l)
 {
-  owl_list_cleanup(l, owl_free);
+  owl_list_cleanup(l, g_free);
 }
 
@@ -645 +645 @@
 {
   if (v->delete_fn) v->delete_fn(v);
-  owl_free(v->name);
-  owl_free(v->summary);
-  owl_free(v->description);
-  owl_free(v);
+  g_free(v->name);
+  g_free(v->summary);
+  g_free(v->description);
+  g_free(v);
 }
 
@@ -869 +869 @@
 void owl_variable_delete_default(owl_variable *v)
 {
-  if (v->val) owl_free(v->val);
+  if (v->val) g_free(v->val);
 }
 
@@ -1008 +1008 @@
     if (!v->validate_fn(v, newval)) return(-1);
   }
-  if (v->val) owl_free(v->val);
+  if (v->val) g_free(v->val);
   v->val = owl_strdup(newval);
   return(0);

view.c

@@ -160 +160 @@
 {
   owl_list_cleanup(&v->ml.list, NULL);
-  if (v->name) owl_free(v->name);
+  if (v->name) g_free(v->name);
 }

viewwin.c

@@ -44 +44 @@
       owl_fmtext_append_normal(&(v->fmtext), "\n");
   }
-  owl_free(text);
+  g_free(text);
   v->textlines=owl_fmtext_num_lines(&(v->fmtext));
   v->topline=0;
@@ -204 +204 @@
   owl_global_push_context_obj(&g, ctx);
   owl_editwin_set_callback(tw, owl_viewwin_callback_search);
-  owl_editwin_set_cbdata(tw, data, owl_free);
+  owl_editwin_set_cbdata(tw, data, g_free);
   /* We aren't saving tw, so release the reference we were given. */
   owl_editwin_unref(tw);
@@ -424 +424 @@
   g_object_unref(v->status);
   owl_fmtext_cleanup(&(v->fmtext));
-  owl_free(v);
-}
+  g_free(v);
+}

zbuddylist.c

@@ -16 +16 @@
   for (i=0; i<j; i++) {
     if (!strcasecmp(user, owl_list_get_element(&(zb->zusers), i))) {
-      owl_free(user);
+      g_free(user);
       return(-1);
     }
@@ -36 +36 @@
     if (!strcasecmp(user, ptr)) {
       owl_list_remove_element(&(zb->zusers), i);
-      owl_free(ptr);
-      owl_free(user);
+      g_free(ptr);
+      g_free(user);
       return(0);
     }
   }
-  owl_free(user);
+  g_free(user);
   return(-1);
 }
@@ -55 +55 @@
   for (i=0; i<j; i++) {
     if (!strcasecmp(user, owl_list_get_element(&(zb->zusers), i))) {
-      owl_free(user);
+      g_free(user);
       return(1);
     }
   }
-  owl_free(user);
+  g_free(user);
   return(0);
 }

zephyr.c

@@ -112 +112 @@
     owl_zephyr_loadsubs_helper(subs->subs, subs->nsubs);
     deferred_subs = g_list_delete_link(deferred_subs, deferred_subs);
-    owl_free(subs);
+    g_free(subs);
   }
 
@@ -127 +127 @@
 
   perl = owl_perlconfig_execute("BarnOwl::Zephyr::_zephyr_startup()");
-  owl_free(perl);
+  g_free(perl);
 
   owl_select_add_pre_select_action(owl_zephyr_pre_select_action, NULL, NULL);
@@ -222 +222 @@
     /* free stuff */
     for (i=0; i<count; i++) {
-      owl_free(subs[i].zsub_class);
-      owl_free(subs[i].zsub_classinst);
-      owl_free(subs[i].zsub_recipient);
-    }
-
-    owl_free(subs);
+      g_free(subs[i].zsub_class);
+      g_free(subs[i].zsub_classinst);
+      g_free(subs[i].zsub_recipient);
+    }
+
+    g_free(subs);
   } else {
     owl_sub_list *s = g_new(owl_sub_list, 1);
@@ -263 +263 @@
 
   if (stat(subsfile, &statbuff) != 0) {
-    owl_free(subsfile);
+    g_free(subsfile);
     if (error_on_nofile == 1)
       return -1;
@@ -272 +272 @@
   count = 0;
   file = fopen(subsfile, "r");
-  owl_free(subsfile);
+  g_free(subsfile);
   if (!file)
     return -1;
@@ -304 +304 @@
     if (buffer[0] == '-') {
       owl_function_zpunt(subs[count].zsub_class, subs[count].zsub_classinst, subs[count].zsub_recipient, 0);
-      owl_free(subs[count].zsub_class);
-      owl_free(subs[count].zsub_classinst);
-      owl_free(subs[count].zsub_recipient);
+      g_free(subs[count].zsub_class);
+      g_free(subs[count].zsub_classinst);
+      g_free(subs[count].zsub_recipient);
     } else {
       count++;
@@ -313 +313 @@
   fclose(file);
   if (buffer)
-    owl_free(buffer);
+    g_free(buffer);
 
   return owl_zephyr_loadsubs_helper(subs, count);
@@ -381 +381 @@
 
   if (stat(subsfile, &statbuff) == -1) {
-    owl_free(subs);
-    owl_free(subsfile);
+    g_free(subs);
+    g_free(subsfile);
     return 0;
   }
@@ -389 +389 @@
   count = 0;
   file = fopen(subsfile, "r");
-  owl_free(subsfile);
+  g_free(subsfile);
   if (file) {
     while (owl_getline_chomp(&buffer, file)) {
@@ -411 +411 @@
   }
   if (buffer)
-    owl_free(buffer);
+    g_free(buffer);
 
   return owl_zephyr_loadsubs_helper(subs, count);
@@ -530 +530 @@
     tmp = g_strndup(n->z_message + save, n->z_message_len - save);
     out = owl_validate_or_convert(tmp);
-    owl_free(tmp);
+    g_free(tmp);
     return out;
   }
@@ -589 +589 @@
 
     msg = owl_sprintf("%s service on %s %s\n%s", n->z_opcode, n->z_class_inst, field3, field4);
-    owl_free(field3);
-    owl_free(field4);
+    g_free(field3);
+    g_free(field4);
     if (msg) {
       return msg;
@@ -607 +607 @@
     
     msg = owl_sprintf("New transaction [%s] entered in %s\nFrom: %s (%s)\nSubject: %s", field1, field2, field3, field5, field4);
-    owl_free(field1);
-    owl_free(field2);
-    owl_free(field3);
-    owl_free(field4);
-    owl_free(field5);
+    g_free(field1);
+    g_free(field2);
+    g_free(field3);
+    g_free(field4);
+    g_free(field5);
     if (msg) {
       return msg;
@@ -623 +623 @@
     
     msg = owl_sprintf("MOIRA %s on %s: %s", n->z_class_inst, owl_message_get_hostname(m), field1);
-    owl_free(field1);
+    g_free(field1);
     if (msg) {
       return msg;
@@ -702 +702 @@
   
   /* free then check the return */
-  owl_free(notice.z_message);
+  g_free(notice.z_message);
   ZFreeNotice(&notice);
   if (ret!=ZERR_NONE) {
@@ -755 +755 @@
           owl_function_makemsg("Message sent to %s on -c %s -i %s\n", tmp, retnotice->z_class, retnotice->z_class_inst);
         }
-        owl_free(tmp);
+        g_free(tmp);
       } else {
         /* class / instance message */
@@ -820 +820 @@
 
       owl_zwrite_cleanup(&zw);
-      owl_free(tmp);
+      g_free(tmp);
     }
   } else {
@@ -886 +886 @@
     tmpbuff = owl_sprintf("zwrite -i %s %s", owl_message_get_instance(m), myuser);
   }
-  owl_free(myuser);
-  owl_free(to);
+  g_free(myuser);
+  g_free(to);
 
   z = owl_zwrite_new(tmpbuff);
@@ -896 +896 @@
   mout=owl_function_make_outgoing_zephyr(z);
   owl_global_messagequeue_addmsg(&g, mout);
-  owl_free(tmpbuff);
+  g_free(tmpbuff);
   owl_zwrite_delete(z);
 #endif
@@ -942 +942 @@
                           locations.tty ? locations.tty : "?",
                           locations.time ? locations.time : "?");
-      owl_free(result);
+      g_free(result);
       result = p;
     }
   }
-  owl_free(myuser);
+  g_free(myuser);
 
   return result;
@@ -974 +974 @@
     }
     fclose(file);
-    owl_free(s);
+    g_free(s);
   }
 
@@ -988 +988 @@
   }
 
-  owl_free(line);
+  g_free(line);
 #endif
 }
@@ -1009 +1009 @@
     owl_function_error("No subscription present in %s", subsfile);
   }
-  owl_free(subsfile);
-  owl_free(line);
+  g_free(subsfile);
+  g_free(line);
 #endif
 }
@@ -1078 +1078 @@
   filename = owl_zephyr_dotfile(".anyone", NULL);
   file = fopen(filename, "a");
-  owl_free(filename);
+  g_free(filename);
   if (!file) {
     owl_function_error("Error opening zephyr buddy file for append");
@@ -1093 +1093 @@
   filename = owl_zephyr_dotfile(".anyone", NULL);
   owl_util_file_deleteline(filename, name, 0);
-  owl_free(filename);
+  g_free(filename);
 }
 
@@ -1151 +1151 @@
                               sub.zsub_recipient);
       g_string_prepend(buf, tmp);
-      owl_free(tmp);
+      g_free(tmp);
     }
   }
@@ -1269 +1269 @@
   if (!f) {
     owl_function_error("Error opening file %s: %s", ourfile, strerror(errno) ? strerror(errno) : "");
-    owl_free(ourfile);
+    g_free(ourfile);
     return -1;
   }
-  owl_free(ourfile);
+  g_free(ourfile);
 
   while (owl_getline_chomp(&s, f)) {
@@ -1291 +1291 @@
     owl_list_append_element(in, long_zuser(s));
   }
-  owl_free(s);
+  g_free(s);
   fclose(f);
   return 0;
@@ -1355 +1355 @@
     }
     ZFreeALD(zald);
-    owl_free(zald);
+    g_free(zald);
   }
 }

zwrite.c

@@ -145 +145 @@
   if(msg) {
     owl_zwrite_set_message(z, msg);
-    owl_free(msg);
+    g_free(msg);
   }
 
@@ -181 +181 @@
     }
     send_ping(to, z->class, z->inst);
-    owl_free(to);
+    g_free(to);
   }
 
@@ -189 +189 @@
 void owl_zwrite_set_message_raw(owl_zwrite *z, const char *msg)
 {
-  if (z->message) owl_free(z->message);
+  if (z->message) g_free(z->message);
   z->message = owl_validate_utf8(msg);
 }
@@ -199 +199 @@
   char *tmp = NULL, *tmp2;
 
-  if (z->message) owl_free(z->message);
+  if (z->message) g_free(z->message);
 
   j=owl_list_get_size(&(z->recips));
@@ -211 +211 @@
         toline = owl_sprintf( "%s%s ", toline, (const char *) owl_list_get_element(&(z->recips), i));
       }
-      owl_free(tmp);
+      g_free(tmp);
       tmp = NULL;
     }
@@ -217 +217 @@
     tmp2 = owl_text_expand_tabs(tmp);
     z->message=owl_sprintf("%s\n%s", toline, tmp2);
-    owl_free(toline);
-    owl_free(tmp);
-    owl_free(tmp2);
+    g_free(toline);
+    g_free(tmp);
+    g_free(tmp2);
   } else {
     tmp=owl_validate_utf8(msg);
     z->message=owl_text_expand_tabs(tmp);
-    owl_free(tmp);
+    g_free(tmp);
   }
 }
@@ -258 +258 @@
       if (ret != 0)
         break;
-      owl_free(to);
+      g_free(to);
       to = NULL;
     }
@@ -265 +265 @@
     ret = send_zephyr(z->opcode, z->zsig, z->class, z->inst, to, z->message);
   }
-  owl_free(to);
+  g_free(to);
   return ret;
 }
@@ -301 +301 @@
 void owl_zwrite_set_opcode(owl_zwrite *z, const char *opcode)
 {
-  if (z->opcode) owl_free(z->opcode);
+  if (z->opcode) g_free(z->opcode);
   z->opcode=owl_validate_utf8(opcode);
 }
@@ -318 +318 @@
 void owl_zwrite_set_zsig(owl_zwrite *z, const char *zsig)
 {
-  if(z->zsig) owl_free(z->zsig);
+  if(z->zsig) g_free(z->zsig);
   z->zsig = owl_strdup(zsig);
 }
@@ -362 +362 @@
 {
   owl_zwrite_cleanup(z);
-  owl_free(z);
+  g_free(z);
 }
 
 void owl_zwrite_cleanup(owl_zwrite *z)
 {
-  owl_list_cleanup(&(z->recips), &owl_free);
-  if (z->cmd) owl_free(z->cmd);
-  if (z->zwriteline) owl_free(z->zwriteline);
-  if (z->class) owl_free(z->class);
-  if (z->inst) owl_free(z->inst);
-  if (z->opcode) owl_free(z->opcode);
-  if (z->realm) owl_free(z->realm);
-  if (z->message) owl_free(z->message);
-  if (z->zsig) owl_free(z->zsig);
+  owl_list_cleanup(&(z->recips), &g_free);
+  if (z->cmd) g_free(z->cmd);
+  if (z->zwriteline) g_free(z->zwriteline);
+  if (z->class) g_free(z->class);
+  if (z->inst) g_free(z->inst);
+  if (z->opcode) g_free(z->opcode);
+  if (z->realm) g_free(z->realm);
+  if (z->message) g_free(z->message);
+  if (z->zsig) g_free(z->zsig);
 }
 
@@ -381 +381 @@
  * Returns a zwrite line suitable for replying, specifically the
  * message field is stripped out. Result should be freed with
- * owl_free.
+ * g_free.
  */
 char *owl_zwrite_get_replyline(const owl_zwrite *z)