Changeset 0d3c100

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:

• perlconfig.c (modified) (1 diff)
• select.c (modified) (1 diff)
• tester.c (modified) (4 diffs)

perlconfig.c

@@ -492 +492 @@
   PUTBACK;
 
-  call_pv("BarnOwl::Hooks::_new_command", G_SCALAR|G_VOID|G_EVAL);
+  call_pv("BarnOwl::Hooks::_new_command", G_VOID|G_EVAL);
 
   SPAGAIN;

select.c

@@ -353 +353 @@
   if (loop) {
     g_main_loop_quit(loop);
+    g_main_loop_unref(loop);
     loop = NULL;
   }

tester.c

@@ -32 +32 @@
   char *perlerr;
   int status = 0;
+  SCREEN *screen;
 
   if (argc <= 1) {
@@ -41 +42 @@
   wnull = fopen("/dev/null", "w");
   rnull = fopen("/dev/null", "r");
-  newterm("xterm", wnull, rnull);
+  screen = newterm("xterm", wnull, rnull);
   /* initialize global structures */
   owl_global_init(&g);
@@ -91 +92 @@
   /* probably not necessary, but tear down the screen */
   endwin();
+  delscreen(screen);
   fclose(rnull);
   fclose(wnull);
@@ -218 +220 @@
   owl_string_appendf_quoted(g, "%q foo %q%q %s %", "hello", "world is", "can't");
   FAIL_UNLESS("owl_string_appendf",
-              !strcmp(g_string_free(g, false),
-                      "hello foo 'world is'\"can't\" %s %"));
+              !strcmp(g->str, "hello foo 'world is'\"can't\" %s %"));
+  g_string_free(g, true);
 
   /* if (numfailed) printf("*** WARNING: failures encountered with owl_util\n"); */