Changeset 7eaa83b


Ignore:
Timestamp:
Jan 23, 2012, 3:40:20 PM (10 years ago)
Author:
GitHub Merge Button <merge-button@github.com>
Parents:
678f607 (diff), 4af1241 (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 4af1241129bea4735ebbe86985915b652490f412 into 678f607a39f5773acac88c24b83bde78981ae8b5
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • functions.c

    r7803326 recfbdcc  
    434434  }
    435435
    436   /* free the zwrite */
     436  /* Clean up. */
    437437  g_free(cryptmsg);
     438  g_free(old_msg);
    438439}
    439440
  • owl.c

    r3b17b57 r389d487  
    585585  );
    586586
     587  owl_function_debugmsg("startup: setting context interactive");
     588
     589  owl_global_pop_context(&g);
     590  owl_global_push_context(&g, OWL_CTX_INTERACTIVE|OWL_CTX_RECV, NULL, "recv", NULL);
     591
    587592  /* process the startup file */
    588593  owl_function_debugmsg("startup: processing startup file");
     
    596601      owl_function_error("No such style: %s", owl_global_get_default_style(&g));
    597602
    598   owl_function_debugmsg("startup: setting context interactive");
    599 
    600   owl_global_pop_context(&g);
    601   owl_global_push_context(&g, OWL_CTX_INTERACTIVE|OWL_CTX_RECV, NULL, "recv", NULL);
    602 
    603603  source = owl_window_redraw_source_new();
    604604  g_source_attach(source, NULL);
  • zwrite.c

    r6329cd5 ref4074b  
    44{
    55  owl_zwrite *z = g_new(owl_zwrite, 1);
    6   if (owl_zwrite_create_from_line(z, line) < 0) {
    7     owl_zwrite_delete(z);
     6  if (owl_zwrite_create_from_line(z, line) != 0) {
     7    g_free(z);
    88    return NULL;
    99  }
     
    1414{
    1515  owl_zwrite *z = g_new(owl_zwrite, 1);
    16   if (owl_zwrite_create(z, argc, argv) < 0) {
    17     owl_zwrite_delete(z);
     16  if (owl_zwrite_create(z, argc, argv) != 0) {
     17    g_free(z);
    1818    return NULL;
    1919  }
     
    135135
    136136  if (badargs) {
     137    owl_zwrite_cleanup(z);
    137138    return(-1);
    138139  }
     
    142143      z->recips->len == 0) {
    143144    owl_function_error("You must specify a recipient for zwrite");
     145    owl_zwrite_cleanup(z);
    144146    return(-1);
    145147  }
     
    267269  owl_zwrite z;
    268270  int rv;
    269   rv=owl_zwrite_create_from_line(&z, cmd);
    270   if (rv) return(rv);
     271  rv = owl_zwrite_create_from_line(&z, cmd);
     272  if (rv != 0) return rv;
    271273  if (!owl_zwrite_is_message_set(&z)) {
    272274    owl_zwrite_set_message(&z, msg);
Note: See TracChangeset for help on using the changeset viewer.