Changeset 61abb18 for editwin.c

Timestamp:

Aug 10, 2008, 10:53:16 AM (16 years ago)

Author:

Geoffrey Thomas <geofft@mit.edu>

Branches:

barnowl_perlaim

Parents:

3dcccba

Message:

Now it compiles. Highly likely to leak or crash, although it seems to work for me...

File:

• editwin.c (modified) (2 diffs)

editwin.c

@@ -84 +84 @@
 }
 
-void owl_editwin_set_command(owl_editwin *e, char *command) {
-  if(e->command) owl_free(e->command);
-  e->command = owl_strdup(command);
-}
-
-char *owl_editwin_get_command(owl_editwin *e) {
-  if(e->command) return e->command;
-  return "";
-}
-
-void owl_editwin_set_callback(owl_editwin *e, void (*cb)(void*, char*)) {
+void owl_editwin_set_callback(owl_editwin *e, owl_callback_t cb, void *cbdata) {
   e->callback = cb;
-}
-
-void (*owl_editwin_get_callback(owl_editwin*))(void *cbdata, char *text) {
+  e->cbdata = cbdata;
+}
+
+owl_callback_t owl_editwin_get_callback(owl_editwin *e) {
   return e->callback;
-}
-
-void owl_editwin_set_cbdata(owl_editwin *e, void *data) {
-  e->cbdata = data;
 }
 
@@ -112 +99 @@
 void owl_editwin_do_callback(owl_editwin *e) {
   /* XXX get rid of me */
-  void (*cb)(void*, char*);
-  cb=owl_editwin_get_callback(e);
+  owl_callback_t cb = owl_editwin_get_callback(e);
   if(!cb) {
     owl_function_error("Internal error: No editwin callback!");
   } else {
     /* owl_function_error("text: |%s|", owl_editwin_get_text(e)); */
-    cb(e->cbdata, e->text);
+    cb(e->cbdata, owl_editwin_get_text(e));
   }
 }