[773] in BarnOwl Developers
[D-O-H] r779 - in branches/barnowl_unicode: . owl
daemon@ATHENA.MIT.EDU (asedeno@MIT.EDU)
Thu Oct 29 18:09:34 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
To: dirty-owl-hackers@mit.edu
From: asedeno@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Sun, 23 Dec 2007 21:19:09 -0500 (EST)
Author: asedeno
Date: 2007-12-23 21:19:08 -0500 (Sun, 23 Dec 2007)
New Revision: 779
Modified:
branches/barnowl_unicode/
branches/barnowl_unicode/owl/owl.c
branches/barnowl_unicode/owl/util.c
Log:
Merged revisions 777-778 via svnmerge from
file:///afs/sipb.mit.edu/project/barnowl/src/svn/trunk
........
r778 | asedeno | 2007-12-23 21:18:36 -0500 (Sun, 23 Dec 2007) | 1 line
Moving owl_get_datadir to util.c so make test'' works again.
........
Property changes on: branches/barnowl_unicode
___________________________________________________________________
Name: svnmerge-integrated
- /trunk:1-776
+ /trunk:1-778
Modified: branches/barnowl_unicode/owl/owl.c
===================================================================
--- branches/barnowl_unicode/owl/owl.c 2007-12-24 02:18:36 UTC (rev 778)
+++ branches/barnowl_unicode/owl/owl.c 2007-12-24 02:19:08 UTC (rev 779)
@@ -64,13 +64,6 @@
owl_global g;
-char * owl_get_datadir() {
- char * datadir = getenv("BARNOWL_DATA_DIR");
- if(datadir != NULL)
- return strchr(datadir, '=') + 1;
- return DATADIR;
-}
-
int main(int argc, char **argv, char **env)
{
WINDOW *recwin, *sepwin, *typwin, *msgwin;
Modified: branches/barnowl_unicode/owl/util.c
===================================================================
--- branches/barnowl_unicode/owl/util.c 2007-12-24 02:18:36 UTC (rev 778)
+++ branches/barnowl_unicode/owl/util.c 2007-12-24 02:19:08 UTC (rev 779)
@@ -775,6 +775,13 @@
return start;
}
+char * owl_get_datadir() {
+ char * datadir = getenv("BARNOWL_DATA_DIR");
+ if(datadir != NULL)
+ return strchr(datadir, '=') + 1;
+ return DATADIR;
+}
+
/**************************************************************************/
/************************* REGRESSION TESTS *******************************/
/**************************************************************************/
