Changes in zephyr.c [f183917:d953ede]
Legend:
- Unmodified
- Added
- Removed
-
zephyr.c
rf183917 rd953ede 697 697 Code_t ret; 698 698 ZNotice_t notice; 699 char *zsender = NULL;700 699 701 700 memset(¬ice, 0, sizeof(notice)); … … 709 708 notice.z_class=zstr(class); 710 709 notice.z_class_inst=zstr(instance); 711 if (!strcmp(recipient, "@")) { 710 notice.z_sender=NULL; 711 if (!strcmp(recipient, "*") || !strcmp(recipient, "@")) { 712 712 notice.z_recipient=zstr(""); 713 if (*owl_global_get_zsender(&g)) 714 notice.z_sender=zstr(owl_global_get_zsender(&g)); 713 715 } else { 714 716 notice.z_recipient=zstr(recipient); 715 717 } 716 if (!owl_zwrite_recip_is_personal(recipient) && *owl_global_get_zsender(&g))717 notice.z_sender = zsender = long_zuser(owl_global_get_zsender(&g));718 718 notice.z_default_format=zstr("Class $class, Instance $instance:\nTo: @bold($recipient) at $time $date\nFrom: @bold{$1 <$sender>}\n\n$2"); 719 719 if (opcode) notice.z_opcode=zstr(opcode); … … 730 730 g_free(notice.z_message); 731 731 ZFreeNotice(¬ice); 732 g_free(zsender);733 732 if (ret != ZERR_NONE) { 734 733 owl_function_error("Error sending zephyr: %s", error_message(ret)); … … 790 789 } else if (!strcmp(retnotice->z_message, ZSRVACK_NOTSENT)) { 791 790 if (retnotice->z_recipient == NULL 792 || !owl_zwrite_recip_is_personal(retnotice->z_recipient)) { 791 || *retnotice->z_recipient == 0 792 || *retnotice->z_recipient == '@') { 793 793 char *buff; 794 794 owl_function_error("No one subscribed to class %s", retnotice->z_class);
Note: See TracChangeset
for help on using the changeset viewer.