Remove the last remnants of XChat-WDK

11 files changed, 56 insertions, 60 deletions

diff --git a/plugins/checksum/checksum.c b/plugins/checksum/checksum.c
index 79f64982..135764eb 100644
--- a/plugins/checksum/checksum.c
+++ b/plugins/checksum/checksum.c
@@ -1,4 +1,4 @@
-/* XChat-WDK
+/* HexChat
  * Copyright (c) 2010-2012 Berke Viktor.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/plugins/exec/exec.c b/plugins/exec/exec.c
index 22f38814..842d428c 100644
--- a/plugins/exec/exec.c
+++ b/plugins/exec/exec.c
@@ -1,5 +1,5 @@
-/* XChat-WDK
- * Copyright (c) 2011 Berke Viktor.
+/* HexChat
+ * Copyright (c) 2011-2012 Berke Viktor.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/plugins/gtkpref/gtkpref.c b/plugins/gtkpref/gtkpref.c
index 5cc754bf..84f51726 100644
--- a/plugins/gtkpref/gtkpref.c
+++ b/plugins/gtkpref/gtkpref.c
@@ -1,5 +1,5 @@
-/* XChat-WDK
- * Copyright (c) 2011 Berke Viktor.
+/* HexChat
+ * Copyright (c) 2011-2012 Berke Viktor.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/plugins/upd/upd.c b/plugins/upd/upd.c
index da92f2e4..f0ed0a2d 100644
--- a/plugins/upd/upd.c
+++ b/plugins/upd/upd.c
@@ -1,5 +1,5 @@
-/* XChat-WDK
- * Copyright (c) 2010-2011 Berke Viktor.
+/* HexChat
+ * Copyright (c) 2010-2012 Berke Viktor.
  *
  * 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,7 +28,7 @@
 static xchat_plugin *ph;   /* plugin handle */
 static const char name[] = "Update Checker";
 static const char desc[] = "Check for HexChat updates automatically";
-static const char version[] = "2.1";
+static const char version[] = "3.0";
 
 static char*
 check_version ()
@@ -165,9 +165,9 @@ print_version ()
 	else
 	{
 #ifdef _WIN64 /* use this approach, the wProcessorArchitecture method always returns 0 (=x86) for some reason */
-		xchat_printf (ph, "A HexChat update is available! You can download it from here:\nhttp://xchat-wdk.googlecode.com/files/HexChat%%20%s%%20x64.exe\n", version);
+		xchat_printf (ph, "A HexChat update is available! You can download it from here:\nhttps://github.com/downloads/hexchat/hexchat/HexChat%%20%s%%20x64.exe\n", version);
 #else
-		xchat_printf (ph, "A HexChat update is available! You can download it from here:\nhttp://xchat-wdk.googlecode.com/files/HexChat%%20%s%%20x86.exe\n", version);
+		xchat_printf (ph, "A HexChat update is available! You can download it from here:\nhttps://github.com/downloads/hexchat/hexchat/HexChat%%20%s%%20x86.exe\n", version);
 #endif
 	}
 
@@ -183,9 +183,9 @@ print_version_quiet (void *userdata)
 	if (!(strcmp (version, xchat_get_info (ph, "version")) == 0) && !(strcmp (version, "Unknown") == 0))
 	{
 #ifdef _WIN64 /* use this approach, the wProcessorArchitecture method always returns 0 (=x86) for plugins for some reason */
-		xchat_printf (ph, "A HexChat update is available! You can download it from here:\nhttp://xchat-wdk.googlecode.com/files/HexChat%%20%s%%20x64.exe\n", version);
+		xchat_printf (ph, "A HexChat update is available! You can download it from here:\nhttps://github.com/downloads/hexchat/hexchat/HexChat%%20%s%%20x64.exe\n", version);
 #else
-		xchat_printf (ph, "A HexChat update is available! You can download it from here:\nhttp://xchat-wdk.googlecode.com/files/HexChat%%20%s%%20x86.exe\n", version);
+		xchat_printf (ph, "A HexChat update is available! You can download it from here:\nhttps://github.com/downloads/hexchat/hexchat/HexChat%%20%s%%20x86.exe\n", version);
 #endif
 		/* print update url once, then stop the timer */
 		return 0;
diff --git a/plugins/winsys/winsys.cpp b/plugins/winsys/winsys.cpp
index 4ab1b3fd..d15118fe 100644
--- a/plugins/winsys/winsys.cpp
+++ b/plugins/winsys/winsys.cpp
@@ -1,5 +1,5 @@
-/* XChat-WDK
- * Copyright (c) 2011 Berke Viktor.
+/* HexChat
+ * Copyright (c) 2011-2012 Berke Viktor.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/plugins/xsasl/xsasl.c b/plugins/xsasl/xsasl.c
index 8abce20b..1d751ff3 100644
--- a/plugins/xsasl/xsasl.c
+++ b/plugins/xsasl/xsasl.c
@@ -1,4 +1,4 @@
-/* XChat-WDK
+/* HexChat
  * Copyright (c) 2010 <ygrek@autistici.org>
  * Copyright (c) 2012 Berke Viktor.
  *
diff --git a/src/fe-gtk/plugin-tray.c b/src/fe-gtk/plugin-tray.c
index ff6e0e05..145e5c95 100644
--- a/src/fe-gtk/plugin-tray.c
+++ b/src/fe-gtk/plugin-tray.c
@@ -220,10 +220,10 @@ tray_stop_flash (void)
 		nets = tray_count_networks ();
 		chans = tray_count_channels ();
 		if (nets)
-			tray_set_tipf (_("XChat-WDK: Connected to %u networks and %u channels"),
+			tray_set_tipf (_(DISPLAY_NAME": Connected to %u networks and %u channels"),
 								nets, chans);
 		else
-			tray_set_tipf ("XChat-WDK: %s", _("Not connected."));
+			tray_set_tipf (DISPLAY_NAME": %s", _("Not connected."));
 	}
 
 	if (custom_icon1)
@@ -580,15 +580,15 @@ tray_hilight_cb (char *word[], void *userdata)
 		/* FIXME: hides any previous private messages */
 		tray_hilight_count++;
 		if (tray_hilight_count == 1)
-			tray_set_tipf (_("XChat-WDK: Highlighted message from: %s (%s)"),
+			tray_set_tipf (_(DISPLAY_NAME": Highlighted message from: %s (%s)"),
 								word[1], xchat_get_info (ph, "channel"));
 		else
-			tray_set_tipf (_("XChat-WDK: %u highlighted messages, latest from: %s (%s)"),
+			tray_set_tipf (_(DISPLAY_NAME": %u highlighted messages, latest from: %s (%s)"),
 								tray_hilight_count, word[1], xchat_get_info (ph, "channel"));
 	}
 
 	if (prefs.input_balloon_hilight)
-		tray_set_balloonf (word[2], _("XChat-WDK: Highlighted message from: %s (%s)"),
+		tray_set_balloonf (word[2], _(DISPLAY_NAME": Highlighted message from: %s (%s)"),
 								 word[1], xchat_get_info (ph, "channel"));
 
 	return XCHAT_EAT_NONE;
@@ -606,14 +606,14 @@ tray_message_cb (char *word[], void *userdata)
 
 		tray_pub_count++;
 		if (tray_pub_count == 1)
-			tray_set_tipf (_("XChat-WDK: New public message from: %s (%s)"),
+			tray_set_tipf (_(DISPLAY_NAME": New public message from: %s (%s)"),
 								word[1], xchat_get_info (ph, "channel"));
 		else
-			tray_set_tipf (_("XChat-WDK: %u new public messages."), tray_pub_count);
+			tray_set_tipf (_(DISPLAY_NAME": %u new public messages."), tray_pub_count);
 	}
 
 	if (prefs.input_balloon_chans)
-		tray_set_balloonf (word[2], _("XChat-WDK: New public message from: %s (%s)"),
+		tray_set_balloonf (word[2], _(DISPLAY_NAME": New public message from: %s (%s)"),
 								 word[1], xchat_get_info (ph, "channel"));
 
 	return XCHAT_EAT_NONE;
@@ -635,14 +635,14 @@ tray_priv (char *from, char *text)
 
 	tray_priv_count++;
 	if (tray_priv_count == 1)
-		tray_set_tipf (_("XChat-WDK: Private message from: %s (%s)"),
+		tray_set_tipf (_(DISPLAY_NAME": Private message from: %s (%s)"),
 							from, network);
 	else
-		tray_set_tipf (_("XChat-WDK: %u private messages, latest from: %s (%s)"),
+		tray_set_tipf (_(DISPLAY_NAME": %u private messages, latest from: %s (%s)"),
 							tray_priv_count, from, network);
 
 	if (prefs.input_balloon_priv)
-		tray_set_balloonf (text, _("XChat-WDK: Private message from: %s (%s)"),
+		tray_set_balloonf (text, _(DISPLAY_NAME": Private message from: %s (%s)"),
 								 from, network);
 }
 
@@ -688,15 +688,15 @@ tray_dcc_cb (char *word[], void *userdata)
 
 		tray_file_count++;
 		if (tray_file_count == 1)
-			tray_set_tipf (_("XChat-WDK: File offer from: %s (%s)"),
+			tray_set_tipf (_(DISPLAY_NAME": File offer from: %s (%s)"),
 								word[1], network);
 		else
-			tray_set_tipf (_("XChat-WDK: %u file offers, latest from: %s (%s)"),
+			tray_set_tipf (_(DISPLAY_NAME": %u file offers, latest from: %s (%s)"),
 								tray_file_count, word[1], network);
 	}
 
 	if (prefs.input_balloon_priv)
-		tray_set_balloonf ("", _("XChat-WDK: File offer from: %s (%s)"),
+		tray_set_balloonf ("", _(DISPLAY_NAME": File offer from: %s (%s)"),
 								word[1], network);
 
 	return XCHAT_EAT_NONE;
diff --git a/src/gtk2-prefs/interface.cpp b/src/gtk2-prefs/interface.cpp
index 7c1cc53c..94279697 100644
--- a/src/gtk2-prefs/interface.cpp
+++ b/src/gtk2-prefs/interface.cpp
@@ -304,7 +304,7 @@ create_main_window (void)
   gtk_widget_show (image2);
   gtk_box_pack_start (GTK_BOX (hbox6665), image2, FALSE, FALSE, 0);
 
-  label2 = gtk_label_new ("You should restart XChat-WDK\nfor this change to take effect.");
+  label2 = gtk_label_new ("You should restart HexChat\nfor this change to take effect.");
   gtk_widget_set_name (label2, "label2");
   gtk_widget_show (label2);
   gtk_box_pack_start (GTK_BOX (hbox6665), label2, FALSE, FALSE, 0);
diff --git a/src/version/version.c b/src/version/version.c
index 9dcccf9b..58218c26 100644
--- a/src/version/version.c
+++ b/src/version/version.c
@@ -1,27 +1,23 @@
-/* XChat-WDK
- * Copyright (c) 2011 Berke Viktor.
+/* HexChat
+ * Copyright (c) 2011-2012 Berke Viktor.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 
 #include <stdio.h>
diff --git a/win32/release-src.bat b/win32/release-src.bat
index 9df98250..2c4f52f2 100644
--- a/win32/release-src.bat
+++ b/win32/release-src.bat
@@ -1,7 +1,7 @@
 @echo off
 set PATH=%PATH%;%PROGRAMW6432%\7-Zip;%PROGRAMFILES(X86)%\Git\bin
-git clone --branch wdk https://xchat-wdk.googlecode.com/git/ xchat-wdk
-rmdir /q /s xchat-wdk\.git
-7z a xchat-wdk-head.7z xchat-wdk
-rmdir /q /s xchat-wdk
+git clone https://github.com/hexchat/hexchat.git hexchat
+rmdir /q /s hexchat\.git
+7z a hexchat-head.7z hexchat
+rmdir /q /s hexchat
 pause
diff --git a/win32/wdkpt/wdkpt.aip b/win32/wdkpt/wdkpt.aip
index 52bbfc51..93c78967 100644
--- a/win32/wdkpt/wdkpt.aip
+++ b/win32/wdkpt/wdkpt.aip
@@ -7,10 +7,10 @@
   <COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent">

     <ROW Property="ALLUSERS" Value="2" MultiBuildValue="DefaultBuild:1"/>

     <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>

-    <ROW Property="ARPHELPLINK" Value="http://www.xchat-wdk.org/developers/wdk-platform-toolset"/>

-    <ROW Property="ARPURLINFOABOUT" Value="http://www.xchat-wdk.org/developers/wdk-platform-toolset"/>

-    <ROW Property="ARPURLUPDATEINFO" Value="http://www.xchat-wdk.org/developers/wdk-platform-toolset"/>

-    <ROW Property="Manufacturer" Value="XChat-WDK" ValueLocId="*"/>

+    <ROW Property="ARPHELPLINK" Value="http://www.hexchat.org/developers/wdk-platform-toolset"/>

+    <ROW Property="ARPURLINFOABOUT" Value="http://www.hexchat.org/developers/wdk-platform-toolset"/>

+    <ROW Property="ARPURLUPDATEINFO" Value="http://www.hexchat.org/developers/wdk-platform-toolset"/>

+    <ROW Property="Manufacturer" Value="HexChat" ValueLocId="*"/>

     <ROW Property="ProductCode" Value="1033:{FE3F5A4C-82A5-4ED9-969B-AECA6070A1A0} " Type="16"/>

     <ROW Property="ProductLanguage" Value="1033"/>

     <ROW Property="ProductName" Value="Visual Studio 2010 Windows Driver Kit Platform Toolset" ValueLocId="*"/>