Changeset 4fd3c04 for global.c

Timestamp:

Oct 12, 2017, 8:28:02 PM (7 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master

Children:

a882637

Parents:

ee6b30f

git-author:

Anders Kaseorg <andersk@mit.edu> (10/06/17 21:27:09)

git-committer:

Anders Kaseorg <andersk@mit.edu> (10/12/17 20:28:02)

Message:

Remove AIM support

This code has received almost no security attention, and anyway, AIM
is shutting down on December 15, 2017.

https://aimemories.tumblr.com/post/166091776077/aimemories

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

File:

• global.c (modified) (5 diffs)

global.c

@@ -84 +84 @@
   _owl_global_init_windows(g);
 
-  g->aim_screenname=NULL;
-  g->aim_screenname_for_filters=NULL;
-  g->aim_loggedin=0;
-  owl_buddylist_init(&(g->buddylist));
-
   g->havezephyr=0;
-  g->haveaim=0;
-  g->ignoreaimlogin=0;
-  owl_global_set_no_doaimevents(g);
 
   owl_errqueue_init(&(g->errqueue));
@@ -646 +638 @@
 }
 
-/* AIM stuff */
-
-int owl_global_is_aimloggedin(const owl_global *g)
-{
-  if (g->aim_loggedin) return(1);
-  return(0);
-}
-
-const char *owl_global_get_aim_screenname(const owl_global *g)
-{
-  if (owl_global_is_aimloggedin(g)) {
-    return (g->aim_screenname);
-  }
-  return("");
-}
-
-const char *owl_global_get_aim_screenname_for_filters(const owl_global *g)
-{
-  if (owl_global_is_aimloggedin(g)) {
-    return (g->aim_screenname_for_filters);
-  }
-  return("");
-}
-
-void owl_global_set_aimloggedin(owl_global *g, const char *screenname)
-{
-  char *sn_escaped;
-  g->aim_loggedin=1;
-  if (g->aim_screenname) g_free(g->aim_screenname);
-  if (g->aim_screenname_for_filters) g_free(g->aim_screenname_for_filters);
-  g->aim_screenname=g_strdup(screenname);
-  sn_escaped = owl_text_quote(screenname, OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
-  g->aim_screenname_for_filters = owl_arg_quote(sn_escaped);
-  g_free(sn_escaped);
-}
-
-void owl_global_set_aimnologgedin(owl_global *g)
-{
-  g->aim_loggedin=0;
-}
-
-bool owl_global_is_doaimevents(const owl_global *g)
-{
-  return g->aim_event_source != NULL;
-}
-
-void owl_global_set_doaimevents(owl_global *g)
-{
-  if (g->aim_event_source)
-    return;
-  g->aim_event_source = owl_aim_event_source_new(owl_global_get_aimsess(g));
-  g_source_attach(g->aim_event_source, NULL);
-}
-
-void owl_global_set_no_doaimevents(owl_global *g)
-{
-  if (!g->aim_event_source)
-    return;
-  g_source_destroy(g->aim_event_source);
-  g_source_unref(g->aim_event_source);
-  g->aim_event_source = NULL;
-}
-
-aim_session_t *owl_global_get_aimsess(owl_global *g)
-{
-  return(&(g->aimsess));
-}
-
-aim_conn_t *owl_global_get_bosconn(owl_global *g)
-{
-  return(&(g->bosconn));
-}
-
-void owl_global_set_bossconn(owl_global *g, aim_conn_t *conn)
-{
-  g->bosconn=*conn;
-}
-
 /* message queue */
 
@@ -750 +664 @@
 }
 
-owl_buddylist *owl_global_get_buddylist(owl_global *g)
-{
-  return(&(g->buddylist));
-}
-  
 /* style */
 
@@ -781 +690 @@
   owl_dict_insert_element(&(g->styledict), owl_style_get_name(s),
                           s, (void (*)(void *))owl_style_delete);
-}
-
-void owl_global_set_haveaim(owl_global *g)
-{
-  g->haveaim=1;
-}
-
-int owl_global_is_haveaim(const owl_global *g)
-{
-  if (g->haveaim) return(1);
-  return(0);
-}
-
-void owl_global_set_ignore_aimlogin(owl_global *g)
-{
-    g->ignoreaimlogin = 1;
-}
-
-void owl_global_unset_ignore_aimlogin(owl_global *g)
-{
-    g->ignoreaimlogin = 0;
-}
-
-int owl_global_is_ignore_aimlogin(const owl_global *g)
-{
-    return g->ignoreaimlogin;
 }
 
@@ -867 +750 @@
     { "reply-lockout", "class ^mail$ or class ^filsrv$" },
     { "out", "direction ^out$" },
-    { "aim", "type ^aim$" },
     { "zephyr", "type ^zephyr$" },
     { "none", "false" },