diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | docs/Makefile.am | 2 | ||||
| -rw-r--r-- | src/common.h | 13 | ||||
| -rw-r--r-- | src/fe-common/core/fe-common-core.c | 11 | ||||
| -rw-r--r-- | src/irc/core/irc-servers.c | 2 |
5 files changed, 3 insertions, 27 deletions
diff --git a/configure.ac b/configure.ac index e33b8c1d..7bcd3fe7 100644 --- a/configure.ac +++ b/configure.ac @@ -261,7 +261,7 @@ for try in 1 2; do echo "*** trying without -lgmodule" glib_modules= fi - AM_PATH_GLIB_2_0(2.6.0,,, $glib_modules) + AM_PATH_GLIB_2_0(2.16.0,,, $glib_modules) if test "$GLIB_LIBS"; then if test $glib_modules = gmodule; then AC_DEFINE(HAVE_GMODULE) diff --git a/docs/Makefile.am b/docs/Makefile.am index 5e222564..861a2ca4 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,5 +1,3 @@ -docdir = $(datadir)/doc/irssi - man_MANS = \ irssi.1 diff --git a/src/common.h b/src/common.h index e9073925..86a079fe 100644 --- a/src/common.h +++ b/src/common.h @@ -43,19 +43,6 @@ # include <gmodule.h> #endif -#if !GLIB_CHECK_VERSION(2,10,0) -#define g_slice_alloc(size) g_malloc(size) -#define g_slice_alloc0(size) g_malloc0(size) -#define g_slice_free1(size, mem) g_free(mem) -#define g_slice_new(type) g_new(type, 1) -#define g_slice_new0(type) g_new0(type, 1) -#define g_slice_free(type, mem) g_free(mem) -#endif - -#if !GLIB_CHECK_VERSION(2,16,0) -#define g_strcmp0(a, b) (!a ? -(a != b) : (!b ? (a != b) : strcmp(a, b))) -#endif - #if defined (UOFF_T_INT) typedef unsigned int uoff_t; #elif defined (UOFF_T_LONG) diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c index 341902df..a15850e2 100644 --- a/src/fe-common/core/fe-common-core.c +++ b/src/fe-common/core/fe-common-core.c @@ -450,18 +450,7 @@ void fe_common_core_finish_init(void) signal_add_first("setup changed", (SIGNAL_FUNC) sig_setup_changed); /* _after_ windows are created.. */ -#if GLIB_CHECK_VERSION(2,6,0) g_log_set_default_handler((GLogFunc) glog_func, NULL); -#else - g_log_set_handler(G_LOG_DOMAIN, - (GLogLevelFlags) (G_LOG_LEVEL_CRITICAL | - G_LOG_LEVEL_WARNING), - (GLogFunc) glog_func, NULL); - g_log_set_handler("GLib", - (GLogLevelFlags) (G_LOG_LEVEL_CRITICAL | - G_LOG_LEVEL_WARNING), - (GLogFunc) glog_func, NULL); /* send glib errors to the same place */ -#endif if (setup_changed) signal_emit("setup changed", 0); diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c index 82584382..81f0c269 100644 --- a/src/irc/core/irc-servers.c +++ b/src/irc/core/irc-servers.c @@ -228,6 +228,8 @@ static void server_init(IRC_SERVER_REC *server) if (conn->sasl_mechanism != SASL_MECHANISM_NONE) cap_toggle(server, "sasl", TRUE); + cap_toggle(server, "multi-prefix", TRUE); + irc_send_cmd_now(server, "CAP LS"); if (conn->password != NULL && *conn->password != '\0') { |