Changeset 3f82515 for functions.c

Timestamp:

Feb 10, 2011, 9:08:33 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

edd0be7

Parents:

6965867

git-author:

David Benjamin <davidben@mit.edu> (01/24/11 17:33:31)

git-committer:

David Benjamin <davidben@mit.edu> (02/10/11 21:08:33)

Message:

Rewrite aimwrite

This now makes more gratuitous use of glib and should, as a bonus, be
more sensible. In particular, we now consistently handle multi-word
recipients with and without -m. Also avoid duplicating sending code.

File:

• functions.c (modified) (2 diffs)

functions.c

@@ -350 +350 @@
 }
 
-void owl_function_aimwrite_setup(const char *line)
-{
+void owl_function_aimwrite_setup(const char *to)
+{
+  /* TODO: We probably actually want an owl_aimwrite object like
+   * owl_zwrite. */
+  char *line = owl_sprintf("aimwrite %s", to);
   owl_function_write_setup("message");
   owl_function_start_edit_win(line,
                               &owl_callback_aimwrite,
-                              owl_strdup(line),
+                              owl_strdup(to),
                               owl_free);
-
+  owl_free(line);
 }
 
@@ -477 +480 @@
 
 void owl_callback_aimwrite(owl_editwin *e) {
-  char *command = owl_editwin_get_cbdata(e);
-  owl_function_aimwrite(command,
-                        owl_editwin_get_text(e));
-}
-
-void owl_function_aimwrite(const char *line, const char *msg)
+  char *to = owl_editwin_get_cbdata(e);
+  owl_function_aimwrite(to, owl_editwin_get_text(e), true);
+}
+
+void owl_function_aimwrite(const char *to, const char *msg, bool unwrap)
 {
   int ret;
-  const char *to;
   char *format_msg;
   owl_message *m;
 
-  to = line + 9;
-
   /* make a formatted copy of the message */
-  format_msg=owl_strdup(msg);
-  owl_text_wordunwrap(format_msg);
+  format_msg = owl_strdup(msg);
+  if (unwrap)
+    owl_text_wordunwrap(format_msg);
   
   /* send the message */