Changeset 2e42098 for functions.c

Timestamp:

Feb 5, 2014, 3:04:26 AM (10 years ago)

Author:

David Benjamin <davidben@davidben.net>

Parents:

9ae6095 (diff), 0071c88 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 0071c88bc882ae44b235200e821626eb6e96230e into 9ae6095ed62f67742f9d4dc1008180e8d23e7b12

File:

• functions.c (modified) (40 diffs)

functions.c

@@ -115 +115 @@
 void owl_function_show_license(void)
 {
-  const char *text;
-
-  text=""
-    "BarnOwl version " OWL_VERSION_STRING "\n"
+  char *text = g_strdup_printf(
+    "BarnOwl version %s\n"
     "Copyright (c) 2006-2011 The BarnOwl Developers. All rights reserved.\n"
     "Copyright (c) 2004 James Kretchmar. All rights reserved.\n"
@@ -155 +153 @@
     "WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE\n"
     "OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN\n"
-    "IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n";
+    "IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n",
+    version);
   owl_function_popless_text(text);
+  g_free(text);
 }
 
@@ -196 +196 @@
   owl_message *m;
 
-  m=g_new(owl_message, 1);
+  m=g_slice_new(owl_message);
   owl_message_create_admin(m, header, body);
   
@@ -204 +204 @@
 
   /* do followlast if necessary */
-  if (owl_global_should_followlast(&g)) owl_function_lastmsg_noredisplay();
+  if (owl_global_should_followlast(&g)) owl_function_lastmsg();
 
   /* redisplay etc. */
@@ -216 +216 @@
 void owl_function_add_outgoing_zephyrs(const owl_zwrite *z)
 {
-  if (z->cc || owl_zwrite_get_numrecips(z) == 0) {
+  if (z->cc && owl_zwrite_is_personal(z)) {
     /* create the message */
-    owl_message *m = g_new(owl_message, 1);
+    owl_message *m = g_slice_new(owl_message);
     owl_message_create_from_zwrite(m, z, owl_zwrite_get_message(z), 0);
 
@@ -225 +225 @@
     int i;
     for (i = 0; i < owl_zwrite_get_numrecips(z); i++) {
+      owl_message *m;
+
+      if (!owl_zwrite_recip_is_personal(owl_zwrite_get_recip_n(z, i)))
+        continue;
+
       /* create the message */
-      owl_message *m = g_new(owl_message, 1);
+      m = g_slice_new(owl_message);
       owl_message_create_from_zwrite(m, z, owl_zwrite_get_message(z), i);
 
@@ -246 +251 @@
   if (!owl_global_is_aimloggedin(&g)) return(NULL);
   
-  m=g_new(owl_message, 1);
+  m=g_slice_new(owl_message);
   owl_message_create_aim(m,
                          owl_global_get_aim_screenname(&g),
@@ -265 +270 @@
 
   /* create the message */
-  m=g_new(owl_message, 1);
+  m=g_slice_new(owl_message);
   owl_message_create_loopback(m, body);
   owl_message_set_direction_out(m);
@@ -272 +277 @@
 }
 
-void owl_function_start_edit_win(const char *line, void (*callback)(owl_editwin *), void *data, void (*cleanup)(void *))
+owl_editwin *owl_function_start_edit_win(const char *line)
 {
   owl_editwin *e;
@@ -286 +291 @@
   g_free(s);
 
-  owl_editwin_set_cbdata(e, data, cleanup);
-  owl_editwin_set_callback(e, callback);
   ctx = owl_editcontext_new(OWL_CTX_EDITMULTI, e, "editmulti",
                             owl_global_deactivate_editcontext, &g);
   owl_global_push_context_obj(&g, ctx);
-
+  return e;
 }
 
@@ -309 +312 @@
 void owl_function_zwrite_setup(owl_zwrite *z)
 {
+  owl_editwin *e;
   /* send a ping if necessary */
   if (owl_global_is_txping(&g)) {
@@ -316 +320 @@
 
   owl_function_write_setup("zephyr");
-  owl_function_start_edit_win(z->zwriteline,
-                              &owl_callback_zwrite,
-                              z, (void(*)(void*))owl_zwrite_delete);
+  e = owl_function_start_edit_win(z->zwriteline);
+  owl_editwin_set_cbdata(e, z, (void (*)(void *))owl_zwrite_delete);
+  owl_editwin_set_callback(e, &owl_callback_zwrite);
 }
 
 void owl_function_aimwrite_setup(const char *to)
 {
+  owl_editwin *e;
   /* TODO: We probably actually want an owl_aimwrite object like
    * owl_zwrite. */
   char *line = g_strdup_printf("aimwrite %s", to);
   owl_function_write_setup("message");
-  owl_function_start_edit_win(line,
-                              &owl_callback_aimwrite,
-                              g_strdup(to),
-                              g_free);
+  e = owl_function_start_edit_win(line);
+  owl_editwin_set_cbdata(e, g_strdup(to), g_free);
+  owl_editwin_set_callback(e, &owl_callback_aimwrite);
   g_free(line);
 }
@@ -336 +340 @@
 void owl_function_loopwrite_setup(void)
 {
+  owl_editwin *e;
   owl_function_write_setup("message");
-  owl_function_start_edit_win("loopwrite",
-                              &owl_callback_loopwrite,
-                              NULL, NULL);
-}
-
-void owl_callback_zwrite(owl_editwin *e) {
+  e = owl_function_start_edit_win("loopwrite");
+  owl_editwin_set_callback(e, &owl_callback_loopwrite);
+}
+
+void owl_callback_zwrite(owl_editwin *e, bool success)
+{
+  if (!success) return;
   owl_zwrite *z = owl_editwin_get_cbdata(e);
   owl_function_zwrite(z, owl_editwin_get_text(e));
@@ -372 +378 @@
   owl_function_makemsg("Waiting for ack...");
 
-  /* If it's personal */
-  if (owl_zwrite_is_personal(z)) {
-    /* create the outgoing message */
-    owl_function_add_outgoing_zephyrs(z);
-  }
+  /* create the outgoing message */
+  owl_function_add_outgoing_zephyrs(z);
 }
 #else
@@ -402 +405 @@
 
   zcrypt = g_build_filename(owl_get_bindir(), "zcrypt", NULL);
-  argv[0] = "zcrypt";
+  argv[0] = zcrypt;
   argv[1] = "-E";
   argv[2] = "-c"; argv[3] = owl_zwrite_get_class(z);
@@ -408 +411 @@
   argv[6] = NULL;
 
-  rv = call_filter(zcrypt, argv, owl_zwrite_get_message(z), &cryptmsg, &status);
+  rv = call_filter(argv, owl_zwrite_get_message(z), &cryptmsg, &status);
 
   g_free(zcrypt);
@@ -426 +429 @@
   owl_function_makemsg("Waiting for ack...");
 
-  /* If it's personal */
-  if (owl_zwrite_is_personal(z)) {
-    /* Create the outgoing message. Restore the un-crypted message for display. */
-    owl_zwrite_set_message_raw(z, old_msg);
-    owl_function_add_outgoing_zephyrs(z);
-  }
-
-  /* free the zwrite */
+  /* Create the outgoing message. Restore the un-crypted message for display. */
+  owl_zwrite_set_message_raw(z, old_msg);
+  owl_function_add_outgoing_zephyrs(z);
+
+  /* Clean up. */
   g_free(cryptmsg);
-}
-
-void owl_callback_aimwrite(owl_editwin *e) {
+  g_free(old_msg);
+}
+
+void owl_callback_aimwrite(owl_editwin *e, bool success)
+{
+  if (!success) return;
   char *to = owl_editwin_get_cbdata(e);
   owl_function_aimwrite(to, owl_editwin_get_text(e), true);
@@ -501 +504 @@
 }
 
-void owl_callback_loopwrite(owl_editwin *e) {
+void owl_callback_loopwrite(owl_editwin *e, bool success)
+{
+  if (!success) return;
   owl_function_loopwrite(owl_editwin_get_text(e));
 }
@@ -511 +516 @@
   /* create a message and put it on the message queue.  This simulates
    * an incoming message */
-  min=g_new(owl_message, 1);
+  min=g_slice_new(owl_message);
   mout=owl_function_make_outgoing_loopback(msg);
 
@@ -808 +813 @@
 }
 
-void owl_function_lastmsg_noredisplay(void)
+void owl_function_lastmsg(void)
 {
   int oldcurmsg, curmsg;
@@ -826 +831 @@
     owl_global_set_curmsg(&g, curmsg+1);
   } 
-  /* owl_mainwin_redisplay(owl_global_get_mainwin(&g)); */
+  owl_mainwin_redisplay(owl_global_get_mainwin(&g));
   owl_global_set_direction_downwards(&g);
-}
-
-void owl_function_lastmsg(void)
-{
-  owl_function_lastmsg_noredisplay();
-  owl_mainwin_redisplay(owl_global_get_mainwin(&g));  
 }
 
@@ -856 +855 @@
 void owl_function_unsuball(void)
 {
-  unsuball();
-  owl_function_makemsg("Unsubscribed from all messages.");
+  if (unsuball())
+    owl_function_makemsg("Unsubscribed from all messages.");
 }
 
@@ -872 +871 @@
 void owl_function_loadsubs(const char *file)
 {
-  int ret, ret2;
-  const char *foo;
+  int ret, ret2, ret3;
   char *path;
 
@@ -885 +883 @@
 
   /* for backwards compatibility for now */
-  ret2=owl_zephyr_loaddefaultsubs();
+  ret2 = owl_zephyr_loaddefaultsubs();
+  ret3 = owl_zephyr_loadbarnowldefaultsubs();
 
   if (!owl_context_is_interactive(owl_global_get_context(&g))) return;
 
-  foo=file?file:"file";
-  if (ret==0 && ret2==0) {
+  if (ret == 0 && ret2 == 0 && ret3 == 0) {
     if (!file) {
       owl_function_makemsg("Subscribed to messages.");
@@ -896 +894 @@
       owl_function_makemsg("Subscribed to messages from %s", file);
     }
-  } else if (ret==-1) {
-    owl_function_error("Could not read %s", foo);
-  } else {
+  } else if (ret == -1) {
+    owl_function_error("Could not read %s", file ? file : "file");
+  } else if (ret2 == -1) {
     owl_function_error("Error subscribing to messages");
+  } else {
+    owl_function_error("Error subscribing to instanced personals");
   }
 }
@@ -918 +918 @@
 }
 
-void owl_callback_aimlogin(owl_editwin *e) {
+void owl_callback_aimlogin(owl_editwin *e, bool success)
+{
+  if (!success) return;
   char *user = owl_editwin_get_cbdata(e);
   owl_function_aimlogin(user,
@@ -989 +991 @@
   /* owl_aim_set_awaymsg(""); */
   owl_function_makemsg("AIM away off");
+}
+
+bool owl_function_is_away(void)
+{
+  return owl_global_is_zaway(&g) ||
+         owl_global_is_aaway(&g) ||
+         owl_perlconfig_perl_call_bool("BarnOwl::Hooks::_get_is_away", 0, NULL);
 }
 
@@ -1350 +1359 @@
 void owl_function_about(void)
 {
-  owl_function_popless_text(
-    "This is BarnOwl version " OWL_VERSION_STRING ".\n\n"
+  char *text = g_strdup_printf(
+    "This is BarnOwl version %s.\n\n"
     "BarnOwl is a fork of the Owl zephyr client, written and\n"
     "maintained by Alejandro Sedeno and Nelson Elhage at the\n"
@@ -1370 +1379 @@
     "This program is free software. You can redistribute it and/or\n"
     "modify under the terms of the Sleepycat License. Use the \n"
-    "':show license' command to display the full license\n"
-  );
+      "':show license' command to display the full license\n",
+      version);
+  owl_function_popless_text(text);
+  g_free(text);
 }
 
@@ -1430 +1441 @@
       char *tmpbuff, *tmpbuff2;
       int i, fields;
+      const char *f;
 
       if (!owl_message_is_pseudo(m)) {
@@ -1460 +1472 @@
         owl_fmtext_append_normal(&fm, "\n");
         owl_fmtext_appendf_normal(&fm, "  Port      : %i\n", ntohs(n->z_port));
+        owl_fmtext_appendf_normal(&fm, "  Charset   : %s\n", owl_zephyr_get_charsetstr(n));
         owl_fmtext_appendf_normal(&fm, "  Auth      : %s\n", owl_zephyr_get_authstr(n));
 
@@ -1471 +1484 @@
         owl_fmtext_appendf_normal(&fm, "  Fields    : %i\n", fields);
 
-        for (i = 0; i < fields; i++) {
-          tmpbuff = owl_zephyr_get_field_as_utf8(n, i + 1);
+        for (i = 0, f = owl_zephyr_first_raw_field(n); f != NULL;
+             i++, f = owl_zephyr_next_raw_field(n, f)) {
+          tmpbuff = owl_zephyr_field_as_utf8(n, f);
           tmpbuff2 = owl_text_indent(tmpbuff, 14, false);
           owl_fmtext_appendf_normal(&fm, "  Field %i   : %s\n", i + 1, tmpbuff2);
@@ -1770 +1784 @@
 
   owl_fmtext_append_normal(&fm, "  Version: ");
-  owl_fmtext_append_normal(&fm, OWL_VERSION_STRING);
+  owl_fmtext_append_normal(&fm, version);
   owl_fmtext_append_normal(&fm, "\n");
 
@@ -1940 +1954 @@
 }
 
-void owl_callback_command(owl_editwin *e)
-{
+void owl_callback_command(owl_editwin *e, bool success)
+{
+  if (!success) return;
   char *rv;
   const char *line = owl_editwin_get_text(e);
@@ -1952 +1967 @@
 }
 
-void owl_function_start_command(const char *line)
+owl_editwin *owl_function_start_command(const char *line)
 {
   owl_editwin *tw;
@@ -1967 +1982 @@
   owl_global_push_context_obj(&g, ctx);
   owl_editwin_set_callback(tw, owl_callback_command);
-}
-
-CALLER_OWN owl_editwin *owl_function_start_question(const char *line)
+  return tw;
+}
+
+owl_editwin *owl_function_start_question(const char *line)
 {
   owl_editwin *tw;
@@ -1984 +2000 @@
 }
 
-CALLER_OWN owl_editwin *owl_function_start_password(const char *line)
+owl_editwin *owl_function_start_password(const char *line)
 {
   owl_editwin *tw;
@@ -2181 +2197 @@
   f = owl_filter_new(argv[1], argc-2, argv+2);
   if (f == NULL) {
-    owl_function_error("Invalid filter");
+    owl_function_error("Invalid filter: %s", argv[1]);
     return false;
   }
@@ -3466 +3482 @@
   while (zaldptr) {
     ZFreeALD(zaldptr->data);
-    g_free(zaldptr->data);
+    g_slice_free(ZAsyncLocateData_t, zaldptr->data);
     zaldptr = g_list_next(zaldptr);
   }
@@ -3476 +3492 @@
     for (i = 0; i < anyone->len; i++) {
       user = anyone->pdata[i];
-      zald = g_new(ZAsyncLocateData_t, 1);
+      zald = g_slice_new(ZAsyncLocateData_t);
       if (ZRequestLocations(zstr(user), zald, UNACKED, ZAUTH) == ZERR_NONE) {
         *zaldlist = g_list_append(*zaldlist, zald);
       } else {
-        g_free(zald);
+        g_slice_free(ZAsyncLocateData_t, zald);
       }
     }