SoniEx2
/
c.sexchat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove the last remnants of XChat-WDK

This commit is contained in:
Berke Viktor 2012-07-13 22:27:12 +02:00
parent e500363aff
commit f61726ba49
11 changed files with 56 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/checksum/checksum.c
View File

@ -1,4 +1,4 @@
/* XChat-WDK /* HexChat
* Copyright (c) 2010-2012 Berke Viktor. * Copyright (c) 2010-2012 Berke Viktor.
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy

4
plugins/exec/exec.c
View File

@ -1,5 +1,5 @@
/* XChat-WDK /* HexChat
* Copyright (c) 2011 Berke Viktor. * Copyright (c) 2011-2012 Berke Viktor.
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal

4
plugins/gtkpref/gtkpref.c
View File

@ -1,5 +1,5 @@
/* XChat-WDK /* HexChat
* Copyright (c) 2011 Berke Viktor. * Copyright (c) 2011-2012 Berke Viktor.
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal

14
plugins/upd/upd.c
View File

@ -1,5 +1,5 @@
/* XChat-WDK /* HexChat
* Copyright (c) 2010-2011 Berke Viktor. * Copyright (c) 2010-2012 Berke Viktor.
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal
@ -28,7 +28,7 @@
static xchat_plugin *ph; /* plugin handle */ static xchat_plugin *ph; /* plugin handle */
static const char name[] = "Update Checker"; static const char name[] = "Update Checker";
static const char desc[] = "Check for HexChat updates automatically"; static const char desc[] = "Check for HexChat updates automatically";
static const char version[] = "2.1"; static const char version[] = "3.0";
static char* static char*
check_version () check_version ()
@ -165,9 +165,9 @@ print_version ()
else else
{ {
#ifdef _WIN64 /* use this approach, the wProcessorArchitecture method always returns 0 (=x86) for some reason */ #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 #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 #endif
} }
@ -183,9 +183,9 @@ print_version_quiet (void *userdata)
if (!(strcmp (version, xchat_get_info (ph, "version")) == 0) && !(strcmp (version, "Unknown") == 0)) 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 */ #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 #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 #endif
/* print update url once, then stop the timer */ /* print update url once, then stop the timer */
return 0; return 0;

4
plugins/winsys/winsys.cpp
View File

@ -1,5 +1,5 @@
/* XChat-WDK /* HexChat
* Copyright (c) 2011 Berke Viktor. * Copyright (c) 2011-2012 Berke Viktor.
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal

2
plugins/xsasl/xsasl.c
View File

@ -1,4 +1,4 @@
/* XChat-WDK /* HexChat
* Copyright (c) 2010 <ygrek@autistici.org> * Copyright (c) 2010 <ygrek@autistici.org>
* Copyright (c) 2012 Berke Viktor. * Copyright (c) 2012 Berke Viktor.
* *

28
src/fe-gtk/plugin-tray.c
View File

@ -220,10 +220,10 @@ tray_stop_flash (void)
nets = tray_count_networks (); nets = tray_count_networks ();
chans = tray_count_channels (); chans = tray_count_channels ();
if (nets) 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); nets, chans);
else else
tray_set_tipf ("XChat-WDK: %s", _("Not connected.")); tray_set_tipf (DISPLAY_NAME": %s", _("Not connected."));
} }
if (custom_icon1) if (custom_icon1)
@ -580,15 +580,15 @@ tray_hilight_cb (char *word[], void *userdata)
/* FIXME: hides any previous private messages */ /* FIXME: hides any previous private messages */
tray_hilight_count++; tray_hilight_count++;
if (tray_hilight_count == 1) 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")); word[1], xchat_get_info (ph, "channel"));
else 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")); tray_hilight_count, word[1], xchat_get_info (ph, "channel"));
} }
if (prefs.input_balloon_hilight) 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")); word[1], xchat_get_info (ph, "channel"));
return XCHAT_EAT_NONE; return XCHAT_EAT_NONE;
@ -606,14 +606,14 @@ tray_message_cb (char *word[], void *userdata)
tray_pub_count++; tray_pub_count++;
if (tray_pub_count == 1) 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")); word[1], xchat_get_info (ph, "channel"));
else 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) 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")); word[1], xchat_get_info (ph, "channel"));
return XCHAT_EAT_NONE; return XCHAT_EAT_NONE;
@ -635,14 +635,14 @@ tray_priv (char *from, char *text)
tray_priv_count++; tray_priv_count++;
if (tray_priv_count == 1) 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); from, network);
else 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); tray_priv_count, from, network);
if (prefs.input_balloon_priv) 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); from, network);
} }
@ -688,15 +688,15 @@ tray_dcc_cb (char *word[], void *userdata)
tray_file_count++; tray_file_count++;
if (tray_file_count == 1) 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); word[1], network);
else 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); tray_file_count, word[1], network);
} }
if (prefs.input_balloon_priv) 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); word[1], network);
return XCHAT_EAT_NONE; return XCHAT_EAT_NONE;

2
src/gtk2-prefs/interface.cpp
View File

@ -304,7 +304,7 @@ create_main_window (void)
gtk_widget_show (image2); gtk_widget_show (image2);
gtk_box_pack_start (GTK_BOX (hbox6665), image2, FALSE, FALSE, 0); 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_set_name (label2, "label2");
gtk_widget_show (label2); gtk_widget_show (label2);
gtk_box_pack_start (GTK_BOX (hbox6665), label2, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox6665), label2, FALSE, FALSE, 0);

40
src/version/version.c
View File

@ -1,27 +1,23 @@
/* XChat-WDK /* HexChat
* Copyright (c) 2011 Berke Viktor. * Copyright (c) 2011-2012 Berke Viktor.
* *
* Redistribution and use in source and binary forms, with or without * Permission is hereby granted, free of charge, to any person obtaining a copy
* modification, are permitted provided that the following conditions * of this software and associated documentation files (the "Software"), to deal
* are met: * in the Software without restriction, including without limitation the rights
* 1. Redistributions of source code must retain the above copyright * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* notice, this list of conditions and the following disclaimer. * copies of the Software, and to permit persons to whom the Software is
* 2. Redistributions in binary form must reproduce the above copyright * furnished to do so, subject to the following conditions:
* 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.
* *
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR * The above copyright notice and this permission notice shall be included in
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * all copies or substantial portions of the Software.
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. *
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THE SOFTWARE.
*/ */
#include <stdio.h> #include <stdio.h>

8
win32/release-src.bat
View File

@ -1,7 +1,7 @@
@echo off @echo off
set PATH=%PATH%;%PROGRAMW6432%\7-Zip;%PROGRAMFILES(X86)%\Git\bin set PATH=%PATH%;%PROGRAMW6432%\7-Zip;%PROGRAMFILES(X86)%\Git\bin
git clone --branch wdk https://xchat-wdk.googlecode.com/git/ xchat-wdk git clone https://github.com/hexchat/hexchat.git hexchat
rmdir /q /s xchat-wdk\.git rmdir /q /s hexchat\.git
7z a xchat-wdk-head.7z xchat-wdk 7z a hexchat-head.7z hexchat
rmdir /q /s xchat-wdk rmdir /q /s hexchat
pause pause

8
win32/wdkpt/wdkpt.aip
View File

@ -7,10 +7,10 @@
<COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent"> <COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent">
<ROW Property="ALLUSERS" Value="2" MultiBuildValue="DefaultBuild:1"/> <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="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="ARPHELPLINK" Value="http://www.hexchat.org/developers/wdk-platform-toolset"/>
<ROW Property="ARPURLINFOABOUT" Value="http://www.xchat-wdk.org/developers/wdk-platform-toolset"/> <ROW Property="ARPURLINFOABOUT" Value="http://www.hexchat.org/developers/wdk-platform-toolset"/>
<ROW Property="ARPURLUPDATEINFO" Value="http://www.xchat-wdk.org/developers/wdk-platform-toolset"/> <ROW Property="ARPURLUPDATEINFO" Value="http://www.hexchat.org/developers/wdk-platform-toolset"/>
<ROW Property="Manufacturer" Value="XChat-WDK" ValueLocId="*"/> <ROW Property="Manufacturer" Value="HexChat" ValueLocId="*"/>
<ROW Property="ProductCode" Value="1033:{FE3F5A4C-82A5-4ED9-969B-AECA6070A1A0} " Type="16"/> <ROW Property="ProductCode" Value="1033:{FE3F5A4C-82A5-4ED9-969B-AECA6070A1A0} " Type="16"/>
<ROW Property="ProductLanguage" Value="1033"/> <ROW Property="ProductLanguage" Value="1033"/>
<ROW Property="ProductName" Value="Visual Studio 2010 Windows Driver Kit Platform Toolset" ValueLocId="*"/> <ROW Property="ProductName" Value="Visual Studio 2010 Windows Driver Kit Platform Toolset" ValueLocId="*"/>