Changeset 0d3c100


Ignore:
Timestamp:
Jun 18, 2011, 5:12:29 PM (13 years ago)
Author:
GitHub Merge Button <merge-button@github.com>
Parents:
5b197f7 (diff), e93dd78 (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 e93dd785a2e76aa0dc14ecd56fd2c61b3598bc96 into 5b197f71370f5a5b3c3c09935c5679d6c90fa4c2
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • perlconfig.c

    r3b8a563 ra9237aa  
    492492  PUTBACK;
    493493
    494   call_pv("BarnOwl::Hooks::_new_command", G_SCALAR|G_VOID|G_EVAL);
     494  call_pv("BarnOwl::Hooks::_new_command", G_VOID|G_EVAL);
    495495
    496496  SPAGAIN;
  • select.c

    r44976fe rf0781ba  
    353353  if (loop) {
    354354    g_main_loop_quit(loop);
     355    g_main_loop_unref(loop);
    355356    loop = NULL;
    356357  }
  • tester.c

    r4c7c21f re93dd78  
    3232  char *perlerr;
    3333  int status = 0;
     34  SCREEN *screen;
    3435
    3536  if (argc <= 1) {
     
    4142  wnull = fopen("/dev/null", "w");
    4243  rnull = fopen("/dev/null", "r");
    43   newterm("xterm", wnull, rnull);
     44  screen = newterm("xterm", wnull, rnull);
    4445  /* initialize global structures */
    4546  owl_global_init(&g);
     
    9192  /* probably not necessary, but tear down the screen */
    9293  endwin();
     94  delscreen(screen);
    9395  fclose(rnull);
    9496  fclose(wnull);
     
    218220  owl_string_appendf_quoted(g, "%q foo %q%q %s %", "hello", "world is", "can't");
    219221  FAIL_UNLESS("owl_string_appendf",
    220               !strcmp(g_string_free(g, false),
    221                       "hello foo 'world is'\"can't\" %s %"));
     222              !strcmp(g->str, "hello foo 'world is'\"can't\" %s %"));
     223  g_string_free(g, true);
    222224
    223225  /* if (numfailed) printf("*** WARNING: failures encountered with owl_util\n"); */
Note: See TracChangeset for help on using the changeset viewer.