Changeset 533b3a4


Ignore:
Timestamp:
Jan 23, 2012, 5:14:50 PM (10 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:
3 edited

Legend:

Unmodified
Added
Removed
  • functions.c

    r7803326 recfbdcc  
    434434  }
    435435
    436   /* free the zwrite */
     436  /* Clean up. */
    437437  g_free(cryptmsg);
     438  g_free(old_msg);
    438439}
    439440
  • owl.c

    rf417630 r8135737  
    585585  );
    586586
     587  owl_function_debugmsg("startup: setting context interactive");
     588
     589  owl_global_pop_context(&g);
     590  owl_global_push_context(&g, OWL_CTX_INTERACTIVE|OWL_CTX_RECV, NULL, "recv", NULL);
     591
    587592  /* process the startup file */
    588593  owl_function_debugmsg("startup: processing startup file");
     
    596601      owl_function_error("No such style: %s", owl_global_get_default_style(&g));
    597602
    598   owl_function_debugmsg("startup: setting context interactive");
    599 
    600   owl_global_pop_context(&g);
    601   owl_global_push_context(&g, OWL_CTX_INTERACTIVE|OWL_CTX_RECV, NULL, "recv", NULL);
    602 
    603603  source = owl_window_redraw_source_new();
    604604  g_source_attach(source, NULL);
  • perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm

    rb8a3e00 r678f607  
    14821482}
    14831483
     1484sub complete_jabberlogout {
     1485    my $ctx = shift;
     1486    if($ctx->word == 1) {
     1487        return ("-A", complete_account() );
     1488    } else {
     1489        return ();
     1490    }
     1491}
     1492
    14841493BarnOwl::Completion::register_completer(jwrite => sub { BarnOwl::Module::Jabber::complete_jwrite(@_) });
     1494BarnOwl::Completion::register_completer(jabberlogout => sub { BarnOwl::Module::Jabber::complete_jabberlogout(@_) });
    14851495
    148614961;
Note: See TracChangeset for help on using the changeset viewer.