Changeset 7eaa83b
- Timestamp:
- Jan 23, 2012, 3:40:20 PM (13 years ago)
- 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. - Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
functions.c
r7803326 recfbdcc 434 434 } 435 435 436 /* free the zwrite*/436 /* Clean up. */ 437 437 g_free(cryptmsg); 438 g_free(old_msg); 438 439 } 439 440 -
owl.c
r3b17b57 r389d487 585 585 ); 586 586 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 587 592 /* process the startup file */ 588 593 owl_function_debugmsg("startup: processing startup file"); … … 596 601 owl_function_error("No such style: %s", owl_global_get_default_style(&g)); 597 602 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 603 603 source = owl_window_redraw_source_new(); 604 604 g_source_attach(source, NULL); -
zwrite.c
r6329cd5 ref4074b 4 4 { 5 5 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); 8 8 return NULL; 9 9 } … … 14 14 { 15 15 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); 18 18 return NULL; 19 19 } … … 135 135 136 136 if (badargs) { 137 owl_zwrite_cleanup(z); 137 138 return(-1); 138 139 } … … 142 143 z->recips->len == 0) { 143 144 owl_function_error("You must specify a recipient for zwrite"); 145 owl_zwrite_cleanup(z); 144 146 return(-1); 145 147 } … … 267 269 owl_zwrite z; 268 270 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; 271 273 if (!owl_zwrite_is_message_set(&z)) { 272 274 owl_zwrite_set_message(&z, msg);
Note: See TracChangeset
for help on using the changeset viewer.