Changeset 8dfb59c for functions.c

Timestamp:

Mar 23, 2010, 5:23:43 PM (14 years ago)

Author:

Nelson Elhage <nelhage@ksplice.com>

Branches:

master, release-1.10, release-1.6, release-1.7, release-1.8, release-1.9

Children:

38cc669

Parents:

1b1cd2c

git-author:

Nelson Elhage <nelhage@mit.edu> (03/04/10 09:41:04)

git-committer:

Nelson Elhage <nelhage@ksplice.com> (03/23/10 17:23:43)

Message:

Nuke the editwin buffercommand.

This was really just an alternate name for callback data that was
known to be a string. Now that we can safely pass callback data that
needs to be destroyed, it's redundant.

File:

• functions.c (modified) (5 diffs)

functions.c

@@ -296 +296 @@
 
   owl_editwin_set_cbdata(owl_global_get_typwin(&g), data, cleanup);
-  owl_global_set_buffercallback(&g, callback);
+  owl_editwin_set_callback(owl_global_get_typwin(&g), callback);
   owl_global_push_context(&g, OWL_CTX_EDITMULTI, e, "editmulti");
 }
@@ -312 +312 @@
                          noun);
 
-  owl_function_start_edit_win(line, callback, NULL, NULL);
-  owl_global_set_buffercommand(&g, line);
+  owl_function_start_edit_win(line, callback,
+                              owl_strdup(line),
+                              owl_free);
 }
 
@@ -349 +350 @@
 
 void owl_callback_zwrite(owl_editwin *e) {
-  owl_function_zwrite(owl_editwin_get_command(e),
+  char *command = owl_editwin_get_cbdata(e);
+  owl_function_zwrite(command,
                       owl_editwin_get_text(e));
 }
@@ -447 +449 @@
 
 void owl_callback_aimwrite(owl_editwin *e) {
-  owl_function_aimwrite(owl_editwin_get_command(e),
+  char *command = owl_editwin_get_cbdata(e);
+  owl_function_aimwrite(command,
                         owl_editwin_get_text(e));
 }
@@ -882 +885 @@
 
 void owl_callback_aimlogin(owl_editwin *e) {
-  owl_function_aimlogin(owl_editwin_get_command(e),
+  char *user = owl_editwin_get_cbdata(e);
+  owl_function_aimlogin(user,
                         owl_editwin_get_text(e));
 }