Changeset 533b3a4

Timestamp:

Jan 23, 2012, 5:14:50 PM (13 years ago)

Author:

GitHub Merge Button <merge-button@github.com>

Parents:

8135737 (diff), f417630 (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 f4176309ffa50e072ad4d74406221428cdca660a into 813573732b0f3417b980267c0277caba41fb2cb3

Files:

• functions.c (modified) (1 diff)
• owl.c (modified) (2 diffs)
• perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm (modified) (1 diff)

functions.c

@@ -434 +434 @@
   }
 
-  /* free the zwrite */
+  /* Clean up. */
   g_free(cryptmsg);
+  g_free(old_msg);
 }
 

owl.c

@@ -585 +585 @@
   );
 
+  owl_function_debugmsg("startup: setting context interactive");
+
+  owl_global_pop_context(&g);
+  owl_global_push_context(&g, OWL_CTX_INTERACTIVE|OWL_CTX_RECV, NULL, "recv", NULL);
+
   /* process the startup file */
   owl_function_debugmsg("startup: processing startup file");
@@ -596 +601 @@
       owl_function_error("No such style: %s", owl_global_get_default_style(&g));
 
-  owl_function_debugmsg("startup: setting context interactive");
-
-  owl_global_pop_context(&g);
-  owl_global_push_context(&g, OWL_CTX_INTERACTIVE|OWL_CTX_RECV, NULL, "recv", NULL);
-
   source = owl_window_redraw_source_new();
   g_source_attach(source, NULL);

perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm

@@ -1482 +1482 @@
 }
 
+sub complete_jabberlogout {
+    my $ctx = shift;
+    if($ctx->word == 1) {
+        return ("-A", complete_account() );
+    } else {
+        return ();
+    }
+}
+
 BarnOwl::Completion::register_completer(jwrite => sub { BarnOwl::Module::Jabber::complete_jwrite(@_) });
+BarnOwl::Completion::register_completer(jabberlogout => sub { BarnOwl::Module::Jabber::complete_jabberlogout(@_) });
 
 1;