[1112] in BarnOwl Developers
[D-O-H] r1078 - trunk/owl
daemon@ATHENA.MIT.EDU (asedeno@MIT.EDU)
Thu Oct 29 18:13:09 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
X-Original-To: nelhage@nelhage.com
To: dirty-owl-hackers@mit.edu
From: asedeno@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Tue, 3 Jun 2008 16:27:40 -0400 (EDT)
Author: asedeno
Date: 2008-06-03 16:27:39 -0400 (Tue, 03 Jun 2008)
New Revision: 1078
Modified:
trunk/owl/ChangeLog
trunk/owl/functions.c
Log:
Don't complain about non-existant ~/.owl/startup when starting.
Modified: trunk/owl/ChangeLog
===================================================================
--- trunk/owl/ChangeLog 2008-06-02 00:37:02 UTC (rev 1077)
+++ trunk/owl/ChangeLog 2008-06-03 20:27:39 UTC (rev 1078)
@@ -1,5 +1,8 @@
$Id$
+1.0.2
+ * Don't complain about non-existant ~/.owl/startup when starting. -asedeno
+
1.0.1
* Remove an unneeded .orig file from libfaim/ - hartmans
* Update the copyright notice in ':show license' - nelhage
Modified: trunk/owl/functions.c
===================================================================
--- trunk/owl/functions.c 2008-06-02 00:37:02 UTC (rev 1077)
+++ trunk/owl/functions.c 2008-06-03 20:27:39 UTC (rev 1078)
@@ -3499,15 +3499,17 @@
{
FILE *file;
char buff[LINE];
+ int fail_silent = 0;
if (!filename) {
+ fail_silent = 1;
filename=owl_global_get_startupfile(&g);
- file=fopen(filename, "r");
- } else {
- file=fopen(filename, "r");
}
+ file=fopen(filename, "r");
if (!file) {
- owl_function_error("Error opening file: %s", filename);
+ if (!fail_silent) {
+ owl_function_error("Error opening file: %s", filename);
+ }
return;
}
while (fgets(buff, LINE, file)!=NULL) {
