Merge with master

BuildAll.sh

@@ -93,7 +93,7 @@ if [ ! -e "$MYDIR/dist/DMDirc.jar" ]; then
 else
 	# Build installers
 	cd "${MYDIR}/installer"
-	./release.sh --jar "${MYDIR}/dist/DMDirc.jar" --opt "--tag ${FILEDATA}" trunk
+	./release.sh --jar "${MYDIR}/dist/DMDirc.jar" --opt "--extra ${FILEDATA}" trunk
 	cd "${MYDIR}"
 	
 	if [ ! -e "${MYDIR}/installer/output/DMDirc-Setup-${FILEDATA}.exe" -o  ! -e "${MYDIR}/installer/output/DMDirc-Setup-${FILEDATA}.run" -o ! -e "${MYDIR}/installer/output/DMDirc-${FILEDATA}.dmg" -o ! -e "${MYDIR}/installer/output/DMDirc-${FILEDATA}.jar" ]; then

UpdateCopyright.sh

@@ -1,8 +1,8 @@
 #!/bin/sh
 # Update Copyright headers in all files.
 
-OLD="2006-2007"
-NEW="2006-2008"
+OLD="2006-2008"
+NEW="2006-2009"
 
 grep -iR "${OLD}" ./* | grep -v /.svn/ | grep -v "Binary file" | grep -v UpdateCopyright.sh | grep -v update.sh | awk -F: '{print "echo \"Updating \\\""$1"\\\"\"\nsed -i \"s/'${OLD}'/'${NEW}'/g\" \""$1"\""}' > update.sh
 sh update.sh

build-jar.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="DMDirc-jar" default="default" basedir=".">
+
+    <!-- Netbeans property files -->
+    <property file="nbproject/project.properties"/>
+    <property file="nbproject/private/private.properties"/>
+    <property file="${user.properties.file}"/>
+    
+    <target name="-addjarlibs">
+        <jar destfile="plugins/ui_swing.jar" compress="${jar.compress}" keepcompression="true" update="true">
+            <zipfileset src="${file.reference.miglayout.jar}" includes="net/miginfocom/layout/**,net/miginfocom/swing/**"/>
+        </jar>
+    </target>
+
+</project>

build.xml

@@ -6,6 +6,7 @@
 
     <import file="nbproject/build-impl.xml"/>
     <import file="build-installer.xml"/>
+    <import file="build-jar.xml"/>
     <import file="build-plugins.xml"/>
     <import file="build-reports.xml"/>
     <import file="build-svn.xml"/>
@@ -14,5 +15,6 @@
     <target name="-post-compile" depends="-unsvn, build-plugins"/>
     <target name="-pre-compile" depends="-addsvn"/>
     <target name="-post-test-run" depends="-do-test-reports"/>
+    <target name="-post-jar" depends="-addjarlibs"/>
 
 </project>

checkstyle/dmdirc.license

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

createPluginJar.sh

@@ -7,42 +7,81 @@ if [ "${1}" = "" -o "${2}" = "" ]; then
 	exit;
 fi
 
+srcdir=${PWD}
 pluginname=${1}
 foldername=${pluginname//.//}
 
+newer=`find src/${foldername} -type f -newer ${srcdir}/plugins/${2}.jar 2>&1 | wc -l`
+
+if [ $newer -eq 0 ]; then
+	echo "${2}.jar appears to be up-to-date";
+	exit 0;
+fi
+
 echo "Creating ${2}.jar for ${pluginname} (${foldername})"
 
-if [ ! -e src/${foldername}/plugin.info ]; then
-	echo "no plugin.info found";
+if [ ! -e src/${foldername}/plugin.info -a ! -e src/${foldername}/plugin.config ]; then
+	echo "no plugin.info or plugin.config found";
 	exit 0;
 fi
 
 #echo "looking for classes"
-srcdir=${PWD}
 TMPDIR=`mktemp -d`
 #echo "Using temp dir: ${TMPDIR}"
 cd $TMPDIR
 
 mkdir META-INF
-cp ${srcdir}/src/${foldername}/plugin.info META-INF/
+if [ -e ${srcdir}/src/${foldername}/plugin.info ]; then
+	cp ${srcdir}/src/${foldername}/plugin.info META-INF/
+fi;
+if [ -e ${srcdir}/src/${foldername}/plugin.config ]; then
+	cp ${srcdir}/src/${foldername}/plugin.config META-INF/
+fi;
 
 # Add the SVN version if there's no version specified and we know the SVN rev
-if ! grep "^version=" META-INF/plugin.info >/dev/null; then
-	SVN=`which svn`	
-	SVNREV=`$SVN info $srcdir/src/$foldername 2>&1 | grep "Last Changed Rev"`
-        SVNREV=${SVNREV##*: }
-        echo "" >> META-INF/plugin.info
-
-	if [ -n "$SVNREV" ]; then
-		echo "version=$SVNREV" >> META-INF/plugin.info;
-	else
-		echo "version=0" >> META-INF/plugin.info;
+if [ -e META-INF/plugin.info ]; then
+	if ! grep "^version=" META-INF/plugin.info >/dev/null; then
+		SVN=`which svn`	
+		SVNREV=`$SVN info $srcdir/src/$foldername 2>&1 | grep "Last Changed Rev"`
+		SVNREV=${SVNREV##*: }
+		echo "" >> META-INF/plugin.info
+	
+		if [ -n "$SVNREV" ]; then
+			echo "version=$SVNREV" >> META-INF/plugin.info;
+		else
+			echo "version=0" >> META-INF/plugin.info;
+		fi
+	
+		if ! grep "^friendlyversion=" META-INF/plugin.info >/dev/null; then
+			echo "friendlyversion=$SVNREV" >> META-INF/plugin.info
+		fi
 	fi
+fi;
 
-	if ! grep "^friendlyversion=" META-INF/plugin.info >/dev/null; then
-		echo "friendlyversion=$SVNREV" >> META-INF/plugin.info
+# Do the same for plugin.config
+# This is rudimentary, it a version: section already exists (eg to specify
+# friendlyversion) then it won't add the number= key.
+if [ -e META-INF/plugin.config ]; then
+	if ! grep "^version:" META-INF/plugin.config >/dev/null; then
+		SVN=`which svn`	
+		SVNREV=`$SVN info $srcdir/src/$foldername 2>&1 | grep "Last Changed Rev"`
+		SVNREV=${SVNREV##*: }
+		echo "" >> META-INF/plugin.config
+		echo "" >> META-INF/plugin.config
+	
+		echo "version:" >> META-INF/plugin.config;
+		if [ -n "$SVNREV" ]; then
+			echo "  number=$SVNREV" >> META-INF/plugin.config;
+		else
+			echo "  number=0" >> META-INF/plugin.config;
+		fi
+		
+		# Add to keysections list
+		sed 's/keysections:/keysections:\n  version/g' META-INF/plugin.config > META-INF/plugin.config.temp
+		rm -Rf META-INF/plugin.config
+		mv META-INF/plugin.config.temp META-INF/plugin.config
 	fi
-fi
+fi;
 
 foo=`echo $foldername | sed -e 's/\/[^\/]*$//g'`
 mkdir -p $foo
@@ -51,7 +90,7 @@ ln -s ${srcdir}/build/classes/${foldername} .
 cd $TMPDIR
 mkdir -p ${srcdir}/plugins/
 rm -Rf ${srcdir}/plugins/${2}.jar
-jar -cvf ${srcdir}/src/${foldername}/${2}.jar META-INF/plugin.info >/dev/null
+jar -cvf ${srcdir}/src/${foldername}/${2}.jar META-INF >/dev/null
 bit=""
 while [ 1 -eq 1 ]; do
 	bit=${bit}/*

installer/jar/makeJar.sh

@@ -3,7 +3,7 @@
 # This script generates a jar file for a release version of DMDirc
 #
 # DMDirc - Open Source IRC Client
-# Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+# Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,6 +28,13 @@ FILENAME=DMDirc
 # full name of the file to output to
 RUNNAME="${PWD}/${FILENAME}.jar"
 
+# Are we a git working copy, or SVN?
+if [ -e ".svn" ]; then
+	isSVN=1
+else
+	isSVN=0
+fi;
+
 # Go!
 echo "-----------"
 if [ -e "${RUNNAME}" ]; then
@@ -46,7 +53,7 @@ showHelp() {
 	echo "-c, --compile             Recompile the .jar file (otherwise use the existing file from dist/)"
 	echo "    --jar <file>          use <file> as DMDirc.jar (ie just add the plugins to it and rename)"
 	echo "    --current             Use the current folder as the base for the build"
-	echo "-t, --tag <tag>           Tag to add to final name to distinguish this build from a standard build"
+	echo "-e, --extra <tag>         Tag to add to final name to distinguish this build from a standard build"
 	echo "-k, --keep                Keep the existing source tree when compiling"
 	echo "                          (don't svn update beforehand)"
 	echo "---------------------"
@@ -60,11 +67,17 @@ isRelease=""
 finalTag=""
 BRANCH="0"
 plugins=""
-location="../../../"
+if [ $isSVN -eq 1 ]; then
+	location="../../../"
+	current=""
+else
+	location="../../"
+	current="1"
+fi;
 jarfile=""
-current=""
 jre=""
 jrename="jre" # Filename for JRE without the .bin
+TAGGED=""
 while test -n "$1"; do
 	case "$1" in
 		--plugins|-p)
@@ -86,7 +99,7 @@ while test -n "$1"; do
 			shift
 			isRelease=${1}
 			;;
-		--tag|-t)
+		--extra|-e)
 			shift
 			finalTag=${1}
 			RUNNAME="${PWD}/${FILENAME}-${1}.jar"
@@ -100,6 +113,16 @@ while test -n "$1"; do
 		--branch|-b)
 			BRANCH="1"
 			;;
+		--tag|-t)
+			shift
+			REGEX="^[0-9]+(\.[0-9]+(\.[0-9]+)?)?$"
+			CHECKTAG=`echo ${1} | egrep "${REGEX}"`
+			if [ "" = "${CHECKTAG}" ]; then
+				echo "Specified tag ("${1}") is invalid."
+				exit 1;
+			fi;
+			TAGGED="${1}"
+			;;
 	esac
 	shift
 done
@@ -109,21 +132,23 @@ else
 	jarPath="${location}"
 fi
 if [ "${isRelease}" != "" ]; then
-	if [ "${BRANCH}" != "0" ]; then
-		if [ -e "${location}/${isRelease}" ]; then
-			jarPath="${location}/${isRelease}"
-		else
-			echo "Branch "${isRelease}" not found."
-			exit 1;
-		fi
-	else
-		if [ -e "${location}/${isRelease}" ]; then
-			jarPath="${location}/${isRelease}"
+	if [ $isSVN -eq 1 ]; then
+		if [ "${BRANCH}" != "0" ]; then
+			if [ -e "${location}/${isRelease}" ]; then
+				jarPath="${location}/${isRelease}"
+			else
+				echo "Branch "${isRelease}" not found."
+				exit 1;
+			fi
 		else
-			echo "Tag "${isRelease}" not found."
-			exit 1;
-		fi
-	fi
+			if [ -e "${location}/${isRelease}" ]; then
+				jarPath="${location}/${isRelease}"
+			else
+				echo "Tag "${isRelease}" not found."
+				exit 1;
+			fi
+		fi;
+	fi	
 fi
 
 if [ "" = "${jarfile}" ]; then
@@ -133,7 +158,9 @@ if [ "" = "${jarfile}" ]; then
 		OLDPWD=${PWD}
 		cd ${jarPath}
 		if [ "${updateSVN}" = "true" ]; then
-			svn update
+			if [ $isSVN -eq 1 ]; then
+				svn update
+			fi;
 		fi
 		ant clean jar
 		if [ ! -e "dist/DMDirc.jar" ]; then
@@ -158,11 +185,25 @@ for plugin in ${plugins}; do
 done
 jar -uvf "${RUNNAME}" ${pluginList}
 rm -Rf plugins;
-
+doRename=0
 if [ "${isRelease}" != "" ]; then
-	if [ "${BRANCH}" = "1" ]; then
-		isRelease=branch-${isRelease}
-	fi;
+	doRename=1
+elif [ $isSVN -eq 0 -a "${TAGGED}" != "" ]; then
+	doRename=1	
+fi;
+
+if [ ${doRename} -eq 1 ]; then
+	if [ $isSVN -eq 1 ]; then
+		if [ "${BRANCH}" = "1" ]; then
+			isRelease=branch-${isRelease}
+		fi;
+	else
+		if [ "${TAGGED}" = "" ]; then
+			isRelease=branch-${isRelease}
+		else
+			isRelease=${TAGGED}
+		fi;
+	fi
 	if [ "" != "${finalTag}" ]; then
 		finalTag="-${finalTag}"
 	fi;

installer/linux/installerstub.sh

@@ -3,7 +3,7 @@
 # This script installs dmdirc
 #
 # DMDirc - Open Source IRC Client
-# Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+# Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -401,4 +401,4 @@ rm -Rf ${TEMPDIR}
 echo "Installation Completed."
 # Job Done!
 exit 0;
-###END STUB###
+###END STUB###

installer/linux/makeInstallerLinux.sh

@@ -3,7 +3,7 @@
 # This script generates a .run file that will install DMDirc
 #
 # DMDirc - Open Source IRC Client
-# Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+# Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,6 +28,13 @@ INSTALLERNAME=DMDirc-Setup
 # full name of the file to output to
 RUNNAME="${PWD}/${INSTALLERNAME}.run"
 
+# Are we a git working copy, or SVN?
+if [ -e ".svn" ]; then
+	isSVN=1
+else
+	isSVN=0
+fi;
+
 # Find out what params we should pass to things.
 # Solaris has a nice and ancient version of grep in /usr/bin
 grep -na "" /dev/null >/dev/null 2>&1
@@ -110,7 +117,7 @@ showHelp() {
 	echo "    --jre64               Include the 64-Bit JRE in this installer"
 	echo "    --jar <file>          use <file> as DMDirc.jar"
 	echo "    --current             Use the current folder as the base for the build"
-	echo "-t, --tag <tag>           Tag to add to final exe name to distinguish this build from a standard build"
+	echo "-e, --extra <tag>         Tag to add to final exe name to distinguish this build from a standard build"
 	echo "-k, --keep                Keep the existing source tree when compiling"
 	echo "                          (don't svn update beforehand)"
 	echo "---------------------"
@@ -124,11 +131,17 @@ isRelease=""
 finalTag=""
 BRANCH="0"
 plugins=""
-location="../../../"
+if [ $isSVN -eq 1 ]; then
+	location="../../../"
+	current=""
+else
+	location="../../"
+	current="1"
+fi;
 jarfile=""
-current=""
 jre=""
 jrename="jre" # Filename for JRE without the .bin
+TAGGED=""
 while test -n "$1"; do
 	case "$1" in
 		--plugins|-p)
@@ -157,7 +170,7 @@ while test -n "$1"; do
 			shift
 			isRelease=${1}
 			;;
-		--tag|-t)
+		--extra|-e)
 			shift
 			finalTag=${1}
 			RUNNAME="${PWD}/${INSTALLERNAME}-${1}.run"
@@ -171,6 +184,16 @@ while test -n "$1"; do
 		--branch|-b)
 			BRANCH="1"
 			;;
+		--tag|-t)
+			shift
+			REGEX="^[0-9]+(\.[0-9]+(\.[0-9]+)?)?$"
+			CHECKTAG=`echo ${1} | egrep "${REGEX}"`
+			if [ "" = "${CHECKTAG}" ]; then
+				echo "Specified tag ("${1}") is invalid."
+				exit 1;
+			fi;
+			TAGGED="${1}"
+			;;
 	esac
 	shift
 done
@@ -180,21 +203,23 @@ else
 	jarPath="${location}"
 fi
 if [ "${isRelease}" != "" ]; then
-	if [ "${BRANCH}" != "0" ]; then
-		if [ -e "${location}/${isRelease}" ]; then
-			jarPath="${location}/${isRelease}"
-		else
-			echo "Branch "${isRelease}" not found."
-			exit 1;
-		fi
-	else
-		if [ -e "${location}/${isRelease}" ]; then
-			jarPath="${location}/${isRelease}"
+	if [ $isSVN -eq 1 ]; then
+		if [ "${BRANCH}" != "0" ]; then
+			if [ -e "${location}/${isRelease}" ]; then
+				jarPath="${location}/${isRelease}"
+			else
+				echo "Branch "${isRelease}" not found."
+				exit 1;
+			fi
 		else
-			echo "Tag "${isRelease}" not found."
-			exit 1;
+			if [ -e "${location}/${isRelease}" ]; then
+				jarPath="${location}/${isRelease}"
+			else
+				echo "Tag "${isRelease}" not found."
+				exit 1;
+			fi
 		fi
-	fi
+	fi;
 fi
 
 if [ "" = "${jarfile}" ]; then
@@ -241,8 +266,13 @@ echo "Adding stub.."
 cat installerstub.sh > ${RUNNAME}
 
 # Add release info.
-awk '{gsub(/###ADDITIONAL_STUFF###/,"isRelease=\"'${isRelease}'\"");print}' ${RUNNAME} > ${RUNNAME}.tmp
-mv ${RUNNAME}.tmp ${RUNNAME}
+if [ $isSVN -eq 1 ]; then
+	awk '{gsub(/###ADDITIONAL_STUFF###/,"isRelease=\"'${isRelease}'\"");print}' ${RUNNAME} > ${RUNNAME}.tmp
+	mv ${RUNNAME}.tmp ${RUNNAME}
+elif [ "${TAGGED}" != "" ]; then
+	awk '{gsub(/###ADDITIONAL_STUFF###/,"isRelease=\"'${TAGGED}'\"");print}' ${RUNNAME} > ${RUNNAME}.tmp
+	mv ${RUNNAME}.tmp ${RUNNAME}
+fi;
 
 FILES="DMDirc.jar";
 echo "Compressing files.."
@@ -303,6 +333,10 @@ if [ -e "${jarPath}/launcher/unix" ]; then
 	FILES="${FILES} DMDirc.sh"
 fi
 
+if [ -e "uninstall.sh" ]; then
+	FILES="${FILES} uninstall.sh"
+fi
+
 compress $FILES
 
 MD5BIN=`which md5sum`
@@ -363,11 +397,25 @@ fi;
 echo "Chmodding"
 chmod a+x ${RUNNAME}
 
-
+doRename=0
 if [ "${isRelease}" != "" ]; then
-	if [ "${BRANCH}" = "1" ]; then
-		isRelease=branch-${isRelease}
-	fi;
+	doRename=1
+elif [ $isSVN -eq 0 -a "${TAGGED}" != "" ]; then
+	doRename=1	
+fi;
+
+if [ ${doRename} -eq 1 ]; then
+	if [ $isSVN -eq 1 ]; then
+		if [ "${BRANCH}" = "1" ]; then
+			isRelease=branch-${isRelease}
+		fi;
+	else
+		if [ "${TAGGED}" = "" ]; then
+			isRelease=branch-${isRelease}
+		else
+			isRelease=${TAGGED}
+		fi;
+	fi
 	if [ "" != "${finalTag}" ]; then
 		finalTag="-${finalTag}"
 	fi;

installer/linux/setup.sh

@@ -3,7 +3,7 @@
 # This script launches the dmdirc java-based installer.
 #
 # DMDirc - Open Source IRC Client
-# Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+# Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

installer/linux/uninstall.sh

@@ -0,0 +1,178 @@
+#!/bin/sh
+
+if [ ! -e .uninstall.conf ]; then
+	echo "No .uninstall.conf found, unable to continue."
+	exit 1;
+else
+	INSTALLED_AS_ROOT=""
+	INSTALL_LOCATION=""
+	
+	. .uninstall.conf
+fi;
+
+PIDOF=`which pidof`
+if [ -z "${PIDOF}" ]; then
+	# For some reason some distros hide pidof...
+	if [ -e /sbin/pidof ]; then
+		PIDOF=/sbin/pidof
+	elif [ -e /usr/sbin/pidof ]; then
+		PIDOF=/usr/sbin/pidof
+	fi;
+fi;
+
+## Helper Functions
+if [ -n "${PIDOF}" ]; then
+	ISKDE=`${PIDOF} -x -s kdeinit`
+	ISGNOME=`${PIDOF} -x -s gnome-panel`
+else
+	ISKDE=`pgrep kdeinit`
+	ISGNOME=`pgrep gnome-panel`
+fi;
+
+KDIALOG=`which kdialog`
+ZENITY=`which zenity`
+DIALOG=`which dialog`
+JAVA=`which java`
+
+messagedialog() {
+	# Send message to console.
+	echo ""
+	echo "-----------------------------------------------------------------------"
+	echo "DMDirc: ${1}"
+	echo "-----------------------------------------------------------------------"
+	echo "${2}"
+	echo "-----------------------------------------------------------------------"
+
+	if [ "" != "${ISKDE}" -a "" != "${KDIALOG}" -a "" != "${DISPLAY}" ]; then
+		echo "Dialog on Display: ${DISPLAY}"
+		${KDIALOG} --title "DMDirc: ${1}" --msgbox "${2}"
+	elif [ "" != "${ISGNOME}" -a "" != "${ZENITY}" -a "" != "${DISPLAY}" ]; then
+		echo "Dialog on Display: ${DISPLAY}"
+		${ZENITY} --info --title "DMDirc: ${1}" --text "${2}"
+	elif [ "" != "${DIALOG}" ]; then
+		${DIALOG} --title "DMDirc: ${1}" --msgbox "${2}" 8 40
+	fi
+}
+
+questiondialog() {
+	# Send question to console.
+	echo ""
+	echo "-----------------------------------------------------------------------"
+	echo "DMDirc: ${1}"
+	echo "-----------------------------------------------------------------------"
+	echo "${2}"
+	echo "-----------------------------------------------------------------------"
+
+	if [ "" != "${ISKDE}" -a "" != "${KDIALOG}" -a "" != "${DISPLAY}" ]; then
+		echo "Dialog on Display: ${DISPLAY}"
+		${KDIALOG} --title "DMDirc: ${1}" --yesno "${2}"
+	elif [ "" != "${ISGNOME}" -a "" != "${ZENITY}" -a "" != "${DISPLAY}" ]; then
+		echo "Dialog on Display: ${DISPLAY}"
+		${ZENITY} --question --title "DMDirc: ${1}" --text "${2}"
+	elif [ "" != "${DIALOG}" ]; then
+		${DIALOG} --title "DMDirc: ${1}" --yesno "${2}" 8 40
+	else
+		echo "Unable to show Dialog for question, assuming no"
+		return 1
+	fi
+}
+
+errordialog() {
+	# Send error to console.
+	echo ""
+	echo "-----------------------------------------------------------------------"
+	echo "[Error] DMDirc: ${1}"
+	echo "-----------------------------------------------------------------------"
+	echo "${2}"
+	echo "-----------------------------------------------------------------------"
+
+	if [ "" != "${ISKDE}" -a "" != "${KDIALOG}" -a "" != "${DISPLAY}" ]; then
+		echo "Dialog on Display: ${DISPLAY}"
+		${KDIALOG} --title "DMDirc: ${1}" --error "${2}"
+	elif [ "" != "${ISGNOME}" -a "" != "${ZENITY}" -a "" != "${DISPLAY}" ]; then
+		echo "Dialog on Display: ${DISPLAY}"
+		${ZENITY} --error --title "DMDirc: ${1}" --text "${2}"
+	elif [ "" != "${DIALOG}" ]; then
+		${DIALOG} --title "[Error] DMDirc: ${1}" --msgbox "${2}" 8 40
+	fi
+}
+
+if [ ${INSTALLED_AS_ROOT} -eq 1 ]; then
+	USER=`whoami`
+	if [ "${USER}" != "root" ]; then
+		errordialog "Uninstaller" "Uninstall Aborted. Only root can use this script"
+		exit 1;
+	fi
+fi
+
+questiondialog "Uninstaller" "Are you sure you want to uninstall DMDirc?"
+if [ $? -ne 0 ]; then
+	messagedialog "Uninstaller" "Uninstall Aborted."
+	echo "Uninstall Aborted"
+	exit 1;
+fi
+
+${JAVA} -jar ${INSTALL_LOCATION}/DMDirc.jar -k
+
+if [ $? -eq 0 ]; then
+	errordialog "Uninstaller" "Uninstall Aborted - DMDirc is still running. Please close DMDirc before continuing"
+	echo "Uninstall Aborted - DMDirc already running."
+	exit 1;
+fi
+
+echo "Uninstalling DMDirc"
+echo "Removing Shortcuts.."
+
+TOOL=`which gconftool-2`
+COMMAND=""
+FILENAME=""
+if [ ${INSTALLED_AS_ROOT} -eq 1 ]; then
+	COMMAND="${TOOL} --config-source=`${TOOL} --get-default-source`"
+	FILENAME="/usr/share/services/irc.protocol"
+	rm -Rfv /usr/share/applications/DMDirc.desktop
+else
+	COMMAND="${TOOL}"
+	FILENAME="${HOME}/.kde/share/services/irc.protocol"
+	rm -Rfv ${HOME}/.local/share/applications/DMDirc.desktop
+	rm -Rfv ${HOME}/Desktop/DMDirc.desktop
+fi;
+
+if [ "${TOOL}" != "" ]; then
+	CURRENT=`${COMMAND} --get /desktop/gnome/url-handlers/irc/command`
+	if [ "${CURRENT}" = "\"${INSTALL_LOCATION}/DMDirc.sh\" -e -c %s" ]; then
+		echo "Removing Gnome Protocol Handler"
+		${COMMAND} --unset /desktop/gnome/url-handlers/irc/enabled
+		${COMMAND} --unset /desktop/gnome/url-handlers/irc/command
+	else
+		echo "Not Removing Gnome Protocol Handler"
+	fi
+fi
+
+if [ -e "${FILENAME}" ]; then
+	CURRENT=`grep DMDirc ${FILENAME}`
+	if [ "" != "${CURRENT}" ]; then
+		echo "Removing KDE Protocol Handler"
+		rm -Rfv ${FILENAME}
+	else
+		echo "Not Removing KDE Protocol Handler"
+	fi
+fi
+
+echo "Removing Installation Directory"
+
+rm -Rfv ${INSTALL_LOCATION}
+
+PROFILEDIR="${HOME}/.DMDirc"
+
+if [ -e ${PROFILEDIR}/dmdirc.config ]; then
+	questiondialog "Uninstaller" "A DMDirc profile has been detected (${PROFILEDIR}) Do you want to delete it aswell?"
+	if [ $? -eq 0 ]; then
+		rm -Rfv "${PROFILEDIR}"
+	fi
+fi
+
+messagedialog "Uninstaller" "DMDirc Uninstalled Successfully"
+
+echo "Done."
+
+exit 0;

installer/osx/DMDirc-Apple.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

installer/osx/makeInstallerOSX.sh

@@ -3,7 +3,7 @@
 # This script generates a .dmg file that includes dmdirc
 #
 # DMDirc - Open Source IRC Client
-# Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+# Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,6 +28,13 @@ INSTALLERNAME=DMDirc
 # full name of the file to output to
 RUNNAME="${PWD}/${INSTALLERNAME}.dmg"
 
+# Are we a git working copy, or SVN?
+if [ -e ".svn" ]; then
+	isSVN=1
+else
+	isSVN=0
+fi;
+
 # Linux needs an entry in fstab to allow normal users to mount things (like a
 # dmg image).
 # These 2 config vars choose what dir and file we mount so that fstab can be
@@ -105,7 +112,7 @@ showHelp() {
 	echo "-c, --compile             Recompile the .jar file"
 	echo "    --jar <file>          use <file> as DMDirc.jar"
 	echo "    --current             Use the current folder as the base for the build"
-	echo "-t, --tag <tag>           Tag to add to final exe name to distinguish this build from a standard build"
+	echo "-e, --extra <tag>         Tag to add to final exe name to distinguish this build from a standard build"
 	echo "-k, --keep                Keep the existing source tree when compiling"
 	echo "                          (don't svn update beforehand)"
 	echo "---------------------"
@@ -119,9 +126,15 @@ isRelease=""
 finalTag=""
 BRANCH="0"
 plugins=""
-location="../../../"
+if [ $isSVN -eq 1 ]; then
+	location="../../../"
+	current=""
+else
+	location="../../"
+	current="1"
+fi;
 jarfile=""
-current=""
+TAGGED=""
 while test -n "$1"; do
 	case "$1" in
 		--plugins|-p)
@@ -143,7 +156,7 @@ while test -n "$1"; do
 			shift
 			isRelease=${1}
 			;;
-		--tag|-t)
+		--extra|-e)
 			shift
 			finalTag=${1}
 			RUNNAME="${PWD}/${INSTALLERNAME}-${1}.dmg"
@@ -157,6 +170,16 @@ while test -n "$1"; do
 		--branch|-b)
 			BRANCH="1"
 			;;
+		--tag|-t)
+			shift
+			REGEX="^[0-9]+(\.[0-9]+(\.[0-9]+)?)?$"
+			CHECKTAG=`echo ${1} | egrep "${REGEX}"`
+			if [ "" = "${CHECKTAG}" ]; then
+				echo "Specified tag ("${1}") is invalid."
+				exit 1;
+			fi;
+			TAGGED="${1}"
+			;;
 	esac
 	shift
 done
@@ -166,19 +189,21 @@ else
 	jarPath="${location}"
 fi
 if [ "${isRelease}" != "" ]; then
-	if [ "${BRANCH}" != "0" ]; then
-		if [ -e "${location}/${isRelease}" ]; then
-			jarPath="${location}/${isRelease}"
+	if [ $isSVN -eq 1 ]; then
+		if [ "${BRANCH}" != "0" ]; then
+			if [ -e "${location}/${isRelease}" ]; then
+				jarPath="${location}/${isRelease}"
+			else
+				echo "Branch "${isRelease}" not found."
+				exit 1;
+			fi
 		else
-			echo "Branch "${isRelease}" not found."
-			exit 1;
-		fi
-	else
-		if [ -e "${location}/${isRelease}" ]; then
-			jarPath="${location}/${isRelease}"
-		else
-			echo "Tag "${isRelease}" not found."
-			exit 1;
+			if [ -e "${location}/${isRelease}" ]; then
+				jarPath="${location}/${isRelease}"
+			else
+				echo "Tag "${isRelease}" not found."
+				exit 1;
+			fi
 		fi
 	fi
 fi
@@ -238,11 +263,26 @@ mkdir -pv ${MACOSDIR}
 echo "Creating meta files"
 echo "APPLDMDI" > ${CONTENTSDIR}/PkgInfo
 
+doRename=0
 if [ "${isRelease}" != "" ]; then
-	if [ "${BRANCH}" = "1" ]; then
-		bundleVersion=branch-${isRelease}
+	doRename=1
+elif [ $isSVN -eq 0 -a "${TAGGED}" != "" ]; then
+	doRename=1	
+fi;
+
+if [ ${doRename} -eq 1 ]; then
+	if [ $isSVN -eq 1 ]; then
+		if [ "${BRANCH}" = "1" ]; then
+			bundleVersion=branch-${isRelease}
+		else
+			bundleVersion=${isRelease}
+		fi;
 	else
-		bundleVersion=${isRelease}
+		if [ "${TAGGED}" = "" ]; then
+			bundleVersion=branch-${isRelease}
+		else
+			bundleVersion=${TAGGED}
+		fi;
 	fi
 else
 	bundleVersion="trunk-"`date +%Y%m%d_%H%M%S`
@@ -436,10 +476,18 @@ fi;
 
 echo "DMG Creation complete!"
 
-if [ "${isRelease}" != "" ]; then
-	if [ "${BRANCH}" = "1" ]; then
-		isRelease=branch-${isRelease}
-	fi;
+if [ ${doRename} -eq 1 ]; then
+	if [ $isSVN -eq 1 ]; then
+		if [ "${BRANCH}" = "1" ]; then
+			isRelease=branch-${isRelease}
+		fi;
+	else
+		if [ "${TAGGED}" = "" ]; then
+			isRelease=branch-${isRelease}
+		else
+			isRelease=${TAGGED}
+		fi;
+	fi
 	if [ "" != "${finalTag}" ]; then
 		finalTag="-${finalTag}"
 	fi;

installer/release.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Jar names of plugins to add to ALL installers. (* means all)
-plugins="dcc.jar dns.jar identd.jar lagdisplay.jar logging.jar systray.jar timeplugin.jar osdplugin.jar"
+plugins="ui_swing.jar ui_dummy.jar dcc.jar dns.jar identd.jar lagdisplay.jar logging.jar systray.jar timeplugin.jar osdplugin.jar"
 
 # Additional Jar names of plugins to add to only Windows installers. (* means all)
 plugins_windows=""
@@ -12,13 +12,29 @@ plugins_linux=""
 # Additional Jar names of plugins to add to only osx installers. (* means all)
 plugins_osx=""
 
+# Are we a git working copy, or SVN?
+if [ -e ".svn" ]; then
+	isSVN=1
+else
+	isSVN=0
+fi;
+
+
 showHelp() {
 	echo "This will generate the different DMDirc installers."
-	echo "Usage: ${0} [params] <release>"
-	echo "Release can be either 'trunk', 'this', a valid tag, or a branch (if -b is passed)"
+	if [ ${isSVN} -eq 1 ]; then
+		echo "Usage: ${0} [params] <release>"
+		echo "Release can be either 'trunk', 'this', a valid tag, or a branch (if -b is passed)"
+	else
+		echo "Usage: ${0} [params]"
+	fi;
 	echo "The following params are known:"
 	echo "---------------------"
-	echo "-b,  --branch                       <release> is a branch"
+	if [ ${isSVN} -eq 1 ]; then
+		echo "-b,  --branch                       <release> is a branch"
+	else
+		echo "-t,  --tag <release>                This is a tagged release"
+	fi;
 	echo "     --jar <file>                   Use <file> instead of compiling a jar."
 	echo "     --fulljar <file>               Use <file> instead of compiling a jar, and don't run makeJar on it."
 	echo "     --jre                          Include a jre in the installers."
@@ -45,6 +61,7 @@ FULLJAR=""
 BUILDTARGET=""
 UPLOAD="0"
 TAG="0"
+TAGGED=""
 while test -n "$1"; do
 	LAST=${1}
 	case "$1" in
@@ -93,10 +110,24 @@ while test -n "$1"; do
 		--branch|-b)
 			BRANCH="-b "
 			;;
+		--tag|-t)
+			shift
+			REGEX="^[0-9]+(\.[0-9]+(\.[0-9]+)?)?$"
+			CHECKTAG=`echo ${1} | egrep "${REGEX}"`
+			if [ "" = "${CHECKTAG}" ]; then
+				echo "Specified tag ("${1}") is invalid."
+				exit 1;
+			fi;
+			TAGGED="-t ${1} "
+			;;
 	esac
 	shift
 done
 
+if [ ! -e output ]; then
+	mkdir output
+fi;
+
 if [ "${plugins}" = "*" -o "${plugins_linux}" = "*" -o "${plugins_windows}" = "*" -o "${plugins_osx}" = "*" ]; then
 	echo "Something is all.";
 	allPlugins=""
@@ -109,53 +140,62 @@ if [ "${plugins}" = "*" -o "${plugins_linux}" = "*" -o "${plugins_windows}" = "*
 	if [ "${plugins_osx}" = "*" ]; then plugins_osx=${allPlugins}; fi
 fi;
 
-VERSION=""
-if [ "${LAST}" != "" ]; then
-	if [ "${LAST}" = "trunk" ]; then
-		VERSION="Trunk"
-		RELEASE=""
-	elif [ "${LAST}" = "this" ]; then
-		# Work out what type of build this is!
-		thisDIR=${PWD}
-		cd ..
-		tempDIR=${PWD##*/}
-		if [ "${tempDIR}" = "trunk" ]; then
+if [ ${isSVN} -eq 1 ]; then
+	VERSION=""
+	if [ "${LAST}" != "" ]; then
+		if [ "${LAST}" = "trunk" ]; then
 			VERSION="Trunk"
-			echo "This is a trunk release.";
-		else
-			echo "This is not a trunk release.";
-			VERSION=${tempDIR}
+			RELEASE=""
+		elif [ "${LAST}" = "this" ]; then
+			# Work out what type of build this is!
+			thisDIR=${PWD}
 			cd ..
 			tempDIR=${PWD##*/}
-			if [ "${tempDIR}" = "tags" ]; then
-				echo "Release of tag "${version}
-				RELEASE="-r "${VERSION}
-				TAG="1"
-			elif [ "${tempDIR}" = "branches" ]; then
-				echo "Release of branch "${version}
-				BRANCH="-b "
-				RELEASE="-r "${VERSION}
+			if [ "${tempDIR}" = "trunk" ]; then
+				VERSION="Trunk"
+				echo "This is a trunk release.";
 			else
-				VERSION="Unknown"
-				echo "Unknown release target - Building as trunk build"
-				OPT="--current ${OPT}"
-			fi
-		fi;
-		cd ${thisDIR}
-	elif [ "${BRANCH}" != "" -a ! -e "../../branches/"${LAST} ]; then
-		echo "Branch '"${LAST}"' not found."
-		exit 1;
-	elif [ "${BRANCH}" = "" -a ! -e "../../tags/"${LAST} ]; then
-		echo "Tag '"${LAST}"' not found."
-		exit 1;
+				echo "This is not a trunk release.";
+				VERSION=${tempDIR}
+				cd ..
+				tempDIR=${PWD##*/}
+				if [ "${tempDIR}" = "tags" ]; then
+					echo "Release of tag "${version}
+					RELEASE="-r "${VERSION}
+					TAG="1"
+				elif [ "${tempDIR}" = "branches" ]; then
+					echo "Release of branch "${version}
+					BRANCH="-b "
+					RELEASE="-r "${VERSION}
+				else
+					VERSION="Unknown"
+					echo "Unknown release target - Building as trunk build"
+					OPT="--current ${OPT}"
+				fi
+			fi;
+			cd ${thisDIR}
+		elif [ "${BRANCH}" != "" -a ! -e "../../branches/"${LAST} ]; then
+			echo "Branch '"${LAST}"' not found."
+			exit 1;
+		elif [ "${BRANCH}" = "" -a ! -e "../../tags/"${LAST} ]; then
+			echo "Tag '"${LAST}"' not found."
+			exit 1;
+		else
+			RELEASE="-r "${LAST}
+		fi
 	else
-		RELEASE="-r "${LAST}
+		echo "Usage: ${0} [params] <release>"
+		echo "Release can be either 'this', 'trunk' or a valid tag. (see ${0} --help for further information)"
+		exit 1;
 	fi
 else
-	echo "Usage: ${0} [params] <release>"
-	echo "Release can be either 'this', 'trunk' or a valid tag. (see ${0} --help for further information)"
-	exit 1;
-fi
+	VERSION=`git branch | grep ^* | sed "s/^* //g"`
+	if [ "${VERSION}" = "master" ]; then
+		RELEASE=""
+	else
+		RELEASE="-r ${VERSION}"
+	fi;
+fi;
 
 JAR=`which jar`
 JAVAC=`which javac`
@@ -196,7 +236,7 @@ if [ "" = "${FULLJAR}" ]; then
 	echo "Building Release Jar"
 	echo "================================================================"
 	cd jar
-	./makeJar.sh ${OPT}${JARFILE}${JRE}-c -k -s ${BRANCH}${RELEASE} -p "${plugins}"
+	./makeJar.sh ${OPT}${JARFILE}${JRE}-c -k -s ${TAGGED}${BRANCH}${RELEASE} -p "${plugins}"
 	RESULT=${?}
 	cd ${THISDIR}
 
@@ -214,7 +254,7 @@ if [ "linux" = "${BUILDTARGET}" -o "" = "${BUILDTARGET}" ]; then
 	echo "Building linux installer"
 	echo "================================================================"
 	cd linux
-	./makeInstallerLinux.sh ${OPT}${JARFILE}${JRE}-k ${BRANCH}${RELEASE} -p "${plugins_linux}"
+	./makeInstallerLinux.sh ${OPT}${JARFILE}${JRE}-k ${TAGGED}${BRANCH}${RELEASE} -p "${plugins_linux}"
 	cd ${THISDIR}
 fi;
 
@@ -223,7 +263,7 @@ if [ "windows" = "${BUILDTARGET}" -o "" = "${BUILDTARGET}" ]; then
 	echo "Building Windows installer"
 	echo "================================================================"
 	cd windows
-	./makeInstallerWindows.sh ${OPT}${JARFILE}${JRE}-k -s ${BRANCH}${RELEASE} -p "${plugins_windows}"
+	./makeInstallerWindows.sh ${OPT}${JARFILE}${JRE}-k -s ${TAGGED}${BRANCH}${RELEASE} -p "${plugins_windows}"
 	cd ${THISDIR}
 fi;
 
@@ -232,7 +272,7 @@ if [ "osx" = "${BUILDTARGET}" -o "" = "${BUILDTARGET}" ]; then
 	echo "Building OSX Bundle"
 	echo "================================================================"
 	cd osx
-	./makeInstallerOSX.sh ${OPT}${JARFILE}-k -s ${BRANCH}${RELEASE} -p "${plugins_osx}"
+	./makeInstallerOSX.sh ${OPT}${JARFILE}-k -s ${TAGGED}${BRANCH}${RELEASE} -p "${plugins_osx}"
 	cd ${THISDIR}
 fi;
 

installer/windows/Launcher.dpr

@@ -2,7 +2,7 @@
  * This application launches the dmdirc java-based installer.
  * 
  * DMDirc - Open Source IRC Client
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

installer/windows/Setup.dpr

@@ -2,7 +2,7 @@
  * This application launches the dmdirc java-based installer.
  * 
  * DMDirc - Open Source IRC Client
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

installer/windows/makeInstallerWindows.sh

@@ -3,7 +3,7 @@
 # This script generates a .exe file that will install DMDirc
 #
 # DMDirc - Open Source IRC Client
-# Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+# Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -35,6 +35,13 @@ INTNAME="${PWD}/${INTNAME}"
 # Get 7zip path
 ZIP=`which 7z`
 
+# Are we a git working copy, or SVN?
+if [ -e ".svn" ]; then
+	isSVN=1
+else
+	isSVN=0
+fi;
+
 if [ "" = "${ZIP}" ]; then
 	echo "7Zip not found, failing."
 	exit 1;
@@ -98,11 +105,17 @@ signEXE="true"
 compilerFlags="-Xs -XX -O2 -Or -Op1"
 BRANCH="0"
 plugins=""
-location="../../../"
+if [ $isSVN -eq 1 ]; then
+	location="../../../"
+	current=""
+else
+	location="../../"
+	current="1"
+fi;
 jarfile=""
-current=""
 jre=""
 jrename="jre" # Filename for JRE without the .exe
+TAGGED=""
 
 showHelp() {
 	echo "This will generate a DMDirc installer for a windows based system."
@@ -112,11 +125,11 @@ showHelp() {
 	echo "-r, --release <version>   Generate a file based on an svn tag (or branch with -b aswell)"
 	echo "-b, --branch              Release in -r is a branch "
 	echo "-s, --setup               Recompile the .exe file"
-	echo "-e,                       If setup.exe compile fails, use old version"
+	echo "-o,                       If setup.exe compile fails, use old version"
 	echo "-p, --plugins <plugins>   What plugins to add to the jar file"
 	echo "-c, --compile             Recompile the .jar file"
 	echo "-u, --unsigned            Don't sign the exe"
-	echo "-t, --tag <tag>           Tag to add to final exe name to distinguish this build from a standard build"
+	echo "-e, --extra <tag>         Tag to add to final exe name to distinguish this build from a standard build"
 	echo "-f, --flags <flags>       Extra flags to pass to the compiler"
 	echo "    --jre                 Include the JRE in this installer"
 	echo "    --jar <file>          use <file> as DMDirc.jar"
@@ -160,14 +173,14 @@ while test -n "$1"; do
 		--setup|-s)
 			compileSetup="true"
 			;;
-		-e)
+		-o)
 			useOldSetup="true"
 			;;
 		--release|-r)
 			shift
 			isRelease=${1}
 			;;
-		--tag|-t)
+		--extra|-e)
 			shift
 			finalTag="-${1}"
 			;;
@@ -190,6 +203,16 @@ while test -n "$1"; do
 		--branch|-b)
 			BRANCH="1"
 			;;
+		--tag|-t)
+			shift
+			REGEX="^[0-9]+(\.[0-9]+(\.[0-9]+)?)?$"
+			CHECKTAG=`echo ${1} | egrep "${REGEX}"`
+			if [ "" = "${CHECKTAG}" ]; then
+				echo "Specified tag ("${1}") is invalid."
+				exit 1;
+			fi;
+			TAGGED="${1}"
+			;;
 	esac
 	shift
 done
@@ -212,19 +235,21 @@ else
 	jarPath="${location}"
 fi
 if [ "${isRelease}" != "" ]; then
-	if [ "${BRANCH}" != "0" ]; then
-		if [ -e "${location}/${isRelease}" ]; then
-			jarPath="${location}/${isRelease}"
-		else
-			echo "Branch "${isRelease}" not found."
-			exit 1;
-		fi
-	else
-		if [ -e "${location}/${isRelease}" ]; then
-			jarPath="${location}/${isRelease}"
+	if [ $isSVN -eq 1 ]; then
+		if [ "${BRANCH}" != "0" ]; then
+			if [ -e "${location}/${isRelease}" ]; then
+				jarPath="${location}/${isRelease}"
+			else
+				echo "Branch "${isRelease}" not found."
+				exit 1;
+			fi
 		else
-			echo "Tag "${isRelease}" not found."
-			exit 1;
+			if [ -e "${location}/${isRelease}" ]; then
+				jarPath="${location}/${isRelease}"
+			else
+				echo "Tag "${isRelease}" not found."
+				exit 1;
+			fi
 		fi
 	fi
 fi
@@ -268,8 +293,11 @@ else
 	rm -Rf plugins;
 fi
 
-
-echo "	ReleaseNumber: String = '${isRelease}';" > SetupConsts.inc
+if [ $isSVN -eq 1 -o "${TAGGED}" = "" ]; then
+	echo "	ReleaseNumber: String = '${isRelease}';" > SetupConsts.inc
+else
+	echo "	ReleaseNumber: String = '${TAGGED}';" > SetupConsts.inc
+fi;
 
 FILES=""
 # Icon Res file
@@ -284,19 +312,25 @@ echo "extractor RCDATA extractor.exe" > files.rc
 
 COMPILER_IS_BROKEN="0";
 
+if [ $isSVN -eq 1 -o "${TAGGED}" = "" ]; then
+	NUM="${1}"
+else
+	NUM="${TAGGED}"
+fi;
+
 # Version Numbers
-if [ "" = "${1}" ]; then
+if [ "" = "${NUM}" ]; then
 	MAJORVER="0"
 	MINORVER="0"
 	RELEASE="0"
-	TEXTVER="Trunk"
+	TEXTVER="${isRelease}"
 	PRIVATE="1"
 	USER=`whoami`
 	HOST=`hostname`
 	DATE=`date`
 else
-	MAJORVER=${1%%.*}
-	SUBVER=${1#*.}
+	MAJORVER=${NUM%%.*}
+	SUBVER=${NUM#*.}
 	DOT=`expr index "${SUBVER}" .`
 	if [ "${DOT}" = "0" ]; then
 		MINORVER=${SUBVER}
@@ -305,7 +339,7 @@ else
 		MINORVER=${SUBVER%%.*}
 		RELEASE=${SUBVER##*.}
 	fi
-	TEXTVER=$1
+	TEXTVER=$NUM
 	PRIVATE="0"
 fi;
 
@@ -346,7 +380,7 @@ echo "			VALUE \"FileDescription\", \"Uninstaller for DMDirc\"" >> uninstallvers
 
 echo "			VALUE \"FileVersion\", \"2.0\"" > version.rc.2
 echo "			VALUE \"InternalName\", \"DMDirc.jar\"" >> version.rc.2
-echo "			VALUE \"LegalCopyright\", \"Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes\"" >> version.rc.2
+echo "			VALUE \"LegalCopyright\", \"Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes\"" >> version.rc.2
 echo "			VALUE \"OriginalFilename\", \"$2\"" >> version.rc.2
 echo "			VALUE \"ProductName\", \"DMDirc\"" >> version.rc.2
 echo "			VALUE \"ProductVersion\", \"${TEXTVER}\"" >> version.rc.2
@@ -517,10 +551,13 @@ echo "Creating config.."
 echo ";!@Install@!UTF-8!" > 7zip.conf
 if [ "${isRelease}" != "" ]; then
 	echo "Title=\"DMDirc Installation "${isRelease}"\"" >> 7zip.conf
-#	echo "BeginPrompt=\"Do you want to install DMDirc "${isRelease}"?\"" >> 7zip.conf
+	echo "BeginPrompt=\"Do you want to install DMDirc "${isRelease}"?\"" >> 7zip.conf
+elif [ "${TAGGED}" != "" ]; then
+	echo "Title=\"DMDirc Installation "${TAGGED}"\"" >> 7zip.conf
+	echo "BeginPrompt=\"Do you want to install DMDirc "${TAGGED}"?\"" >> 7zip.conf
 else
-	echo "Title=\"DMDirc Installation\"" > 7zip.conf
-#	echo "BeginPrompt=\"Do you want to install DMDirc?\"" >> 7zip.conf
+	echo "Title=\"DMDirc Installation\"" >> 7zip.conf
+	echo "BeginPrompt=\"Do you want to install DMDirc?\"" >> 7zip.conf
 fi;
 echo "ExecuteFile=\"Setup.exe\"" >> 7zip.conf
 echo ";!@InstallEnd@!" >> 7zip.conf
@@ -538,12 +575,27 @@ fi;
 echo "Creating .exe"
 cat 7zS.sfx 7zip.conf "${INTNAME}" > "${RUNNAME}"
 
+doRename=0
 if [ "${isRelease}" != "" ]; then
-	if [ "${BRANCH}" = "1" ]; then
-		releaseTag=branch-${isRelease}
+	doRename=1
+elif [ $isSVN -eq 0 -a "${TAGGED}" != "" ]; then
+	doRename=1
+fi;
+
+if [ ${doRename} -eq 1 ]; then
+	if [ $isSVN -eq 1 ]; then
+		if [ "${BRANCH}" = "1" ]; then
+			releaseTag=branch-${isRelease}
+		else
+			releaseTag=${isRelease}
+		fi;
 	else
-		releaseTag=${isRelease};
-	fi;
+		if [ "${TAGGED}" = "" ]; then
+			releaseTag=branch-${isRelease}
+		else
+			releaseTag=${TAGGED}
+		fi;
+	fi
 	ORIGNAME="DMDirc-${releaseTag}-Setup${finalTag}.exe"
 else
 	ORIGNAME="${INSTALLNAME}${finalTag}.exe"

launcher/unix/DMDirc.sh

@@ -3,7 +3,7 @@
 # This script launches dmdirc and attempts to update the jar file if needed.
 #
 # DMDirc - Open Source IRC Client
-# Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+# Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -168,10 +168,12 @@ else
 	jar=`dirname $0`/DMDirc.jar
 fi
 launcherUpdater=${profiledir}/updateLauncher.sh
+BSDJava1="/usr/local/jdk1.6.0/jre/bin/java"
+BSDJava2="/usr/local/diablo-jdk1.6.0/jre/bin/java"
 echo "---------------------"
 echo "DMDirc - Open Source IRC Client"
 echo "Launcher Version: ${LAUNCHERVERSION}"
-echo "Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes"
+echo "Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes"
 echo "---------------------"
 if [ "${ISOSX}" = "1" ]; then
 	echo "Running on OS X."
@@ -344,21 +346,20 @@ if [ "${ISOSX}" = "1" ]; then
 		JAVA="/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Commands/java"
 	fi;
 else
-	# Location where ports on FreeBSD/PCBSD installs java6
-	# check it first, because it isn't added to the path automatically
-	JAVA="/usr/local/jdk1.6.0/jre/bin/java"
+	if [ -e "${HOME}/.profile" ]; then
+		# Source the profile incase java can't be found otherwise
+		. ${HOME}/.profile
+	fi;
+	JAVA=`which java`
 	if [ ! -e "${JAVA}" ]; then
-		# Try alternative BSD Location
-		JAVA="/usr/local/diablo-jdk1.6.0/jre/bin/java"
+		# Location where ports on FreeBSD/PCBSD installs java6
+		# check it first, because it isn't added to the path automatically
+		JAVA=${BSDJava1}
 		if [ ! -e "${JAVA}" ]; then
-			# Look in path
-			if [ -e "${HOME}/.profile" ]; then
-				# Source the profile incase java can't be found otherwise
-				. ${HOME}/.profile
-			fi;
-			JAVA=`which java`
-		fi
-	fi
+			# Try alternative BSD Location
+			JAVA=${BSDJava2}
+		fi;
+	fi;
 fi;
 
 if [ "" != "${JAVA}" ]; then
@@ -384,17 +385,36 @@ if [ -e "${jar}" ]; then
 	# error message to be printed.
 	${JAVA} -jar ${jar} --help >/dev/null 2>&1
 	if [ $? -ne 0 ]; then
-		echo "Failed."
-		ERROR="Sorry, the currently installed version of java is not compatible with DMDirc.";
-		ERROR=${ERROR}"\n";
-		if [ "${ISOSX}" = "1" ]; then
-			ERROR=${ERROR}"\nDMDirc requires a 1.6.0 compatible JVM.";
-		else
-			ERROR=${ERROR}"\nDMDirc requires a 1.6.0 compatible JVM, you can get one from: http://www.java.com";
-			ERROR=${ERROR}"\nor reinstall DMDirc and let the installer install one for you.";
+		FAILED=1
+		# If we are on BSD, check to see if there is alternative versions of java
+		# than the one in the path.
+		if [ "`echo ${KERNEL} | grep -i BSD`" != "" ]; then
+			if [ "${JAVA}" != "${BSDJava1}" -a "${JAVA}" != "${BSDJava2}" ]; then
+				JAVA=${BSDJava1}
+				if [ ! -e "${JAVA}" ]; then
+					JAVA=${BSDJava2}
+				fi;
+				# Now check to see if DMDirc runs again.
+				${JAVA} -jar ${jar} --help >/dev/null 2>&1
+				if [ $? -eq 0 ]; then
+					# It runs!
+					FAILED=0
+				fi;
+			fi;
+		fi;
+		if [ ${FAILED} -eq 1 ]; then
+			echo "Failed."
+			ERROR="Sorry, the currently installed version of java is not compatible with DMDirc.";
+			ERROR=${ERROR}"\n";
+			if [ "${ISOSX}" = "1" ]; then
+				ERROR=${ERROR}"\nDMDirc requires a 1.6.0 compatible JVM.";
+			else
+				ERROR=${ERROR}"\nDMDirc requires a 1.6.0 compatible JVM, you can get one from: http://www.java.com";
+				ERROR=${ERROR}"\nor reinstall DMDirc and let the installer install one for you.";
+			fi;
+			errordialog "Unable to launch dmdirc!" "${ERROR}";
+			exit 1;
 		fi;
-		errordialog "Unable to launch dmdirc!" "${ERROR}";
-		exit 1;
 	fi
 
 	# Now we can run the client for real, this allows stderr/stdout output

launcher/windows/version.rc

@@ -15,7 +15,7 @@ BEGIN
 			VALUE "FileDescription", "Launcher for DMDirc"
 			VALUE "FileVersion", "2.0"
 			VALUE "InternalName", "DMDirc.exe"
-			VALUE "LegalCopyright", "Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes"
+			VALUE "LegalCopyright", "Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes"
 			VALUE "OriginalFilename", "$2"
 			VALUE "ProductName", "DMDirc Launcher"
 		END

nbproject/build-impl.xml

@@ -57,12 +57,6 @@ is divided into following sections:
                 </not>
             </and>
         </condition>
-        <condition property="manifest.available+main.class+mkdist.available">
-            <and>
-                <istrue value="${manifest.available+main.class}"/>
-                <isset property="libs.CopyLibs.classpath"/>
-            </and>
-        </condition>
         <condition property="have.tests">
             <or>
                 <available file="${test.src.dir}"/>

nbproject/project.properties

@@ -1,14 +1,11 @@
-application.title=DMDirc
-application.vendor=greboid
 file.reference.fest-assert-1.0a1.jar=lib/fest-assert-1.0a1.jar
 file.reference.fest-reflect-0.4.jar=lib/fest-reflect-0.4.jar
 file.reference.fest-swing-1.0b1.jar=lib/fest-swing-1.0b1.jar
 file.reference.fest-swing-junit-1.0b1.jar=lib/fest-swing-junit-1.0b1.jar
 file.reference.fest-util-0.4.jar=lib/fest-util-0.4.jar
-
-file.reference.junit-4.1.jar=lib/junit-4.1.jar
-libs.junit.classpath=/usr/share/java/junit.jar
-libs.junit.javadoc=
+file.reference.miglayout.jar=lib/miglayout-3.6.3.jar
+file.reference.junit-4.jar=lib/junit-4.1.jar
+file.reference.junit-3.jar=lib/junit-3.8.1.jar
 
 doccheck.path=doccheck.jar
 doccheck.dir=reports/doccheck/
@@ -35,7 +32,7 @@ dist.jar.excludes=com/dmdirc/addons/**
 excludes=
 includes=**
 jar.compress=false
-javac.classpath=
+javac.classpath=${file.reference.miglayout.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=-Xlint:all
 javac.deprecation=true
@@ -44,8 +41,7 @@ javac.target=1.6
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\
-    ${libs.junit.classpath}:\
-    ${file.reference.junit-4.1.jar}:\
+    ${file.reference.junit-4.jar}:\
     ${file.reference.fest-swing-junit-1.0b1.jar}:\
     ${file.reference.fest-swing-1.0b1.jar}:\
     ${file.reference.fest-assert-1.0a1.jar}:\
@@ -76,7 +72,7 @@ run.jvmargs=
 run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}:\
-    ${libs.junit.classpath}:\
-    ${file.reference.junit-4.1.jar}
+    ${file.reference.junit-4.jar}:\
+    ${file.reference.junit-4.jar}
 src.dir=src
 test.src.dir=test

src/com/dmdirc/CertificateManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/Channel.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -163,31 +163,19 @@ public final class Channel extends MessageTarget
             return;
         }
 
-        if (line.indexOf('\n') > -1) {
-            for (String part : line.split("\n")) {
-                sendLine(part);
-            }
-
-            return;
-        }
-
         final ClientInfo me = server.getParser().getMyself();
-        final String modes = getModes(channelInfo.getUser(me));
         final String[] details = getDetails(channelInfo.getUser(me), showColours);
 
-        if (line.length() <= getMaxLineLength()) {
+        for (String part : splitLine(window.getTranscoder().encode(line))) {
             final StringBuffer buff = new StringBuffer("channelSelfMessage");
 
             ActionManager.processEvent(CoreActionType.CHANNEL_SELF_MESSAGE, buff,
-                    this, channelInfo.getUser(me), line);
+                    this, channelInfo.getUser(me), part);
 
-            addLine(buff, modes, details[0], details[1], details[2],
-                    window.getTranscoder().encode(line), channelInfo);
+            addLine(buff, details[0], details[1], details[2], details[3],
+                    part, channelInfo);
 
-            channelInfo.sendMessage(window.getTranscoder().encode(line));
-        } else {
-            sendLine(line.substring(0, getMaxLineLength()));
-            sendLine(line.substring(getMaxLineLength()));
+            channelInfo.sendMessage(part);
         }
     }
 
@@ -209,7 +197,7 @@ public final class Channel extends MessageTarget
         }
 
         final ClientInfo me = server.getParser().getMyself();
-        final String modes = channelInfo.getUser(me).getImportantModePrefix();
+        final String[] details = getDetails(channelInfo.getUser(me), showColours);
 
         if (server.getParser().getMaxLength("PRIVMSG", getChannelInfo().getName())
                 <= action.length()) {
@@ -220,8 +208,8 @@ public final class Channel extends MessageTarget
             ActionManager.processEvent(CoreActionType.CHANNEL_SELF_ACTION, buff,
                     this, channelInfo.getUser(me), action);
 
-            addLine(buff, modes, me.getNickname(), me.getIdent(),
-                    me.getHost(), window.getTranscoder().encode(action), channelInfo);
+            addLine(buff, details[0], details[1], details[2], details[3],
+                    window.getTranscoder().encode(action), channelInfo);
 
             channelInfo.sendAction(window.getTranscoder().encode(action));
         }
@@ -509,7 +497,7 @@ public final class Channel extends MessageTarget
      * @param showColours Whether or not to show colours
      * @return A string[] containing displayable components
      */
-    private static String[] getDetails(final ChannelClientInfo client,
+    private String[] getDetails(final ChannelClientInfo client,
             final boolean showColours) {
         if (client == null) {
             // WTF?
@@ -517,10 +505,11 @@ public final class Channel extends MessageTarget
                      + " null ChannelClientInfo");
         }
 
-        final String[] res = new String[3];
-        res[0] = Styliser.CODE_NICKNAME + client.getNickname() + Styliser.CODE_NICKNAME;
-        res[1] = client.getClient().getIdent();
-        res[2] = client.getClient().getHost();
+        final String[] res = new String[4];
+        res[0] = getModes(client);
+        res[1] = Styliser.CODE_NICKNAME + client.getNickname() + Styliser.CODE_NICKNAME;
+        res[2] = client.getClient().getIdent();
+        res[3] = client.getClient().getHost();
 
         if (showColours) {
             final Map map = client.getMap();
@@ -537,7 +526,7 @@ public final class Channel extends MessageTarget
             }
 
             if (prefix != null) {
-                res[0] = prefix + res[0] + Styliser.CODE_HEXCOLOUR;
+                res[1] = prefix + res[1] + Styliser.CODE_HEXCOLOUR;
             }
         }
 
@@ -560,7 +549,6 @@ public final class Channel extends MessageTarget
             // Format ChannelClientInfos
 
             final ChannelClientInfo clientInfo = (ChannelClientInfo) arg;
-            args.add(getModes(clientInfo));
             args.addAll(Arrays.asList(getDetails(clientInfo, showColours)));
 
             return true;

src/com/dmdirc/ChannelClientProperty.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/ChannelEventHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/CustomWindow.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/EventHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/FrameContainer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/FrameContainerComparator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/GlobalWindow.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/IgnoreList.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/Invite.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/Main.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,19 +26,25 @@ import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.commandline.CommandLineParser;
 import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.logger.DMDircExceptionHandler;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.plugins.PluginManager;
+import com.dmdirc.plugins.Service;
 import com.dmdirc.ui.themes.ThemeManager;
-import com.dmdirc.ui.dummy.DummyController;
 import com.dmdirc.ui.interfaces.UIController;
-import com.dmdirc.ui.swing.SwingController;
+import com.dmdirc.ui.NoUIDialog;
 import com.dmdirc.updater.UpdateChannel;
 import com.dmdirc.updater.UpdateChecker;
+import com.dmdirc.util.resourcemanager.ResourceManager;
 
 import java.awt.GraphicsEnvironment;
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -96,8 +102,10 @@ public final class Main {
         Thread.setDefaultUncaughtExceptionHandler(new DMDircExceptionHandler());
 
         final CommandLineParser clp = new CommandLineParser(args);
-
+        
         IdentityManager.load();
+
+        final PluginManager pm = PluginManager.getPluginManager();
         
         ThemeManager.loadThemes();
 
@@ -105,13 +113,15 @@ public final class Main {
 
         CommandManager.initCommands();
 
+        loadUI(pm, IdentityManager.getGlobalConfig(), true);
+
         getUI().initUISettings();
 
         doFirstRun();
 
         ActionManager.init();
 
-        PluginManager.getPluginManager();
+        pm.doAutoLoad();
 
         ActionManager.loadActions();
 
@@ -135,6 +145,53 @@ public final class Main {
             }
         }, "Shutdown thread"));        
     }
+
+    /**
+     * Attempts to find and activate a service which provides a UI that we
+     * can use.
+     *
+     * @param pm The plugin manager to use to load plugins
+     * @param cm The config manager to use to retrieve settings
+     * @param tryExtracting If no suitable plugins are found and tryExtracting
+     * is true, the method will try extracting core UI plugins bundled with
+     * DMDirc before giving up.
+     */
+    protected static void loadUI(final PluginManager pm, final ConfigManager cm,
+            final boolean tryExtracting) {
+        final List<Service> uis = pm.getServicesByType("ui");
+        final String desired = cm.getOption("general", "ui", "swing");
+
+        // First try: go for our desired service type
+        for (Service service : uis) {
+            if (service.getName().equals(desired) && service.activate()) {
+                return;
+            }
+        }
+
+        // Second try: go for any service type
+        for (Service service : uis) {
+            if (service.activate()) {
+                return;
+            }
+        }
+
+        // Third try: extract some core plugins and go again
+        if (tryExtracting) {
+            extractCorePlugins("ui_");
+            pm.getPossiblePluginInfos(true);
+
+            loadUI(pm, cm, false);
+            return;
+        }
+
+        if (!GraphicsEnvironment.isHeadless()) {
+            // Show a dialog informing the user that no UI was found.
+            NoUIDialog.displayBlocking();
+        }
+
+        // Can't find any
+        throw new IllegalStateException("No UIs could be loaded");
+    }
     
     /**
      * Executes the first run or migration wizards as required.
@@ -182,14 +239,6 @@ public final class Main {
      * @return The client's UI controller
      */
     public static UIController getUI() {
-        if (controller == null) {
-            if (GraphicsEnvironment.isHeadless()) {
-                controller = new DummyController();
-            } else {
-                controller = new SwingController();
-            }
-        }
-
         return controller;
     }
 
@@ -198,8 +247,12 @@ public final class Main {
      *
      * @param newController The new UI Controller
      */
-    public static void setUI(final UIController newController) {
-        controller = newController;
+    public static synchronized void setUI(final UIController newController) {
+        if (controller == null) {
+            controller = newController;
+        } else {
+            throw new IllegalStateException("User interface is already set");
+        }
     }
 
     /**
@@ -237,4 +290,44 @@ public final class Main {
         configdir = newdir;
     }
 
+    /**
+     * Extracts plugins bundled with DMDirc to the user's profile's plugin
+     * directory.
+     *
+     * @param prefix If non-null, only plugins whose file name starts with
+     * this prefix will be extracted.
+     */
+    public static void extractCorePlugins(final String prefix) {
+        final Map<String, byte[]> resources = ResourceManager.getResourceManager()
+                .getResourcesStartingWithAsBytes("plugins");
+        for (Map.Entry<String, byte[]> resource : resources.entrySet()) {
+            try {
+                final String resourceName = Main.getConfigDir() + "plugins"
+                        + resource.getKey().substring(7);
+
+                if (prefix != null && !resource.getKey().substring(7).startsWith(prefix)) {
+                    continue;
+                }
+
+                final File newDir = new File(resourceName.substring(0,
+                        resourceName.lastIndexOf('/')) + "/");
+
+                if (!newDir.exists()) {
+                    newDir.mkdirs();
+                }
+
+                final File newFile = new File(newDir,
+                        resourceName.substring(resourceName.lastIndexOf('/') + 1,
+                        resourceName.length()));
+
+                if (!newFile.isDirectory()) {
+                    ResourceManager.getResourceManager().
+                            resourceToFile(resource.getValue(), newFile);
+                }
+            } catch (IOException ex) {
+                Logger.userError(ErrorLevel.LOW, "Failed to extract plugins", ex);
+            }
+        }
+    }
+
 }

src/com/dmdirc/MessageTarget.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/ParserFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/Precondition.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/Query.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -136,35 +136,26 @@ public final class Query extends MessageTarget implements
             return;
         }
 
-        if (line.indexOf('\n') > -1) {
-            for (String part : line.split("\n")) {
-                sendLine(part);
-            }
-
-            return;
-        }
-
         final ClientInfo client = server.getParser().getMyself();
 
-        if (line.length() <= getMaxLineLength()) {
-            server.getParser().sendMessage(ClientInfo.parseHost(host), window.getTranscoder().encode(line));
+        for (String part : splitLine(window.getTranscoder().encode(line))) {
+            server.getParser().sendMessage(ClientInfo.parseHost(host),
+                    part);
 
             final StringBuffer buff = new StringBuffer("querySelfMessage");
 
-            ActionManager.processEvent(CoreActionType.QUERY_SELF_MESSAGE, buff, this, line);
+            ActionManager.processEvent(CoreActionType.QUERY_SELF_MESSAGE, buff, this, part);
 
             addLine(buff, client.getNickname(), client.getIdent(),
-                    client.getHost(), window.getTranscoder().encode(line));
-        } else {
-            sendLine(line.substring(0, getMaxLineLength()));
-            sendLine(line.substring(getMaxLineLength()));
+                    client.getHost(), part);
         }
     }
 
     /** {@inheritDoc} */
     @Override
     public int getMaxLineLength() {
-        return server.getParser().getMaxLength("PRIVMSG", host);
+        return server.getState() == ServerState.CONNECTED ? server.getParser()
+                .getMaxLength("PRIVMSG", host) : -1;
     }
 
     /**

src/com/dmdirc/Raw.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/Server.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -1271,11 +1271,16 @@ public final class Server extends WritableFrameContainer implements Serializable
      */
     @Precondition("State is CONNECTING")
     public void onPost005() {
+        if (myState.getState() != ServerState.CONNECTING) {
+            // Shouldn't happen
+            throw new IllegalStateException("Received onPost005 while not "
+                    + "connecting\n\n" + myState.getTransitionHistory());
+        }
+
         synchronized (this) {
             if (myState.getState() != ServerState.CONNECTING) {
-                // Shouldn't happen
-                throw new IllegalStateException("Received onPost005 while not "
-                        + "connecting\n\nState: " + myState);
+                // We've transitioned while waiting for the lock. Just abort.
+                return;
             }
 
             myState.transition(ServerState.CONNECTED);

src/com/dmdirc/ServerEventHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/ServerManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/ServerState.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/ServerStatus.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/Topic.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/WritableFrameContainer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -81,6 +81,40 @@ public abstract class WritableFrameContainer extends FrameContainer {
      * @return The maximum line length for this container
      */
     public abstract int getMaxLineLength();
+
+    /**
+     * Splits the specified line into chunks that contain a number of bytes
+     * less than or equal to the value returned by {@link #getMaxLineLength()}.
+     *
+     * @param line The line to be split
+     * @return An ordered list of chunks of the desired length
+     */
+    protected List<String> splitLine(final String line) {
+        final List<String> result = new ArrayList<String>();
+
+        if (line.indexOf('\n') > -1) {
+            for (String part : line.split("\n")) {
+                result.addAll(splitLine(part));
+            }
+        } else {
+            final StringBuilder remaining = new StringBuilder(line);
+
+            while (remaining.toString().getBytes().length > getMaxLineLength()) {
+                int number = Math.min(remaining.length(), getMaxLineLength());
+
+                while (remaining.substring(0, number).getBytes().length > getMaxLineLength()) {
+                    number--;
+                }
+
+                result.add(remaining.substring(0, number));
+                remaining.delete(0, number);
+            }
+
+            result.add(remaining.toString());
+        }
+
+        return result;
+    }
     
     /**
      * Returns the number of lines that the specified string would be sent as.
@@ -96,7 +130,8 @@ public abstract class WritableFrameContainer extends FrameContainer {
             if (splitLine.isEmpty() || getMaxLineLength() <= 0) {
                 lines++;
             } else {
-                lines += (int) Math.ceil(splitLine.length() / (double) getMaxLineLength());
+                lines += (int) Math.ceil(splitLine.getBytes().length
+                        / (double) getMaxLineLength());
             }
         }
         
@@ -211,7 +246,8 @@ public abstract class WritableFrameContainer extends FrameContainer {
         } else if (target.startsWith("window:")) {
             final String windowName = target.substring(7);
 
-            Window targetWindow = WindowManager.findCustomWindow(getServer().getFrame(), windowName);
+            Window targetWindow = WindowManager.findCustomWindow(getServer().getFrame(),
+                    windowName);
 
             if (targetWindow == null) {
                 targetWindow = new CustomWindow(windowName, windowName,

src/com/dmdirc/actions/Action.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/actions/ActionComponentChain.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,8 +24,8 @@ package com.dmdirc.actions;
 
 import com.dmdirc.actions.interfaces.ActionComponent;
 import com.dmdirc.Precondition;
-
 import com.dmdirc.logger.Logger;
+
 import java.util.ArrayList;
 import java.util.List;
 

src/com/dmdirc/actions/ActionCondition.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/actions/ActionGroup.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,6 @@ package com.dmdirc.actions;
 import com.dmdirc.config.prefs.PreferencesSetting;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;

src/com/dmdirc/actions/ActionManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/actions/ActionModel.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/actions/ActionSubstitutor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/actions/ActionTypeComparator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,6 @@ package com.dmdirc.actions;
 import com.dmdirc.actions.interfaces.ActionType;
 
 import java.io.Serializable;
-
 import java.util.Comparator;
 
 /**

src/com/dmdirc/actions/ConditionTree.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/actions/ConditionTreeFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/actions/CoreActionComparison.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/actions/CoreActionComponent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,9 +30,9 @@ import com.dmdirc.Server;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-
 import com.dmdirc.parser.irc.ClientInfo;
 import com.dmdirc.ui.messages.Styliser;
+
 import java.awt.Color;
 import java.awt.event.KeyEvent;
 import java.util.Calendar;

src/com/dmdirc/actions/CoreActionType.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/actions/interfaces/ActionComparison.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/actions/interfaces/ActionComponent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/actions/interfaces/ActionMetaType.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/actions/interfaces/ActionType.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/actions/metatypes/ActionEvents.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/actions/metatypes/ChannelEvents.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/actions/metatypes/ClientEvents.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/actions/metatypes/PluginEvents.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/actions/metatypes/QueryEvents.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/actions/metatypes/ServerEvents.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/actions/package-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/actions/wrappers/Alias.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/actions/wrappers/AliasWrapper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/actions/wrappers/PerformWrapper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/actions/wrappers/package-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/addons/addonbrowser/AddonInfo.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/addons/addonbrowser/AddonInfoListCellRenderer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.addonbrowser;
 
-import com.dmdirc.ui.swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.TextLabel;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Font;

src/com/dmdirc/addons/addonbrowser/BrowserPlugin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,7 +24,7 @@ package com.dmdirc.addons.addonbrowser;
 
 import com.dmdirc.config.prefs.PreferencesManager;
 import com.dmdirc.plugins.Plugin;
-import com.dmdirc.ui.swing.components.pluginpanel.PluginPanel;
+import com.dmdirc.addons.ui_swing.components.pluginpanel.PluginPanel;
 
 import java.awt.Component;
 import java.awt.event.ActionEvent;

src/com/dmdirc/addons/addonbrowser/BrowserWindow.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,8 +24,8 @@ package com.dmdirc.addons.addonbrowser;
 
 import com.dmdirc.Main;
 import com.dmdirc.addons.addonbrowser.AddonInfo.AddonType;
-import com.dmdirc.ui.swing.SwingController;
-import com.dmdirc.ui.swing.components.LoggingSwingWorker;
+import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.util.ConfigFile;
 import com.dmdirc.util.InvalidConfigFileException;
 

src/com/dmdirc/addons/addonbrowser/InstallListener.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/addons/addonbrowser/plugin.config

@@ -0,0 +1,32 @@
+# This is a DMDirc configuration file.
+
+# This section indicates which sections below take key/value
+# pairs, rather than a simple list. It should be placed above
+# any sections that take key/values.
+keysections:
+  metadata
+  requires
+  updates
+#  version
+
+metadata:
+  author=Chris <chris@dmdirc.com>
+  mainclass=com.dmdirc.addons.addonbrowser.BrowserPlugin
+  description=Browse and download addons from within DMDirc
+  name=addonbrowser
+  nicename=Addon Browser
+
+requires:
+  parent=ui_swing
+
+updates:
+  id=26
+
+#version:
+#  friendly=0.1
+
+provides:
+  addonbrowser component
+
+required-services:
+  swing ui

src/com/dmdirc/addons/audio/AudioCommand.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/addons/audio/AudioPlayer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/addons/audio/AudioPlugin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/addons/audio/BeepCommand.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/addons/audio/plugin.config

@@ -0,0 +1,25 @@
+# This is a DMDirc configuration file.
+
+# This section indicates which sections below take key/value
+# pairs, rather than a simple list. It should be placed above
+# any sections that take key/values.
+keysections:
+  metadata
+  updates
+#  version
+
+metadata:
+  author=Shane <shane@dmdirc.com>
+  mainclass=com.dmdirc.addons.audio.AudioPlugin
+  description=Allows playing audio files
+  name=audio
+  nicename=Audio Plugin
+
+updates:
+  id=14
+
+#version:
+#  friendly=0.2
+
+provides:
+  audio command

src/com/dmdirc/addons/dcc/DCC.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -112,12 +112,11 @@ public abstract class DCC implements Runnable {
 	 * @throws IOException If the listen socket can't be created
 	 */
 	public void listen() throws IOException {
-		listen = true;
-
 		serverSocketSem.acquireUninterruptibly();
 		serverSocket = new ServerSocket(0, 1);
 		serverSocketSem.release();
 
+		listen = true;
 		connect();
 	}
 

src/com/dmdirc/addons/dcc/DCCChat.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/addons/dcc/DCCChatInterface.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/addons/dcc/DCCChatWindow.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/addons/dcc/DCCCommand.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/addons/dcc/DCCFrame.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -33,8 +33,8 @@ import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.interfaces.InputWindow;
-import com.dmdirc.ui.swing.components.InputTextFrame;
-import com.dmdirc.ui.swing.components.TextFrame;
+import com.dmdirc.addons.ui_swing.components.InputTextFrame;
+import com.dmdirc.addons.ui_swing.components.TextFrame;
 
 import java.awt.Container;
 

src/com/dmdirc/addons/dcc/DCCPlugin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -41,12 +41,12 @@ import com.dmdirc.parser.irc.ClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.ui.WindowManager;
-import com.dmdirc.ui.swing.components.TextFrame;
+import com.dmdirc.addons.ui_swing.components.TextFrame;
 
 import com.dmdirc.addons.dcc.kde.KFileChooser;
 import com.dmdirc.addons.dcc.actions.DCCActions;
 
-import com.dmdirc.ui.swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.TextLabel;
 import java.io.File;
 import java.io.IOException;
 
@@ -319,9 +319,14 @@ public final class DCCPlugin extends Plugin implements ActionListener {
 					DCCSend send = DCCSend.findByToken(token);
 					
 					if (send == null && !dontAsk) {
-						ActionManager.processEvent(DCCActions.DCC_SEND_REQUEST, null, ((Server)arguments[0]), nickname, filename);
-						askQuestion("User "+nickname+" on "+((Server)arguments[0]).toString()+" would like to send you a file over DCC.\n\nFile: "+filename+"\n\nDo you want to continue?", "DCC Send Request", JOptionPane.YES_OPTION, type, format, arguments);
-						return;
+						if (!token.isEmpty() && !port.equals(0)) {
+							// This is a reverse DCC Send that we no longer care about.
+							return;
+						} else {
+							ActionManager.processEvent(DCCActions.DCC_SEND_REQUEST, null, ((Server)arguments[0]), nickname, filename);
+							askQuestion("User "+nickname+" on "+((Server)arguments[0]).toString()+" would like to send you a file over DCC.\n\nFile: "+filename+"\n\nDo you want to continue?", "DCC Send Request", JOptionPane.YES_OPTION, type, format, arguments);
+							return;
+						}
 					} else {
 						final boolean newSend = send == null;
 						if (newSend) {

src/com/dmdirc/addons/dcc/DCCSend.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/addons/dcc/DCCSendInterface.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/addons/dcc/DCCSendWindow.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/com/dmdirc/addons/dcc/actions/DCCActions.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal