Changes in / [416241f:85fa6e4]

Files:

• editwin.c (modified) (2 diffs)
• perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm (modified) (2 diffs)

editwin.c

@@ -251 +251 @@
   e->lock=e->bufflen;
   oe_set_index(e, e->lock);
+  e->topindex = 0;
   owl_editwin_redisplay(e, 0);
 }
@@ -470 +471 @@
 static void oe_reframe(owl_editwin *e) {
   oe_excursion x;
-  int goal = e->winlines / 2;
+  int goal = 1 + e->winlines / 2;
   int index;
   int count = 0;

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

@@ -1229 +1229 @@
     $props{xml}        = $j->GetXML();
 
-    if ( $jtype eq 'chat' ) {
+    if ( $jtype eq 'groupchat' ) {
+        my $nick = $props{nick} = $from->GetResource();
+        my $room = $props{room} = $from->GetJID('base');
+        $completion_jids{$room} = 1;
+
+        $props{sender} = $nick || $room;
+        $props{recipient} = $room;
+
+        if ( $props{subject} && !$props{body} ) {
+            $props{body} =
+              '[' . $nick . " has set the topic to: " . $props{subject} . "]";
+        }
+    }
+    elsif ( $jtype eq 'headline' ) {
+        ;
+    }
+    elsif ( $jtype eq 'error' ) {
+        $props{body}     = "Error "
+          . $props{error_code}
+          . " sending to "
+          . $props{from} . "\n"
+          . $props{error};
+    }
+    else { # chat, or normal (default)
         $props{private} = 1;
 
@@ -1256 +1279 @@
             $completion_jids{ $props{recipient} } = 1;
         }
-    }
-    elsif ( $jtype eq 'groupchat' ) {
-        my $nick = $props{nick} = $from->GetResource();
-        my $room = $props{room} = $from->GetJID('base');
-        $completion_jids{$room} = 1;
-
-        $props{sender} = $nick || $room;
-        $props{recipient} = $room;
-
-        if ( $props{subject} && !$props{body} ) {
-            $props{body} =
-              '[' . $nick . " has set the topic to: " . $props{subject} . "]";
-        }
-    }
-    elsif ( $jtype eq 'normal' ) {
-        $props{private} = 1;
-    }
-    elsif ( $jtype eq 'headline' ) {
-    }
-    elsif ( $jtype eq 'error' ) {
-        $props{body}     = "Error "
-          . $props{error_code}
-          . " sending to "
-          . $props{from} . "\n"
-          . $props{error};
     }