@@ -64,7 +64,7 @@ class QgsDataProvider : QObject
        * that can be used by the data provider to create a subset.
        * Must be implemented in the dataprovider.
       */
-      virtual void setSubsetString(QString subset);
+      virtual bool setSubsetString(QString subset);
 
 
       /**
 
@@ -141,10 +141,11 @@ class QgsVectorDataProvider : QgsDataProvider
        * Return unique values of an attribute
        * @param index the index of the attribute
        * @param values reference to the list to fill
+       * @param limit maximum number of values to return (added in 1.4)
        *
        * Default implementation simply iterates the features 
        */
-      virtual void uniqueValues(int index, QList<QVariant> &uniqueValues /Out/);
+      virtual void uniqueValues(int index, QList<QVariant> &uniqueValues /Out/, int limit = -1);
 
       /**Returns the possible enum values of an attribute. Returns an empty stringlist if a provider does not support enum types
       or if the given attribute is not an enum type.
 
@@ -166,8 +166,9 @@ public:
    * @param subset The subset string. This may be the where clause of a sql statement
    *               or other defintion string specific to the underlying dataprovider
    *               and data store.
+   * @return true, when setting the string was successful, false otherwise (added in 1.4)
    */
-  virtual void setSubsetString(QString subset);
+  virtual bool setSubsetString(QString subset);
 
   /**
    * Get the string (typically sql) used to define a subset of the layer
 
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #-----------------------------------------------------------
 # 
 # Locate Line Intersections
@@ -123,11 +124,11 @@ def compute(self, line1, line2, field1, field2, outPath, progressBar):
 		fieldList = self.getFieldList(layer1)
 		index1 = provider1.fieldNameIndex(field1)
 		field1 = fieldList[index1]
-		field1.setName("1_" + unicode(field1.name()))
+		field1.setName(unicode(field1.name()) + "_1")
 		fieldList = self.getFieldList(layer2)
 		index2 = provider2.fieldNameIndex(field2)
 		field2 = fieldList[index2]
-		field2.setName("2_" + unicode(field2.name()))
+		field2.setName(unicode(field2.name()) + "_2")
 		fieldList = {0:field1, 1:field2}
 		sRs = provider1.crs()
 		check = QFile(self.shapefileName)
 
@@ -1,5 +1,5 @@
 Copyright (c) 2007 Matthew T. Perry
-Copyright (c) 2008 Borys Jurgiel
+Copyright (c) 2008-2009 Borys Jurgiel
 
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of 
 
@@ -14,7 +14,7 @@ def name():
   return "Plugin Installer"
 
 def version():
-  return "Version 1.0.3"
+  return "Version 1.0.5"
 
 def description():
   return "Downloads and installs QGIS python plugins"
 
@@ -29,7 +29,7 @@
                                             "valid" bool,
                                             "QPHttp" QPHttp,
                                             "Relay" Relay, # Relay object for transmitting signals from QPHttp with adding the repoName information
-                                            "xmlData" QDomDocument,
+                                            "xmlData" QBuffer,
                                             "state" int,   (0 - disabled, 1-loading, 2-loaded ok, 3-error (to be retried), 4-rejected)
                                             "error" QString}}
 mPlugins = dict of dicts {id : {"name" QString,
@@ -87,6 +87,7 @@ def setIface(qgisIface):
                 ("Volkan Kepoglu's Repository","http://ggit.metu.edu.tr/~volkan/plugins.xml", ""),
                 ("GIS-Lab Repository",         "http://gis-lab.info/programs/qgis/qgis-repo.xml", ""),
                 ("Marco Hugentobler's Repository","http://karlinapp.ethz.ch/python_plugins/python_plugins.xml", ""),
+                ("Bob Bruce's Repository",     "http://www.mappinggeek.ca/QGISPythonPlugins/Bobs-QGIS-plugins.xml", ""),
                 ("Sourcepole Repository",      "http://build.sourcepole.ch/qgis/plugins.xml", "")]
 
 
@@ -376,7 +377,10 @@ def requestFetching(self,key):
     self.mRepositories[key]["state"] = 1
     url = QUrl(self.mRepositories[key]["url"])
     path = QString(url.toPercentEncoding(url.path(), "!$&'()*+,;=:@/"))
-    self.mRepositories[key]["QPHttp"] = QPHttp(url.host())
+    port = url.port()
+    if port < 0:
+      port = 80
+    self.mRepositories[key]["QPHttp"] = QPHttp(url.host(), port)
     self.connect(self.mRepositories[key]["QPHttp"], SIGNAL("requestFinished (int, bool)"), self.xmlDownloaded)
     self.connect(self.mRepositories[key]["QPHttp"], SIGNAL("stateChanged ( int )"), self.mRepositories[key]["Relay"].stateChanged)
     self.connect(self.mRepositories[key]["QPHttp"], SIGNAL("dataReadProgress ( int , int )"), self.mRepositories[key]["Relay"].dataReadProgress)
 
@@ -152,7 +152,10 @@ def __init__(self, parent, plugin):
     tmpDir = QDir.tempPath()
     tmpPath = QDir.cleanPath(tmpDir+"/"+fileName)
     self.file = QFile(tmpPath)
-    self.http = QPHttp(url.host())
+    port = url.port()
+    if port < 0:
+      port = 80
+    self.http = QPHttp(url.host(), port)
     self.connect(self.http, SIGNAL("stateChanged ( int )"), self.stateChanged) 
     self.connect(self.http, SIGNAL("dataReadProgress ( int , int )"), self.readProgress)
     self.connect(self.http, SIGNAL("requestFinished (int, bool)"), self.requestFinished)
@@ -335,7 +338,8 @@ def populateMostWidgets(self):
           a.setToolTip(0,self.tr("This repository is disabled"))
         else:
           a.setToolTip(0,self.tr("This repository is blocked due to incompatibility with your Quantum GIS version"))
-        a.setDisabled(True)
+        for i in [0,1,2]:
+          a.setForeground(i,QBrush(QColor(Qt.gray)))
     for i in [0,1,2]:
       self.treeRepositories.resizeColumnToContents(i)
     self.comboFilter1.addItem(self.tr("orphans"))