[2591] in BarnOwl Developers
Re: [PATCH] Punt OWL_WEBBROWSER_* and userclue
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Sat Aug 7 20:01:12 2010
Date: Sat, 7 Aug 2010 20:01:01 -0400 (EDT)
From: Geoffrey Thomas <geofft@MIT.EDU>
To: David Benjamin <davidben@mit.edu>
cc: barnowl-dev@mit.edu
In-Reply-To: <1281224353-12975-1-git-send-email-davidben@mit.edu>
Yeah, we apparently missed the webbrowser defines when removing that
support, and it looks like userclue doesn't even work at the moment (in
addition to being unused).
Reviewed-by: Geoffrey Thomas <geofft@mit.edu>
--
Geoffrey Thomas
geofft@mit.edu
On Sat, 7 Aug 2010, David Benjamin wrote:
> That code hasn't been used for quite some time, and only one of those
> browsers is still in active development anyway.
> ---
> doc/code.txt | 13 -------------
> global.c | 20 --------------------
> owl.h | 11 -----------
> zephyr.c | 2 --
> 4 files changed, 0 insertions(+), 46 deletions(-)
>
> diff --git a/doc/code.txt b/doc/code.txt
> index 320ac73..c248c78 100644
> --- a/doc/code.txt
> +++ b/doc/code.txt
> @@ -166,19 +166,6 @@ The four curses windows on the screen are
>
> ===========================================================================
>
> -
> -MISC THINGS
> ------------
> -
> -userclue: right now userclue is just used to decide if you sub to
> - classes other than the default. If you don't it doesn't bother
> - making your personal messages bold since there's no point in
> - making every message bold.
> -
> -
> -
> -===========================================================================
> -
> Conventions and Design Criteria
> -------------------------------
>
> diff --git a/global.c b/global.c
> index 91abfe8..e2887fc 100644
> --- a/global.c
> +++ b/global.c
> @@ -73,7 +73,6 @@ void owl_global_init(owl_global *g) {
> g->newmsgproc_pid=0;
>
> owl_global_set_config_format(g, 0);
> - owl_global_set_userclue(g, OWL_USERCLUE_NONE);
> owl_global_set_no_have_config(g);
> owl_history_init(&(g->msghist));
> owl_history_init(&(g->cmdhist));
> @@ -509,25 +508,6 @@ const char *owl_global_get_hostname(const owl_global *g) {
> return("");
> }
>
> -/* userclue */
> -
> -void owl_global_set_userclue(owl_global *g, int clue) {
> - g->userclue=clue;
> -}
> -
> -void owl_global_add_userclue(owl_global *g, int clue) {
> - g->userclue|=clue;
> -}
> -
> -int owl_global_get_userclue(const owl_global *g) {
> - return(g->userclue);
> -}
> -
> -int owl_global_is_userclue(const owl_global *g, int clue) {
> - if (g->userclue & clue) return(1);
> - return(0);
> -}
> -
> /* viewwin */
>
> owl_viewwin *owl_global_get_viewwin(owl_global *g) {
> diff --git a/owl.h b/owl.h
> index a3c9666..a79e693 100644
> --- a/owl.h
> +++ b/owl.h
> @@ -173,16 +173,6 @@ typedef void HV;
> #define OWL_CTX_EDITMULTI 0x2000
> #define OWL_CTX_EDITRESPONSE 0x4000
>
> -#define OWL_USERCLUE_NONE 0
> -#define OWL_USERCLUE_CLASSES 1
> -#define OWL_USERCLUE_FOOBAR 2
> -#define OWL_USERCLUE_BAZ 4
> -
> -#define OWL_WEBBROWSER_NONE 0
> -#define OWL_WEBBROWSER_NETSCAPE 1
> -#define OWL_WEBBROWSER_GALEON 2
> -#define OWL_WEBBROWSER_OPERA 3
> -
> #define OWL_VARIABLE_OTHER 0
> #define OWL_VARIABLE_INT 1
> #define OWL_VARIABLE_BOOL 2
> @@ -609,7 +599,6 @@ typedef struct _owl_global {
> time_t starttime;
> time_t lastinputtime;
> char *startupargs;
> - int userclue;
> int nextmsgid;
> int hascolors;
> int colorpairs;
> diff --git a/zephyr.c b/zephyr.c
> index 4dead4a..bfc5479 100644
> --- a/zephyr.c
> +++ b/zephyr.c
> @@ -147,8 +147,6 @@ void owl_zephyr_load_initial_subs(void) {
>
> if (ret_sd || ret_bd || ret_u) {
> owl_function_error("Error loading zephyr subscriptions");
> - } else if (ret_u!=-1) {
> - owl_global_add_userclue(&g, OWL_USERCLUE_CLASSES);
> }
>
> /* load login subscriptions */
> --
> 1.7.2.1.45.gb1c4
>
>
