[SCM] dpkg's main repository branch, master, updated. 1.16.2-18-gc7b2fdd

[Guillem Jover]

The following commit has been merged in the master branch:
commit cb059163c2d975c2a3a8ac23cc7900ac325fe20b
Author: Guillem Jover <guil...@debian.org>
Date:   Wed Mar 21 20:41:26 2012 +0100

    dselect: Move total_width initialization from derived classes to baselist

diff --git a/dselect/baselist.cc b/dselect/baselist.cc
index 0756a7c..35c45f3 100644
--- a/dselect/baselist.cc
+++ b/dselect/baselist.cc
@@ -243,6 +243,9 @@ baselist::baselist(keybindings *kb) {
   nitems= 0;
 
   gap_width = 1;
+  total_width = TOTAL_LIST_WIDTH;
+  if (total_width < COLS)
+    total_width = COLS;
 
   xmax= -1;
   list_height=0; info_height=0;
diff --git a/dselect/methlist.cc b/dselect/methlist.cc
index a4147d3..e6c1054 100644
--- a/dselect/methlist.cc
+++ b/dselect/methlist.cc
@@ -63,10 +63,6 @@ void methodlist::setwidths() {
   name_width= 14;
   name_column= status_width + gap_width;
   description_column= name_column + name_width + gap_width;
-
-  total_width= TOTAL_LIST_WIDTH;
-  if (total_width < COLS)
-    total_width= COLS;
   description_width= total_width - description_column;
 }
 
diff --git a/dselect/pkgdisplay.cc b/dselect/pkgdisplay.cc
index 4d8a257..bf1f6aa 100644
--- a/dselect/pkgdisplay.cc
+++ b/dselect/pkgdisplay.cc
@@ -181,9 +181,6 @@ void packagelist::setwidths() {
     internerr("unknown versiondisplayopt %d in setwidths", versiondisplayopt);
   }
 
-  total_width= TOTAL_LIST_WIDTH;
-  if (total_width < COLS)
-    total_width= COLS;
   description_width= total_width - description_column;
 }
 

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org