* Removed some compatability code left from 1.2.2->1.2.3 switch

svn: 2238

src/botcmd.c

@@ -844,21 +844,6 @@ static void bot_thisbot(int idx, char *par)
   strcpy(dcc[idx].nick, par);
 }
 
-/* FIXME: remove after 1.2.3 */
-static void bot_hublog(char *botnick, char *code, char *msg)
-{
-  char *par = NULL, *parp;
-  par = parp = strdup(msg);
-  if (egg_isdigit(par[0])) {
-    int type = atoi(newsplit(&par));
-
-    putlog(type, "@", "(%s) %s", botnick, par);
-  } else {
-    putlog(LOG_ERRORS, "*", "Malformed HL line from %s: %s %s", botnick, code, par);
-  }
-  free(parp);
-}
-
 /* Used to send a direct msg from Tcl on one bot to Tcl on another
  * zapf <frombot> <tobot> <code [param]>
  */
@@ -1153,10 +1138,6 @@ botcmd_t C_bot[] =
   {"aw",		bot_away, 0},
   {"bye",		bot_bye, 0},
   {"c",			bot_chan2, 0},
-/* FIXME: remove after 1.2.3 */
-  {"cg",                bot_set, 0},
-/* FIXME: remove after 1.2.3 */
-  {"cgb",		bot_setbroad, 0},
   {"cp", 		bot_cmdpass, 0},
   {"ct",		bot_chat, 0},
   {"e",			bot_error, 0},
@@ -1289,7 +1270,6 @@ static void bot_rsimr(char *botnick, char *code, char *msg)
 
 static cmd_t my_bot[] = 
 {
-  {"hl",	"",	(Function) bot_hublog,  NULL, HUB},
   {"r-sr",	"",	(Function) bot_rsimr,	NULL, HUB},
   {"r-s",	"",	(Function) bot_rsim,	NULL, 0},
   {NULL, 	NULL, 	NULL, 			NULL, 0}

src/set.c

@@ -288,33 +288,12 @@ const char *var_string(variable_t *var)
   return var->gdata ? var->gdata : NULL;
 }
 
-/* FIXME: remove after 1.2.3 */
-static bool var_compat_map(const char *newname, const char *oldname)
-{
-  if (!egg_strcasecmp(newname, "auth-key") && !egg_strcasecmp(oldname, "authkey"))
-    return 1;
-  else if (!egg_strcasecmp(newname, "msg-op") && !egg_strcasecmp(oldname, "msgop"))
-    return 1;
-  else if (!egg_strcasecmp(newname, "msg-pass") && !egg_strcasecmp(oldname, "msgpass"))
-    return 1;
-  else if (!egg_strcasecmp(newname, "msg-invite") && !egg_strcasecmp(oldname, "msginvite"))
-    return 1;
-  else if (!egg_strcasecmp(newname, "msg-ident") && !egg_strcasecmp(oldname, "msgident"))
-    return 1;
-  else if (!egg_strcasecmp(newname, "auth-prefix") && !egg_strcasecmp(oldname, "cmdprefix"))
-    return 1;
-  else if (!egg_strcasecmp(newname, "server-port") && !egg_strcasecmp(oldname, "servport"))
-    return 1;
-  return 0;
-}
-
 static variable_t *var_get_var_by_name(const char *name)
 {
   int i = 0;
 
   for (i = 0; vars[i].name; i++)
-/* FIXME: remove after 1.2.3 */
-    if (!egg_strcasecmp(vars[i].name, name) || var_compat_map(vars[i].name, name))
+    if (!egg_strcasecmp(vars[i].name, name))
       return &(vars[i]);
   return NULL;
 }