Changeset db0ac7e for owl.c


Ignore:
Timestamp:
May 3, 2008, 12:52:32 PM (16 years ago)
Author:
Alejandro R. Sedeño <asedeno@mit.edu>
Branches:
master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9
Children:
feabce2
Parents:
d9337637 (diff), 811ad93 (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:
Merged revisions 983-1032 via svnmerge from 
file:///afs/sipb.mit.edu/project/barnowl/src/svn/trunk

........
  r985 | nelhage | 2008-03-11 12:38:20 -0400 (Tue, 11 Mar 2008) | 2 lines
  
  Generate less ugly error spew if a module fails to load
........
  r986 | geofft | 2008-03-13 15:56:20 -0400 (Thu, 13 Mar 2008) | 1 line
  
  Added :webzephyr command with keybinding W.
........
  r987 | asedeno | 2008-03-18 23:57:24 -0400 (Tue, 18 Mar 2008) | 2 lines
  
  Fix a race condition in which zephyrs received during init
  are not noticed until the next zephyr after entering the mainloop.
........
  r988 | geofft | 2008-03-19 15:46:43 -0400 (Wed, 19 Mar 2008) | 6 lines
  
  IRC: explicitly include the network (-a $alias) in reply commands.
  
  This may be unnecessary because :irc-msg looks at getcurmsg() if it cannot
  automatically determine the network.
........
  r989 | geofft | 2008-03-21 14:47:51 -0400 (Fri, 21 Mar 2008) | 1 line
  
  syntax error.
........
  r990 | nelhage | 2008-03-26 02:24:26 -0400 (Wed, 26 Mar 2008) | 2 lines
  
  Fix sending jabbers to JIDs beginning with `+'
........
  r994 | nelhage | 2008-03-29 17:02:05 -0400 (Sat, 29 Mar 2008) | 3 lines
  
  Compile zcrypt.c with -w so I don't get all these warnings in my
  compile output whenever I change any headers
........
  r998 | geofft | 2008-03-31 01:59:47 -0400 (Mon, 31 Mar 2008) | 1 line
  
  Implement /me for outgoing IRC messages
........
  r999 | geofft | 2008-03-31 09:58:56 -0400 (Mon, 31 Mar 2008) | 1 line
  
  I think this fixes the resizing bug.
........
  r1000 | nelhage | 2008-03-31 11:29:29 -0400 (Mon, 31 Mar 2008) | 2 lines
  
  Make `svkversion' handle exported trees better
........
  r1001 | nelhage | 2008-03-31 11:52:39 -0400 (Mon, 31 Mar 2008) | 2 lines
  
  Add a makefile rule to support emacs flymake-mode
........
  r1015 | nelhage | 2008-04-04 14:58:45 -0400 (Fri, 04 Apr 2008) | 3 lines
  
  Bind the combinations the iPhone sends for arrow keys [probably other
  terminals, too]
........
  r1018 | shadow | 2008-04-08 13:57:49 -0400 (Tue, 08 Apr 2008) | 2 lines
  
  avoid null pointer dereference if msg is NULL (or a 0 length is claimed)
........
  r1019 | nelhage | 2008-04-09 18:08:26 -0400 (Wed, 09 Apr 2008) | 2 lines
  
  Fix some stupid typos
........
  r1020 | chmrr | 2008-04-09 18:16:02 -0400 (Wed, 09 Apr 2008) | 3 lines
  
   r29300@kohr-ah:  chmrr | 2008-04-09 18:14:37 -0400
    * It's apparently a popular typo
........
  r1022 | asedeno | 2008-04-16 17:05:36 -0400 (Wed, 16 Apr 2008) | 2 lines
  
  Jabber reply bugfix.
  Reported by several people, resolved by arolfe.
........
  r1023 | nelhage | 2008-04-28 23:33:03 -0400 (Mon, 28 Apr 2008) | 3 lines
  
  Initialized merge tracking via "svnmerge" with revisions "735" from 
  svn+ssh://lunatique.mit.edu/mit/barnowl/src/svn/branches/barnowl_unicode
........
  r1024 | nelhage | 2008-04-28 23:33:12 -0400 (Mon, 28 Apr 2008) | 3 lines
  
  Initialized merge tracking via "svnmerge" with revisions "735" from 
  svn+ssh://lunatique.mit.edu/mit/barnowl/src/svn/branches/barnowl_sqlite
........
  r1025 | nelhage | 2008-04-29 01:21:12 -0400 (Tue, 29 Apr 2008) | 2 lines
  
  Clone owl_perl from the sqlite branch because I'm about to make use of it.
........
  r1026 | nelhage | 2008-04-29 01:21:13 -0400 (Tue, 29 Apr 2008) | 4 lines
  
  Initial step of moving styles from the current mishmash of different
  options to a unified object interface.
  No backwards-compatibility support yet.
........
  r1027 | nelhage | 2008-04-29 01:21:15 -0400 (Tue, 29 Apr 2008) | 2 lines
  
  Implement back-compat with old-style owl::format_msg() styles
........
  r1028 | nelhage | 2008-04-29 01:21:16 -0400 (Tue, 29 Apr 2008) | 2 lines
  
  Remove nearly all references to the "basic" style.
........
  r1029 | nelhage | 2008-04-29 01:21:17 -0400 (Tue, 29 Apr 2008) | 2 lines
  
  Support the `style' command again. Note that it is deprecated.
........
  r1031 | nelhage | 2008-04-30 13:29:45 -0400 (Wed, 30 Apr 2008) | 2 lines
  
  Refactor default style code somewhat to be more easily extensible
........
File:
1 edited

Legend:

Unmodified
Added
Removed
  • owl.c

    r07bfbc2 rdb0ac7e  
    274274  }
    275275
    276   /* setup the built-in styles */
    277   owl_function_debugmsg("startup: creating built-in styles");
    278 
    279   s=owl_malloc(sizeof(owl_style));
    280   owl_style_create_internal(s, "basic", &owl_stylefunc_basic, "Basic message formatting.");
    281   owl_global_add_style(&g, s);
    282 
    283276  /* setup the default filters */
    284277  /* the personal filter will need to change again when AIM chat's are
     
    409402  if (0 != strcmp(owl_global_get_default_style(&g), "__unspecified__")) {
    410403    /* the style was set by the user: leave it alone */
    411   } else if (owl_global_is_config_format(&g)) {
    412     owl_global_set_default_style(&g, "perl");
    413   } else if (owl_global_is_userclue(&g, OWL_USERCLUE_CLASSES)) {
     404  } else {
    414405    owl_global_set_default_style(&g, "default");
    415   } else {
    416     owl_global_set_default_style(&g, "basic");
    417406  }
    418407
     
    436425  nexttime=time(NULL);
    437426
     427#ifdef HAVE_LIBZEPHYR
     428  /* Check for any zephyrs that have come in while we've done init. */
     429  owl_zephyr_process_events();
     430#endif
     431 
    438432  owl_function_debugmsg("startup: entering main loop");
    439433  /* main loop */
     
    595589  if(owl_message_is_direction_in(m)) {
    596590    /* let perl know about it*/
    597     owl_perlconfig_getmsg(m, 0, NULL);
     591    owl_perlconfig_getmsg(m, NULL);
    598592
    599593    /* do we need to autoreply? */
Note: See TracChangeset for help on using the changeset viewer.