Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • functions.c

    recaec21 r2cfc6d7  
    19921992  newbuff = owl_sprintf("%s%s", buff, redirect);
    19931993
    1994   if (type == 1) {
     1994  if (type == OWL_OUTPUT_POPUP) {
    19951995    owl_popexec_new(newbuff);
    19961996  } else {
     
    19991999    pclose(p);
    20002000   
    2001     if (type==1) {
    2002       owl_function_popless_text(out);
    2003     } else if (type==0) {
     2001    if (type == OWL_OUTPUT_RETURN) {
    20042002      owl_free(newbuff);
    20052003      return out;
    2006     } else if (type==2) {
     2004    } else if (type == OWL_OUTPUT_ADMINMSG) {
    20072005      owl_function_adminmsg(buff, out);
    2008     } else {
    2009       owl_function_popless_text(out);
    20102006    }
    20112007    owl_free(out);
     
    20342030  perlout = owl_perlconfig_execute(buff);
    20352031  if (perlout) {
    2036     if (type==1) {
     2032    if (type == OWL_OUTPUT_POPUP) {
    20372033      owl_function_popless_text(perlout);
    2038     } else if (type==2) {
     2034    } else if (type == OWL_OUTPUT_ADMINMSG) {
    20392035      owl_function_adminmsg(buff, perlout);
    2040     } else if (type==0) {
     2036    } else if (type == OWL_OUTPUT_RETURN) {
    20412037      return perlout;
    2042     } else {
    2043       owl_function_popless_text(perlout);
    20442038    }
    20452039    owl_free(perlout);
     
    23312325  /* if it already exists then go with it.  This lets users override */
    23322326  if (owl_global_get_filter(&g, filtname)) {
    2333     return(filtname);
     2327    goto done;
    23342328  }
    23352329
     
    23612355
    23622356  owl_free(argbuff);
     2357done:
    23632358  owl_free(class);
    23642359  if (instance) {
     
    25042499
    25052500  owl_mainwin_redisplay(owl_global_get_mainwin(&g)); 
    2506 }
    2507 
    2508 static char *owl_function_smartfilter_cc(const owl_message *m) {
    2509   const char *ccs;
    2510   char *filtname;
    2511   char *text;
    2512   owl_filter *f;
    2513 
    2514   ccs = owl_message_get_attribute_value(m, "zephyr_ccs");
    2515 
    2516   filtname = owl_sprintf("conversation-%s", ccs);
    2517   owl_text_tr(filtname, ' ', '-');
    2518 
    2519   if (owl_global_get_filter(&g, filtname)) {
    2520     return filtname;
    2521   }
    2522 
    2523   text = owl_sprintf("type ^zephyr$ and filter personal and "
    2524                      "zephyr_ccs ^%s%s%s$",
    2525                      owl_getquoting(ccs), ccs, owl_getquoting(ccs));
    2526 
    2527   f = owl_filter_new_fromstring(filtname, text);
    2528 
    2529   owl_global_add_filter(&g, f);
    2530 
    2531   owl_free(text);
    2532 
    2533   return filtname;
    25342501}
    25352502
     
    25872554  if (owl_message_is_type_zephyr(m)) {
    25882555    if (owl_message_is_personal(m) || owl_message_is_loginout(m)) {
    2589       if (owl_message_get_attribute_value(m, "zephyr_ccs") != NULL) {
    2590         return owl_function_smartfilter_cc(m);
    2591       }
    2592 
    25932556      if (owl_message_is_direction_in(m)) {
    25942557        zperson=short_zuser(owl_message_get_sender(m));
Note: See TracChangeset for help on using the changeset viewer.