? Makefile
? Makefile.in
? aclocal.m4
? autom4te.cache
? config.h
? config.log
? config.status
? configure
? myconfigure
? new-gui.diff
? stamp-h
? stamp-h.in
? synaptic-0.31
? synaptic-0.32.tar.gz
? common/.deps
? common/Makefile
? common/Makefile.in
? common/conversion.cc
? common/conversion.h
? data/Makefile
? data/Makefile.in
? gtk/.deps
? gtk/Makefile
? gtk/Makefile.in
? gtk/synaptic
? intl/po2tbl.sed
? man/Makefile
? man/Makefile.in
? pixmaps/.xvpics
? pixmaps/Makefile
? pixmaps/Makefile.in
? po/Makefile
? po/Makefile.in
? po/POTFILES
? po/de.gmo
? po/es.gmo
? po/fr.gmo
? po/pt_BR.gmo
? po/ru.gmo
? po/stamp-cat-id
? po/synaptic.pot
? po/tr.gmo
? po/zh_CN.gmo
? po/zh_HK.gmo
? po/zh_TW.gmo
? wings/.deps
? wings/Makefile
? wings/Makefile.in
? wings/wsynaptic
Index: gtk/rgmainwindow.cc
===================================================================
RCS file: /cvsroot/synaptic/synaptic/gtk/rgmainwindow.cc,v
retrieving revision 1.85
diff -u -r1.85 rgmainwindow.cc
--- gtk/rgmainwindow.cc	22 Jan 2003 22:23:08 -0000	1.85
+++ gtk/rgmainwindow.cc	26 Jan 2003 13:01:29 -0000
@@ -39,6 +39,7 @@
 #include <glade/glade.h>
 #include <gdk/gdk.h>
 #include <cmath>
+#include <algorithm>
 
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
@@ -105,8 +106,7 @@
       WHAT_IT_SUGGESTS};      
 
 
-static GdkPixmap *StatusPixmaps[12];
-static GdkBitmap *StatusMasks[12];
+static GdkPixbuf *StatusPixbuf[12];
 static GdkColor *StatusColors[12];
 
 
@@ -256,13 +256,16 @@
     win->_aboutPanel->show();
 }
 
-
+/* search through whole tree_model 
+  <danielk> mvo: Use gtk_tree_model_foreach() with a GtkTreePath** as user_data, and return TRUE from the callback on match (plus the the user_data output arg).
+*/
 void RGMainWindow::findPackageObserver(GtkWidget *self)
 {
     RGMainWindow *me = (RGMainWindow*)gtk_object_get_data(GTK_OBJECT(self), "me");
     const char *text = gtk_entry_get_text(GTK_ENTRY(me->_findText));
     int row;
 
+#if 0
     row = me->_lister->findPackage(text);
     if (row >= 0) {
       gtk_clist_unselect_all(GTK_CLIST(me->_table));
@@ -278,6 +281,7 @@
     } else {
       me->setStatusText(_("No match."));
     }
+#endif
 }
 
 
@@ -285,6 +289,7 @@
 {
     RGMainWindow *me = (RGMainWindow*)data;
     
+#if 0
     int row = me->_lister->findNextPackage();
     if (row >= 0) {
       gtk_clist_unselect_all(GTK_CLIST(me->_table));
@@ -294,6 +299,7 @@
     } else {
       me->setStatusText(_("No more matches."));
     }
+#endif
 }
 
 
@@ -480,12 +486,14 @@
   if (pkg) {	
     index = _lister->getElementIndex(pkg);
   }    
-    
+
+#if 0    
   if (index >= 0) 
     gtk_clist_moveto(GTK_CLIST(_table), index, 0, 0.5, 0.0);
   else
     updatePackageInfo(NULL);
-  
+#endif  
+
   setInterfaceLocked(FALSE);
   
   setStatusText();
@@ -561,13 +569,18 @@
 
 RPackage *RGMainWindow::selectedPackage()
 {
-  if(g_list_length(GTK_CLIST(_table)->selection) > 0) { 
-    int row;
-    row = GPOINTER_TO_INT(g_list_last(GTK_CLIST(_table)->selection)->data);
-    return _lister->getElement(row);
-  } else {
+  //cout << "RGMainWindow::selectedPackage()" << endl;
+  GtkTreeSelection *selection;
+  GtkTreeIter iter;
+  RPackage *pkg = NULL;
+
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (_treeView));
+  if(!gtk_tree_selection_get_selected(selection,
+				      (GtkTreeModel**)(&_treeStore), &iter))
     return NULL;
-  }
+  gtk_tree_model_get(GTK_TREE_MODEL(_treeStore), &iter, 
+		     PKG_COLUMN, &pkg, -1);
+  return pkg;
 }
 
 
@@ -824,99 +837,131 @@
 
 void RGMainWindow::refreshTable(RPackage *selectedPkg)
 {
-  static bool first_run = true;
+  GtkTreeIter parentIter;  /* Parent iter */
+  GtkTreeIter childIter;   /* Child iter  */
+  vector<string> sections;
+  vector<string> expanded_sections;
+
+  /* save old state */
+  if(gtk_tree_model_get_iter_first(GTK_TREE_MODEL(_treeStore), &parentIter)) {
+    //cout << "saving state" << endl;
+    do {
+      GtkTreePath *path;
+      gchar *str;
+      path =  gtk_tree_model_get_path(GTK_TREE_MODEL(_treeStore),
+				      &parentIter);
+      if(gtk_tree_view_row_expanded(GTK_TREE_VIEW(_treeView), path)) {
+	gtk_tree_model_get(GTK_TREE_MODEL(_treeStore), &parentIter, 
+			   NAME_COLUMN, &str, 
+			   -1);
+	expanded_sections.push_back(str);
+      }
+      gtk_tree_path_free(path);
+    }
+    while(gtk_tree_model_iter_next(GTK_TREE_MODEL(_treeStore), &parentIter));
+  }
 
-  gtk_clist_freeze(GTK_CLIST(_table));
-  gtk_clist_clear(GTK_CLIST(_table));
-  
-  unsigned int row = 0;
+  gtk_tree_store_clear(_treeStore);
 
-  while (row < _lister->count()) {
-    const char *array[8];
-    RPackage *elem = _lister->getElement(row);
-    assert(elem);
-    string pkgName = elem->name();
+  _lister->getSections(sections);
+  sort(sections.begin(), sections.end());
 
-    array[0] = NULL;
-    //	array[1] = elem->section();
-    array[1] = pkgName.c_str();
-    array[2] = elem->installedVersion();
-    array[3] = elem->availableDownloadableVersion();
-    array[4] = NULL;
-    
-    gtk_clist_insert(GTK_CLIST(_table), row, (char**)array);
-
-    /* status */
-    RPackage::MarkedStatus s = elem->getMarkedStatus();
-    int other = elem->getOtherStatus();
-
-    if (elem->wouldBreak()) {
-      gtk_clist_set_pixmap(GTK_CLIST(_table), row, 0,
-			   StatusPixmaps[(int)RPackage::MBroken], 
-			   StatusMasks[(int)RPackage::MBroken]);
-      gtk_clist_set_background(GTK_CLIST(_table), row, 
-			       StatusColors[(int)RPackage::MBroken]);
-    } else if (other & RPackage::OPinned) {
-      gtk_clist_set_pixmap(GTK_CLIST(_table), row, 0,
-			   StatusPixmaps[(int)RPackage::MPinned],
-			   StatusMasks[(int)RPackage::MPinned]);
-      gtk_clist_set_background(GTK_CLIST(_table), row, 
-			       StatusColors[(int)RPackage::MPinned]);
-    } else if (s == RPackage::MKeep 
-	       && elem->getStatus() == RPackage::SInstalledOutdated) {
-      gtk_clist_set_pixmap(GTK_CLIST(_table), row, 0,
-			   StatusPixmaps[RPackage::MHeld],
-			   StatusMasks[RPackage::MHeld]);
-      gtk_clist_set_background(GTK_CLIST(_table), row, 
-			       StatusColors[RPackage::MHeld]);
-    } else if ((other & RPackage::ONew) && 
-	       !elem->getMarkedStatus() == RPackage::MInstall) {
-      gtk_clist_set_pixmap(GTK_CLIST(_table), row, 0,
-			   StatusPixmaps[(int)RPackage::MNew],
-			   StatusMasks[(int)RPackage::MNew]);
-      gtk_clist_set_background(GTK_CLIST(_table), row, 
-			       StatusColors[(int)RPackage::MNew]);
-    } else {
-       gtk_clist_set_pixmap(GTK_CLIST(_table), row, 0,
- 			   StatusPixmaps[(int)s],
- 			   StatusMasks[(int)s]);
-       gtk_clist_set_background(GTK_CLIST(_table), row, StatusColors[(int)s]);
-    }
+  /* build top-level */
+  for(int i=0;i<sections.size();i++) {
+    gtk_tree_store_append (_treeStore, &parentIter, NULL);
+    gtk_tree_store_set (_treeStore, &parentIter,
+			NAME_COLUMN, sections[i].c_str(),
+			-1);
+  }
 
-    const char *str = elem->summary().c_str();
-	
-    if (_showUpdateInfo && 
-	elem->updateImportance() == RPackage::ISecurity)
-      gtk_clist_set_pixtext(GTK_CLIST(_table), row, 4, _iconv.convert(str,strlen(str)), 4,
-			    StatusPixmaps[8],
-			    StatusMasks[8]);
-    else
-      gtk_clist_set_text(GTK_CLIST(_table), row, 4, _iconv.convert(str,strlen(str)));
+  /* build children */
+  unsigned int row = 0;
+  string pkgsection;
+  while (row < _lister->count()) {
+    RPackage *pkg = _lister->getElement(row);
+    assert(pkg);
 
-    row++;	
+    pkgsection = pkg->section();
+    /* insert at the right position */
+    for(int i=0;i<sections.size();i++) {
+      GdkPixbuf *pix;
+      GdkColor *bg;
+      if(pkgsection == sections[i]) {
+	RPackage::MarkedStatus s = pkg->getMarkedStatus();
+	int other = pkg->getOtherStatus();
+
+	// decide what pixmap to use
+	if (pkg->wouldBreak()) {
+	  pix = StatusPixbuf[(int)RPackage::MBroken];
+	  bg =  StatusColors[(int)RPackage::MBroken];
+	} else if (other & RPackage::OPinned) {
+	  pix = StatusPixbuf[(int)RPackage::MPinned];
+	  bg = StatusColors[(int)RPackage::MPinned];
+	} else if (s == RPackage::MKeep 
+		   && pkg->getStatus() == RPackage::SInstalledOutdated) {
+	  pix = StatusPixbuf[RPackage::MHeld];
+	  bg = StatusColors[RPackage::MHeld];
+	} else if ((other & RPackage::ONew) && 
+		   !pkg->getMarkedStatus() == RPackage::MInstall) {
+	  pix = StatusPixbuf[(int)RPackage::MNew];
+	  bg = StatusColors[(int)RPackage::MNew];
+	} else {
+	  pix = StatusPixbuf[(int)s];
+	  bg = StatusColors[(int)s];
+	}
+	// go to right location
+	gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL(_treeStore), 
+					     &parentIter, 
+					     g_strdup_printf("%i",i));
+	gtk_tree_store_append (_treeStore, &childIter, &parentIter);
+	gtk_tree_store_set (_treeStore, &childIter,
+			    STATUS_COLUMN, pix,
+			    NAME_COLUMN, pkg->name(),
+			    INSTALLED_VERSION_COLUMN, pkg->installedVersion(),
+			    AVAILABLE_VERSION_COLUMN, pkg->availableDownloadableVersion(),
+			    DESCR_COLUMN, pkg->summary().c_str(),
+			    COLOR_COLUMN, bg,
+			    PKG_COLUMN, pkg,
+			    -1);
+	break;
+      }
+    }
+    row++;
   }
 
-  while (row < GTK_CLIST(_table)->rows)
-    gtk_clist_remove(GTK_CLIST(_table), row);
-  
-  gtk_clist_thaw(GTK_CLIST(_table));
-  if (selectedPkg != NULL) {
-    int index = _lister->getElementIndex(selectedPkg);
-    //cout << "selectedPkg != NULL " << index << endl;
-    if (index >= 0) {
-      gtk_clist_select_row(GTK_CLIST(_table), index, 0);
-      updatePackageInfo(selectedPkg);
-      if (!gtk_clist_row_is_visible(GTK_CLIST(_table), index))
-	gtk_clist_moveto(GTK_CLIST(_table), index, 0, 0.5, 0.0);
-    } else {
-      // package no longer in listing
-      updatePackageInfo(NULL);
+  /* remove unused parents */
+  gtk_tree_model_get_iter_first(GTK_TREE_MODEL(_treeStore), &parentIter);
+  bool res;
+  do {
+    if(!gtk_tree_model_iter_has_child(GTK_TREE_MODEL(_treeStore), &parentIter))
+      res = gtk_tree_store_remove(_treeStore, &parentIter);
+    else 
+      res = gtk_tree_model_iter_next(GTK_TREE_MODEL(_treeStore), &parentIter);
+  } 
+  while(res);
+
+  /* restore state */
+  if(gtk_tree_model_get_iter_first(GTK_TREE_MODEL(_treeStore), &parentIter)) {
+    //cout << "restoring state" << endl;
+    do {
+      GtkTreePath *path;
+      gchar *str;
+      path =  gtk_tree_model_get_path(GTK_TREE_MODEL(_treeStore),
+				      &parentIter);
+      gtk_tree_model_get(GTK_TREE_MODEL(_treeStore), &parentIter, 
+			 NAME_COLUMN, &str, 
+			 -1);
+      if(find(expanded_sections.begin(), 
+	      expanded_sections.end(),
+	      string(str)) != expanded_sections.end())
+	gtk_tree_view_expand_row(GTK_TREE_VIEW(_treeView), path, FALSE);
+      
+      gtk_tree_path_free(path);
     }
+    while(gtk_tree_model_iter_next(GTK_TREE_MODEL(_treeStore), &parentIter));
   }
 
-  if(first_run) {
-    first_run=false;
-  }
+  
 }
 
 
@@ -1023,25 +1068,21 @@
 
     if (pkg->wouldBreak()) {
       gtk_label_set_text(GTK_LABEL(_stateL), _("Broken dependencies."));
-      gtk_image_set_from_pixmap(GTK_IMAGE(_stateP), 
-		     StatusPixmaps[RPackage::MBroken],
-		     StatusMasks[RPackage::MBroken]);
+      gtk_image_set_from_pixbuf(GTK_IMAGE(_stateP), 
+				StatusPixbuf[RPackage::MBroken]);
+
     } else if (mstatus==RPackage::MKeep && status==RPackage::SInstalledOutdated) {
-      gtk_image_set_from_pixmap(GTK_IMAGE(_stateP), 
-				StatusPixmaps[RPackage::MHeld],
-				StatusMasks[RPackage::MHeld]);
+      gtk_image_set_from_pixbuf(GTK_IMAGE(_stateP), 
+				StatusPixbuf[RPackage::MHeld]);
     }  else if(other & RPackage::ONew) {
-      gtk_image_set_from_pixmap(GTK_IMAGE(_stateP), 
-				StatusPixmaps[RPackage::MNew], 
-				StatusMasks[RPackage::MNew]);
+      gtk_image_set_from_pixbuf(GTK_IMAGE(_stateP), 
+				StatusPixbuf[RPackage::MNew]);
     } else if (locked) {
-      gtk_image_set_from_pixmap(GTK_IMAGE(_stateP), 
-				StatusPixmaps[RPackage::MPinned], 
-				StatusMasks[RPackage::MPinned]);
+      gtk_image_set_from_pixbuf(GTK_IMAGE(_stateP), 
+				StatusPixbuf[RPackage::MPinned]);
     } else {
-      gtk_image_set_from_pixmap(GTK_IMAGE(_stateP), 
-				StatusPixmaps[(int)mstatus],
-				StatusMasks[(int)mstatus]);
+      gtk_image_set_from_pixbuf(GTK_IMAGE(_stateP), 
+				StatusPixbuf[(int)mstatus]);
     }
     
     if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(_currentB)) == FALSE) {
@@ -1205,9 +1246,7 @@
 	gtk_label_set_text(GTK_LABEL(_infoL), "");
 	gtk_label_set_text(GTK_LABEL(_stateL), "");
 	gtk_label_set_text(GTK_LABEL(_stateL), "");
-	gtk_image_set_from_pixmap(GTK_IMAGE(_stateP), 
-				  StatusPixmaps[0],
-				  StatusMasks[0]);
+	gtk_image_set_from_pixbuf(GTK_IMAGE(_stateP), StatusPixbuf[0]);
 	if (_showUpdateInfo)
 	    gtk_label_set_text(GTK_LABEL(_importL), "");
 
@@ -1314,6 +1353,9 @@
     // description
     //gtk_text_buffer_set_text(_textBuffer, pkg->description(), -1);
     gtk_text_buffer_set_text(_textBuffer, _iconv.convert(pkg->description(), strlen(pkg->description())), -1);
+    GtkTextIter iter;
+    gtk_text_buffer_get_iter_at_offset(_textBuffer, &iter, 0);
+    gtk_text_view_scroll_to_iter(GTK_TEXT_VIEW(_textView), &iter,0,FALSE,0,0);
     updateDynPackageInfo(pkg);
     setStatusText();
 }
@@ -1329,13 +1371,19 @@
 {
     RGMainWindow *me = (RGMainWindow*)data;
     bool active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(me->_pinB));
+    GtkTreeSelection *selection;
+    GtkTreeIter iter;
     RPackage *pkg;
 
     if(me->_blockActions)
       return;
-
-    if (g_list_length(GTK_CLIST(me->_table)->selection) == 0)
-	return;
+    
+    selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (me->_treeView));
+    if (!gtk_tree_selection_get_selected(selection,
+					 (GtkTreeModel**)(&me->_treeStore), 
+					 &iter)) {
+      return;
+    }
 
     if (me->_unsavedChanges == true && 
 	gtk_run_alert_panel(me->_win, _("Warning"),
@@ -1351,20 +1399,14 @@
 	return;
       }
 
-    GList *selection = g_list_copy(GTK_CLIST(me->_table)->selection);
-    GList *it = g_list_first(selection);
-    while(it!=NULL) {
-      int row = GPOINTER_TO_INT(it->data);
-      pkg = me->_lister->getElement(row);
-      if (pkg == NULL)
-	continue;
+    gtk_tree_model_get(GTK_TREE_MODEL(me->_treeStore), &iter, 
+		       PKG_COLUMN, &pkg, -1);
+    if (pkg == NULL)
+      return;    
+
+    pkg->setPinned(active);
+    _roptions->setPackageLock(pkg->name(), active);
 
-      // set pkg according to status
-      pkg->setPinned(active);
-      _roptions->setPackageLock(pkg->name(), active);
-      it=g_list_next(it);
-    }
-    g_list_free(selection);
     me->setInterfaceLocked(TRUE);
     me->_lister->openCache(TRUE);
     me->refreshTable(pkg);
@@ -1400,24 +1442,24 @@
 
 void RGMainWindow::doPkgAction(RGMainWindow *me, RGPkgAction action)
 {
-  RPackage *pkg;
-
-  if (g_list_length(GTK_CLIST(me->_table)->selection) == 0) 
-    return;
+  GtkTreeSelection *selection;
+  GtkTreeIter iter;
+  RPackage *pkg = NULL;
+
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (me->_treeView));
+  gtk_tree_selection_get_selected (selection, 
+				   (GtkTreeModel**)(&me->_treeStore), 
+				   &iter);
+  gtk_tree_model_get(GTK_TREE_MODEL(me->_treeStore), &iter, 
+		     PKG_COLUMN, &pkg, -1);
+  if (pkg == NULL)
+    return;    
+  g_print ("You want: %s\n", pkg->name());
 
   me->setInterfaceLocked(TRUE);
   me->_blockActions = TRUE;
 
-  GList *selection = g_list_copy(GTK_CLIST(me->_table)->selection);
-  GList *it = g_list_first(selection);
-  while(it != NULL) {
-    int row = GPOINTER_TO_INT(it->data);
-    //cout << "row is " << row << endl;
-    pkg = me->_lister->getElement(row);
-    //cout << "working on: " << pkg->name() << endl;
-    if (pkg == NULL)
-      continue;
-
+  /* do the dirty deed */
     switch (action) {
     case PKG_KEEP: // keep
       pkg->setKeep();
@@ -1435,9 +1477,6 @@
       cout <<"uh oh!!!!!!!!!"<<endl;
       break;
     }
-  it=it->next;
-  }
-  g_list_free(selection);
 
 
   me->_blockActions = FALSE;
@@ -1475,10 +1514,10 @@
     } else {
 	pkg->setRemoveWithDeps(TRUE);
     }
-    
+#if 0
     gtk_clist_select_row(GTK_CLIST(me->_table), 
 			 me->_lister->getElementIndex(pkg), 0);
-    
+#endif
     me->setInterfaceLocked(FALSE);
 }
 
@@ -1518,54 +1557,34 @@
     _busyCursor = gdk_cursor_new(GDK_WATCH);
     _tooltips = gtk_tooltips_new();
 
-    StatusPixmaps[(int)RPackage::MKeep] = 	
-	gdk_pixmap_create_from_xpm_d(_win->window, 
-				  &StatusMasks[(int)RPackage::MKeep],
-				  NULL, keepM_xpm);
-    
-    StatusPixmaps[(int)RPackage::MInstall] = 
-	gdk_pixmap_create_from_xpm_d(_win->window, 
-				  &StatusMasks[(int)RPackage::MInstall],
-				  NULL, installM_xpm);
-    
-    StatusPixmaps[(int)RPackage::MUpgrade] =
-	gdk_pixmap_create_from_xpm_d(_win->window, 
-				  &StatusMasks[(int)RPackage::MUpgrade],
-				  NULL, upgradeM_xpm);
-
-    StatusPixmaps[(int)RPackage::MDowngrade] =
-	gdk_pixmap_create_from_xpm_d(_win->window, 
-				  &StatusMasks[(int)RPackage::MDowngrade],
-				  NULL, downgradeM_xpm);
-
-    StatusPixmaps[(int)RPackage::MRemove] =
-	gdk_pixmap_create_from_xpm_d(_win->window, 
-				  &StatusMasks[(int)RPackage::MRemove],
-				  NULL, removeM_xpm);
-
-    // don't upgrade package 
-    StatusPixmaps[(int)RPackage::MHeld] =
-	gdk_pixmap_create_from_xpm_d(_win->window, 
-				  &StatusMasks[(int)RPackage::MHeld],
-				  NULL, heldM_xpm);
-    // broken
-    StatusPixmaps[(int)RPackage::MBroken] =
-	gdk_pixmap_create_from_xpm_d(_win->window, 
-				  &StatusMasks[(int)RPackage::MBroken],
-				  NULL, brokenM_xpm);
-    // pin = use pining to prevent upgrade
-    StatusPixmaps[(int)RPackage::MPinned] =
-	gdk_pixmap_create_from_xpm_d(_win->window, 
-				     &StatusMasks[(int)RPackage::MPinned],
-				     NULL, pinM_xpm);
-    // new
-    StatusPixmaps[(int)RPackage::MNew] =
-	gdk_pixmap_create_from_xpm_d(_win->window, 
-				     &StatusMasks[(int)RPackage::MNew],
-				     NULL, newM_xpm);
+    StatusPixbuf[(int)RPackage::MKeep] = 	
+	gdk_pixbuf_new_from_xpm_data(keepM_xpm);
+    
+    StatusPixbuf[(int)RPackage::MInstall] = 
+	gdk_pixbuf_new_from_xpm_data(installM_xpm);
+    
+    StatusPixbuf[(int)RPackage::MUpgrade] =
+	gdk_pixbuf_new_from_xpm_data(upgradeM_xpm);
 
+    StatusPixbuf[(int)RPackage::MDowngrade] =
+	gdk_pixbuf_new_from_xpm_data(downgradeM_xpm);
 
-    StatusPixmaps[10] = _alertPix;
+    StatusPixbuf[(int)RPackage::MRemove] =
+	gdk_pixbuf_new_from_xpm_data(removeM_xpm);
+
+    StatusPixbuf[(int)RPackage::MHeld] =
+	gdk_pixbuf_new_from_xpm_data(heldM_xpm);
+
+    StatusPixbuf[(int)RPackage::MBroken] =
+	gdk_pixbuf_new_from_xpm_data(brokenM_xpm);
+
+    StatusPixbuf[(int)RPackage::MPinned] =
+	gdk_pixbuf_new_from_xpm_data(pinM_xpm);
+
+    StatusPixbuf[(int)RPackage::MNew] =
+	gdk_pixbuf_new_from_xpm_data(newM_xpm);
+
+    StatusPixbuf[10] = _alertPix;
 
     _toolbarState = (ToolbarState)_config->FindI("Synaptic::ToolbarState",
 						(int)TOOLBAR_BOTH);
@@ -1720,8 +1739,8 @@
     // here is a pointer to rgmainwindow for every widget that needs it
     g_object_set_data(G_OBJECT(_win), "me", this);
 
-    _alertPix = gdk_pixmap_create_from_xpm_d(_win->window, &_alertMask,
-					     NULL, alert_xpm);
+    
+    _alertPix = gdk_pixbuf_new_from_xpm_data(alert_xpm);
 
     GdkPixbuf *icon = gdk_pixbuf_new_from_xpm_data(synaptic_mini_xpm);
     gtk_window_set_icon(GTK_WINDOW(_win), icon);
@@ -2029,21 +2048,94 @@
     gtk_signal_connect(GTK_OBJECT(button), "clicked",
 		       (GtkSignalFunc)makeFinderFilterAction, this);
 
-    _table = glade_xml_get_widget(_gladeXML, "_table");
-    assert(_table);
-    gtk_clist_set_selection_mode(GTK_CLIST(_table),
-				 GTK_SELECTION_MULTIPLE);
-    gtk_signal_connect(GTK_OBJECT(_table), "select_row", 
-		       (GtkSignalFunc)selectedClistRow, this);
-    gtk_signal_connect(GTK_OBJECT(_table), "unselect_row",
-		       (GtkSignalFunc)unselectedClistRow, this);
-    gtk_clist_set_column_width(GTK_CLIST(_table), 0, 15);
-    gtk_clist_set_column_width(GTK_CLIST(_table), 1, 140);
-    gtk_clist_set_column_width(GTK_CLIST(_table), 2, 80);
-    gtk_clist_set_column_width(GTK_CLIST(_table), 3, 80);
-    gtk_clist_set_column_width(GTK_CLIST(_table), 4, 600);
-    gtk_object_set_data(GTK_OBJECT(_table), "me", this);
-
+    // the treeview stuff - long !-
+    widget = glade_xml_get_widget(_gladeXML, "handlebox_find");
+    gtk_widget_hide(widget);
+    
+    _treeStore = gtk_tree_store_new (N_COLUMNS,
+				     G_TYPE_STRING,
+				     GDK_TYPE_PIXBUF,
+				     G_TYPE_STRING,
+				     G_TYPE_STRING,
+				     G_TYPE_STRING,
+				     G_TYPE_STRING,
+				     GDK_TYPE_COLOR,
+				     G_TYPE_POINTER);
+    assert(_treeStore);
+    _treeView = glade_xml_get_widget(_gladeXML, "treeview_packages");
+    gtk_tree_view_set_model(GTK_TREE_VIEW(_treeView), 
+			    GTK_TREE_MODEL(_treeStore));
+    assert(_treeView);
+    gtk_tree_view_set_search_column (GTK_TREE_VIEW(_treeView), NAME_COLUMN);
+
+    GtkCellRenderer *renderer; 
+    GtkTreeViewColumn *column; 
+
+    /* first column */
+    renderer = gtk_cell_renderer_text_new ();
+    column = gtk_tree_view_column_new_with_attributes(" ", renderer,NULL);
+    gtk_tree_view_append_column (GTK_TREE_VIEW(_treeView), column);
+
+    /* first column */
+    renderer = gtk_cell_renderer_pixbuf_new ();
+    column = gtk_tree_view_column_new_with_attributes("S", renderer,
+						      "pixbuf", STATUS_COLUMN,
+						       NULL);
+    gtk_tree_view_append_column (GTK_TREE_VIEW(_treeView), column);
+
+    /* next */
+    renderer = gtk_cell_renderer_text_new ();
+    column = gtk_tree_view_column_new_with_attributes("Package", renderer,
+						      "text", NAME_COLUMN,
+ 						      "background-gdk", COLOR_COLUMN,
+						       NULL);
+    gtk_tree_view_append_column (GTK_TREE_VIEW(_treeView), column);
+
+    /* next */
+    renderer = gtk_cell_renderer_text_new ();
+    column = gtk_tree_view_column_new_with_attributes("Installed Version", renderer,
+						      "text", INSTALLED_VERSION_COLUMN,
+ 						      "background-gdk", COLOR_COLUMN,
+						       NULL);
+    gtk_tree_view_append_column (GTK_TREE_VIEW(_treeView), column);
+
+    /* next */
+    renderer = gtk_cell_renderer_text_new ();
+    column = gtk_tree_view_column_new_with_attributes("Available Version", renderer,
+
+						      "text", AVAILABLE_VERSION_COLUMN,
+ 						      "background-gdk", COLOR_COLUMN,
+						       NULL);
+    gtk_tree_view_append_column (GTK_TREE_VIEW (_treeView), column);
+
+    /* next */
+    renderer = gtk_cell_renderer_text_new ();
+    column = gtk_tree_view_column_new_with_attributes("Description", renderer,
+						      "text", DESCR_COLUMN,
+ 						      "background-gdk", COLOR_COLUMN,
+						       NULL);
+    gtk_tree_view_append_column (GTK_TREE_VIEW (_treeView), column);
+    
+    GtkTreeSelection *select;
+    select = gtk_tree_view_get_selection (GTK_TREE_VIEW (_treeView));
+    //gtk_tree_selection_set_mode (select, GTK_SELECTION_MULTIPLE);
+    g_signal_connect (G_OBJECT (select), "changed",
+		      G_CALLBACK(selectedRow),
+		      this);
+    g_signal_connect (G_OBJECT (_treeView), "row-activated",
+		      G_CALLBACK(doubleClickRow),
+		      this);
+    glade_xml_signal_connect_data(_gladeXML,
+				  "on_expand_all_activate",
+				  G_CALLBACK(onExpandAll),
+				  this); 
+    glade_xml_signal_connect_data(_gladeXML,
+				  "on_collapse_all_activate",
+				  G_CALLBACK(onCollapseAll),
+				  this); 
+    
+    /* --------------------------------------------------------------- */
+    
     // toolbar menu code
     button = glade_xml_get_widget(_gladeXML, "menu_toolbar_pixmaps");
     g_object_set_data(G_OBJECT(button), "me", this);
@@ -2095,6 +2187,20 @@
     assert(_cacheProgress);
 }
 
+void RGMainWindow::onExpandAll(GtkWidget *self, void *data) 
+{
+  RGMainWindow *me = (RGMainWindow *)data;
+
+  gtk_tree_view_expand_all(GTK_TREE_VIEW(me->_treeView));
+}
+
+void RGMainWindow::onCollapseAll(GtkWidget *self, void *data) 
+{
+  RGMainWindow *me = (RGMainWindow *)data;
+
+  gtk_tree_view_collapse_all(GTK_TREE_VIEW(me->_treeView));
+}
+
 void RGMainWindow::pkgInstallHelper(RPackage *pkg)
 {
   pkg->setInstall();
@@ -2126,76 +2232,87 @@
   pkg->setRemove(purge);
 }
 
-void RGMainWindow::selectedClistRow(GtkWidget *self, int row, int column,
-				    GdkEvent *event)
+void RGMainWindow::selectedRow(GtkTreeSelection *selection, gpointer data)
 { 
-  //cout << "selectedClistRow(): " << row << endl;
+  RGMainWindow *me = (RGMainWindow*)data;
+  GtkTreeIter iter;
+  RPackage *pkg;
   
-  RGMainWindow *me = (RGMainWindow*)gtk_object_get_data(GTK_OBJECT(self),
-							  "me");
-  RPackage *pkg = me->_lister->getElement(row);
+  if (!gtk_tree_selection_get_selected(selection,
+				       (GtkTreeModel**)(&me->_treeStore), 
+				       &iter)) {
+    return;
+  }
+  gtk_tree_model_get(GTK_TREE_MODEL(me->_treeStore), &iter, 
+		     PKG_COLUMN, &pkg, -1);
   if (pkg == NULL)
     return;    
+  g_print ("You selected: %s\n", pkg->name());
 
-  if ( event != NULL && event->type == 5 ) {
-    // double click
-    me->setInterfaceLocked(TRUE);
-
-    RPackage::PackageStatus pstatus =  pkg->getStatus();
-    //   SInstalledUpdated,
-    //   SInstalledOutdated,
-    //   SInstalledBroken,
-    //   SNotInstalled
-
-    RPackage::MarkedStatus  mstatus = pkg->getMarkedStatus();
-    //   MKeep,
-    //   MInstall,
-    //   MUpgrade,
-    //   MDowngrade,
-    //   MRemove,
-    //   MHeld
-
-    if( pstatus == RPackage::SNotInstalled) {
-      if (mstatus == RPackage::MKeep) {
-	// not installed -> installed
-	me->pkgInstallHelper(pkg);
-      }
-      if (mstatus == RPackage::MInstall) 
-	// marked install -> marked don't install
-	me->pkgRemoveHelper(pkg);
-    }
-    
-    if( pstatus == RPackage::SInstalledOutdated ) {
-      if ( mstatus == RPackage::MKeep ) {
-	// keep -> upgrade
-	me->pkgInstallHelper(pkg);
-      }
-      if( mstatus == RPackage::MUpgrade) {
-	// upgrade -> keep
-	pkg->setKeep();
-      }
-    }
-    // end double-click
-    me->setInterfaceLocked(FALSE);
-    return;
-  }
-  
-  // not double-click
   me->updatePackageInfo(pkg);
 }
 
-void RGMainWindow::unselectedClistRow(GtkWidget *self, int row, int column,
-				      GdkEvent *event)
+void RGMainWindow::doubleClickRow(GtkTreeView *treeview,
+				  GtkTreePath *path,
+				  GtkTreeViewColumn *arg2,
+				  gpointer data)
 {
-    RGMainWindow *me = (RGMainWindow*)gtk_object_get_data(GTK_OBJECT(self),
-							  "me");
-    
-    if(g_list_length(GTK_CLIST(me->_table)->selection) != 0) {
-      int row = GPOINTER_TO_INT(g_list_last(GTK_CLIST(me->_table)->selection)->data);
-      RPackage *pkg = me->_lister->getElement(row);
-      me->updatePackageInfo(pkg);
-    } else 
-      me->updatePackageInfo(NULL);
+  RGMainWindow *me = (RGMainWindow*)data;
+  GtkTreeSelection *selection;
+  GtkTreeIter iter;
+  RPackage *pkg = NULL;
+
+
+  //cout << "double click" << endl;
+  if(!gtk_tree_model_get_iter(GTK_TREE_MODEL(me->_treeStore),
+			      &iter,path)) {
+    return;
+  }
+  gtk_tree_model_get(GTK_TREE_MODEL(me->_treeStore), &iter, 
+		     PKG_COLUMN, &pkg, -1);
+  if(pkg == NULL)
+    return;
+
+  // double click
+  me->setInterfaceLocked(TRUE);
+  
+  RPackage::PackageStatus pstatus =  pkg->getStatus();
+  //   SInstalledUpdated,
+  //   SInstalledOutdated,
+  //   SInstalledBroken,
+  //   SNotInstalled
+
+  RPackage::MarkedStatus  mstatus = pkg->getMarkedStatus();
+  //   MKeep,
+  //   MInstall,
+  //   MUpgrade,
+  //   MDowngrade,
+  //   MRemove,
+  //   MHeld
+  
+  if( pstatus == RPackage::SNotInstalled) {
+    if (mstatus == RPackage::MKeep) {
+      // not installed -> installed
+      me->pkgInstallHelper(pkg);
+    }
+    if (mstatus == RPackage::MInstall) 
+      // marked install -> marked don't install
+      me->pkgRemoveHelper(pkg);
+  }
+  
+  if( pstatus == RPackage::SInstalledOutdated ) {
+    if ( mstatus == RPackage::MKeep ) {
+      // keep -> upgrade
+      me->pkgInstallHelper(pkg);
+    }
+    if( mstatus == RPackage::MUpgrade) {
+      // upgrade -> keep
+      pkg->setKeep();
+    }
+  }
+  // end double-click
+  me->setInterfaceLocked(FALSE);
+  return;
 }
 
 
Index: gtk/rgmainwindow.h
===================================================================
RCS file: /cvsroot/synaptic/synaptic/gtk/rgmainwindow.h,v
retrieving revision 1.28
diff -u -r1.28 rgmainwindow.h
--- gtk/rgmainwindow.h	22 Jan 2003 21:50:32 -0000	1.28
+++ gtk/rgmainwindow.h	26 Jan 2003 13:01:30 -0000
@@ -58,7 +58,25 @@
 class RGMainWindow : public RGWindow, public RPackageObserver
 {
   friend class SynapticInterface;
-  enum {DoNothing, InstallRecommended, InstallSuggested, InstallSelected};
+  enum {
+    DoNothing, 
+    InstallRecommended, 
+    InstallSuggested, 
+    InstallSelected
+  };
+  
+  enum {
+    DUMMY_COLUMN,
+    STATUS_COLUMN,
+    NAME_COLUMN,
+    INSTALLED_VERSION_COLUMN,
+    AVAILABLE_VERSION_COLUMN,
+    DESCR_COLUMN,
+    COLOR_COLUMN,
+    PKG_COLUMN,
+    N_COLUMNS
+  };
+
 
   typedef enum {
     TOOLBAR_PIXMAPS,
@@ -81,7 +99,9 @@
    GtkTooltips *_tooltips;
    
    GtkWidget *_sview; // scrolled window for table
-   GtkWidget *_table;
+
+   GtkTreeStore *_treeStore;
+   GtkWidget *_treeView;
 
    GtkWidget *_statusL;
 
@@ -120,8 +140,7 @@
    GtkWidget *_stateL;
    GtkImage *_stateP;
 
-   GdkPixmap *_alertPix;
-   GdkBitmap *_alertMask;
+   GdkPixbuf *_alertPix;
    
    GtkWidget *_importP;
    GtkWidget *_importL;   
@@ -182,11 +201,14 @@
        ((RGMainWindow*)me)->close(); 
      };
 
-   static void selectedClistRow(GtkWidget *self, int row, int column,
-				GdkEvent *event);
-   static void unselectedClistRow(GtkWidget *self, int row, int column,
-				GdkEvent *event);
-   
+   static void selectedRow(GtkTreeSelection *selection, gpointer data);
+   static void doubleClickRow(GtkTreeView *treeview,
+			      GtkTreePath *arg1,
+			      GtkTreeViewColumn *arg2,
+			      gpointer user_data);
+   static void onExpandAll(GtkWidget *self, void *data);
+   static void onCollapseAll(GtkWidget *self, void *data);   
+
    static void showSearchPanel(GtkWidget *self, void *data);
    static void showAboutPanel(GtkWidget *self, void *data);
    static void showFilterWindow(GtkWidget *self, void *data);
Index: gtk/window_main.glade
===================================================================
RCS file: /cvsroot/synaptic/synaptic/gtk/window_main.glade,v
retrieving revision 1.4
diff -u -r1.4 window_main.glade
--- gtk/window_main.glade	21 Jan 2003 20:57:18 -0000	1.4
+++ gtk/window_main.glade	26 Jan 2003 13:01:32 -0000
@@ -55,6 +55,37 @@
 	      </child>
 
 	      <child>
+		<widget class="GtkMenuItem" id="view1">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">View</property>
+		  <property name="use_underline">True</property>
+
+		  <child>
+		    <widget class="GtkMenu" id="view1_menu">
+
+		      <child>
+			<widget class="GtkMenuItem" id="expand_all1">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Expand all</property>
+			  <property name="use_underline">True</property>
+			  <signal name="activate" handler="on_expand_all_activate" last_modification_time="Sat, 25 Jan 2003 01:32:59 GMT"/>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkMenuItem" id="collapse_all1">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Collapse all   </property>
+			  <property name="use_underline">True</property>
+			  <signal name="activate" handler="on_collapse_all_activate" last_modification_time="Sat, 25 Jan 2003 01:33:09 GMT"/>
+			</widget>
+		      </child>
+		    </widget>
+		  </child>
+		</widget>
+	      </child>
+
+	      <child>
 		<widget class="GtkMenuItem" id="actions1">
 		  <property name="visible">True</property>
 		  <property name="label" translatable="yes">Actions</property>
@@ -371,7 +402,7 @@
 				  <property name="visible">True</property>
 				  <property name="label" translatable="yes">Hide</property>
 				  <property name="use_underline">True</property>
-				  <property name="active">False</property>
+				  <property name="active">True</property>
 				  <property name="group">menu_toolbar_pixmaps</property>
 				  <signal name="activate" handler="on_menu_toolbar_hide" last_modification_time="Mon, 20 Jan 2003 23:24:34 GMT"/>
 				</widget>
@@ -590,7 +621,7 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkHandleBox" id="handlebox5">
+	    <widget class="GtkHandleBox" id="handlebox_find">
 	      <property name="visible">True</property>
 	      <property name="shadow_type">GTK_SHADOW_OUT</property>
 	      <property name="handle_position">GTK_POS_LEFT</property>
@@ -697,7 +728,7 @@
 	  <property name="position">140</property>
 
 	  <child>
-	    <widget class="GtkScrolledWindow" id="scrolledwindow8">
+	    <widget class="GtkScrolledWindow" id="scrolledwindow13">
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
@@ -706,100 +737,19 @@
 	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
 	      <child>
-		<widget class="GtkCList" id="_table">
+		<widget class="GtkTreeView" id="treeview_packages">
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
-		  <property name="n_columns">5</property>
-		  <property name="column_widths">14,120,80,80,80</property>
-		  <property name="selection_mode">GTK_SELECTION_SINGLE</property>
-		  <property name="show_titles">True</property>
-		  <property name="shadow_type">GTK_SHADOW_IN</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label48">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes"> </property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label49">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Package</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label50">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Installed</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label51">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Available</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label52">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Summary</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		  </child>
+		  <property name="headers_visible">True</property>
+		  <property name="rules_hint">False</property>
+		  <property name="reorderable">False</property>
+		  <property name="enable_search">True</property>
 		</widget>
 	      </child>
 	    </widget>
 	    <packing>
 	      <property name="shrink">True</property>
-	      <property name="resize">True</property>
+	      <property name="resize">False</property>
 	    </packing>
 	  </child>
 
@@ -1041,7 +991,7 @@
 			      <property name="border_width">2</property>
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="history">2</property>
+			      <property name="history">0</property>
 
 			      <child internal-child="menu">
 				<widget class="GtkMenu" id="convertwidget7">
Index: gtk/window_main.glade.strings
===================================================================
RCS file: /cvsroot/synaptic/synaptic/gtk/window_main.glade.strings,v
retrieving revision 1.2
diff -u -r1.2 window_main.glade.strings
--- gtk/window_main.glade.strings	21 Jan 2003 11:28:39 -0000	1.2
+++ gtk/window_main.glade.strings	26 Jan 2003 13:01:32 -0000
@@ -6,6 +6,9 @@
 
 gchar *s = N_("Synaptic");
 gchar *s = N_("_File");
+gchar *s = N_("View");
+gchar *s = N_("Expand all");
+gchar *s = N_("Collapse all   ");
 gchar *s = N_("Actions");
 gchar *s = N_("Update Package Entries");
 gchar *s = N_("Fix Broken Packages");
@@ -55,11 +58,6 @@
 gchar *s = N_("_Next");
 gchar *s = N_("Make a filter in 'Search Filter' showing all packages matching the pattern");
 gchar *s = N_("To filter");
-gchar *s = N_(" ");
-gchar *s = N_("Package");
-gchar *s = N_("Installed");
-gchar *s = N_("Available");
-gchar *s = N_("Summary");
 gchar *s = N_(" ");
 gchar *s = N_("Information");
 gchar *s = N_("Description");
Index: pixmaps/alert.xpm
===================================================================
RCS file: /cvsroot/synaptic/synaptic/pixmaps/alert.xpm,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 alert.xpm
--- pixmaps/alert.xpm	13 Jun 2002 12:12:11 -0000	1.1.1.1
+++ pixmaps/alert.xpm	26 Jan 2003 13:01:32 -0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * alert_xpm[] = {
+static const char * alert_xpm[] = {
 "11 11 5 1",
 " 	c None",
 ".	c #000000",
Index: pixmaps/alertM.xpm
===================================================================
RCS file: /cvsroot/synaptic/synaptic/pixmaps/alertM.xpm,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 alertM.xpm
--- pixmaps/alertM.xpm	13 Jun 2002 12:12:11 -0000	1.1.1.1
+++ pixmaps/alertM.xpm	26 Jan 2003 13:01:32 -0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * alert_xpm[] = {
+static const char * alert_xpm[] = {
 "11 11 5 1",
 " 	c None",
 ".	c #000000",
Index: pixmaps/brokenM.xpm
===================================================================
RCS file: /cvsroot/synaptic/synaptic/pixmaps/brokenM.xpm,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 brokenM.xpm
--- pixmaps/brokenM.xpm	13 Jun 2002 12:12:11 -0000	1.1.1.1
+++ pixmaps/brokenM.xpm	26 Jan 2003 13:01:32 -0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * brokenM_xpm[] = {
+static const char * brokenM_xpm[] = {
 "11 11 3 1",
 " 	c None",
 ".	c #A87272",
Index: pixmaps/downgradeM.xpm
===================================================================
RCS file: /cvsroot/synaptic/synaptic/pixmaps/downgradeM.xpm,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 downgradeM.xpm
--- pixmaps/downgradeM.xpm	13 Jun 2002 12:12:11 -0000	1.1.1.1
+++ pixmaps/downgradeM.xpm	26 Jan 2003 13:01:33 -0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * downgradeM_xpm[] = {
+static const char * downgradeM_xpm[] = {
 "9 9 2 1",
 " 	c None",
 ".	c #D8B608",
Index: pixmaps/heldM.xpm
===================================================================
RCS file: /cvsroot/synaptic/synaptic/pixmaps/heldM.xpm,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 heldM.xpm
--- pixmaps/heldM.xpm	13 Jun 2002 12:12:11 -0000	1.1.1.1
+++ pixmaps/heldM.xpm	26 Jan 2003 13:01:33 -0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * heldM_xpm[] = {
+static const char * heldM_xpm[] = {
 "9 10 3 1",
 " 	c None",
 ".	c #000000",
Index: pixmaps/holdM.xpm
===================================================================
RCS file: /cvsroot/synaptic/synaptic/pixmaps/holdM.xpm,v
retrieving revision 1.2
diff -u -r1.2 holdM.xpm
--- pixmaps/holdM.xpm	3 Nov 2002 23:51:07 -0000	1.2
+++ pixmaps/holdM.xpm	26 Jan 2003 13:01:33 -0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * pinM_xpm[] = {
+static const char * pinM_xpm[] = {
 "9 9 2 1",
 " 	c None",
 ".	c #000BFF",
Index: pixmaps/installM.xpm
===================================================================
RCS file: /cvsroot/synaptic/synaptic/pixmaps/installM.xpm,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 installM.xpm
--- pixmaps/installM.xpm	13 Jun 2002 12:12:11 -0000	1.1.1.1
+++ pixmaps/installM.xpm	26 Jan 2003 13:01:33 -0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * installM_xpm[] = {
+static const char * installM_xpm[] = {
 "9 9 3 1",
 " 	c None",
 ".	c #00BBFF",
Index: pixmaps/keepM.xpm
===================================================================
RCS file: /cvsroot/synaptic/synaptic/pixmaps/keepM.xpm,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 keepM.xpm
--- pixmaps/keepM.xpm	13 Jun 2002 12:12:11 -0000	1.1.1.1
+++ pixmaps/keepM.xpm	26 Jan 2003 13:01:33 -0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * keepM_xpm[] = {
+static const char * keepM_xpm[] = {
 "9 10 1 1",
 " 	c None",
 "         ",
Index: pixmaps/newM.xpm
===================================================================
RCS file: /cvsroot/synaptic/synaptic/pixmaps/newM.xpm,v
retrieving revision 1.1
diff -u -r1.1 newM.xpm
--- pixmaps/newM.xpm	24 Sep 2002 11:48:46 -0000	1.1
+++ pixmaps/newM.xpm	26 Jan 2003 13:01:33 -0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * newM_xpm[] = {
+static const char * newM_xpm[] = {
 "9 9 3 1",
 " 	c None",
 ".	c #00BBFF",
Index: pixmaps/removeM.xpm
===================================================================
RCS file: /cvsroot/synaptic/synaptic/pixmaps/removeM.xpm,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 removeM.xpm
--- pixmaps/removeM.xpm	13 Jun 2002 12:12:11 -0000	1.1.1.1
+++ pixmaps/removeM.xpm	26 Jan 2003 13:01:33 -0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * removeM_xpm[] = {
+static const char * removeM_xpm[] = {
 "9 9 3 1",
 " 	c None",
 ".	c #FF585C",
Index: pixmaps/upgradeM.xpm
===================================================================
RCS file: /cvsroot/synaptic/synaptic/pixmaps/upgradeM.xpm,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 upgradeM.xpm
--- pixmaps/upgradeM.xpm	13 Jun 2002 12:12:11 -0000	1.1.1.1
+++ pixmaps/upgradeM.xpm	26 Jan 2003 13:01:33 -0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * upgradeM_xpm[] = {
+static const char * upgradeM_xpm[] = {
 "9 9 2 1",
 " 	c None",
 ".	c #A1F14C",
Index: po/cat-id-tbl.c
===================================================================
RCS file: /cvsroot/synaptic/synaptic/po/cat-id-tbl.c,v
retrieving revision 1.48
diff -u -r1.48 cat-id-tbl.c
--- po/cat-id-tbl.c	23 Jan 2003 14:59:51 -0000	1.48
+++ po/cat-id-tbl.c	26 Jan 2003 13:01:34 -0000
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-01-23 14:55+0100\n"
+"POT-Creation-Date: 2003-01-25 02:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -131,12 +131,12 @@
 
 #. package info
 #. common information regardless of state
-#: common/rpackagefilter.cc:39 gtk/rgmainwindow.cc:1240
+#: common/rpackagefilter.cc:39 gtk/rgmainwindow.cc:1279
 #: wings/rwmainwindow.cc:1196
 msgid "Section"
 msgstr ""
 
-#: common/rpackagefilter.cc:40 gtk/rgmainwindow.cc:1241
+#: common/rpackagefilter.cc:40 gtk/rgmainwindow.cc:1280
 #: wings/rwmainwindow.cc:1197
 msgid "Priority"
 msgstr ""
@@ -146,7 +146,7 @@
 msgstr ""
 
 #: common/rpackagefilter.cc:128 gtk/window_main.glade.strings:28
-#: gtk/window_main.glade.strings:65
+#: gtk/window_main.glade.strings:60
 msgid "Description"
 msgstr ""
 
@@ -191,7 +191,6 @@
 #.
 #: common/rpackagelister.cc:134 gtk/rgfiltereditor.cc:353
 #: wings/rwfiltereditor.cc:321 wings/rwmainwindow.cc:1951
-#: gtk/window_main.glade.strings:60
 msgid "Installed"
 msgstr ""
 
@@ -246,9 +245,9 @@
 msgid "Do you want to continue, ignoring these packages?"
 msgstr ""
 
-#: common/rpackagelister.cc:949 gtk/rgmainwindow.cc:751
-#: gtk/rgmainwindow.cc:1341 gtk/rgmainwindow.cc:1463 gtk/rgmainwindow.cc:2112
-#: gtk/rgmainwindow.cc:2321 wings/rwmainwindow.cc:698
+#: common/rpackagelister.cc:949 gtk/rgmainwindow.cc:764
+#: gtk/rgmainwindow.cc:1389 gtk/rgmainwindow.cc:1502 gtk/rgmainwindow.cc:2194
+#: gtk/rgmainwindow.cc:2414 wings/rwmainwindow.cc:698
 #: wings/rwmainwindow.cc:1344 wings/rwmainwindow.cc:1379
 #: wings/rwmainwindow.cc:2080
 msgid "Warning"
@@ -262,9 +261,9 @@
 msgid "Unable to lock the download directory"
 msgstr ""
 
-#: gtk/gsynaptic.cc:98 gtk/rgconfigwindow.cc:58 gtk/rgmainwindow.cc:600
-#: gtk/rgmainwindow.cc:631 gtk/rgmainwindow.cc:666 gtk/rgmainwindow.cc:749
-#: gtk/rgmainwindow.cc:2291 gtk/rgsrcwindow.cc:273 gtk/rgsrcwindow.cc:280
+#: gtk/gsynaptic.cc:98 gtk/rgconfigwindow.cc:58 gtk/rgmainwindow.cc:613
+#: gtk/rgmainwindow.cc:644 gtk/rgmainwindow.cc:679 gtk/rgmainwindow.cc:762
+#: gtk/rgmainwindow.cc:2384 gtk/rgsrcwindow.cc:273 gtk/rgsrcwindow.cc:280
 #: gtk/rgsrcwindow.cc:379 gtk/rgsrcwindow.cc:398 gtk/rgsrcwindow.cc:456
 #: wings/rwconfigwindow.cc:58 wings/rwmainwindow.cc:554
 #: wings/rwmainwindow.cc:589 wings/rwmainwindow.cc:623
@@ -276,13 +275,13 @@
 msgid "You must run this program as the root user."
 msgstr ""
 
-#: gtk/gsynaptic.cc:100 gtk/rgconfigwindow.cc:59 gtk/rgmainwindow.cc:772
-#: gtk/rgmainwindow.cc:2293 gtk/rgsrcwindow.cc:231 wings/rwconfigwindow.cc:59
+#: gtk/gsynaptic.cc:100 gtk/rgconfigwindow.cc:59 gtk/rgmainwindow.cc:785
+#: gtk/rgmainwindow.cc:2386 gtk/rgsrcwindow.cc:231 wings/rwconfigwindow.cc:59
 #: wings/synaptic.cc:81
 msgid "OK"
 msgstr ""
 
-#: gtk/rgconfigwindow.cc:58 gtk/rgmainwindow.cc:2292
+#: gtk/rgconfigwindow.cc:58 gtk/rgmainwindow.cc:2385
 #: wings/rwconfigwindow.cc:58
 msgid "An error occurred while saving configurations."
 msgstr ""
@@ -364,8 +363,8 @@
 msgstr ""
 
 #: gtk/rgfetchprogress.cc:147 gtk/rgfilterwindow.cc:112
-#: gtk/rgmainwindow.cc:1345 gtk/rgmainwindow.cc:1466 gtk/rgmainwindow.cc:2116
-#: gtk/rgmainwindow.cc:2324 gtk/rgsrcwindow.cc:235 gtk/rgsummarywindow.cc:300
+#: gtk/rgmainwindow.cc:1393 gtk/rgmainwindow.cc:1505 gtk/rgmainwindow.cc:2198
+#: gtk/rgmainwindow.cc:2417 gtk/rgsrcwindow.cc:235 gtk/rgsummarywindow.cc:300
 #: gtk/rgsummarywindow.cc:402 wings/rwfetchprogress.cc:143
 #: wings/rwfilterwindow.cc:104 wings/rwmainwindow.cc:1347
 #: wings/rwmainwindow.cc:1382 wings/rwmainwindow.cc:2083
@@ -504,7 +503,7 @@
 msgid "Packages that"
 msgstr ""
 
-#: gtk/rgfiltereditor.cc:628 gtk/rgmainwindow.cc:1466 gtk/rgmainwindow.cc:2116
+#: gtk/rgfiltereditor.cc:628 gtk/rgmainwindow.cc:1505 gtk/rgmainwindow.cc:2198
 #: gtk/rgsrcwindow.cc:243 wings/rwfiltereditor.cc:490
 #: wings/rwmainwindow.cc:1347 wings/rwmainwindow.cc:1382
 #: wings/rwmainwindow.cc:1667 wings/rwsourceswindow.cc:154
@@ -545,149 +544,149 @@
 msgid "Performing Changes"
 msgstr ""
 
-#: gtk/rgmainwindow.cc:95 gtk/rgmainwindow.cc:1284 wings/rwmainwindow.cc:98
+#: gtk/rgmainwindow.cc:96 gtk/rgmainwindow.cc:1323 wings/rwmainwindow.cc:98
 #: wings/rwmainwindow.cc:1241
 msgid "Unknown"
 msgstr ""
 
-#: gtk/rgmainwindow.cc:96 wings/rwmainwindow.cc:99
+#: gtk/rgmainwindow.cc:97 wings/rwmainwindow.cc:99
 msgid "Normal"
 msgstr ""
 
-#: gtk/rgmainwindow.cc:97 wings/rwmainwindow.cc:100
+#: gtk/rgmainwindow.cc:98 wings/rwmainwindow.cc:100
 msgid "Critical"
 msgstr ""
 
-#: gtk/rgmainwindow.cc:98 wings/rwmainwindow.cc:101
+#: gtk/rgmainwindow.cc:99 wings/rwmainwindow.cc:101
 msgid "Security"
 msgstr ""
 
-#: gtk/rgmainwindow.cc:279 wings/rwmainwindow.cc:253
+#: gtk/rgmainwindow.cc:282 wings/rwmainwindow.cc:253
 msgid "No match."
 msgstr ""
 
-#: gtk/rgmainwindow.cc:295 wings/rwmainwindow.cc:268
+#: gtk/rgmainwindow.cc:300 wings/rwmainwindow.cc:268
 msgid "No more matches."
 msgstr ""
 
-#: gtk/rgmainwindow.cc:527 wings/rwmainwindow.cc:480
+#: gtk/rgmainwindow.cc:535 wings/rwmainwindow.cc:480
 msgid "Retrieving Index Files"
 msgstr ""
 
-#: gtk/rgmainwindow.cc:529 wings/rwmainwindow.cc:483
+#: gtk/rgmainwindow.cc:537 wings/rwmainwindow.cc:483
 msgid "Updating Package Lists from Servers..."
 msgstr ""
 
-#: gtk/rgmainwindow.cc:584 wings/rwmainwindow.cc:536
+#: gtk/rgmainwindow.cc:597 wings/rwmainwindow.cc:536
 msgid "Dependency problem resolver failed."
 msgstr ""
 
-#: gtk/rgmainwindow.cc:586 wings/rwmainwindow.cc:538
+#: gtk/rgmainwindow.cc:599 wings/rwmainwindow.cc:538
 msgid "Dependency problems successfully fixed."
 msgstr ""
 
-#: gtk/rgmainwindow.cc:601 gtk/rgmainwindow.cc:631 wings/rwmainwindow.cc:554
+#: gtk/rgmainwindow.cc:614 gtk/rgmainwindow.cc:644 wings/rwmainwindow.cc:554
 #: wings/rwmainwindow.cc:589
 msgid ""
 "Automatic upgrade selection not possible\n"
 "with broken packages. Please fix them first."
 msgstr ""
 
-#: gtk/rgmainwindow.cc:603 gtk/rgmainwindow.cc:633 gtk/rgmainwindow.cc:669
+#: gtk/rgmainwindow.cc:616 gtk/rgmainwindow.cc:646 gtk/rgmainwindow.cc:682
 #: gtk/rgsrcwindow.cc:275 gtk/rgsrcwindow.cc:282 gtk/rgsrcwindow.cc:381
 #: gtk/rgsrcwindow.cc:399 gtk/rgsrcwindow.cc:458 wings/rwmainwindow.cc:556
 #: wings/rwmainwindow.cc:591 wings/rwmainwindow.cc:626
 msgid "Ok"
 msgstr ""
 
-#: gtk/rgmainwindow.cc:608 wings/rwmainwindow.cc:562
+#: gtk/rgmainwindow.cc:621 wings/rwmainwindow.cc:562
 msgid "Performing automatic selection of upgradadable packages..."
 msgstr ""
 
-#: gtk/rgmainwindow.cc:613 wings/rwmainwindow.cc:569
+#: gtk/rgmainwindow.cc:626 wings/rwmainwindow.cc:569
 msgid "Automatic selection of upgradadable packages done."
 msgstr ""
 
-#: gtk/rgmainwindow.cc:615 wings/rwmainwindow.cc:571
+#: gtk/rgmainwindow.cc:628 wings/rwmainwindow.cc:571
 msgid "Automatic upgrade selection failed."
 msgstr ""
 
-#: gtk/rgmainwindow.cc:638 wings/rwmainwindow.cc:597
+#: gtk/rgmainwindow.cc:651 wings/rwmainwindow.cc:597
 msgid "Performing selection for distribution upgrade..."
 msgstr ""
 
-#: gtk/rgmainwindow.cc:644 wings/rwmainwindow.cc:604
+#: gtk/rgmainwindow.cc:657 wings/rwmainwindow.cc:604
 msgid "Selection for distribution upgrade done."
 msgstr ""
 
-#: gtk/rgmainwindow.cc:646 wings/rwmainwindow.cc:606
+#: gtk/rgmainwindow.cc:659 wings/rwmainwindow.cc:606
 msgid "Selection for distribution upgrade failed."
 msgstr ""
 
-#: gtk/rgmainwindow.cc:667 wings/rwmainwindow.cc:624
+#: gtk/rgmainwindow.cc:680 wings/rwmainwindow.cc:624
 msgid ""
 "Operation not possible with broken packages.\n"
 "Please fix them first."
 msgstr ""
 
-#: gtk/rgmainwindow.cc:685 wings/rwmainwindow.cc:642
+#: gtk/rgmainwindow.cc:698 wings/rwmainwindow.cc:642
 msgid ""
 "Performing selected changes... See the terminal from where you started "
 "Synaptic for more information."
 msgstr ""
 
-#: gtk/rgmainwindow.cc:689 wings/rwmainwindow.cc:646
+#: gtk/rgmainwindow.cc:702 wings/rwmainwindow.cc:646
 msgid "Retrieving Package Files"
 msgstr ""
 
-#: gtk/rgmainwindow.cc:782 gtk/rgmainwindow.cc:1254 gtk/rgmainwindow.cc:1263
-#: gtk/rgmainwindow.cc:1267 wings/rwmainwindow.cc:811
+#: gtk/rgmainwindow.cc:795 gtk/rgmainwindow.cc:1293 gtk/rgmainwindow.cc:1302
+#: gtk/rgmainwindow.cc:1306 wings/rwmainwindow.cc:811
 #: wings/rwmainwindow.cc:1210 wings/rwmainwindow.cc:1217
 #: wings/rwmainwindow.cc:1220 wings/rwmainwindow.cc:1224
 msgid "N/A"
 msgstr ""
 
-#: gtk/rgmainwindow.cc:973 wings/rwmainwindow.cc:924
+#: gtk/rgmainwindow.cc:1018 wings/rwmainwindow.cc:924
 msgid "Package is installed."
 msgstr ""
 
-#: gtk/rgmainwindow.cc:975 wings/rwmainwindow.cc:926
+#: gtk/rgmainwindow.cc:1020 wings/rwmainwindow.cc:926
 msgid "Package is not installed."
 msgstr ""
 
-#: gtk/rgmainwindow.cc:979 wings/rwmainwindow.cc:930
+#: gtk/rgmainwindow.cc:1024 wings/rwmainwindow.cc:930
 msgid "Package will be installed."
 msgstr ""
 
-#: gtk/rgmainwindow.cc:985 wings/rwmainwindow.cc:936
+#: gtk/rgmainwindow.cc:1030 wings/rwmainwindow.cc:936
 msgid "Package will be upgraded."
 msgstr ""
 
-#: gtk/rgmainwindow.cc:995 wings/rwmainwindow.cc:946
+#: gtk/rgmainwindow.cc:1040 wings/rwmainwindow.cc:946
 msgid "Package will be uninstalled."
 msgstr ""
 
-#: gtk/rgmainwindow.cc:998
+#: gtk/rgmainwindow.cc:1043
 msgid "Package is broken."
 msgstr ""
 
-#: gtk/rgmainwindow.cc:1004 gtk/rgmainwindow.cc:1020
+#: gtk/rgmainwindow.cc:1049 gtk/rgmainwindow.cc:1065
 msgid "Package is pinned."
 msgstr ""
 
-#: gtk/rgmainwindow.cc:1007
+#: gtk/rgmainwindow.cc:1052
 msgid "Package is new."
 msgstr ""
 
-#: gtk/rgmainwindow.cc:1025 wings/rwmainwindow.cc:951
+#: gtk/rgmainwindow.cc:1070 wings/rwmainwindow.cc:951
 msgid "Broken dependencies."
 msgstr ""
 
-#: gtk/rgmainwindow.cc:1224 gtk/window_main.glade.strings:84
+#: gtk/rgmainwindow.cc:1263 gtk/window_main.glade.strings:79
 msgid "_Install"
 msgstr ""
 
-#: gtk/rgmainwindow.cc:1227
+#: gtk/rgmainwindow.cc:1266
 msgid "_Upgrade"
 msgstr ""
 
@@ -696,123 +695,123 @@
 #. appendTag(bufPtr, bufSize, "Vendor", pkg->vendor());
 #.
 #. installed version info
-#: gtk/rgmainwindow.cc:1249 wings/rwmainwindow.cc:1205
+#: gtk/rgmainwindow.cc:1288 wings/rwmainwindow.cc:1205
 msgid ""
 "\n"
 "Installed Package:\n"
 msgstr ""
 
-#: gtk/rgmainwindow.cc:1251 gtk/rgmainwindow.cc:1259
+#: gtk/rgmainwindow.cc:1290 gtk/rgmainwindow.cc:1298
 #: wings/rwmainwindow.cc:1207 wings/rwmainwindow.cc:1216
 msgid "    Version"
 msgstr ""
 
-#: gtk/rgmainwindow.cc:1253 gtk/rgmainwindow.cc:1262
+#: gtk/rgmainwindow.cc:1292 gtk/rgmainwindow.cc:1301
 #: wings/rwmainwindow.cc:1209 wings/rwmainwindow.cc:1219
 msgid "    Size"
 msgstr ""
 
-#: gtk/rgmainwindow.cc:1257 wings/rwmainwindow.cc:1213
+#: gtk/rgmainwindow.cc:1296 wings/rwmainwindow.cc:1213
 msgid ""
 "\n"
 "Available Package:\n"
 msgstr ""
 
-#: gtk/rgmainwindow.cc:1266 wings/rwmainwindow.cc:1223
+#: gtk/rgmainwindow.cc:1305 wings/rwmainwindow.cc:1223
 msgid "    Package Size"
 msgstr ""
 
-#: gtk/rgmainwindow.cc:1281 wings/rwmainwindow.cc:1238
+#: gtk/rgmainwindow.cc:1320 wings/rwmainwindow.cc:1238
 msgid "Not Relevant"
 msgstr ""
 
-#: gtk/rgmainwindow.cc:1289 wings/rwmainwindow.cc:1246
+#: gtk/rgmainwindow.cc:1328 wings/rwmainwindow.cc:1246
 msgid "Recommended"
 msgstr ""
 
-#: gtk/rgmainwindow.cc:1291 wings/rwmainwindow.cc:1248
+#: gtk/rgmainwindow.cc:1330 wings/rwmainwindow.cc:1248
 msgid "Possible"
 msgstr ""
 
-#: gtk/rgmainwindow.cc:1294 wings/rwmainwindow.cc:1251
+#: gtk/rgmainwindow.cc:1333 wings/rwmainwindow.cc:1251
 msgid "Package Upgrade"
 msgstr ""
 
-#: gtk/rgmainwindow.cc:1296 wings/rwmainwindow.cc:1253
+#: gtk/rgmainwindow.cc:1335 wings/rwmainwindow.cc:1253
 msgid "    Importance"
 msgstr ""
 
-#: gtk/rgmainwindow.cc:1298 wings/rwmainwindow.cc:1255
+#: gtk/rgmainwindow.cc:1337 wings/rwmainwindow.cc:1255
 msgid "    Date"
 msgstr ""
 
-#: gtk/rgmainwindow.cc:1342
+#: gtk/rgmainwindow.cc:1390
 msgid ""
 "There are unsaved changes.\n"
 "Synaptic must reopen its cache.\n"
 "Your changes will be lost. Are you sure?"
 msgstr ""
 
-#: gtk/rgmainwindow.cc:1345 gtk/window_main.glade.strings:23
+#: gtk/rgmainwindow.cc:1393 gtk/window_main.glade.strings:23
 msgid "Apply"
 msgstr ""
 
-#: gtk/rgmainwindow.cc:1464 gtk/rgmainwindow.cc:2113
+#: gtk/rgmainwindow.cc:1503 gtk/rgmainwindow.cc:2195
 #: wings/rwmainwindow.cc:1345 wings/rwmainwindow.cc:1380
 msgid ""
 "Removing this package may render the system unusable.\n"
 "Are you sure you want to do that?"
 msgstr ""
 
-#: gtk/rgmainwindow.cc:1815 wings/rwmainwindow.cc:1562
+#: gtk/rgmainwindow.cc:1834 wings/rwmainwindow.cc:1562
 #: gtk/window_main.glade.strings:38
 msgid "Update package cache"
 msgstr ""
 
-#: gtk/rgmainwindow.cc:1819 wings/rwmainwindow.cc:1576
+#: gtk/rgmainwindow.cc:1838 wings/rwmainwindow.cc:1576
 #: gtk/window_main.glade.strings:40
 msgid "Mark packages for upgrade, except those with new dependencies"
 msgstr ""
 
-#: gtk/rgmainwindow.cc:1823 wings/rwmainwindow.cc:1584
+#: gtk/rgmainwindow.cc:1842 wings/rwmainwindow.cc:1584
 #: gtk/window_main.glade.strings:42
 msgid ""
 "Upgrade installed distribution, including packages with new dependencies"
 msgstr ""
 
-#: gtk/rgmainwindow.cc:1827 wings/rwmainwindow.cc:1592
+#: gtk/rgmainwindow.cc:1846 wings/rwmainwindow.cc:1592
 #: gtk/window_main.glade.strings:44
 msgid "Commit (and download if necessary) selected changes on packages"
 msgstr ""
 
-#: gtk/rgmainwindow.cc:2218 wings/rwmainwindow.cc:2022
+#: gtk/rgmainwindow.cc:2311 wings/rwmainwindow.cc:2022
 #, c-format
 msgid ""
 "%i packages listed, %i installed, %i broken. %i to install/upgrade, %i to "
 "remove; %sB will be %s"
 msgstr ""
 
-#: gtk/rgmainwindow.cc:2221 wings/rwmainwindow.cc:2025
+#: gtk/rgmainwindow.cc:2314 wings/rwmainwindow.cc:2025
 msgid "freed"
 msgstr ""
 
-#: gtk/rgmainwindow.cc:2221 wings/rwmainwindow.cc:2025
+#: gtk/rgmainwindow.cc:2314 wings/rwmainwindow.cc:2025
 msgid "used"
 msgstr ""
 
 #. importend! remove this -> random segfaults
-#: gtk/rgmainwindow.cc:2252 wings/rwmainwindow.cc:1839
+#: gtk/rgmainwindow.cc:2345 wings/rwmainwindow.cc:1839
 #: gtk/window_main.glade.strings:49
 msgid "All Packages"
 msgstr ""
 
-#: gtk/rgmainwindow.cc:2322 wings/rwmainwindow.cc:2081
+#: gtk/rgmainwindow.cc:2415 wings/rwmainwindow.cc:2081
 msgid ""
 "There are unsaved changes, are you sure\n"
 "you want to quit Synaptic?"
 msgstr ""
 
-#: gtk/rgmainwindow.cc:2324 wings/rwmainwindow.cc:2083
+#: gtk/rgmainwindow.cc:2417 wings/rwmainwindow.cc:2083
 msgid "Quit"
 msgstr ""
 
@@ -1080,15 +1079,15 @@
 msgid "Keep"
 msgstr ""
 
-#: wings/rwmainwindow.cc:1653 gtk/window_main.glade.strings:81
+#: wings/rwmainwindow.cc:1653 gtk/window_main.glade.strings:76
 msgid "Keep selected package as is in the system, unmarking selections over it"
 msgstr ""
 
-#: wings/rwmainwindow.cc:1661 gtk/window_main.glade.strings:83
+#: wings/rwmainwindow.cc:1661 gtk/window_main.glade.strings:78
 msgid "Mark selected package for installation/upgrade"
 msgstr ""
 
-#: wings/rwmainwindow.cc:1668 gtk/window_main.glade.strings:85
+#: wings/rwmainwindow.cc:1668 gtk/window_main.glade.strings:80
 msgid "Mark selected package for removal from system"
 msgstr ""
 
@@ -1109,15 +1108,15 @@
 msgid "Depends."
 msgstr ""
 
-#: wings/rwmainwindow.cc:1733 gtk/window_main.glade.strings:66
+#: wings/rwmainwindow.cc:1733 gtk/window_main.glade.strings:61
 msgid "What it depends on"
 msgstr ""
 
-#: wings/rwmainwindow.cc:1734 gtk/window_main.glade.strings:67
+#: wings/rwmainwindow.cc:1734 gtk/window_main.glade.strings:62
 msgid "What depends on it"
 msgstr ""
 
-#: wings/rwmainwindow.cc:1736 gtk/window_main.glade.strings:69
+#: wings/rwmainwindow.cc:1736 gtk/window_main.glade.strings:64
 msgid "Suggested and Recommended"
 msgstr ""
 
@@ -1195,15 +1194,14 @@
 msgstr ""
 
 #: wings/rwmainwindow.cc:1938 gtk/window_main.glade.strings:15
-#: gtk/window_main.glade.strings:59
 msgid "Package"
 msgstr ""
 
-#: wings/rwmainwindow.cc:1958 gtk/window_main.glade.strings:61
+#: wings/rwmainwindow.cc:1958
 msgid "Available"
 msgstr ""
 
-#: wings/rwmainwindow.cc:1967 gtk/window_main.glade.strings:62
+#: wings/rwmainwindow.cc:1967
 msgid "Summary"
 msgstr ""
 
@@ -1370,82 +1368,82 @@
 msgid "To filter"
 msgstr ""
 
-#: gtk/window_main.glade.strings:58 gtk/window_main.glade.strings:63
+#: gtk/window_main.glade.strings:58
 msgid " "
 msgstr ""
 
-#: gtk/window_main.glade.strings:64
+#: gtk/window_main.glade.strings:59
 msgid "Information"
 msgstr ""
 
-#: gtk/window_main.glade.strings:68
+#: gtk/window_main.glade.strings:63
 msgid "What it would depend on"
 msgstr ""
 
-#: gtk/window_main.glade.strings:70
+#: gtk/window_main.glade.strings:65
 msgid "label62"
 msgstr ""
 
-#: gtk/window_main.glade.strings:71
+#: gtk/window_main.glade.strings:66
 msgid "label_dep_info"
 msgstr ""
 
-#: gtk/window_main.glade.strings:72
+#: gtk/window_main.glade.strings:67
 msgid "label53"
 msgstr ""
 
-#: gtk/window_main.glade.strings:73
+#: gtk/window_main.glade.strings:68
 msgid "label57"
 msgstr ""
 
-#: gtk/window_main.glade.strings:74
+#: gtk/window_main.glade.strings:69
 msgid "label54"
 msgstr ""
 
-#: gtk/window_main.glade.strings:75
+#: gtk/window_main.glade.strings:70
 msgid "label58"
 msgstr ""
 
-#: gtk/window_main.glade.strings:76
+#: gtk/window_main.glade.strings:71
 msgid "label_availdep_info"
 msgstr ""
 
-#: gtk/window_main.glade.strings:77
+#: gtk/window_main.glade.strings:72
 msgid "label55"
 msgstr ""
 
-#: gtk/window_main.glade.strings:78
+#: gtk/window_main.glade.strings:73
 msgid "label59"
 msgstr ""
 
-#: gtk/window_main.glade.strings:79
+#: gtk/window_main.glade.strings:74
 msgid "label56"
 msgstr ""
 
-#: gtk/window_main.glade.strings:80
+#: gtk/window_main.glade.strings:75
 msgid "Dependencies"
 msgstr ""
 
-#: gtk/window_main.glade.strings:82
+#: gtk/window_main.glade.strings:77
 msgid "_Keep"
 msgstr ""
 
-#: gtk/window_main.glade.strings:86
+#: gtk/window_main.glade.strings:81
 msgid "_Remove"
 msgstr ""
 
-#: gtk/window_main.glade.strings:87
+#: gtk/window_main.glade.strings:82
 msgid "Never upgrade this package"
 msgstr ""
 
-#: gtk/window_main.glade.strings:88
+#: gtk/window_main.glade.strings:83
 msgid "Hold package"
 msgstr ""
 
-#: gtk/window_main.glade.strings:89
+#: gtk/window_main.glade.strings:84
 msgid "Show Pkg Help"
 msgstr ""
 
-#: gtk/window_main.glade.strings:90
+#: gtk/window_main.glade.strings:85
 msgid "_statusL"
 msgstr ""
Index: wings/rwmainwindow.cc
===================================================================
RCS file: /cvsroot/synaptic/synaptic/wings/rwmainwindow.cc,v
retrieving revision 1.5
diff -u -r1.5 rwmainwindow.cc
--- wings/rwmainwindow.cc	26 Jul 2002 01:33:51 -0000	1.5
+++ wings/rwmainwindow.cc	26 Jan 2003 13:01:35 -0000
@@ -1480,17 +1480,17 @@
     
     StatusPixmaps[(int)RPackage::MKeep] = NULL;
     StatusPixmaps[(int)RPackage::MInstall] = 
-	WMCreatePixmapFromXPMData(scr, installM_xpm);
+	WMCreatePixmapFromXPMData(scr, (char**)installM_xpm);
     StatusPixmaps[(int)RPackage::MUpgrade] =
-	WMCreatePixmapFromXPMData(scr, upgradeM_xpm);
+	WMCreatePixmapFromXPMData(scr, (char**)upgradeM_xpm);
     StatusPixmaps[(int)RPackage::MDowngrade] =
-	WMCreatePixmapFromXPMData(scr, downgradeM_xpm);
+	WMCreatePixmapFromXPMData(scr,  (char**)downgradeM_xpm);
     StatusPixmaps[(int)RPackage::MRemove] =
-	WMCreatePixmapFromXPMData(scr, removeM_xpm);
+	WMCreatePixmapFromXPMData(scr,  (char**)removeM_xpm);
     StatusPixmaps[(int)RPackage::MHeld] =
-	WMCreatePixmapFromXPMData(scr, heldM_xpm);
+	WMCreatePixmapFromXPMData(scr,  (char**)heldM_xpm);
     StatusPixmaps[7] = 
-	WMCreatePixmapFromXPMData(scr, brokenM_xpm);
+	WMCreatePixmapFromXPMData(scr,  (char**)brokenM_xpm);
     StatusPixmaps[8] = _alertPix;
 }
 
@@ -1516,7 +1516,7 @@
 			 keyPressHandler, this);
     
     
-    _alertPix = WMCreatePixmapFromXPMData(scr, alert_xpm);
+    _alertPix = WMCreatePixmapFromXPMData(scr,  (char**)alert_xpm);
 
     font = WMSystemFontOfSize(scr, 10);
     bfont = WMBoldSystemFontOfSize(scr, 12);