From 894448ca6fb17ea8328593e083cdf8f73a061ba6 Mon Sep 17 00:00:00 2001 From: John Reese Date: Tue, 24 Jul 2012 09:23:11 -0700 Subject: [PATCH] Remove legacy version handling --- push.cpp | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/push.cpp b/push.cpp index 6153496..8c3e961 100644 --- a/push.cpp +++ b/push.cpp @@ -18,15 +18,6 @@ #include #include "time.h" -#if (!defined(VERSION_MAJOR) || !defined(VERSION_MINOR) || (VERSION_MAJOR == 0 && VERSION_MINOR < 72)) -#error This module needs ZNC 0.072 or newer. -#endif - -// Handle versions of ZNC older than 0.090 by disabling the away_only condition -#if VERSION_MAJOR == 0 && VERSION_MINOR >= 90 -#define PUSH_AWAY -#endif - // Forward declaration class CPushMod; @@ -121,9 +112,7 @@ class CPushMod : public CModule defaults["query_conditions"] = "all"; // Notification conditions -#ifdef PUSH_AWAY defaults["away_only"] = "no"; -#endif defaults["client_count_less_than"] = "0"; defaults["highlight"] = ""; defaults["idle"] = "0"; @@ -444,12 +433,8 @@ class CPushMod : public CModule */ bool away_only() { -#ifdef PUSH_AWAY CString value = options["away_only"].AsLower(); return value != "yes" || GetNetwork()->IsIRCAway(); -#else - return true; -#endif } /** @@ -1122,11 +1107,9 @@ class CPushMod : public CModule table.AddColumn("Condition"); table.AddColumn("Status"); -#ifdef PUSH_AWAY table.AddRow(); table.SetCell("Condition", "away"); table.SetCell("Status", GetNetwork()->IsIRCAway() ? "yes" : "no"); -#endif table.AddRow(); table.SetCell("Condition", "client_count");