Changeset 1dafc7e


Ignore:
Timestamp:
Jan 13, 2013, 9:09:20 AM (9 years ago)
Author:
David Benjamin <davidben@mit.edu>
Parents:
c068c03 (diff), 007081e (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 007081e831c30952f1cf800bc610c33ba0671fb4 into c068c0307a85727dd3ad619122a640f96399d627
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • functions.c

    r06470d7 r007081e  
    871871void owl_function_loadsubs(const char *file)
    872872{
    873   int ret, ret2;
    874   const char *foo;
     873  int ret, ret2, ret3;
    875874  char *path;
    876875
     
    884883
    885884  /* for backwards compatibility for now */
    886   ret2=owl_zephyr_loaddefaultsubs();
     885  ret2 = owl_zephyr_loaddefaultsubs();
     886  ret3 = owl_zephyr_loadbarnowldefaultsubs();
    887887
    888888  if (!owl_context_is_interactive(owl_global_get_context(&g))) return;
    889889
    890   foo=file?file:"file";
    891   if (ret==0 && ret2==0) {
     890  if (ret == 0 && ret2 == 0 && ret3 == 0) {
    892891    if (!file) {
    893892      owl_function_makemsg("Subscribed to messages.");
     
    895894      owl_function_makemsg("Subscribed to messages from %s", file);
    896895    }
    897   } else if (ret==-1) {
    898     owl_function_error("Could not read %s", foo);
    899   } else {
     896  } else if (ret == -1) {
     897    owl_function_error("Could not read %s", file ? file : "file");
     898  } else if (ret2 == -1) {
    900899    owl_function_error("Error subscribing to messages");
     900  } else {
     901    owl_function_error("Error subscribing to instanced personals");
    901902  }
    902903}
  • aim.c

    rf271129 r8258ea5  
    707707{
    708708  aim_clientready(sess, fr->conn);
    709   owl_function_debugmsg("conninitdone_admin: initializtion done for admin connection");
     709  owl_function_debugmsg("conninitdone_admin: initialization done for admin connection");
    710710  return(1);
    711711}
     
    836836  params = va_arg(ap, struct aim_icbmparameters *);
    837837  va_end(ap);
    838  
    839   owl_function_debugmsg("faimtest_icbmparaminfo: ICBM Parameters: maxchannel = %d, default flags = 0x%08x, max msg len = %d, max sender evil = %f, max reciever evil = %f, min msg interval = %u",
     838
     839  owl_function_debugmsg("faimtest_icbmparaminfo: ICBM Parameters: maxchannel = %d, default flags = 0x%08x, max msg len = %d, max sender evil = %f, max receiver evil = %f, min msg interval = %u",
    840840                       params->maxchan, params->flags, params->maxmsglen, ((float)params->maxsenderwarn)/10.0, ((float)params->maxrecverwarn)/10.0, params->minmsginterval);
    841841     
  • commands.c

    r39a531d r8258ea5  
    10331033  OWLCMD_ARGS_CTX("popless:start-search", owl_viewwin_command_start_search, OWL_CTX_POPLESS,
    10341034                  "starts a command line to search for particular string",
    1035                   "popless:start-search [-r] [inital-value]",
     1035                  "popless:start-search [-r] [initial-value]",
    10361036                  "Initializes the command-line to search for initial-value. If\n"
    10371037                  "-r is used, the search will be performed backwards.\n\n"
     
    21902190    if (!strcmp(argv[0], "-f")) {
    21912191      if (argc<2) {
    2192         owl_function_makemsg("Too few argments to the view command");
     2192        owl_function_makemsg("Too few arguments to the view command");
    21932193        return(NULL);
    21942194      }
     
    22022202    } else if (!strcmp(argv[0], "-s")) {
    22032203      if (argc<2) {
    2204         owl_function_makemsg("Too few argments to the view command");
     2204        owl_function_makemsg("Too few arguments to the view command");
    22052205        return(NULL);
    22062206      }
     
    22092209      argv+=2;
    22102210    } else {
    2211       owl_function_makemsg("Too few argments to the view command");
     2211      owl_function_makemsg("Too few arguments to the view command");
    22122212      return(NULL);
    22132213    }
  • editwin.c

    r7803326 r8258ea5  
    619619
    620620  if (!g_utf8_validate(s, -1, NULL)) {
    621     owl_function_debugmsg("owl_editwin_insert_string: received non-utf-8 string.");
     621    owl_function_debugmsg("owl_editwin_insert_string: received non-UTF-8 string.");
    622622    return 0;
    623623  }
  • filter.c

    r30781f6 rc068c03  
    124124
    125125  op1 = owl_filter_parse_primitive_expression(argc-i, argv+i, &skip);
     126  if(!op1) goto err;
    126127  i += skip;
    127   if(!op1) goto err;
    128128
    129129  while(i < argc) {
  • help.c

    rd6b8b50 r8258ea5  
    107107     "    unsuball      Unsubscribe from all zephyr classes\n"
    108108     "    load-subs     Load zephyr subscriptions from a file\n"
    109      "    zpunt         Supress messages from a zephyr triplet\n"
     109     "    zpunt         Suppress messages from a zephyr triplet\n"
    110110     "    zlog          Send a login or logout notification\n"
    111111     "    zlist         Print a list of zephyr buddies logged in\n"
  • perl/lib/BarnOwl.pm

    rb303ba2 r374089a  
    9393command line, and C<MESSAGE> is the zephyr body to send.
    9494
     95=cut
     96
     97sub zephyr_zwrite {
     98    my ($command, $message) = @_;
     99    my $ret = BarnOwl::Internal::zephyr_zwrite($command, $message);
     100    die "Error sending zephyr" unless $ret == 0;
     101}
     102
    95103=head2 ztext_stylestrip STRING
    96104
  • perl/lib/BarnOwl/Complete/Client.pm

    rd973a73 r4626016  
    2020
    2121my %show = (
    22     information => undef,
    2322    colors      => undef,
    2423    commands    => undef,
  • perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm

    r678f607 r8258ea5  
    320320              . "configure [<muc>]\n"
    321321              . "            Configures a MUC.\n"
    322               . "            Necessary to initalize a new MUC.\n"
     322              . "            Necessary to initialize a new MUC.\n"
    323323              . "            At present, only the default configuration is supported.\n"
    324324              . "            The MUC is taken from the current message if not supplied.\n\n"
  • perlglue.xs

    rb303ba2 r374089a  
    9696                RETVAL
    9797
    98 void
    99 zephyr_zwrite(cmd,msg)
    100         const char *cmd
    101         const char *msg
    102         PREINIT:
    103                 int i;
    104         CODE:
    105                 i = owl_zwrite_create_and_send_from_line(cmd, msg);
    106 
    10798const utf8 *
    10899ztext_stylestrip(ztext)
     
    475466        }
    476467
     468int
     469zephyr_zwrite(cmd,msg)
     470        const char *cmd
     471        const char *msg
     472        CODE:
     473                RETVAL = owl_zwrite_create_and_send_from_line(cmd, msg);
     474        OUTPUT:
     475                RETVAL
     476
    477477MODULE = BarnOwl                PACKAGE = BarnOwl::Editwin
    478478
  • variable.c

    rd126a19 r8258ea5  
    354354  OWLVAR_BOOL( "narrow-related" /* %OwlVarStub:narrow_related */, 1,
    355355               "Make smartnarrow use broader filters",
    356                "Causes smartfiler to narrow to messages \"related\" to \n"
     356               "Causes smartfilter to narrow to messages \"related\" to \n"
    357357               "the current message, as well as ones to the same place.\n\n"
    358358               "for Zephyr, this controls whether to narrow to e.g. class-help or\n"
  • zcrypt.c

    r048b1ff rd72ba1e  
    866866
    867867  err = call_filter(argv, in, &out, &status);
     868  free(in);
    868869  if(err || status) {
    869870    g_free(out);
Note: See TracChangeset for help on using the changeset viewer.