Changeset 1dafc7e

Timestamp:

Jan 13, 2013, 9:09:20 AM (12 years ago)

Author:

David Benjamin <davidben@mit.edu>

Parents:

c068c03 (diff), 007081e (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 007081e831c30952f1cf800bc610c33ba0671fb4 into c068c0307a85727dd3ad619122a640f96399d627

Files:

• functions.c (modified) (3 diffs)
• aim.c (modified) (2 diffs)
• commands.c (modified) (4 diffs)
• editwin.c (modified) (1 diff)
• filter.c (modified) (1 diff)
• help.c (modified) (1 diff)
• perl/lib/BarnOwl.pm (modified) (1 diff)
• perl/lib/BarnOwl/Complete/Client.pm (modified) (1 diff)
• perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm (modified) (1 diff)
• perlglue.xs (modified) (2 diffs)
• variable.c (modified) (1 diff)
• zcrypt.c (modified) (1 diff)

functions.c

@@ -871 +871 @@
 void owl_function_loadsubs(const char *file)
 {
-  int ret, ret2;
-  const char *foo;
+  int ret, ret2, ret3;
   char *path;
 
@@ -884 +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.");
@@ -895 +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");
   }
 }

aim.c

@@ -707 +707 @@
 {
   aim_clientready(sess, fr->conn);
-  owl_function_debugmsg("conninitdone_admin: initializtion done for admin connection");
+  owl_function_debugmsg("conninitdone_admin: initialization done for admin connection");
   return(1);
 }
@@ -836 +836 @@
   params = va_arg(ap, struct aim_icbmparameters *);
   va_end(ap);
-  
-  owl_function_debugmsg("faimtest_icbmparaminfo: ICBM Parameters: maxchannel = %d, default flags = 0x%08x, max msg len = %d, max sender evil = %f, max reciever evil = %f, min msg interval = %u",
+
+  owl_function_debugmsg("faimtest_icbmparaminfo: ICBM Parameters: maxchannel = %d, default flags = 0x%08x, max msg len = %d, max sender evil = %f, max receiver evil = %f, min msg interval = %u",
                        params->maxchan, params->flags, params->maxmsglen, ((float)params->maxsenderwarn)/10.0, ((float)params->maxrecverwarn)/10.0, params->minmsginterval);
      

commands.c

@@ -1033 +1033 @@
   OWLCMD_ARGS_CTX("popless:start-search", owl_viewwin_command_start_search, OWL_CTX_POPLESS,
                   "starts a command line to search for particular string",
-                  "popless:start-search [-r] [inital-value]",
+                  "popless:start-search [-r] [initial-value]",
                   "Initializes the command-line to search for initial-value. If\n"
                   "-r is used, the search will be performed backwards.\n\n"
@@ -2190 +2190 @@
     if (!strcmp(argv[0], "-f")) {
       if (argc<2) {
-        owl_function_makemsg("Too few argments to the view command");
+        owl_function_makemsg("Too few arguments to the view command");
         return(NULL);
       }
@@ -2202 +2202 @@
     } else if (!strcmp(argv[0], "-s")) {
       if (argc<2) {
-        owl_function_makemsg("Too few argments to the view command");
+        owl_function_makemsg("Too few arguments to the view command");
         return(NULL);
       }
@@ -2209 +2209 @@
       argv+=2;
     } else {
-      owl_function_makemsg("Too few argments to the view command");
+      owl_function_makemsg("Too few arguments to the view command");
       return(NULL);
     }

editwin.c

@@ -619 +619 @@
 
   if (!g_utf8_validate(s, -1, NULL)) {
-    owl_function_debugmsg("owl_editwin_insert_string: received non-utf-8 string.");
+    owl_function_debugmsg("owl_editwin_insert_string: received non-UTF-8 string.");
     return 0;
   }

filter.c

@@ -124 +124 @@
 
   op1 = owl_filter_parse_primitive_expression(argc-i, argv+i, &skip);
+  if(!op1) goto err;
   i += skip;
-  if(!op1) goto err;
 
   while(i < argc) {

help.c

@@ -107 +107 @@
      "    unsuball      Unsubscribe from all zephyr classes\n"
      "    load-subs     Load zephyr subscriptions from a file\n"
-     "    zpunt         Supress messages from a zephyr triplet\n"
+     "    zpunt         Suppress messages from a zephyr triplet\n"
      "    zlog          Send a login or logout notification\n"
      "    zlist         Print a list of zephyr buddies logged in\n"

perl/lib/BarnOwl.pm

@@ -93 +93 @@
 command line, and C<MESSAGE> is the zephyr body to send.
 
+=cut
+
+sub zephyr_zwrite {
+    my ($command, $message) = @_;
+    my $ret = BarnOwl::Internal::zephyr_zwrite($command, $message);
+    die "Error sending zephyr" unless $ret == 0;
+}
+
 =head2 ztext_stylestrip STRING
 

perl/lib/BarnOwl/Complete/Client.pm

@@ -20 +20 @@
 
 my %show = (
-    information => undef,
     colors      => undef,
     commands    => undef,

perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm

@@ -320 +320 @@
               . "configure [<muc>]\n"
               . "            Configures a MUC.\n"
-              . "            Necessary to initalize a new MUC.\n"
+              . "            Necessary to initialize a new MUC.\n"
               . "            At present, only the default configuration is supported.\n"
               . "            The MUC is taken from the current message if not supplied.\n\n"

perlglue.xs

@@ -96 +96 @@
                 RETVAL
 
-void
-zephyr_zwrite(cmd,msg)
-        const char *cmd
-        const char *msg
-        PREINIT:
-                int i;
-        CODE:
-                i = owl_zwrite_create_and_send_from_line(cmd, msg);
-
 const utf8 *
 ztext_stylestrip(ztext)
@@ -475 +466 @@
         }
 
+int
+zephyr_zwrite(cmd,msg)
+        const char *cmd
+        const char *msg
+        CODE:
+                RETVAL = owl_zwrite_create_and_send_from_line(cmd, msg);
+        OUTPUT:
+                RETVAL
+
 MODULE = BarnOwl                PACKAGE = BarnOwl::Editwin
 

variable.c

@@ -354 +354 @@
   OWLVAR_BOOL( "narrow-related" /* %OwlVarStub:narrow_related */, 1,
                "Make smartnarrow use broader filters",
-               "Causes smartfiler to narrow to messages \"related\" to \n"
+               "Causes smartfilter to narrow to messages \"related\" to \n"
                "the current message, as well as ones to the same place.\n\n"
                "for Zephyr, this controls whether to narrow to e.g. class-help or\n"

zcrypt.c

@@ -866 +866 @@
 
   err = call_filter(argv, in, &out, &status);
+  free(in);
   if(err || status) {
     g_free(out);