Commit 16d32fde authored by Berke Viktor's avatar Berke Viktor
Browse files

Another bunch of rebranding stuff

parent ea2c58c2
......@@ -2,11 +2,11 @@
SUBDIRS = po intl src plugins
EXTRA_DIST = autogen.sh HACKING INSTALL.w32 faq.html xchat.png \
xchat.desktop xchat.spec config.h.w32 xchat.ico
EXTRA_DIST = autogen.sh HACKING INSTALL.w32 faq.html hexchat.png \
hexchat.desktop hexchat.spec hexchat.ico
icon_DATA = xchat.png
icon_DATA = hexchat.png
icondir = $(datadir)/pixmaps
util_DATA = xchat.desktop
util_DATA = hexchat.desktop
utildir = $(datadir)/applications
......@@ -9,8 +9,11 @@
#define PACKAGE_NAME "hexchat"
#define PACKAGE_VERSION "2.9.0"
#define XCHAT_REVISION "1508"
#define XCHATLIBDIR "."
#define XCHATSHAREDIR "."
#define HEXCHATLIBDIR "."
#define HEXCHATSHAREDIR "."
#define OLD_PERL
#define GETTEXT_PACKAGE "hexchat"
#define PACKAGE_TARNAME "hexchat-2.9.0"
#ifndef USE_IPV6
#define socklen_t int
#endif
dnl Process this file with autoconf to produce a configure script.
AC_INIT([XChat],[2.8.8],[http://www.xchat.org/],[xchat])
AC_INIT([HexChat],[2.9.0],[http://www.hexchat.org/],[hexchat])
AC_PREREQ([2.59])
AC_COPYRIGHT([Copyright (C) 1998-2010 Peter Zelezny])
......@@ -21,7 +21,7 @@ AC_PROG_LIBTOOL
dnl -----------------------------------------------------------
dnl Language Support
dnl -----------------------------------------------------------
GETTEXT_PACKAGE=xchat
GETTEXT_PACKAGE=hexchat
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package name])
......@@ -31,8 +31,8 @@ AM_GNU_GETTEXT
dnl displaced from acconfig.h
AH_VERBATIM([OLD_PERL],[#undef OLD_PERL])
AH_VERBATIM([PREFIX],[#undef PREFIX])
AH_VERBATIM([XCHATLIBDIR],[#undef XCHATLIBDIR])
AH_VERBATIM([XCHATSHAREDIR],[#undef XCHATSHAREDIR])
AH_VERBATIM([HEXCHATLIBDIR],[#undef HEXCHATLIBDIR])
AH_VERBATIM([HEXCHATSHAREDIR],[#undef HEXCHATSHAREDIR])
AH_VERBATIM([SOCKS],[#undef SOCKS])
AH_VERBATIM([USE_MSPROXY],[#undef USE_MSPROXY])
AH_VERBATIM([USE_LIBPROXY],[#undef USE_LIBPROXY])
......@@ -812,15 +812,15 @@ test "x$exec_prefix" = xNONE && exec_prefix="$prefix"
AC_DEFINE_UNQUOTED(PREFIX, "${prefix}")
XCHATLIBDIR=`eval echo ${libdir}/xchat`
AC_DEFINE_UNQUOTED(XCHATLIBDIR, "$XCHATLIBDIR")
HEXCHATLIBDIR=`eval echo ${libdir}/hexchat`
AC_DEFINE_UNQUOTED(HEXCHATLIBDIR, "$HEXCHATLIBDIR")
XCHATSHAREDIR=`eval echo ${datadir}`
AC_DEFINE_UNQUOTED(XCHATSHAREDIR, "$XCHATSHAREDIR")
HEXCHATSHAREDIR=`eval echo ${datadir}`
AC_DEFINE_UNQUOTED(HEXCHATSHAREDIR, "$HEXCHATSHAREDIR")
dnl for plugins/xxx/Makefile.am
xchatlibdir=${libdir}/xchat
AC_SUBST(xchatlibdir)
hexchatlibdir=${libdir}/hexchat
AC_SUBST(hexchatlibdir)
AC_OUTPUT([
Makefile
......@@ -839,7 +839,7 @@ po/Makefile.in
])
echo
echo xchat $VERSION
echo hexchat $VERSION
echo
echo Building GTK+ Interface .... : $gtkfe
echo Building TEXT Interface .... : $textfe
......
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html><head>
<title>XCHAT FAQ</title>
<title>HexChat FAQ</title>
<style type="text/css">
<!--
body {
......@@ -195,13 +195,13 @@ list at the top of the window.
<p>
<u>Unix/Linux</u>
<br>The default icons are hard coded (compiled) in. You can override them by creating
some PNG files in ${PREFIX}/share/xchat. ${PREFIX} is usually /usr, so that
would translate to /usr/share/xchat. If you compiled from source tarball without
some PNG files in ${PREFIX}/share/hexchat. ${PREFIX} is usually /usr, so that
would translate to /usr/share/hexchat. If you compiled from source tarball without
specifying a prefix, it will be /usr/local instead.
<br>
<br>
<u>Windows</u>
<br>Your own custom icons can be placed in C:\Program Files\XChat\Icons. Image format
<br>Your own custom icons can be placed in C:\Program Files\HexChat\Icons. Image format
may be PNG or ICO. PNG support on Windows 2000 may require installing GDI+, but it's
standard on XP or newer.
</p>
......@@ -224,7 +224,7 @@ standard on XP or newer.
<tr><td>highlight.png</td><td>Tray: Highlighted Message</td></tr>
<tr><td>fileoffer.png</td><td>Tray: DCC</td></tr>
<tr><td></td><td></td></tr>
<tr><td>xchat.png</td><td>Main XChat icon</td></tr>
<tr><td>hexchat.png</td><td>Main HexChat icon</td></tr>
</table>
</blockquote>
......@@ -367,7 +367,7 @@ the plugin for running those scripts isn't loaded.
<li>The Perl, Python and TCL plugins come with XChat in the same archive.</li>
<li>During ./configure, it will check for Perl, Python and TCL libs and headers, you should check if it failed there.</li>
<li>The plugins directory can be found by issuing the shell command
<pre>xchat -p</pre>
<pre>hexchat -p</pre>
</li>
<li>All *.so files are auto-loaded at startup (*.dll on Windows).</li>
<li>If you downloaded a binary package, maybe the packager decided to exclude the Perl or Python plugins.</li>
......@@ -395,12 +395,12 @@ It depends on your version of Windows and where it stores the
C:\Documents and Settings\<i><b>username</b></i>\Application Data\X-Chat 2\
<br><b>or simply:</b>
<br>
C:\Program Files\XChat\Plugins\
C:\Program Files\HexChat\Plugins\
<br><br><br>
<u>UNIX</u>
<br><br>
~/.xchat2/
Where "~" represents your home directory i.e.: $HOME/.xchat2/
~/.config/hexchat/
Where "~" represents your home directory i.e.: $HOME/.config/hexchat/
</p>
<br><h3><a name="q219">19. How do I minimize X-Chat to the System Tray (Notification Area)?</a></h3>
......@@ -461,14 +461,14 @@ You can also add more items to the right-click menu in XChat: <b>Settings &gt; A
<p>
<u>UNIX</u>
<br>
<br>~/.xchat2/xchatlogs/
<br>~/.hexchat/logs/
<br>where ~ represents your home directory.
<br>
<br>
<br><u>Windows</u>
<br>
<br><b>Windows XP/2000</b>: C:\Documents and Settings\<i><b>username</b></i>\Application Data\X-Chat 2\xchatlogs
<br><b>Windows Vista/7</b>: C:\Users\<i><b>username</b></i>\AppData\Roaming\X-Chat 2\xchatlogs
<br><b>Windows XP/2000</b>: C:\Documents and Settings\<i><b>username</b></i>\Application Data\HexChat\logs
<br><b>Windows Vista/7</b>: C:\Users\<i><b>username</b></i>\AppData\Roaming\HexChat\logs
</p>
<br><h3><a name="q223">23. How do I rotate log files every so often?</a></h3>
......
[Desktop Entry]
Encoding=UTF-8
Name=XChat IRC
Name=HexChat IRC
Name[zh_TW]=網路清談
Comment[de]=IRC-Client
Comment[es]=Aplicación de IRC
......@@ -16,8 +16,8 @@ Comment[sv]=IRC-klient
Comment[ro]=Client de IRC
Comment[zh_TW]=X-Chat 聊天程式
Comment=Chat with other people using Internet Relay Chat
Exec=xchat
Icon=xchat
Exec=hexchat
Icon=hexchat
Terminal=false
Type=Application
Categories=Network;
......
......@@ -2,14 +2,14 @@
%define gconf_version 2.14
Summary: A popular and easy to use graphical IRC (chat) client
Name: xchat
Name: hexchat
Version: 2.8.8
Release: 0%{?dist}
Epoch: 1
Group: Applications/Internet
License: GPLv2+
URL: http://www.xchat.org
Source: http://www.xchat.org/files/source/2.8/xchat-%{version}.tar.bz2
URL: http://www.hexchat.org
Source: https://github.com/downloads/hexchat/hexchat/hexchat-%{version}.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Patches 0-9 reserved for official xchat.org patches
......@@ -29,10 +29,10 @@ Requires(preun): GConf2 >= %{gconf_version}
# Ensure that a compatible libperl is installed
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Provides: xchat-perl = %{epoch}:%{version}-%{release}
Obsoletes: xchat-perl < %{epoch}:%{version}-%{release}
Provides: xchat-python = %{epoch}:%{version}-%{release}
Obsoletes: xchat-python < %{epoch}:%{version}-%{release}
Provides: hexchat-perl = %{epoch}:%{version}-%{release}
Obsoletes: hexchat-perl < %{epoch}:%{version}-%{release}
Provides: hexchat-python = %{epoch}:%{version}-%{release}
Obsoletes: hexchat-python < %{epoch}:%{version}-%{release}
%description
X-Chat is an easy to use graphical IRC chat client for the X Window System.
......@@ -78,14 +78,14 @@ make %{?_smp_mflags}
%{__make} install DESTDIR=$RPM_BUILD_ROOT GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
# Get rid of libtool archives
%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/xchat/plugins/*.la
%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/hexchat/plugins/*.la
# Install the .desktop file properly
%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/applications/xchat.desktop
%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/applications/hexchat.desktop
desktop-file-install --vendor="" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-category=IRCClient \
--add-category=GTK xchat.desktop
--add-category=GTK hexchat.desktop
%find_lang %{name}
......@@ -124,18 +124,18 @@ fi
%files -f %{name}.lang
%defattr(-,root,root)
%doc README ChangeLog
%doc plugins/plugin20.html plugins/perl/xchat2-perl.html
%{_bindir}/xchat
%dir %{_libdir}/xchat
%dir %{_libdir}/xchat/plugins
%{_libdir}/xchat/plugins/perl.so
%{_libdir}/xchat/plugins/python.so
%{_datadir}/applications/xchat.desktop
%doc plugins/plugin20.html plugins/perl/hexchat-perl.html
%{_bindir}/hexchat
%dir %{_libdir}/hexchat
%dir %{_libdir}/hexchat/plugins
%{_libdir}/hexchat/plugins/perl.so
%{_libdir}/hexchat/plugins/python.so
%{_datadir}/applications/hexchat.desktop
%{_datadir}/pixmaps/*
%{_sysconfdir}/gconf/schemas/apps_xchat_url_handler.schemas
%{_datadir}/dbus-1/services/org.xchat.service.service
%{_datadir}/dbus-1/services/org.hexchat.service.service
%files tcl
%defattr(-,root,root)
%{_libdir}/xchat/plugins/tcl.so
%{_libdir}/hexchat/plugins/tcl.so
......@@ -391,7 +391,7 @@ Util_Autoload()
Util_Autoload_from(xchat_get_info(ph, "xchatdirfs"));
#ifdef WIN32 /* also auto-load C:\Program Files\XChat\Plugins\*.py */
Util_Autoload_from(XCHATLIBDIR"/plugins");
Util_Autoload_from(HEXCHATLIBDIR"/plugins");
#endif
}
......
......@@ -278,7 +278,7 @@ END
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
ICO_XCHAT ICON "icons\\xchat.ico"
ICO_XCHAT ICON "icons\\hexchat.ico"
ICO_BANNED ICON "icons\\banned.ico"
ICO_CHANMSG ICON "icons\\chan_msg.ico"
ICO_HIGHLIGHT ICON "icons\\highlight.ico"
......
......@@ -105,7 +105,7 @@
<None Include="icons\priv_msg-1-2-2.ico" />
<None Include="icons\sd.ico" />
<None Include="icons\server_notice.ico" />
<None Include="icons\xchat.ico" />
<None Include="icons\hexchat.ico" />
<None Include="xtray.def" />
</ItemGroup>
<ItemGroup>
......
......@@ -54,7 +54,7 @@
<None Include="icons\server_notice.ico">
<Filter>Resource Files\icons</Filter>
</None>
<None Include="icons\xchat.ico">
<None Include="icons\hexchat.ico">
<Filter>Resource Files\icons</Filter>
</None>
</ItemGroup>
......
......@@ -3,5 +3,5 @@ subdir = po
top_builddir = ..
XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
COPYRIGHT_HOLDER =
MSGID_BUGS_ADDRESS = www.xchat.org
MSGID_BUGS_ADDRESS = www.hexchat.org
EXTRA_LOCALE_CATEGORIES =
......@@ -31,8 +31,8 @@
#define PDESC _("plugin for remote access using DBUS")
#define PVERSION ""
#define DBUS_SERVICE "org.xchat.service"
#define DBUS_OBJECT_PATH "/org/xchat"
#define DBUS_SERVICE "org.hexchat.service"
#define DBUS_OBJECT_PATH "/org/hexchat"
static xchat_plugin *ph;
static guint last_context_id = 0;
......
......@@ -451,10 +451,10 @@ plugin_auto_load (session *sess)
for_files (get_xdir_fs (), "*.dll", plugin_auto_load_cb);
#else
#if defined(__hpux)
for_files (XCHATLIBDIR"/plugins", "*.sl", plugin_auto_load_cb);
for_files (HEXCHATLIBDIR"/plugins", "*.sl", plugin_auto_load_cb);
for_files (get_xdir_fs (), "*.sl", plugin_auto_load_cb);
#else
for_files (XCHATLIBDIR"/plugins", "*.so", plugin_auto_load_cb);
for_files (HEXCHATLIBDIR"/plugins", "*.so", plugin_auto_load_cb);
for_files (get_xdir_fs (), "*.so", plugin_auto_load_cb);
#endif
#endif
......@@ -1007,7 +1007,7 @@ xchat_get_info (xchat_plugin *ph, const char *id)
switch (hash)
{
case 0x325acab5: /* libdirfs */
return XCHATLIBDIR;
return HEXCHATLIBDIR;
case 0x14f51cd8: /* version */
return PACKAGE_VERSION;
......
......@@ -586,7 +586,7 @@ log_create_pathname (char *servname, char *channame, char *netname)
#endif
snprintf (fname, sizeof (fname), "%s", fnametime);
else
snprintf (fname, sizeof (fname), "%s/xchatlogs/%s", get_xdir_utf8 (), fnametime);
snprintf (fname, sizeof (fname), "%s/logs/%s", get_xdir_utf8 (), fnametime);
/* now we need it in FileSystem encoding */
fs = xchat_filename_from_utf8 (fname, -1, 0, 0, 0);
......@@ -641,7 +641,7 @@ log_open (session *sess)
char message[512];
snprintf (message, sizeof (message),
_("* Can't open log file(s) for writing. Check the\n" \
" permissions on %s/xchatlogs"), get_xdir_utf8 ());
" permissions on %s/logs"), get_xdir_utf8 ());
fe_message (message, FE_MSG_WAIT | FE_MSG_ERROR);
log_error = TRUE;
......
localedir = $(datadir)/locale
bin_PROGRAMS = xchat
bin_PROGRAMS = hexchat
INCLUDES = $(GUI_CFLAGS) -DG_DISABLE_CAST_CHECKS -DLOCALEDIR=\"$(localedir)\"
......
......@@ -257,7 +257,7 @@ fe_args (int argc, char *argv[])
}
}
#else
printf ("%s\n", XCHATLIBDIR"/plugins");
printf ("%s\n", HEXCHATLIBDIR"/plugins");
#endif
return 0;
}
......
......@@ -86,12 +86,12 @@ pixmap_load_from_file (char *filename)
}
#define LOADPIX(vv,pp,ff) \
vv = gdk_pixbuf_new_from_file (XCHATSHAREDIR"/xchat/"ff, 0); \
vv = gdk_pixbuf_new_from_file (HEXCHATSHAREDIR"/hexchat/"ff, 0); \
if (!vv) \
vv = gdk_pixbuf_new_from_inline (-1, pp, FALSE, 0);
#define LOADPIX_DISKONLY(vv,ff) \
vv = gdk_pixbuf_new_from_file (XCHATSHAREDIR"/xchat/"ff, 0);
vv = gdk_pixbuf_new_from_file (HEXCHATSHAREDIR"/hexchat/"ff, 0);
#define EXT ".png"
......@@ -101,7 +101,7 @@ pixmaps_init (void)
pix_book = gdk_pixbuf_new_from_inline (-1, bookpng, FALSE, 0);
/* used in About window, tray icon and WindowManager icon. */
LOADPIX (pix_xchat, xchatpng, "xchat"EXT);
LOADPIX (pix_xchat, hexchatpng, "hexchat"EXT);
/* userlist icons, with inlined defaults */
LOADPIX (pix_hop, hoppng, "hop"EXT);
......
......@@ -162,7 +162,7 @@ fe_tray_set_balloon (const char *title, const char *text)
notify_text = strip_color (text, -1, STRIP_ALL|STRIP_ESCMARKUP);
notify_title = strip_color (title, -1, STRIP_ALL);
notification = XC_NOTIFY_NEW (notify_title, notify_text, XCHATSHAREDIR"/pixmaps/xchat.png", NULL);
notification = XC_NOTIFY_NEW (notify_title, notify_text, HEXCHATSHAREDIR"/pixmaps/hexchat.png", NULL);
g_free ((char *)notify_title);
g_free ((char *)notify_text);
......
bin_PROGRAMS = xchat-text
bin_PROGRAMS = hexchat-text
EXTRA_DIST = README
......
......@@ -506,7 +506,7 @@ fe_args (int argc, char *argv[])
printf ("%s\\plugins\n", exe);
}
#else
printf ("%s\n", XCHATLIBDIR"/plugins");
printf ("%s\n", HEXCHATLIBDIR"/plugins");
#endif
return 0;
}
......
......@@ -9,7 +9,7 @@ LIST = traymsgpng $(srcdir)/message.png \
purplepng $(srcdir)/purple.png \
redpng $(srcdir)/red.png \
voicepng $(srcdir)/voice.png \
xchatpng $(srcdir)/../../xchat.png
hexchatpng $(srcdir)/../../hexchat.png
PNGS = message.png highlight.png fileoffer.png book.png hop.png op.png purple.png red.png voice.png
noinst_HEADERS = inline_pngs.h
......
......@@ -33,7 +33,7 @@
<PythonOutput>xcpython</PythonOutput>
<Glib>$(DepsRoot)\include\glib-2.0;$(DepsRoot)\lib\glib-2.0\include;$(DepsRoot)\include\libxml2</Glib>
<Gtk>$(DepsRoot)\include\gtk-2.0;$(DepsRoot)\lib\gtk-2.0\include;$(DepsRoot)\include\atk-1.0;$(DepsRoot)\include\cairo;$(DepsRoot)\include\pango-1.0;$(DepsRoot)\include\gdk-pixbuf-2.0</Gtk>
<Pixmaps>bookpng "$(SolutionDir)\..\src\pixmaps\book.png" hoppng "$(SolutionDir)\..\src\pixmaps\hop.png" oppng "$(SolutionDir)\..\src\pixmaps\op.png" purplepng "$(SolutionDir)\..\src\pixmaps\purple.png" redpng "$(SolutionDir)\..\src\pixmaps\red.png" trayfilepng "$(SolutionDir)\..\src\pixmaps\fileoffer.png" trayhilightpng "$(SolutionDir)\..\src\pixmaps\highlight.png" traymsgpng "$(SolutionDir)\..\src\pixmaps\message.png" voicepng "$(SolutionDir)\..\src\pixmaps\voice.png" xchatpng "$(SolutionDir)\..\hexchat.png"</Pixmaps>
<Pixmaps>bookpng "$(SolutionDir)\..\src\pixmaps\book.png" hoppng "$(SolutionDir)\..\src\pixmaps\hop.png" oppng "$(SolutionDir)\..\src\pixmaps\op.png" purplepng "$(SolutionDir)\..\src\pixmaps\purple.png" redpng "$(SolutionDir)\..\src\pixmaps\red.png" trayfilepng "$(SolutionDir)\..\src\pixmaps\fileoffer.png" trayhilightpng "$(SolutionDir)\..\src\pixmaps\highlight.png" traymsgpng "$(SolutionDir)\..\src\pixmaps\message.png" voicepng "$(SolutionDir)\..\src\pixmaps\voice.png" hexchatpng "$(SolutionDir)\..\hexchat.png"</Pixmaps>
<DepLibs>gtk-win32-2.0.lib;gdk-win32-2.0.lib;atk-1.0.lib;gio-2.0.lib;gdk_pixbuf-2.0.lib;pangowin32-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;gobject-2.0.lib;gmodule-2.0.lib;glib-2.0.lib;intl.lib;libxml2.lib;libeay32.lib;ssleay32.lib;wininet.lib;winmm.lib;ws2_32.lib</DepLibs>
<HexChatDest>$(SolutionDir)build\$(PlatformName)\rel</HexChatDest>
</PropertyGroup>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment