[Shadowirc-commits] CVS: shadowirc/src ApplBase.c,1.77,1.78 ApplBase.h,1.11,1.12 IRCInit.c,1.20,1.21 ShadowIRC.c,1.12,1.13

[John B. <ds...@us...>]

Update of /cvsroot/shadowirc/shadowirc/src
In directory sc8-pr-cvs1:/tmp/cvs-serv24288/src

Modified Files:
	ApplBase.c ApplBase.h IRCInit.c ShadowIRC.c 
Log Message:
Minor code cleanup.

Index: ApplBase.c
===================================================================
RCS file: /cvsroot/shadowirc/shadowirc/src/ApplBase.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- ApplBase.c	9 Nov 2002 01:58:01 -0000	1.77
+++ ApplBase.c	12 Jan 2003 05:53:21 -0000	1.78
@@ -1,6 +1,6 @@
 /*
 	ShadowIRC - A Mac OS IRC Client
-	Copyright (C) 1996-2002 John Bafford
+	Copyright (C) 1996-2003 John Bafford
 	ds...@sh...
 	http://www.shadowirc.com
 
@@ -116,7 +116,7 @@
 	SetEventLoopTimerNextFireTime(AsyncSoundTimer, kEventDurationNoWait);
 }
 
-pascal OSErr AsyncSoundPlay(Handle sound, long refcon, Ptr *channel)
+OSErr AsyncSoundPlay(Handle sound, long refcon, Ptr *channel)
 {
 	SndChannelPtr soundChannel=0;
 	OSErr err;
@@ -226,7 +226,7 @@
 	return result;
 }
 
-pascal char doQuit(LongString *reason)
+char doQuit(LongString *reason)
 {
 	linkPtr link;
 	sqData sq;
@@ -625,8 +625,18 @@
 	conn->InputFunc(c, conn);
 }
 
-pascal void ApplRun(void)
+static void RunStartupConnections(void)
+{
+	linkPtr curLink;
+
+	linkfor(curLink, firstLink)
+		if(curLink->linkPrefs->autoConnect)
+			OpenConnection(curLink);
+}
+
+void ApplRun(void)
 {
+	RunStartupConnections();
 	RunApplicationEventLoop();
 	ApplExit();
 }

Index: ApplBase.h
===================================================================
RCS file: /cvsroot/shadowirc/shadowirc/src/ApplBase.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ApplBase.h	22 Oct 2002 02:55:12 -0000	1.11
+++ ApplBase.h	12 Jan 2003 05:53:21 -0000	1.12
@@ -1,6 +1,6 @@
 /*
 	ShadowIRC - A Mac OS IRC Client
-	Copyright (C) 1996-2002 John Bafford
+	Copyright (C) 1996-2003 John Bafford
 	ds...@sh...
 	http://www.shadowirc.com
 
@@ -28,10 +28,10 @@
 #include "LongStrings.h"
 #endif
 
-pascal void ApplRun(void);
-pascal void ApplInit(void);
-pascal char doQuit(LongString *reason);
+void ApplRun(void);
+void ApplInit(void);
+char doQuit(LongString *reason);
 
-pascal OSErr AsyncSoundPlay(Handle sound, long refcon, Ptr *channel);
+OSErr AsyncSoundPlay(Handle sound, long refcon, Ptr *channel);
 
 #endif

Index: IRCInit.c
===================================================================
RCS file: /cvsroot/shadowirc/shadowirc/src/IRCInit.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- IRCInit.c	22 Oct 2002 02:55:12 -0000	1.20
+++ IRCInit.c	12 Jan 2003 05:53:21 -0000	1.21
@@ -1,6 +1,6 @@
 /*
 	ShadowIRC - A Mac OS IRC Client
-	Copyright (C) 1996-2002 John Bafford
+	Copyright (C) 1996-2003 John Bafford
 	ds...@sh...
 	http://www.shadowirc.com
 
@@ -50,10 +50,12 @@
 #include "IRCPreferences.h"
 #include "MenuCommands.h"
 #include "IRCChannels.h"
+#include "plugins.h"
+
 
 inline void AppleMenuURLInit(void);
 inline void CheckPreferences(void);
-void ToolboxInit(void);
+static void ToolboxInit(void);
 void ApplicationInit(void);
 inline void SetupUPPs(void);
 
@@ -114,6 +116,8 @@
 	ControlRef theControl;
 	ControlButtonContentInfo content;
 	
+	ToolboxInit();
+	
 	spFiles = GetStrN(srFiles);
 	spCM=GetStrN(srCM);
 	spError=GetStrN(srError);
@@ -127,6 +131,8 @@
 	spFile=GetStrN(srFile);
 	spWhois=GetStrN(srWhois);
 	
+	GetDateTime(&now);
+	
 	setVers();
 	
 	InstallAEHandlers();
@@ -210,6 +216,11 @@
 		
 		DisposeWindow(splashWindow);
 	}
+
+	makePlugsDB();
+	UseResFile(gApplResFork);
+	
+	CurrentTarget.link=firstLink;
 }
 
 static void Gestalts(void)
@@ -225,7 +236,7 @@
 	}
 }
 
-void ToolboxInit(void)
+static void ToolboxInit(void)
 {
 	gApplResFork = CurResFile();
 	

Index: ShadowIRC.c
===================================================================
RCS file: /cvsroot/shadowirc/shadowirc/src/ShadowIRC.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ShadowIRC.c	30 Oct 2002 04:27:13 -0000	1.12
+++ ShadowIRC.c	12 Jan 2003 05:53:21 -0000	1.13
@@ -1,6 +1,6 @@
 /*
 	ShadowIRC - A Mac OS IRC Client
-	Copyright (C) 1996-2002 John Bafford
+	Copyright (C) 1996-2003 John Bafford
 	ds...@sh...
 	http://www.shadowirc.com
 
@@ -19,49 +19,15 @@
 	Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#include "IRCGlobals.h"
-#include "utils.h"
-#include "MsgWindows.h"
-#include "connections.h"
-#include "Inline.h"
-#include "plugins.h"
-#include "IRCAux.h"
 #include "ApplBase.h"
-#include "IRCChannels.h"
 
 int main(void);
 
-void ToolboxInit(void);
 void ApplicationInit(void);
 
-static void RunStartupConnections(void)
-{
-	linkPtr curLink;
-
-	linkfor(curLink, firstLink)
-		if(curLink->linkPrefs->autoConnect)
-			OpenConnection(curLink);
-}
-
 int main(void)
 {
-	EventRecord e;
-	
-	ToolboxInit();
-	
-	EventAvail(everyEvent, &e);
-	if(e.modifiers & controlKey)
-		return 0;
-	
-	GetDateTime(&now);
 	ApplicationInit();
-
-	makePlugsDB();
-	UseResFile(gApplResFork);
-	
-	CurrentTarget.link=firstLink;
-	if(!(e.modifiers & shiftKey))
-		RunStartupConnections();
 	
 	InitCursor();
 	DrawMenuBar();