[Amsn-commits] SF.net SVN: amsn: [8970] trunk/amsn

[<kak...@us...>]

Revision: 8970
          http://amsn.svn.sourceforge.net/amsn/?rev=8970&view=rev
Author:   kakaroto
Date:     2007-08-22 22:29:13 -0700 (Wed, 22 Aug 2007)

Log Message:
-----------
OnBSD now checks for OpenBSD/FreeBSD/NetBSD so traydock works on all 3. Thanks to lirva from http://www.amsn-project.net/forums/viewtopic.php?t=3776

Modified Paths:
--------------
    trunk/amsn/amsn
    trunk/amsn/amsncore.tcl
    trunk/amsn/dock.tcl
    trunk/amsn/trayicon.tcl

Modified: trunk/amsn/amsn
===================================================================
--- trunk/amsn/amsn	2007-08-21 14:56:43 UTC (rev 8969)
+++ trunk/amsn/amsn	2007-08-23 05:29:13 UTC (rev 8970)
@@ -146,7 +146,7 @@
 	lappend auto_path [file join utils windows]
 } elseif { [OnLinux] } {
 	lappend auto_path [file join utils linux]
-} elseif { [OnOpenBSD] } {
+} elseif { [OnBSD] } {
         lappend auto_path [file join utils linux] 
 }
 lappend auto_path [file join utils]

Modified: trunk/amsn/amsncore.tcl
===================================================================
--- trunk/amsn/amsncore.tcl	2007-08-21 14:56:43 UTC (rev 8969)
+++ trunk/amsn/amsncore.tcl	2007-08-23 05:29:13 UTC (rev 8970)
@@ -152,10 +152,12 @@
 	}
 }
 
-#Test for OpenBSD
-proc OnOpenBSD {} {
+#Test for BSD
+proc OnBSD {} {
 	global tcl_platform
-	if { $tcl_platform(os) == "OpenBSD" } {
+	if { $tcl_platform(os) == "OpenBSD" || 
+             $tcl_platform(os) == "FreeBSD" ||
+             $tcl_platform(os) == "NetBSD"} {
 		return 1
 	} else {
 		return 0

Modified: trunk/amsn/dock.tcl
===================================================================
--- trunk/amsn/dock.tcl	2007-08-21 14:56:43 UTC (rev 8969)
+++ trunk/amsn/dock.tcl	2007-08-23 05:29:13 UTC (rev 8970)
@@ -129,7 +129,7 @@
 
 		if {[OnWin]} {
 			trayicon_init
-		} elseif {[OnLinux] || [OnOpenBSD]} {
+		} elseif {[OnLinux] || [OnBSD]} {
 			#We use the freedesktop standard here
 			if { $systemtray_exist == 0 } {
 				trayicon_init
@@ -147,7 +147,7 @@
 }
 
 proc UnixDock { } {
-	if {[::config::getKey use_tray] && ([OnLinux] || [OnOpenBSD]) } {
+	if {[::config::getKey use_tray] && ([OnLinux] || [OnBSD]) } {
 		return 1
 	} else {
 		return 0

Modified: trunk/amsn/trayicon.tcl
===================================================================
--- trunk/amsn/trayicon.tcl	2007-08-21 14:56:43 UTC (rev 8969)
+++ trunk/amsn/trayicon.tcl	2007-08-23 05:29:13 UTC (rev 8970)
@@ -507,7 +507,7 @@
 			return 0
 		}
 
-	} elseif { [OnLinux] || [OnOpenBSD] } {
+	} elseif { [OnLinux] || [OnBSD] } {
 		#if there is a problem loading the lib, print the error on the console and return
 		if { [catch {package require libtray} errormsg] } {
 			status_log "[trans traynotcompiled] : $errormsg"
@@ -555,7 +555,7 @@
 
 
 		#X11/Freedesktop (linux) specific code
-		} elseif { ([OnLinux] || [OnOpenBSD]) && $xiconpath != ""} {
+		} elseif { ([OnLinux] || [OnBSD]) && $xiconpath != ""} {
 			if { [winfo exists .$name] } {
 				status_log "trayicon.tcl: won't add icon $name as it already exists"
 			} else {
@@ -596,7 +596,7 @@
 		if { [OnWin] } {
 			winico taskbar delete $name
 		#X11/Freedesktop (linux) specific code
-		} elseif { [OnLinux] || [OnOpenBSD] } {
+		} elseif { [OnLinux] || [OnBSD] } {
 			if { [catch {removeti .$name} errormsg] } {
 				status_log "$errormsg\n"
 			}
@@ -619,7 +619,7 @@
 			winico taskbar add $name -text "$tooltip" -callback "$winactionhandler %m %x %y"			
 
 		#X11/Freedesktop (linux) specific code
-		} elseif { [OnLinux] || [OnOpenBSD]} {
+		} elseif { [OnLinux] || [OnBSD]} {
 			configureti .$name
 			image create photo source_$name -file $xiconpath
 			image create photo dest_$name


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.