deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-03-12 08:40:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

new name after fork

Browse Source
This commit is contained in:
deepend
2026-01-05 23:12:38 -07:00
parent ca43595430
commit 4683ef705b
316 changed files with 5422 additions and 6141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/fe-gtk/ascii.c
View File

@@ -22,8 +22,8 @@
#include "fe-gtk.h"
#include "../common/hexchat.h"
#include "../common/hexchatc.h"
#include "../common/zoitechat.h"
#include "../common/zoitechatc.h"
#include "gtkutil.h"
#include "ascii.h"
#include "maingui.h"

2
src/fe-gtk/ascii.h
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 1998-2010 Peter Zelezny.
* Copyright (C) 2009-2013 Berke Viktor.
*

4
src/fe-gtk/banlist.c
View File

@@ -28,11 +28,11 @@
#include "fe-gtk.h"
#include "../common/hexchat.h"
#include "../common/zoitechat.h"
#include "../common/fe.h"
#include "../common/modes.h"
#include "../common/outbound.h"
#include "../common/hexchatc.h"
#include "../common/zoitechatc.h"
#include "gtkutil.h"
#include "maingui.h"
#include "banlist.h"

4
src/fe-gtk/banlist.h
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 1998-2010 Peter Zelezny.
* Copyright (C) 2009-2013 Berke Viktor.
*
@@ -20,7 +20,7 @@
#ifndef HEXCHAT_BANLIST_H
#define HEXCHAT_BANLIST_H
#include "../common/hexchat.h"
#include "../common/zoitechat.h"
void banlist_opengui (session *sess);
#ifndef RPL_BANLIST

8
src/fe-gtk/chanlist.c
View File

@@ -32,8 +32,8 @@
#include <gdk/gdkkeysyms.h>
#include "../common/hexchat.h"
#include "../common/hexchatc.h"
#include "../common/zoitechat.h"
#include "../common/zoitechatc.h"
#include "../common/cfgfiles.h"
#include "../common/outbound.h"
#include "../common/util.h"
@@ -477,12 +477,12 @@ chanlist_filereq_done (server *serv, char *file)
if (!file)
return;
fh = hexchat_open_file (file, O_TRUNC | O_WRONLY | O_CREAT, 0600,
fh = zoitechat_open_file (file, O_TRUNC | O_WRONLY | O_CREAT, 0600,
XOF_DOMODE | XOF_FULLPATH);
if (fh == -1)
return;
g_snprintf (buf, sizeof buf, "HexChat Channel List: %s - %s\n",
g_snprintf (buf, sizeof buf, "ZoiteChat Channel List: %s - %s\n",
serv->servername, ctime (&t));
write (fh, buf, strlen (buf));

2
src/fe-gtk/chanlist.h
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 1998-2010 Peter Zelezny.
* Copyright (C) 2009-2013 Berke Viktor.
*

4
src/fe-gtk/chanview-tabs.c
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 1998-2010 Peter Zelezny.
* Copyright (C) 2009-2013 Berke Viktor.
*
@@ -561,7 +561,7 @@ cv_tabs_add (chanview *cv, chan *ch, char *name, GtkTreeIter *parent)
GtkWidget *but;
but = gtk_toggle_button_new_with_label (name);
gtk_widget_set_name (but, "hexchat-tab");
gtk_widget_set_name (but, "zoitechat-tab");
g_object_set_data (G_OBJECT (but), "c", ch);
/* used to trap right-clicks */
g_signal_connect (G_OBJECT (but), "button_press_event",

4
src/fe-gtk/chanview-tree.c
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 1998-2010 Peter Zelezny.
* Copyright (C) 2009-2013 Berke Viktor.
*
@@ -115,7 +115,7 @@ cv_tree_init (chanview *cv)
gtk_widget_show (win);
view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (cv->store));
gtk_widget_set_name (view, "hexchat-tree");
gtk_widget_set_name (view, "zoitechat-tree");
if (cv->style)
gtk_widget_set_style (view, cv->style);
/*gtk_widget_modify_base (view, GTK_STATE_NORMAL, &colors[COL_BG]);*/

10
src/fe-gtk/chanview.c
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 1998-2010 Peter Zelezny.
* Copyright (C) 2009-2013 Berke Viktor.
*
@@ -22,8 +22,8 @@
#include <stdlib.h>
#include <string.h>
#include "../common/hexchat.h"
#include "../common/hexchatc.h"
#include "../common/zoitechat.h"
#include "../common/zoitechatc.h"
#include "fe-gtk.h"
#include "maingui.h"
#include "gtkutil.h"
@@ -601,9 +601,9 @@ chan_remove (chan *ch, gboolean force)
{
chan *new_ch;
int i, num;
extern int hexchat_is_quitting;
extern int zoitechat_is_quitting;
if (hexchat_is_quitting) /* avoid lots of looping on exit */
if (zoitechat_is_quitting) /* avoid lots of looping on exit */
return TRUE;
/* is this ch allowed to be closed while still having children? */

2
src/fe-gtk/chanview.h
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 1998-2010 Peter Zelezny.
* Copyright (C) 2009-2013 Berke Viktor.
*

2
src/fe-gtk/custom-list.c
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 1998-2010 Peter Zelezny.
* Copyright (C) 2009-2013 Berke Viktor.
*

2
src/fe-gtk/custom-list.h
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 1998-2010 Peter Zelezny.
* Copyright (C) 2009-2013 Berke Viktor.
*

4
src/fe-gtk/dccgui.c
View File

@@ -28,8 +28,8 @@
#include "../common/inet.h"
#include "fe-gtk.h"
#include "../common/hexchat.h"
#include "../common/hexchatc.h"
#include "../common/zoitechat.h"
#include "../common/zoitechatc.h"
#include "../common/fe.h"
#include "../common/util.h"
#include "../common/network.h"

6
src/fe-gtk/editlist.c
View File

@@ -33,9 +33,9 @@
#include "fe-gtk.h"
#include "../common/hexchat.h"
#include "../common/zoitechat.h"
#include "../common/cfgfiles.h"
#include "../common/hexchatc.h"
#include "../common/zoitechatc.h"
#include "../common/fe.h"
#include "menu.h"
#include "gtkutil.h"
@@ -67,7 +67,7 @@ editlist_save (GtkWidget *igad, gchar *file)
char *name, *cmd;
int fh;
fh = hexchat_open_file (file, O_TRUNC | O_WRONLY | O_CREAT, 0600, XOF_DOMODE);
fh = zoitechat_open_file (file, O_TRUNC | O_WRONLY | O_CREAT, 0600, XOF_DOMODE);
if (fh != -1)
{
if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter))

2
src/fe-gtk/editlist.h
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 1998-2010 Peter Zelezny.
* Copyright (C) 2009-2013 Berke Viktor.
*

24
src/fe-gtk/fe-gtk.c
View File

@@ -29,12 +29,12 @@
#include <unistd.h>
#endif
#include "../common/hexchat.h"
#include "../common/zoitechat.h"
#include "../common/fe.h"
#include "../common/util.h"
#include "../common/text.h"
#include "../common/cfgfiles.h"
#include "../common/hexchatc.h"
#include "../common/zoitechatc.h"
#include "../common/plugin.h"
#include "../common/server.h"
#include "../common/url.h"
@@ -86,7 +86,7 @@ static const GOptionEntry gopt_entries[] =
{"url", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, &arg_url, N_("Open an irc://server:port/channel?key URL"), "URL"},
{"command", 'c', 0, G_OPTION_ARG_STRING, &arg_command, N_("Execute command:"), "COMMAND"},
#ifdef USE_DBUS
{"existing", 'e', 0, G_OPTION_ARG_NONE, &arg_existing, N_("Open URL or execute command in an existing HexChat"), NULL},
{"existing", 'e', 0, G_OPTION_ARG_NONE, &arg_existing, N_("Open URL or execute command in an existing ZoiteChat"), NULL},
#endif
{"minimize", 0, 0, G_OPTION_ARG_INT, &arg_minimize, N_("Begin minimized. Level 0=Normal 1=Iconified 2=Tray"), N_("level")},
{"version", 'v', 0, G_OPTION_ARG_NONE, &arg_show_version, N_("Show version information"), NULL},
@@ -106,7 +106,7 @@ create_msg_dialog (gchar *title, gchar *message)
/* On Win32 we automatically have the icon. If we try to load it explicitly, it will look ugly for some reason. */
#ifndef WIN32
pixmaps_init ();
gtk_window_set_icon (GTK_WINDOW (dialog), pix_hexchat);
gtk_window_set_icon (GTK_WINDOW (dialog), pix_zoitechat);
#endif
gtk_dialog_run (GTK_DIALOG (dialog));
@@ -252,10 +252,10 @@ const char cursor_color_rc[] =
"{"
"GtkEntry::cursor-color=\"#%02x%02x%02x\""
"}"
"widget \"*.hexchat-inputbox\" style : application \"xc-ib-st\"";
"widget \"*.zoitechat-inputbox\" style : application \"xc-ib-st\"";
static const char adwaita_workaround_rc[] =
"style \"hexchat-input-workaround\""
"style \"zoitechat-input-workaround\""
"{"
"engine \"pixmap\" {"
"image {"
@@ -268,7 +268,7 @@ static const char adwaita_workaround_rc[] =
"}"
"}"
"}"
"widget \"*.hexchat-inputbox\" style \"hexchat-input-workaround\"";
"widget \"*.zoitechat-inputbox\" style \"zoitechat-input-workaround\"";
GtkStyle *
create_input_style (GtkStyle *style)
@@ -321,7 +321,7 @@ fe_init (void)
pixmaps_init ();
#ifdef HAVE_GTK_MAC
gtkosx_application_set_dock_icon_pixbuf (osx_app, pix_hexchat);
gtkosx_application_set_dock_icon_pixbuf (osx_app, pix_zoitechat);
#endif
channelwin_pix = pixmap_load_from_file (prefs.hex_text_background);
input_style = create_input_style (gtk_style_new ());
@@ -331,7 +331,7 @@ fe_init (void)
static void
gtkosx_application_terminate (GtkosxApplication *app, gpointer userdata)
{
hexchat_exit();
zoitechat_exit();
}
#endif
@@ -691,9 +691,9 @@ fe_beep (session *sess)
{
ca_context_create (&ca_con);
ca_context_change_props (ca_con,
CA_PROP_APPLICATION_ID, "hexchat",
CA_PROP_APPLICATION_ID, "zoitechat",
CA_PROP_APPLICATION_NAME, DISPLAY_NAME,
CA_PROP_APPLICATION_ICON_NAME, "hexchat", NULL);
CA_PROP_APPLICATION_ICON_NAME, "zoitechat", NULL);
}
if (ca_context_play (ca_con, 0, CA_PROP_EVENT_ID, "message-new-instant", NULL) != 0)
@@ -1043,7 +1043,7 @@ osx_show_uri (const char *url)
open = g_find_program_in_path ("open");
cmd = g_strjoin (" ", open, encoded_url, NULL);
hexchat_exec (cmd);
zoitechat_exec (cmd);
g_free (encoded_url);
g_free (cmd);

4
src/fe-gtk/fe-gtk.h
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 1998-2010 Peter Zelezny.
* Copyright (C) 2009-2013 Berke Viktor.
*
@@ -22,7 +22,7 @@
#include "config.h"
#define DISPLAY_NAME "HexChat"
#define DISPLAY_NAME "ZoiteChat"
#ifndef WIN32
#include <sys/types.h>

38
src/fe-gtk/fe-gtk.vcxproj
View File

@@ -22,32 +22,32 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\win32\hexchat.props" />
<Import Project="..\..\win32\zoitechat.props" />
<PropertyGroup>
<TargetName>hexchat</TargetName>
<OutDir>$(HexChatRel)</OutDir>
<TargetName>zoitechat</TargetName>
<OutDir>$(ZoiteChatRel)</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\common;$(HexChatLib);$(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\common;$(ZoiteChatLib);$(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
<AdditionalLibraryDirectories>$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>$(DepLibs);$(HexChatLib)common.lib;wbemuuid.lib;comsupp.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>$(DepLibs);$(ZoiteChatLib)common.lib;wbemuuid.lib;comsupp.lib;%(AdditionalDependencies)</AdditionalDependencies>
<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\common;$(HexChatLib);$(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\common;$(ZoiteChatLib);$(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
<AdditionalLibraryDirectories>$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>$(DepLibs);$(HexChatLib)common.lib;wbemuuid.lib;comsupp.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>$(DepLibs);$(ZoiteChatLib)common.lib;wbemuuid.lib;comsupp.lib;%(AdditionalDependencies)</AdditionalDependencies>
<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
</Link>
</ItemDefinitionGroup>
@@ -55,13 +55,13 @@
<PreBuildEvent>
<Command><![CDATA[
SET SOLUTIONDIR=$(SolutionDir)..\
powershell -File "$(SolutionDir)..\win32\version-template.ps1" "$(SolutionDir)..\src\fe-gtk\hexchat.rc.tt" "$(HexChatLib)hexchat.rc.utf8"
REM hexchat.rc needs to be in UCS-2 or Resource Compiler will complain
powershell "Get-Content -Encoding UTF8 '$(HexChatLib)hexchat.rc.utf8' | Out-File '$(HexChatLib)hexchat.rc'; Remove-Item '$(HexChatLib)hexchat.rc.utf8'"
"$(DepsRoot)\bin\glib-compile-resources.exe" --generate-header --manual-register --sourcedir "$(DataDir)" --target "$(HexChatLib)resources.h" "$(DataDir)hexchat.gresource.xml"
"$(DepsRoot)\bin\glib-compile-resources.exe" --generate-source --manual-register --sourcedir "$(DataDir)" --target "$(HexChatLib)resources.c" "$(DataDir)hexchat.gresource.xml"
powershell -File "$(SolutionDir)..\win32\version-template.ps1" "$(SolutionDir)..\src\fe-gtk\zoitechat.rc.tt" "$(ZoiteChatLib)zoitechat.rc.utf8"
REM zoitechat.rc needs to be in UCS-2 or Resource Compiler will complain
powershell "Get-Content -Encoding UTF8 '$(ZoiteChatLib)zoitechat.rc.utf8' | Out-File '$(ZoiteChatLib)zoitechat.rc'; Remove-Item '$(ZoiteChatLib)zoitechat.rc.utf8'"
"$(DepsRoot)\bin\glib-compile-resources.exe" --generate-header --manual-register --sourcedir "$(DataDir)" --target "$(ZoiteChatLib)resources.h" "$(DataDir)zoitechat.gresource.xml"
"$(DepsRoot)\bin\glib-compile-resources.exe" --generate-source --manual-register --sourcedir "$(DataDir)" --target "$(ZoiteChatLib)resources.c" "$(DataDir)zoitechat.gresource.xml"
]]></Command>
<Message>Build hexchat.rc and gresource file</Message>
<Message>Build zoitechat.rc and gresource file</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
@@ -116,7 +116,7 @@ powershell "Get-Content -Encoding UTF8 '$(HexChatLib)hexchat.rc.utf8' | Out-File
<ClCompile Include="plugin-tray.c" />
<ClCompile Include="plugingui.c" />
<ClCompile Include="rawlog.c" />
<ClCompile Include="$(HexChatLib)resources.c" />
<ClCompile Include="$(ZoiteChatLib)resources.c" />
<ClCompile Include="servlistgui.c" />
<ClCompile Include="setup.c" />
<ClCompile Include="sexy-iso-codes.c" />
@@ -127,17 +127,17 @@ powershell "Get-Content -Encoding UTF8 '$(HexChatLib)hexchat.rc.utf8' | Out-File
<ClCompile Include="xtext.c" />
</ItemGroup>
<ItemGroup>
<Manifest Include="..\..\win32\hexchat.exe.manifest" />
<Manifest Include="..\..\win32\zoitechat.exe.manifest" />
</ItemGroup>
<ItemGroup>
<None Include="hexchat.rc.tt" />
<ResourceCompile Include="$(HexChatLib)hexchat.rc" />
<None Include="zoitechat.rc.tt" />
<ResourceCompile Include="$(ZoiteChatLib)zoitechat.rc" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\data\icons\hexchat.ico" />
<None Include="..\..\data\icons\zoitechat.ico" />
</ItemGroup>
<ItemGroup>
<Xml Include="..\..\data\hexchat.gresource.xml" />
<Xml Include="..\..\data\zoitechat.gresource.xml" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project>

12
src/fe-gtk/fe-gtk.vcxproj.filters
View File

@@ -182,7 +182,7 @@
<ClCompile Include="xtext.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(HexChatLib)resources.c">
<ClCompile Include="$(ZoiteChatLib)resources.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="plugin-notification.c">
@@ -193,22 +193,22 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
<Manifest Include="..\..\win32\hexchat.exe.manifest">
<Manifest Include="..\..\win32\zoitechat.exe.manifest">
<Filter>Resource Files</Filter>
</Manifest>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="$(HexChatLib)hexchat.rc">
<ResourceCompile Include="$(ZoiteChatLib)zoitechat.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\..\data\icons\hexchat.ico">
<None Include="..\..\data\icons\zoitechat.ico">
<Filter>Resource Files</Filter>
</None>
<None Include="hexchat.rc.tt" />
<None Include="zoitechat.rc.tt" />
</ItemGroup>
<ItemGroup>
<Xml Include="..\..\data\hexchat.gresource.xml" />
<Xml Include="..\..\data\zoitechat.gresource.xml" />
</ItemGroup>
</Project>

10
src/fe-gtk/fkeys.c
View File

@@ -33,8 +33,8 @@
#define GLIB_DISABLE_DEPRECATION_WARNINGS
#include "fe-gtk.h"
#include "../common/hexchat.h"
#include "../common/hexchatc.h"
#include "../common/zoitechat.h"
#include "../common/zoitechatc.h"
#include "../common/cfgfiles.h"
#include "../common/fe.h"
#include "../common/userlist.h"
@@ -850,11 +850,11 @@ key_save_kbs (void)
GSList *list = keybind_list;
struct key_binding *kb;
fd = hexchat_open_file ("keybindings.conf", O_CREAT | O_TRUNC | O_WRONLY,
fd = zoitechat_open_file ("keybindings.conf", O_CREAT | O_TRUNC | O_WRONLY,
0x180, XOF_DOMODE);
if (fd < 0)
return 1;
write (fd, buf, g_snprintf (buf, 510, "# HexChat key bindings config file\n\n"));
write (fd, buf, g_snprintf (buf, 510, "# ZoiteChat key bindings config file\n\n"));
while (list)
{
@@ -947,7 +947,7 @@ key_load_kbs (void)
GdkModifierType mod = 0;
off_t size;
fd = hexchat_open_file ("keybindings.conf", O_RDONLY, 0, 0);
fd = zoitechat_open_file ("keybindings.conf", O_RDONLY, 0, 0);
if (fd < 0)
{
ibuf = g_strdup (default_kb_cfg);

2
src/fe-gtk/fkeys.h
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 1998-2010 Peter Zelezny.
* Copyright (C) 2009-2013 Berke Viktor.
*

8
src/fe-gtk/gtkutil.c
View File

@@ -35,11 +35,11 @@
#include <gdk/gdkx.h>
#endif
#include "../common/hexchat.h"
#include "../common/zoitechat.h"
#include "../common/fe.h"
#include "../common/util.h"
#include "../common/cfgfiles.h"
#include "../common/hexchatc.h"
#include "../common/zoitechatc.h"
#include "../common/typedef.h"
#include "gtkutil.h"
#include "pixmaps.h"
@@ -585,7 +585,7 @@ gtkutil_set_icon (GtkWidget *win)
/* FIXME: Magically breaks icon rendering in most
* (sub)windows, but OFC only on Windows. GTK <3
*/
gtk_window_set_icon (GTK_WINDOW (win), pix_hexchat);
gtk_window_set_icon (GTK_WINDOW (win), pix_zoitechat);
#endif
}
@@ -599,7 +599,7 @@ gtkutil_window_new (char *title, char *role, int width, int height, int flags)
win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtkutil_set_icon (win);
#ifdef WIN32
gtk_window_set_wmclass (GTK_WINDOW (win), "HexChat", "hexchat");
gtk_window_set_wmclass (GTK_WINDOW (win), "ZoiteChat", "zoitechat");
#endif
gtk_window_set_title (GTK_WINDOW (win), title);
gtk_window_set_default_size (GTK_WINDOW (win), width, height);

2
src/fe-gtk/gtkutil.h
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 1998-2010 Peter Zelezny.
* Copyright (C) 2009-2013 Berke Viktor.
*

2
src/fe-gtk/ignoregui.c
View File

@@ -24,7 +24,7 @@
#include <fcntl.h>
#include "fe-gtk.h"
#include "../common/hexchat.h"
#include "../common/zoitechat.h"
#include "../common/ignore.h"
#include "../common/cfgfiles.h"
#include "../common/fe.h"

6
src/fe-gtk/joind.c
View File

@@ -31,8 +31,8 @@
#include <unistd.h>
#endif
#include "../common/hexchat.h"
#include "../common/hexchatc.h"
#include "../common/zoitechat.h"
#include "../common/zoitechatc.h"
#include "../common/server.h"
#include "../common/servlist.h"
#include "../common/fe.h"
@@ -249,7 +249,7 @@ joind_show_dialog (server *serv)
if (serv->network)
if (g_ascii_strcasecmp(((ircnet*)serv->network)->name, "Libera.Chat") == 0)
{
gtk_entry_set_text (GTK_ENTRY (entry1), "#hexchat");
gtk_entry_set_text (GTK_ENTRY (entry1), "#zoitechat");
}
gtk_widget_grab_focus (okbutton1);

2
src/fe-gtk/joind.h
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 1998-2010 Peter Zelezny.
* Copyright (C) 2009-2013 Berke Viktor.
*

34
src/fe-gtk/maingui.c
View File

@@ -23,10 +23,10 @@
#include <gdk/gdkkeysyms.h>
#include "../common/hexchat.h"
#include "../common/zoitechat.h"
#include "../common/fe.h"
#include "../common/server.h"
#include "../common/hexchatc.h"
#include "../common/zoitechatc.h"
#include "../common/outbound.h"
#include "../common/inbound.h"
#include "../common/plugin.h"
@@ -996,7 +996,7 @@ static void
mg_topdestroy_cb (GtkWidget *win, session *sess)
{
/* printf("enter mg_topdestroy. sess %p was destroyed\n", sess);*/
session_free (sess); /* tell hexchat.c about it */
session_free (sess); /* tell zoitechat.c about it */
}
/* cleanup an IRC tab */
@@ -1006,7 +1006,7 @@ mg_ircdestroy (session *sess)
{
GSList *list;
session_free (sess); /* tell hexchat.c about it */
session_free (sess); /* tell zoitechat.c about it */
if (mg_gui == NULL)
{
@@ -1176,13 +1176,13 @@ mg_open_quit_dialog (gboolean minimize_button)
cons = mg_count_networks ();
if (dccs + cons == 0 || !prefs.hex_gui_quit_dialog)
{
hexchat_exit ();
zoitechat_exit ();
return;
}
dialog = gtk_dialog_new ();
gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
gtk_window_set_title (GTK_WINDOW (dialog), _("Quit HexChat?"));
gtk_window_set_title (GTK_WINDOW (dialog), _("Quit ZoiteChat?"));
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent_window));
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
@@ -1252,7 +1252,7 @@ mg_open_quit_dialog (gboolean minimize_button)
case 0:
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbutton1)))
prefs.hex_gui_quit_dialog = 0;
hexchat_exit ();
zoitechat_exit ();
break;
case 1: /* minimize to tray */
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbutton1)))
@@ -1785,7 +1785,7 @@ mg_tabwindow_kill_cb (GtkWidget *win, gpointer userdata)
session *sess;
/* puts("enter mg_tabwindow_kill_cb");*/
hexchat_is_quitting = TRUE;
zoitechat_is_quitting = TRUE;
/* see if there's any non-tab windows left */
list = sess_list;
@@ -1795,7 +1795,7 @@ mg_tabwindow_kill_cb (GtkWidget *win, gpointer userdata)
next = list->next;
if (!sess->gui->is_tab)
{
hexchat_is_quitting = FALSE;
zoitechat_is_quitting = FALSE;
/* puts("-> will not exit, some toplevel windows left");*/
} else
{
@@ -1851,7 +1851,7 @@ mg_link_irctab (session *sess, int focus)
win = mg_changui_destroy (sess);
mg_changui_new (sess, sess->res, 0, focus);
mg_populate (sess);
hexchat_is_quitting = FALSE;
zoitechat_is_quitting = FALSE;
if (win)
gtk_widget_destroy (win);
return;
@@ -2078,7 +2078,7 @@ mg_create_chanmodebuttons (session_gui *gui, GtkWidget *box)
gui->flag_k = mg_create_flagbutton (_("Keyword"), box, "k");
gui->key_entry = gtk_entry_new ();
gtk_widget_set_name (gui->key_entry, "hexchat-inputbox");
gtk_widget_set_name (gui->key_entry, "zoitechat-inputbox");
gtk_entry_set_max_length (GTK_ENTRY (gui->key_entry), 23);
gtk_widget_set_size_request (gui->key_entry, 115, -1);
gtk_box_pack_start (GTK_BOX (box), gui->key_entry, 0, 0, 0);
@@ -2090,7 +2090,7 @@ mg_create_chanmodebuttons (session_gui *gui, GtkWidget *box)
gui->flag_l = mg_create_flagbutton (_("User Limit"), box, "l");
gui->limit_entry = gtk_entry_new ();
gtk_widget_set_name (gui->limit_entry, "hexchat-inputbox");
gtk_widget_set_name (gui->limit_entry, "zoitechat-inputbox");
gtk_entry_set_max_length (GTK_ENTRY (gui->limit_entry), 10);
gtk_widget_set_size_request (gui->limit_entry, 30, -1);
gtk_box_pack_start (GTK_BOX (box), gui->limit_entry, 0, 0, 0);
@@ -2180,7 +2180,7 @@ mg_create_topicbar (session *sess, GtkWidget *box)
sess->res->tab = NULL;
gui->topic_entry = topic = sexy_spell_entry_new ();
gtk_widget_set_name (topic, "hexchat-inputbox");
gtk_widget_set_name (topic, "zoitechat-inputbox");
sexy_spell_entry_set_checked (SEXY_SPELL_ENTRY (topic), FALSE);
gtk_container_add (GTK_CONTAINER (hbox), topic);
g_signal_connect (G_OBJECT (topic), "activate",
@@ -2991,7 +2991,7 @@ mg_create_entry (session *sess, GtkWidget *box)
G_CALLBACK (mg_inputbox_cb), gui);
gtk_container_add (GTK_CONTAINER (hbox), entry);
gtk_widget_set_name (entry, "hexchat-inputbox");
gtk_widget_set_name (entry, "zoitechat-inputbox");
g_signal_connect (G_OBJECT (entry), "key_press_event",
G_CALLBACK (key_handle_key_press), NULL);
g_signal_connect (G_OBJECT (entry), "focus_in_event",
@@ -3130,10 +3130,10 @@ mg_create_topwindow (session *sess)
GtkWidget *table;
if (sess->type == SESS_DIALOG)
win = gtkutil_window_new ("HexChat", NULL,
win = gtkutil_window_new ("ZoiteChat", NULL,
prefs.hex_gui_dialog_width, prefs.hex_gui_dialog_height, 0);
else
win = gtkutil_window_new ("HexChat", NULL,
win = gtkutil_window_new ("ZoiteChat", NULL,
prefs.hex_gui_win_width,
prefs.hex_gui_win_height, 0);
sess->gui->window = win;
@@ -3253,7 +3253,7 @@ mg_create_tabwindow (session *sess)
GdkWindow *parent_win;
#endif
win = gtkutil_window_new ("HexChat", NULL, prefs.hex_gui_win_width,
win = gtkutil_window_new ("ZoiteChat", NULL, prefs.hex_gui_win_width,
prefs.hex_gui_win_height, 0);
sess->gui->window = win;
gtk_window_move (GTK_WINDOW (win), prefs.hex_gui_win_left,

2
src/fe-gtk/maingui.h
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 1998-2010 Peter Zelezny.
* Copyright (C) 2009-2013 Berke Viktor.
*

28
src/fe-gtk/menu.c
View File

@@ -32,8 +32,8 @@
#include <gdk/gdkkeysyms.h>
#include "../common/hexchat.h"
#include "../common/hexchatc.h"
#include "../common/zoitechat.h"
#include "../common/zoitechatc.h"
#include "../common/cfgfiles.h"
#include "../common/outbound.h"
#include "../common/ignore.h"
@@ -101,7 +101,7 @@ static void
nick_command (session * sess, char *cmd)
{
if (*cmd == '!')
hexchat_exec (cmd + 1);
zoitechat_exec (cmd + 1);
else
handle_command (sess, cmd, TRUE);
}
@@ -514,7 +514,7 @@ menu_create (GtkWidget *menu, GSList *list, char *target, int check_path)
{
char *icon, *label;
/* default command in hexchat.c */
/* default command in zoitechat.c */
if (pop->cmd[0] == 'n' && !strcmp (pop->cmd, "notify -n ASK %s"))
{
/* don't create this item if already in notify list */
@@ -1491,7 +1491,7 @@ menu_noplugin_info (void)
"%m = machine info\n"\
"%n = your nick\n"\
"%t = time/date\n"\
"%v = HexChat version\n"\
"%v = ZoiteChat version\n"\
"%2 = word 2\n"\
"%3 = word 3\n"\
"&2 = word 2 to the end of line\n"\
@@ -1538,7 +1538,7 @@ menu_noplugin_info (void)
"%s = the URL string\n\n"\
"Putting a ! in front of the command\n"\
"indicates it should be sent to a\n"\
"shell instead of HexChat")
"shell instead of ZoiteChat")
static void
menu_usercommands (void)
@@ -1613,7 +1613,7 @@ menu_ctcpguiopen (void)
static void
menu_docs (GtkWidget *wid, gpointer none)
{
fe_open_url ("http://hexchat.readthedocs.org");
fe_open_url ("http://zoitechat.readthedocs.org");
}
/*static void
@@ -1674,7 +1674,7 @@ menu_metres_off (GtkWidget *item, gpointer none)
{
prefs.hex_gui_lagometer = 0;
prefs.hex_gui_throttlemeter = 0;
hexchat_reinit_timers ();
zoitechat_reinit_timers ();
menu_setting_foreach (menu_apply_metres_cb, -1, 0);
}
}
@@ -1686,7 +1686,7 @@ menu_metres_text (GtkWidget *item, gpointer none)
{
prefs.hex_gui_lagometer = 2;
prefs.hex_gui_throttlemeter = 2;
hexchat_reinit_timers ();
zoitechat_reinit_timers ();
menu_setting_foreach (menu_apply_metres_cb, -1, 0);
}
}
@@ -1698,7 +1698,7 @@ menu_metres_graph (GtkWidget *item, gpointer none)
{
prefs.hex_gui_lagometer = 1;
prefs.hex_gui_throttlemeter = 1;
hexchat_reinit_timers ();
zoitechat_reinit_timers ();
menu_setting_foreach (menu_apply_metres_cb, -1, 0);
}
}
@@ -1710,7 +1710,7 @@ menu_metres_both (GtkWidget *item, gpointer none)
{
prefs.hex_gui_lagometer = 3;
prefs.hex_gui_throttlemeter = 3;
hexchat_reinit_timers ();
zoitechat_reinit_timers ();
menu_setting_foreach (menu_apply_metres_cb, -1, 0);
}
}
@@ -1758,9 +1758,9 @@ menu_about (GtkWidget *wid, gpointer sess)
gtk_about_dialog_set_program_name (dialog, _(DISPLAY_NAME));
gtk_about_dialog_set_version (dialog, PACKAGE_VERSION);
gtk_about_dialog_set_license (dialog, license); /* gtk3 can use GTK_LICENSE_GPL_2_0 */
gtk_about_dialog_set_website (dialog, "http://hexchat.github.io");
gtk_about_dialog_set_website (dialog, "http://zoitechat.github.io");
gtk_about_dialog_set_website_label (dialog, "Website");
gtk_about_dialog_set_logo (dialog, pix_hexchat);
gtk_about_dialog_set_logo (dialog, pix_zoitechat);
gtk_about_dialog_set_copyright (dialog, "\302\251 1998-2010 Peter \305\275elezn\303\275\n\302\251 2009-2014 Berke Viktor");
gtk_about_dialog_set_comments (dialog, comment);
@@ -2501,7 +2501,7 @@ togitem:
menu_widgets[mymenu[i].id] = item;
#ifdef HAVE_GTK_MAC
/* We want HexChat to be the app menu, not including Quit or HexChat itself */
/* We want ZoiteChat to be the app menu, not including Quit or ZoiteChat itself */
if (bar && item && i <= CLOSE_OFFSET + 1 && mymenu[i].id != MENU_ID_HEXCHAT)
{
if (!submenu || mymenu[i].type == M_MENUSUB)

2
src/fe-gtk/menu.h
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 1998-2010 Peter Zelezny.
* Copyright (C) 2009-2013 Berke Viktor.
*

40
src/fe-gtk/meson.build
View File

@@ -1,4 +1,4 @@
hexchat_gtk_sources = [
zoitechat_gtk_sources = [
'ascii.c',
'banlist.c',
'chanlist.c',
@@ -29,22 +29,22 @@ hexchat_gtk_sources = [
]
gtk_dep = dependency('gtk+-2.0', version: '>= 2.24.0')
hexchat_gtk_deps = [
hexchat_common_dep,
zoitechat_gtk_deps = [
zoitechat_common_dep,
libgmodule_dep, # used by libsexy
gtk_dep
]
if gtk_dep.get_pkgconfig_variable('target') == 'x11'
hexchat_gtk_deps += dependency('x11')
zoitechat_gtk_deps += dependency('x11')
endif
hexchat_gtk_cflags = []
zoitechat_gtk_cflags = []
hexchat_gtk_ldflags = []
zoitechat_gtk_ldflags = []
if host_machine.system() == 'windows'
hexchat_gtk_sources += 'notifications/notification-windows.c'
zoitechat_gtk_sources += 'notifications/notification-windows.c'
# TODO: mingw doesn't have these headers or libs
# add_languages('cpp')
@@ -53,38 +53,38 @@ if host_machine.system() == 'windows'
#)
else
hexchat_gtk_sources += 'notifications/notification-freedesktop.c'
zoitechat_gtk_sources += 'notifications/notification-freedesktop.c'
endif
iso_codes = dependency('iso-codes', required: false)
if iso_codes.found()
hexchat_gtk_sources += 'sexy-iso-codes.c'
zoitechat_gtk_sources += 'sexy-iso-codes.c'
iso_codes_prefix = iso_codes.get_pkgconfig_variable('prefix')
hexchat_gtk_cflags += '-DISO_CODES_PREFIX="@0@"'.format(iso_codes_prefix)
hexchat_gtk_cflags += '-DISO_CODES_LOCALEDIR="@0@"'.format(
zoitechat_gtk_cflags += '-DISO_CODES_PREFIX="@0@"'.format(iso_codes_prefix)
zoitechat_gtk_cflags += '-DISO_CODES_LOCALEDIR="@0@"'.format(
join_paths(iso_codes_prefix, 'share/locale'))
endif
if get_option('plugin')
hexchat_gtk_sources += 'plugingui.c'
zoitechat_gtk_sources += 'plugingui.c'
endif
resources = gnome.compile_resources('resources',
'../../data/hexchat.gresource.xml',
'../../data/zoitechat.gresource.xml',
source_dir: '../../data', # TODO: Fix upstream
c_name: 'hexchat',
c_name: 'zoitechat',
extra_args: ['--manual-register']
)
if host_machine.system() == 'windows'
hexchat_gtk_ldflags += '-Wl,-e,mainCRTStartup'
zoitechat_gtk_ldflags += '-Wl,-e,mainCRTStartup'
endif
executable('hexchat',
sources: resources + hexchat_gtk_sources,
dependencies: hexchat_gtk_deps,
c_args: hexchat_gtk_cflags,
link_args: hexchat_gtk_ldflags,
executable('zoitechat',
sources: resources + zoitechat_gtk_sources,
dependencies: zoitechat_gtk_deps,
c_args: zoitechat_gtk_cflags,
link_args: zoitechat_gtk_ldflags,
pie: true,
install: true,
gui_app: true,

2
src/fe-gtk/notifications/notification-backend.h
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 2015 Patrick Griffis.
*
* This program is free software; you can redistribute it and/or modify

2
src/fe-gtk/notifications/notification-dummy.c
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 2015 Patrick Griffis.
*
* This program is free software; you can redistribute it and/or modify

4
src/fe-gtk/notifications/notification-freedesktop.c
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 2021 Patrick Griffis.
*
* This program is free software; you can redistribute it and/or modify
@@ -54,7 +54,7 @@ notification_backend_show (const char *title, const char *text)
text = g_markup_escape_text (text, -1);
g_variant_builder_init (&params, G_VARIANT_TYPE ("(susssasa{sv}i)"));
g_variant_builder_add (&params, "s", "hexchat"); /* App name */
g_variant_builder_add (&params, "s", "zoitechat"); /* App name */
g_variant_builder_add (&params, "u", 0); /* ID, 0 means don't replace */
g_variant_builder_add (&params, "s", "io.github.Hexchat"); /* App icon */
g_variant_builder_add (&params, "s", title);

2
src/fe-gtk/notifications/notification-osx.m
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 2015 Patrick Griffis.
*
* This program is free software; you can redistribute it and/or modify

4
src/fe-gtk/notifications/notification-windows.c
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 2015 Arnav Singh.
*
* This program is free software; you can redistribute it and/or modify
@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "hexchat.h"
#include "zoitechat.h"
#include "plugin.h"
#include <gmodule.h>

4
src/fe-gtk/notifications/notification-winrt.cpp
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (c) 2014 Leetsoftwerx
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -88,7 +88,7 @@ extern "C"
try
{
if (!notifier)
notifier = ToastNotificationManager::CreateToastNotifier (L"HexChat.Desktop.Notify");
notifier = ToastNotificationManager::CreateToastNotifier (L"ZoiteChat.Desktop.Notify");
}
catch (Platform::Exception ^ ex)
{

4
src/fe-gtk/notifications/notifications-winrt.vcxproj
View File

@@ -29,10 +29,10 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\..\win32\hexchat.props" />
<Import Project="..\..\..\win32\zoitechat.props" />
<PropertyGroup>
<TargetName>hcnotifications-winrt</TargetName>
<OutDir>$(HexChatRel)plugins\</OutDir>
<OutDir>$(ZoiteChatRel)plugins\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>

2
src/fe-gtk/notifygui.c
View File

@@ -24,7 +24,7 @@
#include "fe-gtk.h"
#include "../common/hexchat.h"
#include "../common/zoitechat.h"
#include "../common/notify.h"
#include "../common/cfgfiles.h"
#include "../common/fe.h"

2
src/fe-gtk/notifygui.h
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 1998-2010 Peter Zelezny.
* Copyright (C) 2009-2013 Berke Viktor.
*

6
src/fe-gtk/palette.c
View File

@@ -31,7 +31,7 @@
#include "fe-gtk.h"
#include "palette.h"
#include "../common/hexchat.h"
#include "../common/zoitechat.h"
#include "../common/util.h"
#include "../common/cfgfiles.h"
#include "../common/typedef.h"
@@ -112,7 +112,7 @@ palette_load (void)
char *cfg;
guint16 red, green, blue;
fh = hexchat_open_file ("colors.conf", O_RDONLY, 0, 0);
fh = zoitechat_open_file ("colors.conf", O_RDONLY, 0, 0);
if (fh != -1)
{
fstat (fh, &st);
@@ -149,7 +149,7 @@ palette_save (void)
int i, j, fh;
char prefname[256];
fh = hexchat_open_file ("colors.conf", O_TRUNC | O_WRONLY | O_CREAT, 0600, XOF_DOMODE);
fh = zoitechat_open_file ("colors.conf", O_TRUNC | O_WRONLY | O_CREAT, 0600, XOF_DOMODE);
if (fh != -1)
{
/* mIRC colors 0-31 are here */

2
src/fe-gtk/palette.h
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 1998-2010 Peter Zelezny.
* Copyright (C) 2009-2013 Berke Viktor.
*

8
src/fe-gtk/pixmaps.c
View File

@@ -22,7 +22,7 @@
#include "fe-gtk.h"
#include "../common/cfgfiles.h"
#include "../common/hexchat.h"
#include "../common/zoitechat.h"
#include "../common/fe.h"
#include "resources.h"
@@ -47,7 +47,7 @@ GdkPixbuf *pix_tree_server;
GdkPixbuf *pix_tree_util;
GdkPixbuf *pix_book;
GdkPixbuf *pix_hexchat;
GdkPixbuf *pix_zoitechat;
static GdkPixmap *
pixmap_load_from_file_real (char *file)
@@ -130,7 +130,7 @@ load_pixmap (const char *filename)
void
pixmaps_init (void)
{
hexchat_register_resource();
zoitechat_register_resource();
pix_ulist_voice = load_pixmap ("ulist_voice");
pix_ulist_halfop = load_pixmap ("ulist_halfop");
@@ -153,5 +153,5 @@ pixmaps_init (void)
pix_book = gdk_pixbuf_new_from_resource ("/icons/book.png", NULL);
/* used in About window, tray icon and WindowManager icon. */
pix_hexchat = load_pixmap ("hexchat");
pix_zoitechat = load_pixmap ("zoitechat");
}

4
src/fe-gtk/pixmaps.h
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 1998-2010 Peter Zelezny.
* Copyright (C) 2009-2013 Berke Viktor.
*
@@ -38,7 +38,7 @@ extern GdkPixbuf *pix_tree_server;
extern GdkPixbuf *pix_tree_util;
extern GdkPixbuf *pix_book;
extern GdkPixbuf *pix_hexchat;
extern GdkPixbuf *pix_zoitechat;
extern GdkPixmap *pixmap_load_from_file (char *file);
extern void pixmaps_init (void);

76
src/fe-gtk/plugin-notification.c
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 2015 Patrick Griffis.
*
* This program is free software; you can redistribute it and/or modify
@@ -19,11 +19,11 @@
#include "config.h"
#include <glib.h>
#include "../common/hexchat-plugin.h"
#include "../common/zoitechat-plugin.h"
#include "../common/inbound.h" /* For alert_match_word() */
#include "notifications/notification-backend.h"
static hexchat_plugin *ph;
static zoitechat_plugin *ph;
const int CHANNEL_FLAG_BALLOON = 1 << 21;
const int CHANNEL_FLAG_BALLOON_UNSET = 1 << 22;
@@ -33,27 +33,27 @@ should_alert (void)
{
int omit_away, omit_focused, omit_tray;
if (hexchat_get_prefs (ph, "gui_focus_omitalerts", NULL, &omit_focused) == 3 && omit_focused)
if (zoitechat_get_prefs (ph, "gui_focus_omitalerts", NULL, &omit_focused) == 3 && omit_focused)
{
const char *status = hexchat_get_info (ph, "win_status");
const char *status = zoitechat_get_info (ph, "win_status");
if (status && !g_strcmp0 (status, "active"))
return FALSE;
}
if (hexchat_get_prefs (ph, "away_omit_alerts", NULL, &omit_away) == 3 && omit_away)
if (zoitechat_get_prefs (ph, "away_omit_alerts", NULL, &omit_away) == 3 && omit_away)
{
if (hexchat_get_info (ph, "away"))
if (zoitechat_get_info (ph, "away"))
return FALSE;
}
if (hexchat_get_prefs (ph, "gui_tray_quiet", NULL, &omit_tray) == 3 && omit_tray)
if (zoitechat_get_prefs (ph, "gui_tray_quiet", NULL, &omit_tray) == 3 && omit_tray)
{
int tray_enabled;
if (hexchat_get_prefs (ph, "gui_tray", NULL, &tray_enabled) == 3 && tray_enabled)
if (zoitechat_get_prefs (ph, "gui_tray", NULL, &tray_enabled) == 3 && tray_enabled)
{
const char *status = hexchat_get_info (ph, "win_status");
const char *status = zoitechat_get_info (ph, "win_status");
if (status && g_strcmp0 (status, "hidden") != 0)
return FALSE;
@@ -68,7 +68,7 @@ is_ignored (char *nick)
{
const char *no_hilight;
if (hexchat_get_prefs (ph, "irc_no_hilight", &no_hilight, NULL) == 1 && no_hilight)
if (zoitechat_get_prefs (ph, "irc_no_hilight", &no_hilight, NULL) == 1 && no_hilight)
{
return alert_match_word (nick, (char*)no_hilight);
}
@@ -81,13 +81,13 @@ show_notification (const char *title, const char *text)
char *stripped_title, *stripped_text;
/* Strip all colors */
stripped_title = hexchat_strip (ph, title, -1, 7);
stripped_text = hexchat_strip (ph, text, -1, 7);
stripped_title = zoitechat_strip (ph, title, -1, 7);
stripped_text = zoitechat_strip (ph, text, -1, 7);
notification_backend_show (stripped_title, stripped_text);
hexchat_free (ph, stripped_title);
hexchat_free (ph, stripped_text);
zoitechat_free (ph, stripped_title);
zoitechat_free (ph, stripped_text);
}
static void
@@ -109,9 +109,9 @@ incoming_hilight_cb (char *word[], gpointer userdata)
{
int hilight;
if (hexchat_get_prefs (ph, "input_balloon_hilight", NULL, &hilight) == 3 && hilight && should_alert())
if (zoitechat_get_prefs (ph, "input_balloon_hilight", NULL, &hilight) == 3 && hilight && should_alert())
{
show_notificationf (word[2], _("Highlighted message from: %s (%s)"), word[1], hexchat_get_info (ph, "channel"));
show_notificationf (word[2], _("Highlighted message from: %s (%s)"), word[1], zoitechat_get_info (ph, "channel"));
}
return HEXCHAT_EAT_NONE;
}
@@ -123,7 +123,7 @@ incoming_message_cb (char *word[], gpointer userdata)
int flags;
int alert = 0;
flags = hexchat_list_int(ph, NULL, "flags");
flags = zoitechat_list_int(ph, NULL, "flags");
/* Let sure that can alert */
if (should_alert()) {
@@ -132,12 +132,12 @@ incoming_message_cb (char *word[], gpointer userdata)
alert = (flags & CHANNEL_FLAG_BALLOON);
} else {
/* Else follow global environment */
alert = (hexchat_get_prefs(ph, "input_balloon_chans", NULL, &message) == 3 && message);
alert = (zoitechat_get_prefs(ph, "input_balloon_chans", NULL, &message) == 3 && message);
}
}
if (alert) {
show_notificationf(word[2], _("Channel message from: %s (%s)"), word[1], hexchat_get_info(ph, "channel"));
show_notificationf(word[2], _("Channel message from: %s (%s)"), word[1], zoitechat_get_info(ph, "channel"));
}
return HEXCHAT_EAT_NONE;
}
@@ -149,7 +149,7 @@ incoming_priv_cb (char *word[], gpointer userdata)
int flags;
int alert = 0;
flags = hexchat_list_int(ph, NULL, "flags");
flags = zoitechat_list_int(ph, NULL, "flags");
/* Let sure that can alert */
if (should_alert()) {
@@ -158,15 +158,15 @@ incoming_priv_cb (char *word[], gpointer userdata)
alert = (flags & CHANNEL_FLAG_BALLOON);
} else {
/* Else follow global environment */
alert = (hexchat_get_prefs(ph, "input_balloon_priv", NULL, &priv) == 3 && priv);
alert = (zoitechat_get_prefs(ph, "input_balloon_priv", NULL, &priv) == 3 && priv);
}
}
if (alert)
{
const char *network = hexchat_get_info (ph, "network");
const char *network = zoitechat_get_info (ph, "network");
if (!network)
network = hexchat_get_info (ph, "server");
network = zoitechat_get_info (ph, "server");
if (userdata != NULL) /* Special event */
{
@@ -206,7 +206,7 @@ tray_cmd_cb (char *word[], char *word_eol[], gpointer userdata)
}
int
notification_plugin_init (hexchat_plugin *plugin_handle, char **plugin_name, char **plugin_desc, char **plugin_version, char *arg)
notification_plugin_init (zoitechat_plugin *plugin_handle, char **plugin_name, char **plugin_desc, char **plugin_version, char *arg)
{
const char* error = NULL;
@@ -222,24 +222,24 @@ notification_plugin_init (hexchat_plugin *plugin_handle, char **plugin_name, cha
return 0;
}
hexchat_hook_print (ph, "Channel Msg Hilight", HEXCHAT_PRI_LOWEST, incoming_hilight_cb, NULL);
hexchat_hook_print (ph, "Channel Action Hilight", HEXCHAT_PRI_LOWEST, incoming_hilight_cb, NULL);
zoitechat_hook_print (ph, "Channel Msg Hilight", HEXCHAT_PRI_LOWEST, incoming_hilight_cb, NULL);
zoitechat_hook_print (ph, "Channel Action Hilight", HEXCHAT_PRI_LOWEST, incoming_hilight_cb, NULL);
hexchat_hook_print (ph, "Channel Message", HEXCHAT_PRI_LOWEST, incoming_message_cb, NULL);
hexchat_hook_print (ph, "Channel Action", HEXCHAT_PRI_LOWEST, incoming_message_cb, NULL);
hexchat_hook_print (ph, "Channel Notice", HEXCHAT_PRI_LOWEST, incoming_message_cb, NULL);
zoitechat_hook_print (ph, "Channel Message", HEXCHAT_PRI_LOWEST, incoming_message_cb, NULL);
zoitechat_hook_print (ph, "Channel Action", HEXCHAT_PRI_LOWEST, incoming_message_cb, NULL);
zoitechat_hook_print (ph, "Channel Notice", HEXCHAT_PRI_LOWEST, incoming_message_cb, NULL);
hexchat_hook_print (ph, "Private Message", HEXCHAT_PRI_LOWEST, incoming_priv_cb, NULL);
hexchat_hook_print (ph, "Private Message to Dialog", HEXCHAT_PRI_LOWEST, incoming_priv_cb, NULL);
hexchat_hook_print (ph, "Private Action", HEXCHAT_PRI_LOWEST, incoming_priv_cb, NULL);
hexchat_hook_print (ph, "Private Action to Dialog", HEXCHAT_PRI_LOWEST, incoming_priv_cb, NULL);
zoitechat_hook_print (ph, "Private Message", HEXCHAT_PRI_LOWEST, incoming_priv_cb, NULL);
zoitechat_hook_print (ph, "Private Message to Dialog", HEXCHAT_PRI_LOWEST, incoming_priv_cb, NULL);
zoitechat_hook_print (ph, "Private Action", HEXCHAT_PRI_LOWEST, incoming_priv_cb, NULL);
zoitechat_hook_print (ph, "Private Action to Dialog", HEXCHAT_PRI_LOWEST, incoming_priv_cb, NULL);
/* Special events treated as priv */
hexchat_hook_print (ph, "Notice", HEXCHAT_PRI_LOWEST, incoming_priv_cb, GINT_TO_POINTER (1));
hexchat_hook_print (ph, "Invited", HEXCHAT_PRI_LOWEST, incoming_priv_cb, GINT_TO_POINTER (2));
hexchat_hook_print (ph, "DCC Offer", HEXCHAT_PRI_LOWEST, incoming_priv_cb, GINT_TO_POINTER (3));
zoitechat_hook_print (ph, "Notice", HEXCHAT_PRI_LOWEST, incoming_priv_cb, GINT_TO_POINTER (1));
zoitechat_hook_print (ph, "Invited", HEXCHAT_PRI_LOWEST, incoming_priv_cb, GINT_TO_POINTER (2));
zoitechat_hook_print (ph, "DCC Offer", HEXCHAT_PRI_LOWEST, incoming_priv_cb, GINT_TO_POINTER (3));
hexchat_hook_command (ph, "TRAY", HEXCHAT_PRI_HIGH, tray_cmd_cb, NULL, NULL);
zoitechat_hook_command (ph, "TRAY", HEXCHAT_PRI_HIGH, tray_cmd_cb, NULL, NULL);
return 1;
}

2
src/fe-gtk/plugin-notification.h
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 2015 Patrick Griffis.
*
* This program is free software; you can redistribute it and/or modify

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

@@ -17,9 +17,9 @@
*/
#include <string.h>
#include "../common/hexchat-plugin.h"
#include "../common/hexchat.h"
#include "../common/hexchatc.h"
#include "../common/zoitechat-plugin.h"
#include "../common/zoitechat.h"
#include "../common/zoitechatc.h"
#include "../common/inbound.h"
#include "../common/server.h"
#include "../common/fe.h"
@@ -68,7 +68,7 @@ static TrayStatus tray_status;
static guint tray_menu_timer;
static gint64 tray_menu_inactivetime;
#endif
static hexchat_plugin *ph;
static zoitechat_plugin *ph;
static TrayIcon custom_icon1;
static TrayIcon custom_icon2;
@@ -91,7 +91,7 @@ tray_get_window_status (void)
{
const char *st;
st = hexchat_get_info (ph, "win_status");
st = zoitechat_get_info (ph, "win_status");
if (!st)
return WS_HIDDEN;
@@ -328,9 +328,9 @@ tray_toggle_visibility (gboolean force_hide)
return FALSE;
/* ph may have an invalid context now */
hexchat_set_context (ph, hexchat_find_context (ph, NULL, NULL));
zoitechat_set_context (ph, zoitechat_find_context (ph, NULL, NULL));
win = GTK_WINDOW (hexchat_get_info (ph, "gtkwin_ptr"));
win = GTK_WINDOW (zoitechat_get_info (ph, "gtkwin_ptr"));
tray_stop_flash ();
tray_reset_counts ();
@@ -341,7 +341,7 @@ tray_toggle_visibility (gboolean force_hide)
if (force_hide || gtk_widget_get_visible (GTK_WIDGET (win)))
{
if (prefs.hex_gui_tray_away)
hexchat_command (ph, "ALLSERV AWAY");
zoitechat_command (ph, "ALLSERV AWAY");
gtk_window_get_position (win, &x, &y);
screen = gtk_window_get_screen (win);
maximized = prefs.hex_gui_win_state;
@@ -351,7 +351,7 @@ tray_toggle_visibility (gboolean force_hide)
else
{
if (prefs.hex_gui_tray_away)
hexchat_command (ph, "ALLSERV BACK");
zoitechat_command (ph, "ALLSERV BACK");
gtk_window_set_screen (win, screen);
gtk_window_move (win, x, y);
if (maximized)
@@ -534,7 +534,7 @@ tray_menu_cb (GtkWidget *widget, guint button, guint time, gpointer userdata)
int away_status;
/* ph may have an invalid context now */
hexchat_set_context (ph, hexchat_find_context (ph, NULL, NULL));
zoitechat_set_context (ph, zoitechat_find_context (ph, NULL, NULL));
/* close any old menu */
if (G_IS_OBJECT (menu))
@@ -632,10 +632,10 @@ tray_hilight_cb (char *word[], void *userdata)
tray_hilight_count++;
if (tray_hilight_count == 1)
tray_set_tipf (_("Highlighted message from: %s (%s) - %s"),
word[1], hexchat_get_info (ph, "channel"), _(DISPLAY_NAME));
word[1], zoitechat_get_info (ph, "channel"), _(DISPLAY_NAME));
else
tray_set_tipf (_("%u highlighted messages, latest from: %s (%s) - %s"),
tray_hilight_count, word[1], hexchat_get_info (ph, "channel"),
tray_hilight_count, word[1], zoitechat_get_info (ph, "channel"),
_(DISPLAY_NAME));
}
@@ -655,7 +655,7 @@ tray_message_cb (char *word[], void *userdata)
tray_pub_count++;
if (tray_pub_count == 1)
tray_set_tipf (_("Channel message from: %s (%s) - %s"),
word[1], hexchat_get_info (ph, "channel"), _(DISPLAY_NAME));
word[1], zoitechat_get_info (ph, "channel"), _(DISPLAY_NAME));
else
tray_set_tipf (_("%u channel messages. - %s"), tray_pub_count, _(DISPLAY_NAME));
}
@@ -671,9 +671,9 @@ tray_priv (char *from, char *text)
if (alert_match_word (from, prefs.hex_irc_no_hilight))
return;
network = hexchat_get_info (ph, "network");
network = zoitechat_get_info (ph, "network");
if (!network)
network = hexchat_get_info (ph, "server");
network = zoitechat_get_info (ph, "server");
if (prefs.hex_input_tray_priv)
{
@@ -714,9 +714,9 @@ tray_dcc_cb (char *word[], void *userdata)
/* if (tray_status == TS_FILEOFFER)
return HEXCHAT_EAT_NONE;*/
network = hexchat_get_info (ph, "network");
network = zoitechat_get_info (ph, "network");
if (!network)
network = hexchat_get_info (ph, "server");
network = zoitechat_get_info (ph, "server");
if (prefs.hex_input_tray_priv && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1))
{
@@ -764,42 +764,42 @@ tray_apply_setup (void)
}
else
{
GtkWindow *window = GTK_WINDOW(hexchat_get_info (ph, "gtkwin_ptr"));
GtkWindow *window = GTK_WINDOW(zoitechat_get_info (ph, "gtkwin_ptr"));
if (prefs.hex_gui_tray && gtkutil_tray_icon_supported (window))
tray_init ();
}
}
int
tray_plugin_init (hexchat_plugin *plugin_handle, char **plugin_name,
tray_plugin_init (zoitechat_plugin *plugin_handle, char **plugin_name,
char **plugin_desc, char **plugin_version, char *arg)
{
/* we need to save this for use with any hexchat_* functions */
/* we need to save this for use with any zoitechat_* functions */
ph = plugin_handle;
*plugin_name = "";
*plugin_desc = "";
*plugin_version = "";
hexchat_hook_print (ph, "Channel Msg Hilight", -1, tray_hilight_cb, NULL);
hexchat_hook_print (ph, "Channel Action Hilight", -1, tray_hilight_cb, NULL);
zoitechat_hook_print (ph, "Channel Msg Hilight", -1, tray_hilight_cb, NULL);
zoitechat_hook_print (ph, "Channel Action Hilight", -1, tray_hilight_cb, NULL);
hexchat_hook_print (ph, "Channel Message", -1, tray_message_cb, NULL);
hexchat_hook_print (ph, "Channel Action", -1, tray_message_cb, NULL);
hexchat_hook_print (ph, "Channel Notice", -1, tray_message_cb, NULL);
zoitechat_hook_print (ph, "Channel Message", -1, tray_message_cb, NULL);
zoitechat_hook_print (ph, "Channel Action", -1, tray_message_cb, NULL);
zoitechat_hook_print (ph, "Channel Notice", -1, tray_message_cb, NULL);
hexchat_hook_print (ph, "Private Message", -1, tray_priv_cb, NULL);
hexchat_hook_print (ph, "Private Message to Dialog", -1, tray_priv_cb, NULL);
hexchat_hook_print (ph, "Private Action", -1, tray_priv_cb, NULL);
hexchat_hook_print (ph, "Private Action to Dialog", -1, tray_priv_cb, NULL);
hexchat_hook_print (ph, "Notice", -1, tray_priv_cb, NULL);
hexchat_hook_print (ph, "Invited", -1, tray_invited_cb, NULL);
zoitechat_hook_print (ph, "Private Message", -1, tray_priv_cb, NULL);
zoitechat_hook_print (ph, "Private Message to Dialog", -1, tray_priv_cb, NULL);
zoitechat_hook_print (ph, "Private Action", -1, tray_priv_cb, NULL);
zoitechat_hook_print (ph, "Private Action to Dialog", -1, tray_priv_cb, NULL);
zoitechat_hook_print (ph, "Notice", -1, tray_priv_cb, NULL);
zoitechat_hook_print (ph, "Invited", -1, tray_invited_cb, NULL);
hexchat_hook_print (ph, "DCC Offer", -1, tray_dcc_cb, NULL);
zoitechat_hook_print (ph, "DCC Offer", -1, tray_dcc_cb, NULL);
hexchat_hook_print (ph, "Focus Window", -1, tray_focus_cb, NULL);
zoitechat_hook_print (ph, "Focus Window", -1, tray_focus_cb, NULL);
GtkWindow *window = GTK_WINDOW(hexchat_get_info (ph, "gtkwin_ptr"));
GtkWindow *window = GTK_WINDOW(zoitechat_get_info (ph, "gtkwin_ptr"));
if (prefs.hex_gui_tray && gtkutil_tray_icon_supported (window))
tray_init ();
@@ -807,7 +807,7 @@ tray_plugin_init (hexchat_plugin *plugin_handle, char **plugin_name,
}
int
tray_plugin_deinit (hexchat_plugin *plugin_handle)
tray_plugin_deinit (zoitechat_plugin *plugin_handle)
{
#ifdef WIN32
tray_cleanup ();

2
src/fe-gtk/plugin-tray.h
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 1998-2010 Peter Zelezny.
* Copyright (C) 2009-2013 Berke Viktor.
*

10
src/fe-gtk/plugingui.c
View File

@@ -22,15 +22,15 @@
#include "fe-gtk.h"
#include "../common/hexchat.h"
#include "../common/zoitechat.h"
#define PLUGIN_C
typedef struct session hexchat_context;
#include "../common/hexchat-plugin.h"
typedef struct session zoitechat_context;
#include "../common/zoitechat-plugin.h"
#include "../common/plugin.h"
#include "../common/util.h"
#include "../common/outbound.h"
#include "../common/fe.h"
#include "../common/hexchatc.h"
#include "../common/zoitechatc.h"
#include "../common/cfgfiles.h"
#include "gtkutil.h"
#include "maingui.h"
@@ -110,7 +110,7 @@ extern GSList *plugin_list;
void
fe_pluginlist_update (void)
{
hexchat_plugin *pl;
zoitechat_plugin *pl;
GSList *list;
GtkTreeView *view;
GtkListStore *store;

2
src/fe-gtk/plugingui.h
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 1998-2010 Peter Zelezny.
* Copyright (C) 2009-2013 Berke Viktor.
*

6
src/fe-gtk/rawlog.c
View File

@@ -31,8 +31,8 @@
#include <gdk/gdkkeysyms.h>
#include "../common/hexchat.h"
#include "../common/hexchatc.h"
#include "../common/zoitechat.h"
#include "../common/zoitechatc.h"
#include "../common/cfgfiles.h"
#include "../common/server.h"
#include "gtkutil.h"
@@ -57,7 +57,7 @@ rawlog_save (server *serv, char *file)
if (file)
{
if (serv->gui->rawlog_window)
fh = hexchat_open_file (file, O_TRUNC | O_WRONLY | O_CREAT,
fh = zoitechat_open_file (file, O_TRUNC | O_WRONLY | O_CREAT,
0600, XOF_DOMODE | XOF_FULLPATH);
if (fh != -1)
{

2
src/fe-gtk/rawlog.h
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 1998-2010 Peter Zelezny.
* Copyright (C) 2009-2013 Berke Viktor.
*

12
src/fe-gtk/servlistgui.c
View File

@@ -23,8 +23,8 @@
#include <gdk/gdkkeysyms.h>
#include "../common/hexchat.h"
#include "../common/hexchatc.h"
#include "../common/zoitechat.h"
#include "../common/zoitechatc.h"
#include "../common/servlist.h"
#include "../common/cfgfiles.h"
#include "../common/fe.h"
@@ -119,7 +119,7 @@ static const char *pages[]=
* network list without breaking config compatibility.
*
* Also make sure inbound_nickserv_login() won't break, i.e. if you add a new
* type that is NickServ-based, add it there as well so that HexChat knows to
* type that is NickServ-based, add it there as well so that ZoiteChat knows to
* treat it as such.
*/
static int login_types_conf[] =
@@ -980,7 +980,7 @@ servlist_savegui (void)
sp[0] = 0; /* spaces will break the login */
/* strcpy (prefs.hex_irc_real_name, gtk_entry_get_text (GTK_ENTRY (entry_greal))); */
servlist_save ();
save_config (); /* For nicks stored in hexchat.conf */
save_config (); /* For nicks stored in zoitechat.conf */
return 0;
}
@@ -1298,7 +1298,7 @@ servlist_delete_cb (GtkWidget *win, GdkEventAny *event, gpointer userdata)
selected_net = NULL;
if (sess_list == NULL)
hexchat_exit ();
zoitechat_exit ();
return FALSE;
}
@@ -1312,7 +1312,7 @@ servlist_close_cb (GtkWidget *button, gpointer userdata)
selected_net = NULL;
if (sess_list == NULL)
hexchat_exit ();
zoitechat_exit ();
}
/* convert "host:port" format to "host/port" */

2
src/fe-gtk/servlistgui.h
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 1998-2010 Peter Zelezny.
* Copyright (C) 2009-2013 Berke Viktor.
*

12
src/fe-gtk/setup.c
View File

@@ -22,13 +22,13 @@
#include <sys/stat.h>
#include <sys/types.h>
#include "../common/hexchat.h"
#include "../common/zoitechat.h"
#include "../common/cfgfiles.h"
#include "../common/fe.h"
#include "../common/text.h"
#include "../common/userlist.h"
#include "../common/util.h"
#include "../common/hexchatc.h"
#include "../common/zoitechatc.h"
#include "../common/outbound.h"
#include "fe-gtk.h"
#include "gtkutil.h"
@@ -52,7 +52,7 @@ static GtkWidget *setup_window = NULL;
static int last_selected_page = 0;
static int last_selected_row = 0; /* sound row */
static gboolean color_change;
static struct hexchatprefs setup_prefs;
static struct zoitechatprefs setup_prefs;
static GtkWidget *cancel_button;
static GtkWidget *font_dialog = NULL;
@@ -1486,7 +1486,7 @@ setup_create_color_button (GtkWidget *table, int num, int row, int col)
but = gtk_button_new_with_label (" ");
gtk_label_set_markup (GTK_LABEL (gtk_bin_get_child (GTK_BIN (but))), buf);
/* win32 build uses this to turn off themeing */
g_object_set_data (G_OBJECT (but), "hexchat-color", (gpointer)1);
g_object_set_data (G_OBJECT (but), "zoitechat-color", (gpointer)1);
gtk_table_attach (GTK_TABLE (table), but, col, col+1, row, row+1,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
g_signal_connect (G_OBJECT (but), "clicked",
@@ -2146,7 +2146,7 @@ setup_apply_real (int new_pix, int do_ulist, int do_layout, int do_identd)
mg_apply_setup ();
tray_apply_setup ();
hexchat_reinit_timers ();
zoitechat_reinit_timers ();
if (do_layout)
menu_change_layout ();
@@ -2156,7 +2156,7 @@ setup_apply_real (int new_pix, int do_ulist, int do_layout, int do_identd)
}
static void
setup_apply (struct hexchatprefs *pr)
setup_apply (struct zoitechatprefs *pr)
{
#ifdef WIN32
PangoFontDescription *old_desc;

2
src/fe-gtk/setup.h
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 1998-2010 Peter Zelezny.
* Copyright (C) 2009-2013 Berke Viktor.
*

6
src/fe-gtk/sexy-spell-entry.c
View File

@@ -46,7 +46,7 @@
#endif
#include "../common/cfgfiles.h"
#include "../common/hexchatc.h"
#include "../common/zoitechatc.h"
#include "palette.h"
#include "xtext.h"
@@ -264,7 +264,7 @@ sexy_spell_entry_class_init(SexySpellEntryClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(SexySpellEntryClass, word_check),
(GSignalAccumulator) spell_accumulator, NULL,
_hexchat_marshal_BOOLEAN__STRING,
_zoitechat_marshal_BOOLEAN__STRING,
G_TYPE_BOOLEAN,
1, G_TYPE_STRING);
@@ -1331,7 +1331,7 @@ sexy_spell_entry_activate_language_internal(SexySpellEntry *entry, const gchar *
return FALSE;
}
enchant_dict_add_to_session (dict, "HexChat", strlen("HexChat"));
enchant_dict_add_to_session (dict, "ZoiteChat", strlen("ZoiteChat"));
entry->priv->dict_list = g_slist_append(entry->priv->dict_list, (gpointer) dict);
g_hash_table_insert(entry->priv->dict_hash, get_lang_from_dict(dict), (gpointer) dict);

4
src/fe-gtk/textgui.c
View File

@@ -26,8 +26,8 @@
#include "fe-gtk.h"
#include "../common/hexchat.h"
#include "../common/hexchatc.h"
#include "../common/zoitechat.h"
#include "../common/zoitechatc.h"
#include "../common/cfgfiles.h"
#include "../common/outbound.h"
#include "../common/fe.h"

2
src/fe-gtk/textgui.h
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 1998-2010 Peter Zelezny.
* Copyright (C) 2009-2013 Berke Viktor.
*

4
src/fe-gtk/urlgrab.c
View File

@@ -22,8 +22,8 @@
#include "fe-gtk.h"
#include "../common/hexchat.h"
#include "../common/hexchatc.h"
#include "../common/zoitechat.h"
#include "../common/zoitechatc.h"
#include "../common/cfgfiles.h"
#include "../common/fe.h"
#include "../common/url.h"

2
src/fe-gtk/urlgrab.h
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 1998-2010 Peter Zelezny.
* Copyright (C) 2009-2013 Berke Viktor.
*

6
src/fe-gtk/userlistgui.c
View File

@@ -24,13 +24,13 @@
#include <gdk/gdkkeysyms.h>
#include "../common/hexchat.h"
#include "../common/zoitechat.h"
#include "../common/util.h"
#include "../common/userlist.h"
#include "../common/modes.h"
#include "../common/text.h"
#include "../common/notify.h"
#include "../common/hexchatc.h"
#include "../common/zoitechatc.h"
#include "../common/fe.h"
#include "gtkutil.h"
#include "palette.h"
@@ -664,7 +664,7 @@ userlist_create (GtkWidget *box)
gtk_widget_show (sw);
treeview = gtk_tree_view_new ();
gtk_widget_set_name (treeview, "hexchat-userlist");
gtk_widget_set_name (treeview, "zoitechat-userlist");
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE);
gtk_tree_selection_set_mode (gtk_tree_view_get_selection
(GTK_TREE_VIEW (treeview)),

2
src/fe-gtk/userlistgui.h
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 1998-2010 Peter Zelezny.
* Copyright (C) 2009-2013 Berke Viktor.
*

8
src/fe-gtk/xtext.c
View File

@@ -32,10 +32,10 @@
#include <time.h>
#include "config.h"
#include "../common/hexchat.h"
#include "../common/zoitechat.h"
#include "../common/fe.h"
#include "../common/util.h"
#include "../common/hexchatc.h"
#include "../common/zoitechatc.h"
#include "../common/url.h"
#ifdef WIN32
@@ -2316,7 +2316,7 @@ gtk_xtext_class_init (GtkXTextClass * class)
G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkXTextClass, word_click),
NULL, NULL,
_hexchat_marshal_VOID__POINTER_POINTER,
_zoitechat_marshal_VOID__POINTER_POINTER,
G_TYPE_NONE,
2, G_TYPE_POINTER, G_TYPE_POINTER);
xtext_signals[SET_SCROLL_ADJUSTMENTS] =
@@ -2325,7 +2325,7 @@ gtk_xtext_class_init (GtkXTextClass * class)
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkXTextClass, set_scroll_adjustments),
NULL, NULL,
_hexchat_marshal_VOID__OBJECT_OBJECT,
_zoitechat_marshal_VOID__OBJECT_OBJECT,
G_TYPE_NONE,
2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);

2
src/fe-gtk/xtext.h
View File

@@ -1,4 +1,4 @@
/* HexChat
/* ZoiteChat
* Copyright (C) 1998-2010 Peter Zelezny.
* Copyright (C) 2009-2013 Berke Viktor.
*

8
src/fe-gtk/hexchat.rc.tt → src/fe-gtk/zoitechat.rc.tt
View File

@@ -3,7 +3,7 @@
#define COMMA_VERSION <#= [string]::Join(',', $versionParts) #>,0
XC_ICON ICON "<#= $env:SOLUTIONDIR -replace '\\', '/' #>data/icons/hexchat.ico"
XC_ICON ICON "<#= $env:SOLUTIONDIR -replace '\\', '/' #>data/icons/zoitechat.ico"
VS_VERSION_INFO VERSIONINFO
FILEVERSION COMMA_VERSION
@@ -14,9 +14,9 @@ VS_VERSION_INFO VERSIONINFO
BLOCK "040904B0"
BEGIN
VALUE "FileDescription", "HexChat IRC Client"
VALUE "CompanyName", "HexChat"
VALUE "ProductName", "HexChat"
VALUE "FileDescription", "ZoiteChat IRC Client"
VALUE "CompanyName", "ZoiteChat"
VALUE "ProductName", "ZoiteChat"
VALUE "ProductVersion", PACKAGE_VERSION
VALUE "FileVersion", PACKAGE_VERSION
END