diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | src/common/outbound.c | 2 | ||||
| -rw-r--r-- | src/fe-gtk/xtext.c | 9 | ||||
| -rw-r--r-- | src/htm/Main.cs | 2 |
5 files changed, 6 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index 91ca9d79..073fd4b2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,4 +4,3 @@ SUBDIRS = po intl src plugins man share EXTRA_DIST = autogen.sh -ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index e30887aa..eb4d881f 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,6 @@ AC_COPYRIGHT([Copyright (C) 1998-2010 Peter Zelezny]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_SRCDIR([configure.ac]) -AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([1.11 dist-bzip2 subdir-objects no-define foreign]) @@ -949,7 +948,7 @@ dnl for plugins/xxx/Makefile.am hexchatlibdir=${libdir}/hexchat AC_SUBST(hexchatlibdir) -AC_OUTPUT([ +AC_CONFIG_FILES([ Makefile share/Makefile share/icons/Makefile @@ -974,6 +973,8 @@ man/Makefile dnl plugins/tcl/Makefile dnl plugins/sasl/Makefile +AC_OUTPUT + echo echo HexChat $VERSION echo diff --git a/src/common/outbound.c b/src/common/outbound.c index cc023889..e073ca1d 100644 --- a/src/common/outbound.c +++ b/src/common/outbound.c @@ -2873,7 +2873,7 @@ open_query (server *serv, char *nick, gboolean focus_existing) sess = find_dialog (serv, nick); if (!sess) - new_ircwindow (serv, nick, SESS_DIALOG, 1); + new_ircwindow (serv, nick, SESS_DIALOG, focus_existing); else if (focus_existing) fe_ctrl_gui (sess, 2, 0); /* bring-to-front */ } diff --git a/src/fe-gtk/xtext.c b/src/fe-gtk/xtext.c index 6005e265..5b85022e 100644 --- a/src/fe-gtk/xtext.c +++ b/src/fe-gtk/xtext.c @@ -90,15 +90,8 @@ #endif /* is delimiter */ -#if 0 -/* () is used by Wikipedia */ -#define is_del(c) \ - (c == ' ' || c == '\n' || c == ')' || c == '(' || \ - c == '>' || c == '<' || c == ATTR_RESET || c == ATTR_BOLD || c == 0) -#endif #define is_del(c) \ - (c == ' ' || c == '\n' || c == '>' || c == '<' || \ - c == ATTR_RESET || c == ATTR_BOLD || c == 0) + (c == ' ' || c == '\n' || c == '>' || c == '<' || c == 0) #ifdef SCROLL_HACK /* force scrolling off */ diff --git a/src/htm/Main.cs b/src/htm/Main.cs index cc33e206..e3ae04cf 100644 --- a/src/htm/Main.cs +++ b/src/htm/Main.cs @@ -281,7 +281,7 @@ namespace thememan try { - using (Package zip = Package.Open(zipFile.FullName, FileMode.Open)) + using (Package zip = Package.Open(zipFile.FullName, FileMode.Open, FileAccess.Read)) { PackagePartCollection parts = zip.GetParts(); |