summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am8
-rw-r--r--configure.ac3
-rw-r--r--plugins/mpcinfo/mpcInfo.c2
-rw-r--r--plugins/mpcinfo/theme.c2
-rw-r--r--plugins/upd/upd.c4
-rw-r--r--share/Makefile.am1
-rw-r--r--share/icons/Makefile.am13
-rw-r--r--share/misc/Makefile.am3
-rw-r--r--src/common/servlist.c6
-rw-r--r--win32/installer/hexchat-x64.skel.iss2
-rw-r--r--win32/installer/hexchat-x86.skel.iss2
11 files changed, 31 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am
index 40ed64e9..91ca9d79 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = po intl src plugins man
+SUBDIRS = po intl src plugins man share
 
 EXTRA_DIST = autogen.sh
 
-icon_DATA = src/pixmaps/hexchat.png
-icondir = $(datadir)/pixmaps
-
-util_DATA = share/misc/hexchat.desktop
-utildir = $(datadir)/applications
-
 ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index 66f698d3..5e129180 100644
--- a/configure.ac
+++ b/configure.ac
@@ -950,6 +950,9 @@ AC_SUBST(hexchatlibdir)
 
 AC_OUTPUT([
 Makefile
+share/Makefile
+share/icons/Makefile
+share/misc/Makefile
 src/Makefile
 src/common/Makefile
 src/common/dbus/Makefile
diff --git a/plugins/mpcinfo/mpcInfo.c b/plugins/mpcinfo/mpcInfo.c
index be2fe74f..471b92cf 100644
--- a/plugins/mpcinfo/mpcInfo.c
+++ b/plugins/mpcinfo/mpcInfo.c
@@ -46,7 +46,7 @@ static int mpc_tell(char *word[], char *word_eol[], void *userdata){
        char *tTitle, *zero, *oggLine, *line;
 	   struct tagInfo info;
 	   HWND hwnd = FindWindow("MediaPlayerClassicW",NULL);
-       if (hwnd==0) {hexchat_command(ph, randomLine(notRunTheme));return HEXCHAT_EAT_ALL;}
+       if (hwnd==0) {hexchat_print(ph, randomLine(notRunTheme));return HEXCHAT_EAT_ALL;}
        
        tTitle=(char*)malloc(sizeof(char)*1024);
        GetWindowText(hwnd, tTitle, 1024);
diff --git a/plugins/mpcinfo/theme.c b/plugins/mpcinfo/theme.c
index 0be6e376..2f035592 100644
--- a/plugins/mpcinfo/theme.c
+++ b/plugins/mpcinfo/theme.c
@@ -120,7 +120,7 @@ void loadThemes(){
 		fclose(f);
 		hexchat_print(ph, "theme loaded successfull\n");
 	}
-	if (notRunTheme.size==0) notRunTheme=themeAdd(notRunTheme,"say Media Player Classic not running");
+	if (notRunTheme.size==0) notRunTheme=themeAdd(notRunTheme,"Media Player Classic not running");
 	if (titleTheme.size==0) titleTheme=themeAdd(titleTheme,"say Playing %title in Media Player Classic");
 	if (mp3Theme.size==0) mp3Theme=themeAdd(mp3Theme,"me listens to %art with %tit from %alb [%gen|%br kbps|%frq kHz|%mode] in Media Player Classic ");
 	if (oggTheme.size==0) oggTheme=themeAdd(oggTheme,"me listens to %art with %tit from %alb [%gen|%br kbps|%frq kHz|%chan channels] in Media Player Classic ");
diff --git a/plugins/upd/upd.c b/plugins/upd/upd.c
index c299c4e6..ed1ad854 100644
--- a/plugins/upd/upd.c
+++ b/plugins/upd/upd.c
@@ -34,7 +34,7 @@ static hexchat_plugin *ph;   /* plugin handle */
 static char name[] = "Update Checker";
 static char desc[] = "Check for HexChat updates automatically";
 static char version[] = "4.0";
-static const char upd_help[] = "Update Checker Usage:\n  /UPDCHK, check for HexChat updates\n  /UPDCHK SET delay|format, set startup delay or check frequency\n";
+static const char upd_help[] = "Update Checker Usage:\n  /UPDCHK, check for HexChat updates\n  /UPDCHK SET delay|freq, set startup delay or check frequency\n";
 
 static char*
 check_version ()
@@ -220,7 +220,7 @@ print_version (char *word[], char *word_eol[], void *userdata)
 		{
 			hexchat_printf (ph, "%s\tYou have the latest version of HexChat installed!\n", name);
 		}
-		else if (strcmp (version, "Unknown") == 0)
+		else if (strcmp (version, "Unknown") == 0 || strlen (version) != 5)
 		{
 			hexchat_printf (ph, "%s\tUnable to check for HexChat updates!\n", name);
 		}
diff --git a/share/Makefile.am b/share/Makefile.am
new file mode 100644
index 00000000..f265b88e
--- /dev/null
+++ b/share/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = icons misc
diff --git a/share/icons/Makefile.am b/share/icons/Makefile.am
new file mode 100644
index 00000000..ee5384cc
--- /dev/null
+++ b/share/icons/Makefile.am
@@ -0,0 +1,13 @@
+icon_DATA = ../../src/pixmaps/hexchat.png
+icondir = $(datadir)/icons/hicolor/48x48/apps
+
+hicolor_DATA = hexchat.svg
+hicolordir = $(datadir)/icons/hicolor/scalable/apps
+
+UPDATE_ICON_CACHE = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook:
+	$(UPDATE_ICON_CACHE);
+
+uninstall-hook:
+	$(UPDATE_ICON_CACHE);
diff --git a/share/misc/Makefile.am b/share/misc/Makefile.am
new file mode 100644
index 00000000..eec37250
--- /dev/null
+++ b/share/misc/Makefile.am
@@ -0,0 +1,3 @@
+util_DATA = hexchat.desktop
+utildir = $(datadir)/applications
+
diff --git a/src/common/servlist.c b/src/common/servlist.c
index c42c371d..a259464b 100644
--- a/src/common/servlist.c
+++ b/src/common/servlist.c
@@ -264,6 +264,9 @@ static const struct defaultserver def[] =
 /*	{0,			"sprynet.us.galaxynet.org"},
 	{0,			"atlanta.ga.us.galaxynet.org"},*/
 
+	{"GameSurge",	0},
+	{0,			"irc.gamesurge.net"},
+	
 /*	{"GamesNET",	0},
 	{0,				"irc.gamesnet.net"},
 	{0,				"irc.us.gamesnet.net"},
@@ -382,6 +385,9 @@ static const struct defaultserver def[] =
 	{"MIXXnet",		0},
 	{0,			"irc.mixxnet.net"},
 
+	{"Moznet",		0},
+	{0,			"irc.mozilla.org"},
+
 	{"NeverNET",	0},
 	{0,			"irc.nevernet.net"},
 	{0,			"imagine.nevernet.net"},
diff --git a/win32/installer/hexchat-x64.skel.iss b/win32/installer/hexchat-x64.skel.iss
index 7f0a55bc..e680a060 100644
--- a/win32/installer/hexchat-x64.skel.iss
+++ b/win32/installer/hexchat-x64.skel.iss
@@ -41,7 +41,6 @@ Name: "plugins\dns"; Description: "DNS"; Types: custom; Flags: disablenouninstal
 Name: "plugins\doat"; Description: "Do At"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\exec"; Description: "Exec"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\fishlim"; Description: "FiSHLiM"; Types: custom; Flags: disablenouninstallwarning

-Name: "plugins\hextray"; Description: "HexTray"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\sysinfo"; Description: "SysInfo"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\upd"; Description: "Update Checker"; Types: normal custom; Flags: disablenouninstallwarning

@@ -154,7 +153,6 @@ Source: "plugins\hcupd.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Com
 Source: "plugins\hcwinamp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\winamp

 Source: "etc\system.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\sysinfo

 Source: "plugins\hcsysinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\sysinfo

-Source: "plugins\hchextray.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\hextray

 Source: "plugins\hcwmpa.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\wmpa

 

 ;Source: "plugins\hclua.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\lua

diff --git a/win32/installer/hexchat-x86.skel.iss b/win32/installer/hexchat-x86.skel.iss
index 48d02c42..77f623f8 100644
--- a/win32/installer/hexchat-x86.skel.iss
+++ b/win32/installer/hexchat-x86.skel.iss
@@ -40,7 +40,6 @@ Name: "plugins\dns"; Description: "DNS"; Types: custom; Flags: disablenouninstal
 Name: "plugins\doat"; Description: "Do At"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\exec"; Description: "Exec"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\fishlim"; Description: "FiSHLiM"; Types: custom; Flags: disablenouninstallwarning

-Name: "plugins\hextray"; Description: "HexTray"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\sysinfo"; Description: "SysInfo"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\upd"; Description: "Update Checker"; Types: normal custom; Flags: disablenouninstallwarning

@@ -153,7 +152,6 @@ Source: "plugins\hcupd.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Com
 Source: "plugins\hcwinamp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\winamp

 Source: "etc\system.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\sysinfo

 Source: "plugins\hcsysinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\sysinfo

-Source: "plugins\hchextray.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\hextray

 Source: "plugins\hcwmpa.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\wmpa

 

 ;Source: "plugins\hclua.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\lua
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-10 23:33:14 +0000