McKael / mcabber / changeset / ece4f26bf9ff

Up to file-list mcabber/src/commands.c:

@@ -633,6 +633,21 @@ static void roster_note(char *arg)
+  }
+}
 //  roster_updown(updown, nitems)
 // updown: -1=up, +1=down
 inline static void roster_updown(int updown, char *nitems)
+{
   int nbitems;
   if (!nitems || !*nitems)
     nbitems = 1;
   else
     nbitems = strtol(nitems, NULL, 10);
   if (nbitems > 0)
     scr_RosterUpDown(updown, nbitems);
+}
 /* Commands callback functions */
 /* All these do_*() functions will be called with a "arg" parameter */
 /* (with arg not null)                                              */
@@ -701,9 +716,9 @@ static void do_roster(char *arg)
     scr_RosterSearch(arg);
     update_roster = TRUE;
   } else if (!strcasecmp(subcmd, "up")) {
-    scr_RosterUp();
+    roster_updown(-1, arg);
   } else if (!strcasecmp(subcmd, "down")) {
-    scr_RosterDown();
+    roster_updown(1, arg);
   } else if (!strcasecmp(subcmd, "group_prev")) {
     scr_RosterPrevGroup();
   } else if (!strcasecmp(subcmd, "group_next")) {
@@ -1534,7 +1549,7 @@ inline static void buffer_updown(int upd
   if (!nlines || !*nlines)
     nblines = 0;
   else
-    nblines = atoi(nlines);
+    nblines = strtol(nlines, NULL, 10);
   if (nblines >= 0)
     scr_BufferScrollUpDown(updown, nblines);
@@ -1934,7 +1949,7 @@ static void do_rename(char *arg)
     foreach_group_member(bud, &move_group_member, name_utf8);
     // Let's jump to the previous buddy, because this group name should
     // disappear when we receive the server answer.
-    scr_RosterUp();
+    scr_RosterUpDown(-1, 1);
   } else {
     // Rename a single buddy
     guint del_name = 0;
@@ -1988,7 +2003,7 @@ static void do_move(char *arg)
     guint msgflag;
     jb_updatebuddy(bjid, name, *group_utf8 ? group_utf8 : NULL);
-    scr_RosterUp();
+    scr_RosterUpDown(-1, 1);
     // If the buddy has a pending message flag,
     // we remove it temporarily in order to reset the global group

Up to file-list mcabber/src/screen.c:

@@ -2253,20 +2253,20 @@ void scr_RosterBottom(void)
     scr_ShowBuddyWindow();
+}
 //  scr_RosterUp()
 // Go to the previous buddy in the buddylist
 void scr_RosterUp(void)
+{
   set_current_buddy(g_list_previous(current_buddy));
   if (chatmode)
     scr_ShowBuddyWindow();
+}
 //  scr_RosterDown()
 // Go to the next buddy in the buddylist
 void scr_RosterDown(void)
+{
   set_current_buddy(g_list_next(current_buddy));
 //  scr_RosterUpDown(updown, n)
 // Go to the nth next buddy in the buddylist
 // (up if updown == -1, down if updown == 1)
 void scr_RosterUpDown(int updown, unsigned int n)
+{
   unsigned int i;
   if (updown < 0) {
     for (i = 0; i < n; i++)
       set_current_buddy(g_list_previous(current_buddy));
   } else {
     for (i = 0; i < n; i++)
       set_current_buddy(g_list_next(current_buddy));
+  }
   if (chatmode)
     scr_ShowBuddyWindow();
+}

Up to file-list mcabber/src/screen.h:

@@ -130,8 +130,7 @@ int chatstates_disabled;
 // For commands...
 void scr_RosterTop(void);
 void scr_RosterBottom(void);
 void scr_RosterUp(void);
 void scr_RosterDown(void);
 void scr_RosterUpDown(int updown, unsigned int n);
 void scr_RosterPrevGroup(void);
 void scr_RosterNextGroup(void);
 void scr_RosterSearch(char *);

commit 1573:	ece4f26bf9ff
parent 1572:	8c0237c8c186
branch:	default

McKael / mcabber (http://mcabber.com)