Changeset 81655f8

Timestamp:

May 12, 2008, 8:01:58 PM (15 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

9f4e3f8

Parents:

6b3878b

Message:

* filterelement.c - quote regexp filter elements with spaces in them.
* functions.c - deal with smart-narrowing when the user's screenname has spaces in it.
* owl.h - add a new struct member to the global to hold an escaped aim screenname.
* global.c - populate the aforementioned new struct member.

Files:

• filterelement.c (modified) (1 diff)
• functions.c (modified) (1 diff)
• global.c (modified) (2 diffs)
• owl.h (modified) (1 diff)

filterelement.c

@@ -138 +138 @@
 static void owl_filterelement_print_re(owl_filterelement *fe, char *buf)
 {
+  char *re, *q;
   strcat(buf, fe->field);
   strcat(buf, " ");
-  strcat(buf, owl_regex_get_string(&(fe->re)));
+
+  re = owl_regex_get_string(&(fe->re));
+  q = owl_getquoting(re);
+  strcat(buf, q);
+  strcat(buf, re); 
+  strcat(buf, q);
 }
 

functions.c

@@ -2723 +2723 @@
   sprintf(argbuff,
           "( type ^aim$ and ( ( sender ^%s$ and recipient ^%s$ ) or ( sender ^%s$ and recipient ^%s$ ) ) )",
-          escuser, owl_global_get_aim_screenname(&g), owl_global_get_aim_screenname(&g), escuser);
+          escuser, owl_global_get_aim_screenname_for_filters(&g),
+          owl_global_get_aim_screenname_for_filters(&g), escuser);
 
   owl_filter_init_fromstring(f, filtname, argbuff);

global.c

@@ -98 +98 @@
 
   g->aim_screenname=NULL;
+  g->aim_screenname_for_filters=NULL;
   g->aim_loggedin=0;
   owl_timer_create_countdown(&(g->aim_noop_timer), 30);
@@ -748 +749 @@
 }
 
+char *owl_global_get_aim_screenname_for_filters(owl_global *g)
+{
+  if (owl_global_is_aimloggedin(g)) {
+    return (g->aim_screenname_for_filters);
+  }
+  return("");
+}
+
 void owl_global_set_aimloggedin(owl_global *g, char *screenname)
 {
+  char *sn_escaped, *quote;
   g->aim_loggedin=1;
   if (g->aim_screenname) owl_free(g->aim_screenname);
+  if (g->aim_screenname_for_filters) owl_free(g->aim_screenname_for_filters);
   g->aim_screenname=owl_strdup(screenname);
+  sn_escaped = owl_text_quote(screenname, OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
+  quote = owl_getquoting(sn_escaped);
+  g->aim_screenname_for_filters=sprintf("%s%s%s", quote, sn_escaped, quote);
+  owl_free(sn_escaped);
 }
 

owl.h

@@ -621 +621 @@
   int aim_doprocessing;     /* true if we should process AIM events (like pending login) */
   char *aim_screenname;     /* currently logged in AIM screen name */
+  char *aim_screenname_for_filters;     /* currently logged in AIM screen name */
   owl_buddylist buddylist;  /* list of logged in AIM buddies */
   owl_list messagequeue;    /* for queueing up aim and other messages */