Changes in / [7eaa83b:4af1241]

Files:

• functions.c (modified) (1 diff)
• owl.c (modified) (2 diffs)
• zwrite.c (modified) (5 diffs)

functions.c

@@ -434 +434 @@
   }
 
-  /* Clean up. */
+  /* free the zwrite */
   g_free(cryptmsg);
-  g_free(old_msg);
 }
 

owl.c

@@ -585 +585 @@
   );
 
-  owl_function_debugmsg("startup: setting context interactive");
-
-  owl_global_pop_context(&g);
-  owl_global_push_context(&g, OWL_CTX_INTERACTIVE|OWL_CTX_RECV, NULL, "recv", NULL);
-
   /* process the startup file */
   owl_function_debugmsg("startup: processing startup file");
@@ -601 +596 @@
       owl_function_error("No such style: %s", owl_global_get_default_style(&g));
 
+  owl_function_debugmsg("startup: setting context interactive");
+
+  owl_global_pop_context(&g);
+  owl_global_push_context(&g, OWL_CTX_INTERACTIVE|OWL_CTX_RECV, NULL, "recv", NULL);
+
   source = owl_window_redraw_source_new();
   g_source_attach(source, NULL);

zwrite.c

@@ -4 +4 @@
 {
   owl_zwrite *z = g_new(owl_zwrite, 1);
-  if (owl_zwrite_create_from_line(z, line) != 0) {
-    g_free(z);
+  if (owl_zwrite_create_from_line(z, line) < 0) {
+    owl_zwrite_delete(z);
     return NULL;
   }
@@ -14 +14 @@
 {
   owl_zwrite *z = g_new(owl_zwrite, 1);
-  if (owl_zwrite_create(z, argc, argv) != 0) {
-    g_free(z);
+  if (owl_zwrite_create(z, argc, argv) < 0) {
+    owl_zwrite_delete(z);
     return NULL;
   }
@@ -135 +135 @@
 
   if (badargs) {
-    owl_zwrite_cleanup(z);
     return(-1);
   }
@@ -143 +142 @@
       z->recips->len == 0) {
     owl_function_error("You must specify a recipient for zwrite");
-    owl_zwrite_cleanup(z);
     return(-1);
   }
@@ -269 +267 @@
   owl_zwrite z;
   int rv;
-  rv = owl_zwrite_create_from_line(&z, cmd);
-  if (rv != 0) return rv;
+  rv=owl_zwrite_create_from_line(&z, cmd);
+  if (rv) return(rv);
   if (!owl_zwrite_is_message_set(&z)) {
     owl_zwrite_set_message(&z, msg);