Changes in / [625802a:ee310eb]

Files:

• dict.c (modified) (1 diff)
• editwin.c (modified) (2 diffs)
• filter.c (modified) (2 diffs)
• filterelement.c (modified) (2 diffs)
• fmtext.c (modified) (5 diffs)
• functions.c (modified) (1 diff)
• logging.c (modified) (2 diffs)
• obarray.c (modified) (3 diffs)
• perl/modules/IRC/lib/BarnOwl/Module/IRC.pm (modified) (1 diff)
• perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm (modified) (3 diffs)
• perlconfig.c (modified) (1 diff)
• util.c (modified) (1 diff)
• variable.c (modified) (1 diff)

dict.c

@@ -179 +179 @@
   owl_dict_free_all(&d, NULL);
 
-  //  if (numfailed) printf("*** WARNING: failures encountered with owl_dict\n");
+  /*  if (numfailed) printf("*** WARNING: failures encountered with owl_dict\n"); */
   printf("# END testing owl_dict (%d failures)\n", numfailed);
   return(numfailed);

editwin.c

@@ -36 +36 @@
   e->echochar='\0';
 
+  /* We get initialized multiple times, but we need to hold on to
+     the callbacks, so we can't NULL them here. */
   /*
-    // We get initialized multiple times, but we need to hold on to
-    // the callbacks, so we can't NULL them here.
     e->command = NULL;
     e->callback = NULL;
@@ -116 +116 @@
     owl_function_error("Internal error: No editwin callback!");
   } else {
-    // owl_function_error("text: |%s|", owl_editwin_get_text(e));
+    /* owl_function_error("text: |%s|", owl_editwin_get_text(e)); */
     cb(e);
   }

filter.c

@@ -341 +341 @@
   TEST_FILTER("type ^zephyr$ and direction ^in$ and ( class ^owl$ or instance ^owl$ )", 1);
 
-  // Order of operations and precedence
+  /* Order of operations and precedence */
   TEST_FILTER("not true or false", 0);
   TEST_FILTER("true or true and false", 0);
@@ -352 +352 @@
   TEST_FILTER("filter f1", 1);
 
-  // Test recursion prevention
+  /* Test recursion prevention */
   FAIL_UNLESS("self reference", owl_filter_init_fromstring(&f2, "test", "filter test"));
 
-  // mutual recursion
+  /* mutual recursion */
   owl_filter_init_fromstring(&f3, "f3", "filter f4");
   owl_global_add_filter(&g, &f3);

filterelement.c

@@ -124 +124 @@
 }
 
-// Print methods
+/* Print methods */
 
 static void owl_filterelement_print_true(owl_filterelement *fe, char *buf)
@@ -182 +182 @@
 }
 
-// Constructors
+/* Constructors */
 
 void owl_filterelement_create(owl_filterelement *fe) {

fmtext.c

@@ -793 +793 @@
 void owl_fmtext_init_colorpair_mgr(owl_colorpair_mgr *cpmgr)
 {
-  // This could be a bitarray if we wanted to save memory.
+  /* This could be a bitarray if we wanted to save memory. */
   short i, j;
   cpmgr->next = 8;
   
-  // The test is <= because we allocate COLORS+1 entries.
+  /* The test is <= because we allocate COLORS+1 entries. */
   cpmgr->pairs = owl_malloc((COLORS+1) * sizeof(short*));
   for(i = 0; i <= COLORS; i++) {
@@ -823 +823 @@
     cpmgr->next = 8;
     
-    // The test is <= because we allocated COLORS+1 entries.
+    /* The test is <= because we allocated COLORS+1 entries. */
     for(i = 0; i <= COLORS; i++) {
       for(j = 0; j <= COLORS; j++) {
@@ -844 +844 @@
   short pair, default_bg;
 
+  /* Sanity (Bounds) Check */
+  if (fg > COLORS || fg < OWL_COLOR_DEFAULT) fg = OWL_COLOR_DEFAULT;
+  if (bg > COLORS || bg < OWL_COLOR_DEFAULT) bg = OWL_COLOR_DEFAULT;
+            
 #ifdef HAVE_USE_DEFAULT_COLORS
   if (fg == OWL_COLOR_DEFAULT) fg = -1;
@@ -853 +857 @@
 #endif
 
-  // looking for a pair we already set up for this draw.
+  /* looking for a pair we already set up for this draw. */
   cpmgr = owl_global_get_colorpair_mgr(&g);
   pair = cpmgr->pairs[fg+1][bg+1];
   if (!(pair != -1 && pair < cpmgr->next)) {
-/*    owl_global_set_needrefresh(&g);*/
-    // If we didn't find a pair, search for a free one to assign.
+    /* If we didn't find a pair, search for a free one to assign. */
     pair = (cpmgr->next < COLOR_PAIRS) ? cpmgr->next : -1;
     if (pair != -1) {
-      // We found a free pair, initialize it.
+      /* We found a free pair, initialize it. */
       init_pair(pair, fg, bg);
       cpmgr->pairs[fg+1][bg+1] = pair;
@@ -867 +870 @@
     }
     else if (bg != OWL_COLOR_DEFAULT) {
-      // We still don't have a pair, drop the background color. Too bad.
+      /* We still don't have a pair, drop the background color. Too bad. */
       owl_function_debugmsg("colorpairs: color shortage - dropping background color.");
       pair = owl_fmtext_get_colorpair(fg, OWL_COLOR_DEFAULT);
     }
     else {
-      // We still don't have a pair, defaults all around.
+      /* We still don't have a pair, defaults all around. */
       owl_function_debugmsg("colorpairs: color shortage - dropping foreground and background color.");
       pair = 0;

functions.c

@@ -1372 +1372 @@
   redrawwin(owl_global_get_curs_recwin(&g));
   redrawwin(owl_global_get_curs_sepwin(&g));
-  // Work around curses segfualts with windows off the screen
+  /* Work around curses segfualts with windows off the screen */
   if (g.lines >= owl_global_get_typwin_lines(&g)+2)
       redrawwin(owl_global_get_curs_typwin(&g));

logging.c

@@ -139 +139 @@
   /* Figure out what path to log to */
   if (owl_message_is_type_zephyr(m)) {
-    // If this has CC's, do all but the "recipient" which we'll do below
+    /* If this has CC's, do all but the "recipient" which we'll do below */
     to = owl_message_get_cc_without_recipient(m);
     if (to != NULL) {
@@ -326 +326 @@
 
   if (personal && owl_message_is_type_zephyr(m)) {
-    // We want to log to all of the CC'd people who were not us, or
-    // the sender, as well.
+    /* We want to log to all of the CC'd people who were not us, or
+     * the sender, as well.
+     */
     char *cc, *temp;
     cc = owl_message_get_cc_without_recipient(m);

obarray.c

@@ -10 +10 @@
  */
 
-// Helper method: Lookup a key in the obarray. If the key exists,
-// return its index, and the interned value in *val. Otherwise, return
-// the index it should be inserted at.
+/* Helper method: Lookup a key in the obarray. If the key exists,
+ * return its index, and the interned value in *val. Otherwise, return
+ * the index it should be inserted at.
+ */
 int owl_obarray_lookup(owl_obarray *oa, char * key, char ** val) /*noproto*/
 {
@@ -39 +40 @@
 }
 
-// Returns NULL if the string doesn't exist in the obarray
+/* Returns NULL if the string doesn't exist in the obarray */
 char * owl_obarray_find(owl_obarray *oa, char * string)
 {
@@ -47 +48 @@
 }
 
-// Inserts the string into the obarray if it doesn't exist
+/* Inserts the string into the obarray if it doesn't exist */
 char * owl_obarray_insert(owl_obarray *oa, char * string)
 {

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

@@ -162 +162 @@
        );
 
-    if ($conn->connected) {
+    if ($conn->conn->connected) {
         BarnOwl::admin_message("IRC", "Connected to $alias as $nick");
         $ircnets{$alias} = $conn;

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

@@ -137 +137 @@
 }
 
+our $showOffline = 0;
+
 sub blist_listBuddy {
     my $roster = shift;
@@ -152 +154 @@
         $blistStr .= " [" . ( $rq{show} ? $rq{show} : 'online' ) . "]";
         $blistStr .= " " . $rq{status} if $rq{status};
-        $blistStr = BarnOwl::Style::boldify($blistStr);
+        $blistStr = BarnOwl::Style::boldify($blistStr) if $showOffline;
     }
     else {
-        return '' if (BarnOwl::getvar('jabber:show_offline_buddies') eq 'off');
+        return '' unless $showOffline;
         if ($jq{ask}) {
             $blistStr .= " [pending]";
@@ -198 +200 @@
 
 sub onGetBuddyList {
+    $showOffline = BarnOwl::getvar('jabber:show_offline_buddies') eq 'on';
     my $blist = "";
     foreach my $jid ($conn->getJIDs()) {

perlconfig.c

@@ -14 +14 @@
 extern XS(boot_BarnOwl);
 extern XS(boot_DynaLoader);
-// extern XS(boot_DBI);
+/* extern XS(boot_DBI); */
 
 static void owl_perl_xs_init(pTHX)

util.c

@@ -888 +888 @@
               !strcmp("meep foo bar", owl_util_uniq("meep foo", "bar foo meep", "-")));
 
-  // if (numfailed) printf("*** WARNING: failures encountered with owl_util\n");
+  /* if (numfailed) printf("*** WARNING: failures encountered with owl_util\n"); */
   printf("# END testing owl_util (%d failures)\n", numfailed);
   return(numfailed);

variable.c

@@ -1083 +1083 @@
   owl_variable_dict_free(&vd);
 
-  // if (numfailed) printf("*** WARNING: failures encountered with owl_variable\n");
+  /* if (numfailed) printf("*** WARNING: failures encountered with owl_variable\n"); */
   printf("# END testing owl_variable (%d failures)\n", numfailed);
   return(numfailed);