summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorBerke Viktor <bviktor@hexchat.org>2012-07-13 18:04:00 +0200
committerBerke Viktor <bviktor@hexchat.org>2012-07-13 18:04:00 +0200
commit16d32fdeda288f5b8be71aea4a2f554b694d13eb (patch)
treebae7992c111eb5e915dfffc2b1602a9b53224336
parentea2c58c2344f3ed9c4fa01f05119c5a3715ffdaa (diff)
Another bunch of rebranding stuff
-rw-r--r--Makefile.am8
-rw-r--r--config.h7
-rw-r--r--configure.in22
-rw-r--r--faq.html24
-rw-r--r--hexchat.desktop6
-rw-r--r--hexchat.spec38
-rw-r--r--plugins/python/python.c2
-rw-r--r--plugins/xtray/resource.rc2
-rw-r--r--plugins/xtray/xtray.vcxproj2
-rw-r--r--plugins/xtray/xtray.vcxproj.filters2
-rw-r--r--po/Makevars2
-rw-r--r--src/common/dbus/dbus-plugin.c4
-rw-r--r--src/common/plugin.c6
-rw-r--r--src/common/text.c4
-rw-r--r--src/fe-gtk/Makefile.am2
-rw-r--r--src/fe-gtk/fe-gtk.c2
-rw-r--r--src/fe-gtk/pixmaps.c6
-rw-r--r--src/fe-gtk/plugin-tray.c2
-rw-r--r--src/fe-text/Makefile.am2
-rw-r--r--src/fe-text/fe-text.c2
-rw-r--r--src/pixmaps/Makefile.am2
-rw-r--r--win32/hexchat.props2
22 files changed, 76 insertions, 73 deletions
diff --git a/Makefile.am b/Makefile.am
index f86b4ed7..02213fd9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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
diff --git a/config.h b/config.h
index f5948583..291eae42 100644
--- a/config.h
+++ b/config.h
@@ -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
diff --git a/configure.in b/configure.in
index 3c0cce27..02fe2007 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 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
diff --git a/faq.html b/faq.html
index 4f4c1cde..c5b4357a 100644
--- a/faq.html
+++ b/faq.html
@@ -1,6 +1,6 @@
 <!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>
diff --git a/hexchat.desktop b/hexchat.desktop
index 3e4b8af3..b2acb0c8 100644
--- a/hexchat.desktop
+++ b/hexchat.desktop
@@ -1,6 +1,6 @@
 [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;
diff --git a/hexchat.spec b/hexchat.spec
index 406d9866..6faec8b3 100644
--- a/hexchat.spec
+++ b/hexchat.spec
@@ -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
 
diff --git a/plugins/python/python.c b/plugins/python/python.c
index 74d07224..e887ef8f 100644
--- a/plugins/python/python.c
+++ b/plugins/python/python.c
@@ -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
 }
 
diff --git a/plugins/xtray/resource.rc b/plugins/xtray/resource.rc
index 312c74c4..b786cfbd 100644
--- a/plugins/xtray/resource.rc
+++ b/plugins/xtray/resource.rc
@@ -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"

diff --git a/plugins/xtray/xtray.vcxproj b/plugins/xtray/xtray.vcxproj
index c766c3c7..305b3845 100644
--- a/plugins/xtray/xtray.vcxproj
+++ b/plugins/xtray/xtray.vcxproj
@@ -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>

diff --git a/plugins/xtray/xtray.vcxproj.filters b/plugins/xtray/xtray.vcxproj.filters
index 3b909983..637a896d 100644
--- a/plugins/xtray/xtray.vcxproj.filters
+++ b/plugins/xtray/xtray.vcxproj.filters
@@ -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>

diff --git a/po/Makevars b/po/Makevars
index 771c7f21..176a8416 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -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 =
diff --git a/src/common/dbus/dbus-plugin.c b/src/common/dbus/dbus-plugin.c
index 012812cc..30a133e6 100644
--- a/src/common/dbus/dbus-plugin.c
+++ b/src/common/dbus/dbus-plugin.c
@@ -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;
diff --git a/src/common/plugin.c b/src/common/plugin.c
index 41293129..71e1ae61 100644
--- a/src/common/plugin.c
+++ b/src/common/plugin.c
@@ -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;
diff --git a/src/common/text.c b/src/common/text.c
index f8afc4b3..25dd5cf1 100644
--- a/src/common/text.c
+++ b/src/common/text.c
@@ -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;
diff --git a/src/fe-gtk/Makefile.am b/src/fe-gtk/Makefile.am
index da36ed57..a8cbcb63 100644
--- a/src/fe-gtk/Makefile.am
+++ b/src/fe-gtk/Makefile.am
@@ -1,6 +1,6 @@
 localedir = $(datadir)/locale
 
-bin_PROGRAMS = xchat
+bin_PROGRAMS = hexchat
 
 INCLUDES = $(GUI_CFLAGS) -DG_DISABLE_CAST_CHECKS -DLOCALEDIR=\"$(localedir)\"
 
diff --git a/src/fe-gtk/fe-gtk.c b/src/fe-gtk/fe-gtk.c
index 88a1138c..8c7e515a 100644
--- a/src/fe-gtk/fe-gtk.c
+++ b/src/fe-gtk/fe-gtk.c
@@ -257,7 +257,7 @@ fe_args (int argc, char *argv[])
 			}
 		}
 #else
-		printf ("%s\n", XCHATLIBDIR"/plugins");
+		printf ("%s\n", HEXCHATLIBDIR"/plugins");
 #endif
 		return 0;
 	}
diff --git a/src/fe-gtk/pixmaps.c b/src/fe-gtk/pixmaps.c
index 3d85c3b0..4cac3801 100644
--- a/src/fe-gtk/pixmaps.c
+++ b/src/fe-gtk/pixmaps.c
@@ -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);
diff --git a/src/fe-gtk/plugin-tray.c b/src/fe-gtk/plugin-tray.c
index b9f60f8d..ff6e0e05 100644
--- a/src/fe-gtk/plugin-tray.c
+++ b/src/fe-gtk/plugin-tray.c
@@ -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);
diff --git a/src/fe-text/Makefile.am b/src/fe-text/Makefile.am
index ef48203e..065b3e76 100644
--- a/src/fe-text/Makefile.am
+++ b/src/fe-text/Makefile.am
@@ -1,4 +1,4 @@
-bin_PROGRAMS = xchat-text
+bin_PROGRAMS = hexchat-text
 
 EXTRA_DIST = README 
 
diff --git a/src/fe-text/fe-text.c b/src/fe-text/fe-text.c
index f3c1ff05..514d4be0 100644
--- a/src/fe-text/fe-text.c
+++ b/src/fe-text/fe-text.c
@@ -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;
 	}
diff --git a/src/pixmaps/Makefile.am b/src/pixmaps/Makefile.am
index 5476f9d4..6dff376c 100644
--- a/src/pixmaps/Makefile.am
+++ b/src/pixmaps/Makefile.am
@@ -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
diff --git a/win32/hexchat.props b/win32/hexchat.props
index 448765be..97e512b0 100644
--- a/win32/hexchat.props
+++ b/win32/hexchat.props
@@ -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>

<endermoneymod@gmail.com> 2019-04-16 22:58:00 -0300 [Project] GAnarchy' href='/git-repos/ganarchy.git/commit/ganarchy.py?h=feature/run&id=385e734a52e13949a7a5c71827f6de920dbfea43'>385e734
4c47aba ^

385e734
4c47aba ^
385e734
4a23fbf ^






c02d1fb ^



828d0ac ^

385e734


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353