diff options
97 files changed, 149 insertions, 128 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/dns/dns.c b/plugins/dns/dns.c index 9e359805..3610e9d0 100644 --- a/plugins/dns/dns.c +++ b/plugins/dns/dns.c @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ /* * Requires MS Visual Studio and IPV6 headers to compile (run nmake). diff --git a/plugins/ewc/ewc.c b/plugins/ewc/ewc.c index c8e508f7..48336b36 100644 --- a/plugins/ewc/ewc.c +++ b/plugins/ewc/ewc.c @@ -14,7 +14,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <windows.h> diff --git a/plugins/hextray/callbacks.cpp b/plugins/hextray/callbacks.cpp index 0ced8384..d902af50 100644 --- a/plugins/hextray/callbacks.cpp +++ b/plugins/hextray/callbacks.cpp @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with X-Tray; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #define _WIN32_IE 0x0601 diff --git a/plugins/hextray/callbacks.h b/plugins/hextray/callbacks.h index 99cbae74..fc7cf47b 100644 --- a/plugins/hextray/callbacks.h +++ b/plugins/hextray/callbacks.h @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with X-Tray; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef _H_CALLBACKS_H @@ -34,4 +34,4 @@ LRESULT CALLBACK AlertsProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) LRESULT CALLBACK SettingsProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam); int CALLBACK PrefProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam); -#endif \ No newline at end of file +#endif diff --git a/plugins/hextray/hexchat.cpp b/plugins/hextray/hexchat.cpp index 38d0e52f..211e5c7f 100644 --- a/plugins/hextray/hexchat.cpp +++ b/plugins/hextray/hexchat.cpp @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with X-Tray; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <windows.h> @@ -317,4 +317,4 @@ void hexchat_exec(char *command) { hexchat_set_context(ph, hexchat_find_context(ph, NULL, NULL)); hexchat_command(ph, command); -} \ No newline at end of file +} diff --git a/plugins/hextray/hexchat.h b/plugins/hextray/hexchat.h index 847f3547..bae633b2 100644 --- a/plugins/hextray/hexchat.h +++ b/plugins/hextray/hexchat.h @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with X-Tray; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef _H_XCHAT_H @@ -29,4 +29,4 @@ void hexchat_globally_back (); void hexchat_back (); HMENU setServerMenu (); -#endif \ No newline at end of file +#endif diff --git a/plugins/hextray/hextray.cpp b/plugins/hextray/hextray.cpp index 56d79ba5..bf09f736 100644 --- a/plugins/hextray/hextray.cpp +++ b/plugins/hextray/hextray.cpp @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with X-Tray; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #define _WIN32_IE 0x0601 diff --git a/plugins/hextray/hextray.h b/plugins/hextray/hextray.h index 30a564bc..2fc4b507 100644 --- a/plugins/hextray/hextray.h +++ b/plugins/hextray/hextray.h @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with X-Tray; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef _XTRAY_H diff --git a/plugins/hextray/sdAlerts.cpp b/plugins/hextray/sdAlerts.cpp index 5e042806..bf61f1eb 100644 --- a/plugins/hextray/sdAlerts.cpp +++ b/plugins/hextray/sdAlerts.cpp @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with X-Tray; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <windows.h> @@ -106,4 +106,4 @@ LRESULT CALLBACK sdAlertProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) int sdAlertNum() { return g_iAlerts; -} \ No newline at end of file +} diff --git a/plugins/hextray/sdAlerts.h b/plugins/hextray/sdAlerts.h index cd45a05b..6c2a3dc0 100644 --- a/plugins/hextray/sdAlerts.h +++ b/plugins/hextray/sdAlerts.h @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with X-Tray; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef _H_SDALERTS_H @@ -23,4 +23,4 @@ void sdSystemAlert (HINSTANCE, UINT, char *, char *, UINT); LRESULT CALLBACK sdAlertProc (HWND, UINT, WPARAM, LPARAM); int sdAlertNum (); void sdCloseAlerts (); -#endif \ No newline at end of file +#endif diff --git a/plugins/hextray/sdTray.cpp b/plugins/hextray/sdTray.cpp index 3a91a61b..953fcf4a 100644 --- a/plugins/hextray/sdTray.cpp +++ b/plugins/hextray/sdTray.cpp @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with X-Tray; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #define _WIN32_IE 0x601 #include <windows.h> @@ -204,4 +204,4 @@ void StopBlink(HWND hwnd, UINT id, HICON hBase) } SetIcon(hwnd, id, hBase); -} \ No newline at end of file +} diff --git a/plugins/hextray/sdTray.h b/plugins/hextray/sdTray.h index 68469fe0..82dc016b 100644 --- a/plugins/hextray/sdTray.h +++ b/plugins/hextray/sdTray.h @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with X-Tray; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef _H_SDTRAY_H @@ -36,4 +36,4 @@ typedef struct IBLINK UINT time; UINT num; }iBlink; -#endif \ No newline at end of file +#endif diff --git a/plugins/hextray/utility.cpp b/plugins/hextray/utility.cpp index 44eaf7b7..e7500161 100644 --- a/plugins/hextray/utility.cpp +++ b/plugins/hextray/utility.cpp @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with X-Tray; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <windows.h> diff --git a/plugins/hextray/utility.h b/plugins/hextray/utility.h index bc8a8bfd..76cc38ae 100644 --- a/plugins/hextray/utility.h +++ b/plugins/hextray/utility.h @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with X-Tray; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef _H_UTILITY_H @@ -43,4 +43,4 @@ struct HOTKEY WORD key; WORD mod; }; -#endif \ No newline at end of file +#endif diff --git a/plugins/lua/lua.c b/plugins/lua/lua.c index 872d3081..0908f6cb 100644 --- a/plugins/lua/lua.c +++ b/plugins/lua/lua.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ /* * $Id: lua.c 91 2007-06-09 18:44:03Z vetinari $ diff --git a/plugins/mpcinfo/functions.c b/plugins/mpcinfo/functions.c index ba6ba519..ff2d563e 100644 --- a/plugins/mpcinfo/functions.c +++ b/plugins/mpcinfo/functions.c @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ /* diff --git a/plugins/mpcinfo/mp3Info.c b/plugins/mpcinfo/mp3Info.c index c08e9663..b7112a5d 100644 --- a/plugins/mpcinfo/mp3Info.c +++ b/plugins/mpcinfo/mp3Info.c @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ //#include <stdio.h> diff --git a/plugins/mpcinfo/mpcInfo.c b/plugins/mpcinfo/mpcInfo.c index be2fe74f..0ba9385c 100644 --- a/plugins/mpcinfo/mpcInfo.c +++ b/plugins/mpcinfo/mpcInfo.c @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ //static int DEBUG=0; @@ -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/oggInfo.c b/plugins/mpcinfo/oggInfo.c index 64c9c512..ee7d6363 100644 --- a/plugins/mpcinfo/oggInfo.c +++ b/plugins/mpcinfo/oggInfo.c @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ static int getOggInt(char *buff, int beg, int bytes){ diff --git a/plugins/mpcinfo/theme.c b/plugins/mpcinfo/theme.c index 0be6e376..3f98a59c 100644 --- a/plugins/mpcinfo/theme.c +++ b/plugins/mpcinfo/theme.c @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <time.h> @@ -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/perl/perl.c b/plugins/perl/perl.c index 8d5dce4e..bda3f6f2 100644 --- a/plugins/perl/perl.c +++ b/plugins/perl/perl.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdlib.h> diff --git a/plugins/python/python.c b/plugins/python/python.c index d65efec2..0ff669b6 100644 --- a/plugins/python/python.c +++ b/plugins/python/python.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this file; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ /* Thread support diff --git a/plugins/sysinfo/hwmon.c b/plugins/sysinfo/hwmon.c index d7616b47..3cc2fb8d 100644 --- a/plugins/sysinfo/hwmon.c +++ b/plugins/sysinfo/hwmon.c @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/plugins/sysinfo/hwmon.h b/plugins/sysinfo/hwmon.h index 020111f9..fe71274b 100644 --- a/plugins/sysinfo/hwmon.h +++ b/plugins/sysinfo/hwmon.h @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ diff --git a/plugins/sysinfo/match.c b/plugins/sysinfo/match.c index 3184ce22..e40ac428 100644 --- a/plugins/sysinfo/match.c +++ b/plugins/sysinfo/match.c @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/plugins/sysinfo/match.h b/plugins/sysinfo/match.h index b8846527..61811e4a 100644 --- a/plugins/sysinfo/match.h +++ b/plugins/sysinfo/match.h @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef _MATCH_H_ diff --git a/plugins/sysinfo/parse.c b/plugins/sysinfo/parse.c index 45399496..fbca6213 100644 --- a/plugins/sysinfo/parse.c +++ b/plugins/sysinfo/parse.c @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/plugins/sysinfo/parse.h b/plugins/sysinfo/parse.h index eb7a1362..27aac7da 100644 --- a/plugins/sysinfo/parse.h +++ b/plugins/sysinfo/parse.h @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ diff --git a/plugins/sysinfo/pci.c b/plugins/sysinfo/pci.c index 31df60f0..bc8fb11f 100644 --- a/plugins/sysinfo/pci.c +++ b/plugins/sysinfo/pci.c @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/plugins/sysinfo/pci.h b/plugins/sysinfo/pci.h index b7afb1fc..673f0a0a 100644 --- a/plugins/sysinfo/pci.h +++ b/plugins/sysinfo/pci.h @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ diff --git a/plugins/sysinfo/xsys.c b/plugins/sysinfo/xsys.c index cf807343..98bc9017 100644 --- a/plugins/sysinfo/xsys.c +++ b/plugins/sysinfo/xsys.c @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ diff --git a/plugins/sysinfo/xsys.h b/plugins/sysinfo/xsys.h index ffb30bab..4daf8545 100644 --- a/plugins/sysinfo/xsys.h +++ b/plugins/sysinfo/xsys.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ diff --git a/plugins/upd/upd.c b/plugins/upd/upd.c index c299c4e6..2b28e74d 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 () @@ -69,7 +69,10 @@ check_version () InternetCloseHandle (hFile); InternetCloseHandle (hINet); - return buffer; + if (strlen (buffer) == 5) + return buffer; + else + return "Unknown"; } InternetCloseHandle (hINet); 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/doc/COPYING b/share/doc/COPYING index eeb586b3..48c9fe9b 100644 --- a/share/doc/COPYING +++ b/share/doc/COPYING @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. 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/cfgfiles.c b/src/common/cfgfiles.c index b51fb1d2..7a2b9427 100644 --- a/src/common/cfgfiles.c +++ b/src/common/cfgfiles.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <fcntl.h> diff --git a/src/common/ctcp.c b/src/common/ctcp.c index bbe4e1e5..d02355cf 100644 --- a/src/common/ctcp.c +++ b/src/common/ctcp.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/common/dbus/dbus-client.c b/src/common/dbus/dbus-client.c index 6ea8e45a..cc2fd087 100644 --- a/src/common/dbus/dbus-client.c +++ b/src/common/dbus/dbus-client.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * Claessens Xavier * xclaesse@gmail.com diff --git a/src/common/dbus/dbus-client.h b/src/common/dbus/dbus-client.h index 0cd4336c..1ca5713e 100644 --- a/src/common/dbus/dbus-client.h +++ b/src/common/dbus/dbus-client.h @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * Claessens Xavier * xclaesse@gmail.com diff --git a/src/common/dbus/dbus-plugin.c b/src/common/dbus/dbus-plugin.c index b62bfda5..2467c845 100644 --- a/src/common/dbus/dbus-plugin.c +++ b/src/common/dbus/dbus-plugin.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * Claessens Xavier * xclaesse@gmail.com diff --git a/src/common/dbus/dbus-plugin.h b/src/common/dbus/dbus-plugin.h index 05619d40..a28d16fb 100644 --- a/src/common/dbus/dbus-plugin.h +++ b/src/common/dbus/dbus-plugin.h @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * Claessens Xavier * xclaesse@gmail.com diff --git a/src/common/dbus/example.c b/src/common/dbus/example.c index 1eebdfcf..b78bb004 100644 --- a/src/common/dbus/example.c +++ b/src/common/dbus/example.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * Claessens Xavier * xclaesse@gmail.com diff --git a/src/common/dcc.c b/src/common/dcc.c index 58e04749..d404b617 100644 --- a/src/common/dcc.c +++ b/src/common/dcc.c @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * Wayne Conrad, 3 Apr 1999: Color-coded DCC file transfer status windows * Bernhard Valenti <bernhard.valenti@gmx.net> 2000-11-21: Fixed DCC send behind nat diff --git a/src/common/hexchat.c b/src/common/hexchat.c index 1aa5fe54..e8659fb0 100644 --- a/src/common/hexchat.c +++ b/src/common/hexchat.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/common/history.c b/src/common/history.c index 1cd6b508..1acd3327 100644 --- a/src/common/history.c +++ b/src/common/history.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <string.h> diff --git a/src/common/ignore.c b/src/common/ignore.c index 49b95c3b..cc357828 100644 --- a/src/common/ignore.c +++ b/src/common/ignore.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdlib.h> diff --git a/src/common/inbound.c b/src/common/inbound.c index 7b4c67e8..41b36296 100644 --- a/src/common/inbound.c +++ b/src/common/inbound.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <string.h> diff --git a/src/common/modes.c b/src/common/modes.c index b84b2b84..6caa46b9 100644 --- a/src/common/modes.c +++ b/src/common/modes.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <string.h> diff --git a/src/common/msproxy.c b/src/common/msproxy.c index 9febe8d0..294c208d 100644 --- a/src/common/msproxy.c +++ b/src/common/msproxy.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * MS Proxy (ISA server) support is (c) 2006 Pavel Fedin <sonic_amiga@rambler.ru> * based on Dante source code diff --git a/src/common/msproxy.h b/src/common/msproxy.h index 9dce4e2e..9fb312ad 100644 --- a/src/common/msproxy.h +++ b/src/common/msproxy.h @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * MS Proxy (ISA server) support is (c) 2006 Pavel Fedin <sonic_amiga@rambler.ru> * based on Dante source code diff --git a/src/common/network.c b/src/common/network.c index f8722433..c3390b31 100644 --- a/src/common/network.c +++ b/src/common/network.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ /* ipv4 and ipv6 networking functions with a common interface */ diff --git a/src/common/notify.c b/src/common/notify.c index 5646fda7..849220ca 100644 --- a/src/common/notify.c +++ b/src/common/notify.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/common/outbound.c b/src/common/outbound.c index 05910df9..a8a65d6a 100644 --- a/src/common/outbound.c +++ b/src/common/outbound.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #define _GNU_SOURCE /* for memrchr */ diff --git a/src/common/plugin.c b/src/common/plugin.c index ade7fce4..d38085c5 100644 --- a/src/common/plugin.c +++ b/src/common/plugin.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdlib.h> diff --git a/src/common/proto-irc.c b/src/common/proto-irc.c index 2e12d0e5..18015607 100644 --- a/src/common/proto-irc.c +++ b/src/common/proto-irc.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ /* IRC RFC1459(+commonly used extensions) protocol implementation */ diff --git a/src/common/server.c b/src/common/server.c index 3e694c43..1fd04422 100644 --- a/src/common/server.c +++ b/src/common/server.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * MS Proxy (ISA server) support is (c) 2006 Pavel Fedin <sonic_amiga@rambler.ru> * based on Dante source code diff --git a/src/common/servlist.c b/src/common/servlist.c index c42c371d..e77c0409 100644 --- a/src/common/servlist.c +++ b/src/common/servlist.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdlib.h> @@ -246,7 +246,7 @@ static const struct defaultserver def[] = {0, "irc.ggn.net"}, {0, "irc.vendetta.com"}, - {"freenode", 0, "#hexchat"}, + {"freenode", 0}, #ifdef USE_OPENSSL {0, "irc.freenode.net/+6697"}, #endif @@ -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"}, @@ -321,7 +324,6 @@ static const struct defaultserver def[] = {0, "tonsberg.no.eu.irclink.net"}, {"IRCNet", 0}, - {0, "irc.ircnet.com"}, {0, "irc.stealth.net/6668"}, {0, "ircnet.demon.co.uk"}, /* {0, "ircnet.hinet.hr"},*/ @@ -382,6 +384,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/src/common/ssl.c b/src/common/ssl.c index 830b3d83..75a81250 100644 --- a/src/common/ssl.c +++ b/src/common/ssl.c @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "inet.h" /* make it first to avoid macro redefinitions */ diff --git a/src/common/text.c b/src/common/text.c index f57165be..a89fd511 100644 --- a/src/common/text.c +++ b/src/common/text.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdlib.h> diff --git a/src/common/url.c b/src/common/url.c index 52e37daa..c5335859 100644 --- a/src/common/url.c +++ b/src/common/url.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/common/userlist.c b/src/common/userlist.c index 061e8d95..f6a091a4 100644 --- a/src/common/userlist.c +++ b/src/common/userlist.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/common/util.c b/src/common/util.c index e1ef3e62..55cb530a 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #define WANTSOCKET diff --git a/src/fe-gtk/about.c b/src/fe-gtk/about.c index 48136d13..647d6603 100644 --- a/src/fe-gtk/about.c +++ b/src/fe-gtk/about.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/fe-gtk/ascii.c b/src/fe-gtk/ascii.c index 85dcf26d..06621cd7 100644 --- a/src/fe-gtk/ascii.c +++ b/src/fe-gtk/ascii.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/fe-gtk/banlist.c b/src/fe-gtk/banlist.c index f91be2fc..a783ea07 100644 --- a/src/fe-gtk/banlist.c +++ b/src/fe-gtk/banlist.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/fe-gtk/chanlist.c b/src/fe-gtk/chanlist.c index ac44bdb1..c2cc6fcb 100644 --- a/src/fe-gtk/chanlist.c +++ b/src/fe-gtk/chanlist.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/fe-gtk/dccgui.c b/src/fe-gtk/dccgui.c index 60881959..6cfcd8b7 100644 --- a/src/fe-gtk/dccgui.c +++ b/src/fe-gtk/dccgui.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/fe-gtk/editlist.c b/src/fe-gtk/editlist.c index af241e04..c1be5b23 100644 --- a/src/fe-gtk/editlist.c +++ b/src/fe-gtk/editlist.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/fe-gtk/fe-gtk.c b/src/fe-gtk/fe-gtk.c index f589b1b0..57ffa2f6 100644 --- a/src/fe-gtk/fe-gtk.c +++ b/src/fe-gtk/fe-gtk.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> @@ -1022,21 +1022,26 @@ fe_open_url_inner (const char *url) #elif defined __APPLE__ try_browser ("open", NULL, url); /* on Mac you can just 'open http://foo.bar/' */ #else + + /* lets try what gtk has built in first. */ + if (gtk_show_uri (NULL, url, GDK_CURRENT_TIME, NULL)) + return; + /* universal desktop URL opener (from xdg-utils). Supports gnome,kde,xfce4. */ if (try_browser ("xdg-open", NULL, url)) return; - /* try to detect GNOME */ + /* try to detect GNOME (this env variable is depreciated) */ if (g_getenv ("GNOME_DESKTOP_SESSION_ID")) { - if (try_browser ("gnome-open", NULL, url)) /* Gnome 2.4+ has this */ + if (try_browser ("gvfs-open", NULL, url)) return; } /* try to detect KDE */ if (g_getenv ("KDE_FULL_SESSION")) { - if (try_browser ("kfmclient", "exec", url)) + if (try_browser ("kde-open", NULL, url)) return; } @@ -1044,8 +1049,8 @@ fe_open_url_inner (const char *url) if (try_browser ("firefox", NULL, url)) return; - /* fresh out of ideas... */ - try_browser ("mozilla", NULL, url); + /* fresh out of ideas... i hear chromium is popular */ + try_browser ("chromium", NULL, url); #endif } diff --git a/src/fe-gtk/fkeys.c b/src/fe-gtk/fkeys.c index 4e0cd4a3..e606dfd5 100644 --- a/src/fe-gtk/fkeys.c +++ b/src/fe-gtk/fkeys.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/fe-gtk/gtkutil.c b/src/fe-gtk/gtkutil.c index a3ef1396..0484de83 100644 --- a/src/fe-gtk/gtkutil.c +++ b/src/fe-gtk/gtkutil.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #define _FILE_OFFSET_BITS 64 /* allow selection of large files */ #include <stdio.h> diff --git a/src/fe-gtk/ignoregui.c b/src/fe-gtk/ignoregui.c index 6531bd27..dca4384b 100644 --- a/src/fe-gtk/ignoregui.c +++ b/src/fe-gtk/ignoregui.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c index e5f79abd..a52aa9d4 100644 --- a/src/fe-gtk/maingui.c +++ b/src/fe-gtk/maingui.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdlib.h> @@ -498,10 +498,6 @@ fe_set_title (session *sess) static gboolean mg_windowstate_cb (GtkWindow *wid, GdkEventWindowState *event, gpointer userdata) { - prefs.hex_gui_win_state = 0; - if (event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED) - prefs.hex_gui_win_state = 1; - if ((event->changed_mask & GDK_WINDOW_STATE_ICONIFIED) && (event->new_window_state & GDK_WINDOW_STATE_ICONIFIED) && prefs.hex_gui_tray_minimize && !hextray_mode ()) @@ -510,6 +506,10 @@ mg_windowstate_cb (GtkWindow *wid, GdkEventWindowState *event, gpointer userdata gtk_window_deiconify (wid); } + prefs.hex_gui_win_state = 0; + if (event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED) + prefs.hex_gui_win_state = 1; + return FALSE; } diff --git a/src/fe-gtk/menu.c b/src/fe-gtk/menu.c index 3daf42c8..6fd62509 100644 --- a/src/fe-gtk/menu.c +++ b/src/fe-gtk/menu.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/fe-gtk/notifygui.c b/src/fe-gtk/notifygui.c index 7daf2484..0559734c 100644 --- a/src/fe-gtk/notifygui.c +++ b/src/fe-gtk/notifygui.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/fe-gtk/palette.c b/src/fe-gtk/palette.c index cd01c097..7507cbf4 100644 --- a/src/fe-gtk/palette.c +++ b/src/fe-gtk/palette.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/fe-gtk/pixmaps.c b/src/fe-gtk/pixmaps.c index e0e0a149..419ef4c1 100644 --- a/src/fe-gtk/pixmaps.c +++ b/src/fe-gtk/pixmaps.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/fe-gtk/plugin-tray.c b/src/fe-gtk/plugin-tray.c index 07207a99..294920da 100644 --- a/src/fe-gtk/plugin-tray.c +++ b/src/fe-gtk/plugin-tray.c @@ -372,6 +372,7 @@ tray_toggle_visibility (gboolean force_hide) { static int x, y; static GdkScreen *screen; + static int maximized; GtkWindow *win; if (!sticon) @@ -396,12 +397,15 @@ tray_toggle_visibility (gboolean force_hide) { gtk_window_get_position (win, &x, &y); screen = gtk_window_get_screen (win); + maximized = prefs.hex_gui_win_state; gtk_widget_hide (GTK_WIDGET (win)); } else { gtk_window_set_screen (win, screen); gtk_window_move (win, x, y); + if (maximized) + gtk_window_maximize (win); gtk_widget_show (GTK_WIDGET (win)); gtk_window_present (win); } diff --git a/src/fe-gtk/plugingui.c b/src/fe-gtk/plugingui.c index f10e439c..436accef 100644 --- a/src/fe-gtk/plugingui.c +++ b/src/fe-gtk/plugingui.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <string.h> diff --git a/src/fe-gtk/rawlog.c b/src/fe-gtk/rawlog.c index e37b3ba0..6764034f 100644 --- a/src/fe-gtk/rawlog.c +++ b/src/fe-gtk/rawlog.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/fe-gtk/search.c b/src/fe-gtk/search.c index e0839f79..41a1a642 100644 --- a/src/fe-gtk/search.c +++ b/src/fe-gtk/search.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/fe-gtk/sexy-iso-codes.c b/src/fe-gtk/sexy-iso-codes.c index 1e963cc1..9dc20105 100644 --- a/src/fe-gtk/sexy-iso-codes.c +++ b/src/fe-gtk/sexy-iso-codes.c @@ -18,9 +18,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifdef WIN32 diff --git a/src/fe-gtk/sexy-iso-codes.h b/src/fe-gtk/sexy-iso-codes.h index e5f37162..771c8eb0 100644 --- a/src/fe-gtk/sexy-iso-codes.h +++ b/src/fe-gtk/sexy-iso-codes.h @@ -18,9 +18,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef GTKSPELL_ISO_CODES_H diff --git a/src/fe-gtk/sexy-spell-entry.c b/src/fe-gtk/sexy-spell-entry.c index 4dabc28a..48a6c383 100644 --- a/src/fe-gtk/sexy-spell-entry.c +++ b/src/fe-gtk/sexy-spell-entry.c @@ -16,8 +16,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifdef HAVE_CONFIG_H # include "config.h" diff --git a/src/fe-gtk/sexy-spell-entry.h b/src/fe-gtk/sexy-spell-entry.h index 61d1b795..23f01af5 100644 --- a/src/fe-gtk/sexy-spell-entry.h +++ b/src/fe-gtk/sexy-spell-entry.h @@ -15,8 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef _SEXY_SPELL_ENTRY_H_ #define _SEXY_SPELL_ENTRY_H_ diff --git a/src/fe-gtk/textgui.c b/src/fe-gtk/textgui.c index 7d4c38bd..7e006e69 100644 --- a/src/fe-gtk/textgui.c +++ b/src/fe-gtk/textgui.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/fe-gtk/urlgrab.c b/src/fe-gtk/urlgrab.c index 89ea374f..b8a40a35 100644 --- a/src/fe-gtk/urlgrab.c +++ b/src/fe-gtk/urlgrab.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/fe-gtk/userlistgui.c b/src/fe-gtk/userlistgui.c index 89ddd49b..8405695b 100644 --- a/src/fe-gtk/userlistgui.c +++ b/src/fe-gtk/userlistgui.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/fe-gtk/xtext.c b/src/fe-gtk/xtext.c index 611bf090..e8419b5a 100644 --- a/src/fe-gtk/xtext.c +++ b/src/fe-gtk/xtext.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * ========================================================================= * * xtext, the text widget used by X-Chat. diff --git a/src/fe-text/fe-text.c b/src/fe-text/fe-text.c index 6b57eec6..bd9d2d1a 100644 --- a/src/fe-text/fe-text.c +++ b/src/fe-text/fe-text.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/htm/Main.cs b/src/htm/Main.cs index 6a7cd4d2..cc33e206 100644 --- a/src/htm/Main.cs +++ b/src/htm/Main.cs @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ using System; 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 |