Merge lp:~george-edison55/askubuntu-lens/added-au-data-server into lp:~stefano-palazzo/askubuntu-lens/trunk

[Stefano Palazzo]

Mark's port to 11.10, George's fixes. Full of awesome.

Mark's port to 11.10, George's fixes. Full of awesome.

=== added file 'askubuntu-logo.svg'
--- askubuntu-logo.svg	1970-01-01 00:00:00 +0000
+++ askubuntu-logo.svg	2011-10-18 22:01:23 +0000
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg3039"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   width="150"
+   height="150"
+   sodipodi:docname="askubuntu-place.svg">
+  <metadata
+     id="metadata3045">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3043" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="744"
+     id="namedview3041"
+     showgrid="false"
+     inkscape:zoom="1.11"
+     inkscape:cx="0"
+     inkscape:cy="0"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg3039" />
+  <path
+     style="fill:#ffffff"
+     d="M 63.390987,139.63313 C 38.078487,134.71419 17.213007,116.42987 10.473927,93.262164 6.3529375,79.09497 5.9621275,73.72447 8.2258275,62.368702 14.767297,29.553578 38.921757,8.0473283 70.890987,6.5739343 88.659307,5.7550293 102.6916,10.078909 116.2751,20.558499 c 23.7431,18.317676 32.16782,54.960212 18.73222,81.474091 l -2.51454,4.9622 4.46387,16.28559 c 2.45513,8.95707 4.33341,16.41604 4.17396,16.57549 -0.15945,0.15945 -4.3286,-0.82324 -9.26477,-2.18377 -4.93617,-1.36052 -12.23468,-3.36985 -16.21891,-4.46517 l -7.24406,-1.99148 -4.04317,2.06267 c -8.341083,4.2553 -16.156173,6.09729 -27.468713,6.47427 -6.05,0.2016 -12.125,0.14794 -13.5,-0.11926 z m -11.749999,-44.012816 3.75,-0.61983 0,-14.418822 c 0,-16.025126 -0.85815,-19.160544 -5.96727,-21.802572 -3.28906,-1.700836 -13.536791,-2.036184 -17.395141,-0.56924 -2.11444,0.80391 -2.3823,1.360162 -1.7655,3.66644 0.71177,2.661398 0.87534,2.713944 7.75405,2.490845 7.578631,-0.245801 8.692931,0.333818 9.901871,5.150623 l 0.6888,2.744406 -6.04331,0 c -10.755241,0 -16.173501,3.923544 -16.173501,11.711764 0,5.468936 1.21954,7.841549 5.31382,10.338006 3.31838,2.02336 12.117041,2.60081 19.936181,1.30838 z m -16.050001,-7.55815 c -1.57179,-1.571788 -1.54062,-6.282606 0.05,-7.555166 2.19495,-1.756062 5.823971,-2.453537 9.336931,-1.794502 3.3387,0.626342 3.41307,0.748255 3.41307,5.594981 l 0,4.954687 -5.8,0 c -3.190001,0 -6.340001,-0.54 -7.000001,-1.2 z m 45.78895,6.70571 c 3.96591,-2.050852 6.01105,-5.284971 6.01105,-9.50571 0,-5.22562 -2.41406,-7.846763 -10.70778,-11.626335 -6.78867,-3.093694 -7.3971,-3.612607 -7.10818,-6.062413 0.39364,-3.337851 4.39374,-4.640879 10.22481,-3.330723 2.2203,0.498869 4.15693,0.78702 4.30361,0.640336 0.14669,-0.146684 0.54668,-1.666561 0.88886,-3.377505 0.5895,-2.947502 0.43013,-3.146834 -3.03593,-3.797071 -2.01195,-0.377444 -6.18783,-0.476477 -9.27973,-0.220073 -4.74922,0.393842 -6.06114,0.958073 -8.45365,3.635763 -3.18908,3.569196 -3.842469,9.373884 -1.42699,12.677252 0.77277,1.05682 4.71027,3.505329 8.75,5.44113 6.71228,3.216455 7.34498,3.778061 7.34498,6.519639 0,2.922772 -0.13821,3.007887 -5.36889,3.306382 -2.95288,0.168511 -6.68576,-0.152685 -8.29529,-0.713768 -3.06891,-1.069831 -3.4044,-0.791371 -4.03832,3.3519 -0.19106,1.248778 0.59698,2.406335 2.2025,3.235256 3.44054,1.77635 14.42277,1.67008 17.98895,-0.17406 z m 19.011053,-7.50571 c 0,-4.4 0.38842,-8 0.86316,-8 0.97042,0 8.32641,7.776712 12.13684,12.831007 2.25789,2.994943 2.92235,3.284763 6.86107,2.992543 l 4.36107,-0.32355 L 120.0099,88.52 c -2.53178,-3.43319 -6.35598,-7.994901 -8.49821,-10.137137 l -3.89497,-3.894973 7.38713,-7.337836 c 4.06293,-4.035809 7.38714,-7.686598 7.38714,-8.112863 0,-0.426266 -1.90461,-0.775028 -4.23247,-0.775028 -3.96955,0 -4.64992,0.450389 -10.95212,7.250001 l -6.71963,7.25 -0.0479,-16.250001 -0.0479,-16.249999 -2.800003,0 c -5.11384,0 -5.2,0.464525 -5.2,28.033333 0,14.098334 0.3,25.933334 0.66666,26.299997 0.36667,0.36667 2.16667,0.66667 4.00001,0.66667 l 3.333333,0 0,-8 z"
+     id="path3068"
+     inkscape:connector-curvature="0" />
+</svg>

=== removed file 'askubuntu-place.png'
Binary files askubuntu-place.png	2011-04-15 19:46:56 +0000 and askubuntu-place.png	1970-01-01 00:00:00 +0000 differ
=== added file 'askubuntu.lens'
--- askubuntu.lens	1970-01-01 00:00:00 +0000
+++ askubuntu.lens	2011-10-18 22:01:23 +0000
@@ -0,0 +1,12 @@
+[Lens]
+DBusName=net.launchpad.AskUbuntuLens
+DBusPath=/net/launchpad/lens/askubuntulens
+
+Icon=/usr/share/unity/lenses/askubuntu/askubuntu-logo.svg
+Name=Ask Ubuntu
+Description=Ask Questions and Get Answers on Ask Ubuntu
+SearchHint=Search Ask Ubuntu
+Shortcut=u
+
+[Desktop Entry]
+X-Ubuntu-Gettext-Domain=askubuntu-lens

=== removed file 'askubuntu.place'
--- askubuntu.place	2011-04-09 18:30:55 +0000
+++ askubuntu.place	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-
-[Place]
-DBusName=net.launchpad.AskUbuntuPlace
-DBusObjectPath=/net/launchpad/askubuntuplace
-
-
-[Entry:Stuff]
-DBusObjectPath=/net/launchpad/askubuntuplace/mainentry
-Icon=/usr/share/unity-place-askubuntu/askubuntu-place.png
-Name=Ask Ubuntu
-Description=Ask Questions and Get Answers on Ask Ubuntu
-SearchHint=Search Ask Ubuntu
-Shortcut=u
-
-[Desktop Entry]
-X-Ubuntu-Gettext-Domain=askubuntu-place
-

=== modified file 'askubuntu_bridge.py'
--- askubuntu_bridge.py	2011-04-28 17:52:51 +0000
+++ askubuntu_bridge.py	2011-10-18 22:01:23 +0000
@@ -24,7 +24,7 @@
 import json
 import functools
 import time
-
+import random
 
 DEFAULT_SITE = "askubuntu.com"
 SE_API_KEY = "BmtlCGm1UU-Cmn8FAvfT4Q"
@@ -32,58 +32,59 @@
 ICONS = {}
 NUMS = "0123456789"
 SITES = (
-    ("@meta", "meta." + DEFAULT_SITE),
-    ("@so", "stackoverflow.com"),
-    ("@su", "superuser.com"),
-    ("@sf", "serverfault.com"),
-    ("@stackoverflow", "stackoverflow.com"), 
-    ("@serverfault", "serverfault.com"), 
-    ("@superuser", "superuser.com"), 
-    ("@webapps", "webapps.stackexchange.com"), 
-    ("@gaming", "gaming.stackexchange.com"), 
-    ("@webmasters", "webmasters.stackexchange.com"), 
-    ("@cooking", "cooking.stackexchange.com"), 
-    ("@gamedev", "gamedev.stackexchange.com"), 
-    ("@photo", "photo.stackexchange.com"), 
-    ("@stats", "stats.stackexchange.com"), 
-    ("@math", "math.stackexchange.com"), 
-    ("@diy", "diy.stackexchange.com"), 
-    ("@gis", "gis.stackexchange.com"), 
-    ("@tex", "tex.stackexchange.com"),  
-    ("@money", "money.stackexchange.com"), 
-    ("@english", "english.stackexchange.com"), 
-    ("@stackapps", "stackapps.com"), 
-    ("@ux", "ux.stackexchange.com"), 
-    ("@unix", "unix.stackexchange.com"), 
-    ("@wordpress", "wordpress.stackexchange.com"), 
-    ("@cstheory", "cstheory.stackexchange.com"), 
-    ("@apple", "apple.stackexchange.com"), 
-    ("@rpg", "rpg.stackexchange.com"), 
-    ("@bicycles", "bicycles.stackexchange.com"), 
-    ("@programmers", "programmers.stackexchange.com"), 
-    ("@electronics", "electronics.stackexchange.com"), 
-    ("@android", "android.stackexchange.com"), 
-    ("@onstartups", "onstartups.stackexchange.com"), 
-    ("@boardgames", "boardgames.stackexchange.com"), 
-    ("@physics", "physics.stackexchange.com"), 
-    ("@homebrew", "homebrew.stackexchange.com"), 
-    ("@security", "security.stackexchange.com"), 
-    ("@writers", "writers.stackexchange.com"), 
-    ("@audio", "audio.stackexchange.com"), 
-    ("@graphicdesign", "graphicdesign.stackexchange.com"), 
-    ("@dba", "dba.stackexchange.com"), 
-    ("@scifi", "scifi.stackexchange.com"), 
-    ("@guitars", "guitars.stackexchange.com"), 
-    ("@codereview", "codereview"), 
-    ("@codegolf", "codegolf.stackexchange.com"), 
-    ("@quant", "quant.stackexchange.com"), 
-    ("@pm", "pm.stackexchange.com"), 
-    ("@skeptics", "skeptics.stackexchange.com"), 
-    ("@fitness", "fitness.stackexchange.com"), 
-    ("@drupal", "drupal.stackexchange.com"), 
-    ("@mechanics", "mechanics.stackexchange.com"), 
-    ("@parenting", "parenting.stackexchange.com"), 
-    ("@sharepoint", "sharepoint.stackexchange.com"),
+    ("@au", DEFAULT_SITE, "Ask Ubuntu"),
+    ("@so", "stackoverflow.com", ""),
+    ("@su", "superuser.com", ""),
+    ("@sf", "serverfault.com", ""),
+    ("@stackoverflow", "stackoverflow.com", "Stack Overflow"), 
+    ("@serverfault", "serverfault.com", "Server Fault"), 
+    ("@superuser", "superuser.com", "Super User"), 
+    ("@webapps", "webapps.stackexchange.com", "Web Applications"), 
+    ("@gaming", "gaming.stackexchange.com", "Gaming"), 
+    ("@webmasters", "webmasters.stackexchange.com", "Webmasters"), 
+    ("@cooking", "cooking.stackexchange.com", "Cooking"), 
+    ("@gamedev", "gamedev.stackexchange.com", "Game Development"), 
+    ("@photo", "photo.stackexchange.com", "Photography"), 
+    ("@stats", "stats.stackexchange.com", "Statistics"), 
+    ("@math", "math.stackexchange.com", "Mathematics"), 
+    ("@diy", "diy.stackexchange.com", "DIY"), 
+    ("@gis", "gis.stackexchange.com", "GIS"), 
+    ("@tex", "tex.stackexchange.com", "TeX - LaTeX"),  
+    ("@money", "money.stackexchange.com", "Personal Finance and Money "), 
+    ("@english", "english.stackexchange.com", "English Language & Usage"), 
+    ("@stackapps", "stackapps.com", "Stack Apps"), 
+    ("@ux", "ux.stackexchange.com", "User Experience"), 
+    ("@unix", "unix.stackexchange.com", "Unix and Linux"), 
+    ("@wordpress", "wordpress.stackexchange.com", "Wordpress"), 
+    ("@cstheory", "cstheory.stackexchange.com", "Theoretical Computer Science"), 
+    ("@apple", "apple.stackexchange.com", "Apple"), 
+    ("@rpg", "rpg.stackexchange.com", "Role Playing Games"), 
+    ("@bicycles", "bicycles.stackexchange.com", "Bicycles"), 
+    ("@programmers", "programmers.stackexchange.com", "Programmers"), 
+    ("@electronics", "electronics.stackexchange.com", "Electronics"), 
+    ("@android", "android.stackexchange.com", "Android"), 
+    ("@onstartups", "onstartups.stackexchange.com", "OnStartups"), 
+    ("@boardgames", "boardgames.stackexchange.com", "Board & Card Games"), 
+    ("@physics", "physics.stackexchange.com", "Physics"), 
+    ("@homebrew", "homebrew.stackexchange.com", "Homebrew"), 
+    ("@security", "security.stackexchange.com", "IT Security"), 
+    ("@writers", "writers.stackexchange.com", "Writers"), 
+    ("@audio", "audio.stackexchange.com", "Audio-Video Production"), 
+    ("@graphicdesign", "graphicdesign.stackexchange.com", "Graphic Design"), 
+    ("@dba", "dba.stackexchange.com", "Database Administration"), 
+    ("@scifi", "scifi.stackexchange.com", "Science Fiction"), 
+    ("@guitars", "guitars.stackexchange.com", "Guitars"), 
+    ("@codereview", "codereview", "Code Review"), 
+    ("@codegolf", "codegolf.stackexchange.com", "Code Golf"), 
+    ("@quant", "quant.stackexchange.com", "Quantitative Finance"), 
+    ("@pm", "pm.stackexchange.com", "Project Management"), 
+    ("@skeptics", "skeptics.stackexchange.com", "Skeptics"), 
+    ("@fitness", "fitness.stackexchange.com", "Fitness & Nutrition"), 
+    ("@drupal", "drupal.stackexchange.com", "Drupal"), 
+    ("@mechanics", "mechanics.stackexchange.com", "Motor Vehicle Maintenence"), 
+    ("@parenting", "parenting.stackexchange.com", "Parenting"), 
+    ("@sharepoint", "sharepoint.stackexchange.com", "Sharepoint"),
+    ("@meta", "meta." + DEFAULT_SITE, "Ask Ubuntu Meta"),
 )
 
 
@@ -102,10 +103,16 @@
     print "api.%s/\33[1;31m%s\33[m" % (site, query)
     if query.startswith("similar?title") and site == "askubuntu.com":
         try:
-            result = json.loads(urllib2.urlopen(
-                "http://50.19.108.78:8080/%s" % query.replace(" ", "%20"),
-                timeout=0.5).read())
-            print "\33[1mused ec2 service\33[m"
+            if random.random() > 0.5:
+                result = json.loads(urllib2.urlopen(
+                    "http://50.19.108.78:8080/%s" % query.replace(" ", "%20"),
+                    timeout=0.5).read())
+                print "\33[1mused ec2 service\33[m"
+            else:
+                result = json.loads(urllib2.urlopen(
+                    "http://audata.quickmediasolutions.com:8046/%s" % query.replace(" ", "%20"),
+                    timeout=0.5).read())
+                print "\33[1mused AU Data Server service\33[m"
             return result
         except Exception as e:
             print "\33[1;31m%s\33[m" % repr(e)
@@ -127,7 +134,7 @@
 def detect_site(search):
     global BADGES
     site = DEFAULT_SITE
-    for modifier, url in SITES:
+    for modifier, url, sitename in SITES:
         if search.startswith(modifier):
             search = search.replace(modifier, "").strip()
             site = url

=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2011-10-18 22:01:23 +0000
@@ -0,0 +1,6 @@
+unity-askubuntu-lens (0.2) oneiric; urgency=low
+
+  * Updated to work with Ubuntu 11.10 - Oneiric Ocelot
+
+ -- Mark Tully <[e-mail]>  Thu, 15 Sep 2011 19:53:10 +0100
+ 

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2011-10-18 22:01:23 +0000
@@ -0,0 +1,1 @@
+7

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2011-10-18 22:01:23 +0000
@@ -0,0 +1,24 @@
+Source: unity-askubuntu-lens
+Section: gnome
+Priority: optional
+Maintainer: Stefano Palazzo <[e-mail]>
+Build-Depends: debhelper (>= 7),
+               pkg-config,
+               libglib2.0-dev (>= 2.29),
+               libdee-dev (>= 0.5.18),
+               libunity-dev (>= 4.0.2),
+               python-all,
+               python-distutils-extra
+Standards-Version: 3.9.1
+X-Python-Version: >= 2.5
+Homepage: https://launchpad.net/askubuntu-lens
+
+Package: unity-askubuntu-lens
+Architecture: all
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         ${python:Depends},
+         gir1.2-unity-4.0,
+         gir1.2-dee-0.5
+Description: Unity Ask Ubuntu Lens
+ A Unity Lens to Ask Questions and Get Answers at AskUbuntu.com, from your Desktop.

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2011-10-18 22:01:23 +0000
@@ -0,0 +1,33 @@
+Format: http://dep.debian.net/deps/dep5
+Name: unity-askubuntu-lens
+Source: https://launchpad.net/askubuntu-lens
+Maintainer: Stefano Palazzo <[e-mail]>
+
+Files: *
+Copyright: 2011 Stefano Palazzo <[e-mail]>
+          
+License: GPL-2.0+
+
+Files: debian/*
+Copyright: 2011 Stefano Palazzo <[e-mail]>
+License: GPL-2.0+
+
+License: GPL-2.0+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2011-10-18 22:01:23 +0000
@@ -0,0 +1,4 @@
+#!/usr/bin/make -f
+
+%:
+	dh --buildsystem=python_distutils --with python2 $*

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2011-10-18 22:01:23 +0000
@@ -0,0 +1,1 @@
+3.0 (native)

=== added file 'debian/watch.ex'
--- debian/watch.ex	1970-01-01 00:00:00 +0000
+++ debian/watch.ex	2011-10-18 22:01:23 +0000
@@ -0,0 +1,2 @@
+version=3
+https://launchpad.net/unity-askubuntu-lens/+download .*/unity-askubuntu-lens-([0-9.]+)\.tar\.gz

=== modified file 'setup.py'
--- setup.py	2011-03-30 01:21:52 +0000
+++ setup.py	2011-10-18 22:01:23 +0000
@@ -2,17 +2,20 @@
 #
 from distutils.core import setup
 from DistUtilsExtra.command import *
+import os
 
 setup(name="askubuntu-lens",
-      version="0.0.1",
+      version="0.2",
       author="Stefano Palazzo",
       author_email="[e-mail]",
       url="http://launchpad.net/askubuntu-lens/",
       license="GNU General Public License (GPL)",
       data_files=[
-    ('share/unity-place-askubuntu', ['askubuntu-place.png']),
-    ('share/unity/places', ['askubuntu.place']),
-    ('share/dbus-1/services', ['unity-place-askubuntu.service']),
-    ('lib/unity-place-askubuntu', ['askubuntu_bridge.py']),
-    ('lib/unity-place-askubuntu', ['unity-askubuntu-daemon']),
+    ('share/unity/lenses/askubuntu', ['askubuntu.lens']),
+    ('share/dbus-1/services', ['unity-lens-askubuntu.service']),
+    ('lib/unity-lens-askubuntu', ['askubuntu_bridge.py']),
+    ('lib/unity-lens-askubuntu', ['unity-askubuntu-daemon']),
+    ('share/unity-lens-askubuntu', ['askubuntu-logo.svg']),
     ], cmdclass={"build":  build_extra.build_extra, })
+
+os.system('setsid unity')

=== modified file 'unity-askubuntu-daemon'
--- unity-askubuntu-daemon	2011-04-21 16:57:41 +0000
+++ unity-askubuntu-daemon	2011-10-18 22:01:23 +0000
@@ -37,28 +37,18 @@
 
 
 #
-# The primary bus name we grab *must* match what we specify in our .place file
+# The primary bus name we grab *must* match what we specify in our .lens file
 #
-BUS_NAME = "net.launchpad.AskUbuntuPlace"
+BUS_NAME = "net.launchpad.AskUbuntuLens"
 
 # Group ids. Must match the offset into the group models
 # These are the groups of results, separated by a horizontal
 # rule. They have their own icons, which should be monochrome(?).
-GROUP_QUESTIONS = 0
-GROUP_TAGS = 1
-GROUP_EVERYTHING = 2  # EVERYTHING is probably a misnomer here, it's default.
-GROUP_USERS = 3
-GROUP_BADGES = 4
-
-# Section ids. Must match the offset into the section model
-# These are the sections you see by clicking the arror to the
-# right of the search field.
-SECTION_EVERYTHING = 0
-SECTION_QUESTIONS = 1
-SECTION_TAGS = 2
-SECTION_USERS = 3
-SECTION_BADGES = 4
-
+EVERYTHING = 0
+QUESTIONS = 1
+TAGS = 2  
+USERS = 3
+BADGES = 4
 
 def interesting():
     blacklist = ["nautilus",
@@ -93,222 +83,148 @@
 
 class Daemon (object):
 
-    active_section = 0
     special_searches = ["me", "chat", "meta", "au", "help", "lens"]
 
     def __init__(self):
         # Safe for the signal handlers, I don't know what any of the things
         # in this method mean. Should have to ask someone.
 
-        self._entry = Unity.PlaceEntryInfo.new(
-            "/net/launchpad/askubuntuplace/mainentry")
-
-        #
-        # Set up all the datamodels we'll share with the Unity process
-        # See https://wiki.ubuntu.com/Unity/Places
-        #
-        # Terminology:
-        #
-        #   - "sections" A set of disjoint browsable categories.
-        #                Fx. "Books", "Film", and "Music"
-        #
-        #   - "groups" A set of labels that partition the result set into
-        #              user-visible chunks. "Popular Books", "Recent Books"
-        #
-        sections_model = Dee.SharedModel.new(BUS_NAME + ".SectionsModel")
-        sections_model.set_schema("s", "s")
-        self._entry.props.sections_model = sections_model
-
-        groups_model = Dee.SharedModel.new(BUS_NAME + ".GroupsModel")
-        groups_model.set_schema("s", "s", "s")
-        self._entry.props.entry_renderer_info.props.groups_model = groups_model
-
-        global_groups_model = Dee.SharedModel.new(BUS_NAME +
-            ".GlobalGroupsModel")
-        global_groups_model.set_schema("s", "s", "s")
-        self._entry.props.global_renderer_info.props.groups_model = (
-            global_groups_model)
-
-        results_model = Dee.SharedModel.new(BUS_NAME + ".ResultsModel")
-        results_model.set_schema("s", "s", "u", "s", "s", "s")
-        self._entry.props.entry_renderer_info.props.results_model = (
-            results_model)
-
-        global_results_model = Dee.SharedModel.new(BUS_NAME +
-            ".GlobalResultsModel")
-        global_results_model.set_schema("s", "s", "u", "s", "s", "s")
-        self._entry.props.global_renderer_info.props.results_model = (
-            global_results_model)
-
-        #
-        # Populate the sections and groups once we are in sync with Unity
-        #
-        sections_model.connect("notify::synchronized",
-            self._on_sections_synchronized)
-        groups_model.connect("notify::synchronized",
-            self._on_groups_synchronized)
-        global_groups_model.connect("notify::synchronized",
-            self._on_global_groups_synchronized)
-
-        #
-        # Set up the signals we'll receive when Unity starts to talk to us
-        #
-
-        # The 'active-search' property is changed when the users searches
-        # within this particular place
-        self._entry.connect("notify::active-search", self._on_search_changed)
-
-        # The 'active-global-search' property is changed when the user searches
-        # from the Dash aka Home Screen
-        self._entry.connect("notify::active-global-search",
-            self._on_global_search_changed)
-
-        # Listen for changes to the secion (Everything, Questions, Tags...)
-        self._entry.connect("notify::active-section", self._on_section_change)
-        #
-        # PlaceEntries are housed by PlaceControllers.
-        # You may have mutiple entries per controller if you like.
-        # The controller *must* have the DBus Object path you specify
-        # in your .place file
-        #
-        self._entry.connect("notify::active", self.on_active_change)
-        self.search = ""
-        self._ctrl = Unity.PlaceController.new("/net/launchpad/askubuntuplace")
-        self._ctrl.add_entry(self._entry)
-        self._ctrl.export()
-
-    def on_active_change(self, entry, section):
-        # FIXME "active" is NOT reliable to check for lens closing/opening.
-        # It can be sent during long or slow searches.
-        if entry.get_property("active") and not self.search:
-            model = self._entry.props.entry_renderer_info.props.results_model
-            print "on_active_change"
-            search = None
-            model.clear()
-            for i in interesting():
-                self.add_tags_results(i, model, _max=1)
-                model.flush_revision_queue()
-                print i
-            self.add_default_results("", model)
+        self._lens = Unity.Lens.new ("/net/launchpad/lens/askubuntulens", "askubuntu")
+        self._scope = Unity.Scope.new ("/net/launchpad/scope/askubuntulens/main")
+    
+        self._lens.props.search_hint = "Search Ask Ubuntu"
+        self._lens.props.visible = True;
+        self._lens.props.search_in_global = False;
+        
+        # Populate categories
+        cats = []
+        cats.append (Unity.Category.new ("Everything",
+                                         Gio.ThemedIcon.new("help"),
+                                         Unity.CategoryRenderer.HORIZONTAL_TILE))
+        cats.append (Unity.Category.new ("Questions",
+                                         Gio.ThemedIcon.new("help"),
+                                         Unity.CategoryRenderer.HORIZONTAL_TILE))
+        cats.append (Unity.Category.new ("Tags",
+                                         Gio.ThemedIcon.new("help"),
+                                         Unity.CategoryRenderer.VERTICAL_TILE))
+        cats.append (Unity.Category.new ("Users",
+                                         Gio.ThemedIcon.new("stock-person"),
+                                         Unity.CategoryRenderer.VERTICAL_TILE))
+        cats.append (Unity.Category.new ("Badges",
+                                         Gio.ThemedIcon.new("help"),
+                                         Unity.CategoryRenderer.VERTICAL_TILE))
+        
+        self._lens.props.categories = cats
+        
+        filters = []
+        f = Unity.RadioOptionFilter.new ("sites",
+                                         "Other Stack Exchange Sites",
+                                         Gio.ThemedIcon.new("input-keyboard-symbolic"),
+                                         False)
+        for site in askubuntu_bridge.SITES:
+            if site[2] != "":
+                f.add_option (site[0], site[2], None)
+        filters.append (f)
+
+        self._lens.props.filters = filters
+
+        # Listen for changes and requests
+        self._scope.connect ("notify::active-search", self._on_search_changed)
+        self._scope.connect ("notify::active-global-search", self._on_global_search_changed)
+        self._scope.connect ("filters-changed", self._on_search_changed)
+        self._lens.add_local_scope (self._scope);
+        self._lens.export ();
 
     def get_search_string(self):
-        search = self._entry.props.active_search
-        return search.get_search_string() if search else None
+        search = self._scope.props.active_search
+        return search.props.search_string if search else ""
 
     def get_global_search_string(self):
-        print "get global search string"
-        search = self._entry.props.active_global_search
-        return search.get_search_string() if search else None
-
-    def _on_section_change(self, entry_info, section):
-        print "section change"
-        self.active_section = self._entry.props.active_section
-
-    def _on_sections_synchronized(self, sections_model, *args):
-        print "sections synchronized"
-        # Column0: display name
-        # Column1: GIcon in string format
-        sections_model.clear()
-        sections_model.append("Everything",
-            Gio.ThemedIcon.new("help").to_string())
-        sections_model.append("Questions",
-            Gio.ThemedIcon.new("help").to_string())
-        sections_model.append("Tags",
-            Gio.ThemedIcon.new("help").to_string())
-        sections_model.append("Users",
-            Gio.ThemedIcon.new("stock-person").to_string())
-        sections_model.append("Badges",
-            Gio.ThemedIcon.new("help").to_string())
-
-    def _on_groups_synchronized(self, groups_model, *args):
-        # Column0: group renderer
-        # Column1: display name
-        # Column2: GIcon in string format
-        groups_model.clear()
-
-        print "groups synchronized"
-        # !! The row offsets must match the GROUP_* constants !!
-        groups_model.append("UnityHorizontalTileRenderer",
-            "Questions",
-            Gio.ThemedIcon.new("gtg-panel").to_string())
-        groups_model.append("UnityDefaultRenderer",
-            "Tags",
-            Gio.ThemedIcon.new("ubuntuone-client-idle").to_string())
-        groups_model.append("UnityDefaultRenderer",
-            "Ask Ubuntu",
-            Gio.ThemedIcon.new("applications-chat-panel").to_string())
-        groups_model.append("UnityShowcaseRenderer",
-            "Users",
-            Gio.ThemedIcon.new("stock_person-panel").to_string())
-        groups_model.append("UnityDefaultRenderer",
-            "Badges",
-            Gio.ThemedIcon.new("account-logged-in").to_string())
-
-    def _on_global_groups_synchronized(self, global_groups_model, *args):
-        # Just the same as the normal groups
-        print "global groups synchronized"
-        self._on_groups_synchronized(global_groups_model)
+        search = self._scope.props.active_global_search
+        return search.props.search_string if search else ""
 
     def _on_search_changed(self, *args):
         search = self.get_search_string()
         self.search = search
-        results = self._entry.props.entry_renderer_info.props.results_model
+        results = self._scope.props.results_model
         print "Search changed to: '%s'" % search
         self._update_results_model(search, results)
 
     def _on_global_search_changed(self, entry, param_spec):
         search = self.get_global_search_string()
-        results = self._entry.props.global_renderer_info.props.results_model
+        results = self._scope.props.results_model
         print "Global search changed to: '%s'" % search
         self._update_results_model(search, results, _global=True)
 
     def add_default_results(self, search, model):
         if not search.startswith("@"):
             icon_hint = Gio.ThemedIcon.new("distributor-logo").to_string()
+
             if search.lower() not in self.special_searches:
                 model.append("http://askubuntu.com/questions/ask",
-                    Gio.ThemedIcon.new("help-faq").to_string(),
-                    GROUP_EVERYTHING,
-                    "text/html", "Ask your own question",
-                    "Ask a Question")
+                            Gio.ThemedIcon.new("help-faq").to_string(),
+                            EVERYTHING,
+                            "text/html", 
+                "Ask your own question",
+                            "Ask a Question", 
+                "")
+    
             if search and search.lower() not in self.special_searches:
                 model.append("http://askubuntu.com/search?q=" + search.strip(),
-                    Gio.ThemedIcon.new("search").to_string(), GROUP_EVERYTHING,
-                    "text/html", "Search on Ask Ubuntu",
-                    "Find '%s' on Ask Ubuntu" % search)
+                            Gio.ThemedIcon.new("search").to_string(), 
+                EVERYTHING,
+                            "text/html", 
+                "Search on Ask Ubuntu",
+                            "Find '%s' on Ask Ubuntu" % search, 
+                "")
+
             if "chat" in search.lower():
                 model.append("http://chat.stackexchange.com/rooms/201/",
-                    Gio.ThemedIcon.new("applications-chat").to_string(),
-                    GROUP_EVERYTHING,
-                    "text/html", "Join the Ask Ubuntu Chat",
-                    "Join the Ask Ubuntu General Chat Room")
+                        Gio.ThemedIcon.new("applications-chat").to_string(),
+                            EVERYTHING,
+                            "text/html", 
+                "Join the Ask Ubuntu Chat",
+                            "Join the Ask Ubuntu General Chat Room", 
+                "")
+
             if "meta" in search.lower():
                 model.append("http://meta.askubuntu.com/",
-                    Gio.ThemedIcon.new("gnome-fs-bookmark-missing").to_string(),
-                    GROUP_EVERYTHING,
-                    "text/html", "Visit Ask Ubuntu - Meta",
-                    "Visit Ask Ubuntu - Meta")
+                        Gio.ThemedIcon.new("gnome-fs-bookmark-missing").to_string(),
+                            EVERYTHING,
+                            "text/html", 
+                "Visit Ask Ubuntu - Meta",
+                            "Visit Ask Ubuntu - Meta", 
+                "")
+
             if (any(i in search.lower() for i in ["askubuntu", "ask"]) or
                 search.lower() == "au"):
                 model.append("http://askubuntu.com/",
-                    Gio.ThemedIcon.new("distributor-logo").to_string(),
-                    GROUP_EVERYTHING,
-                    "text/html", "Ask Ubuntu",
-                    "Ask Ubuntu")
+                            Gio.ThemedIcon.new("distributor-logo").to_string(),
+                            EVERYTHING,
+                            "text/html", 
+                "Ask Ubuntu",
+                            "Ask Ubuntu", 
+                "")
+
             if (any(i in search.lower() for i in ["profile", "recent"]) or
                 search.lower() == "me"):
                 model.append("http://askubuntu.com/users/recent",
-                    Gio.ThemedIcon.new("user-info").to_string(),
-                    GROUP_EVERYTHING,
-                    "text/html", "Your Responses",
-                    "Your Responses")
+                            Gio.ThemedIcon.new("user-info").to_string(),
+                            EVERYTHING,
+                            "text/html", 
+                "Your Responses",
+                        "Your Responses",
+                "")
+
             if ("askubuntu" in search.lower() and "lens" in search.lower() or
                 search.lower() == "help" or search.lower() == "wtf"):
                 model.append("http://askubuntu.com/questions/31712",
-                    Gio.ThemedIcon.new("help").to_string(),
-                    GROUP_EVERYTHING,
-                    "text/html", "Help about this Lens",
-                    "")
+                            Gio.ThemedIcon.new("help").to_string(),
+                            EVERYTHING,
+                            "text/html", 
+                            "Help about this Lens",
+                            "", 
+                            "")
 
     # These next four methods should be merged into one, but only after
     # it's clear that there are no more changes to the API, requiring me
@@ -316,15 +232,13 @@
 
     def add_questions_results(self, search, model):
         for url, icon, title, text in askubuntu_bridge.get_questions(search):
-            model.append(url, icon, GROUP_QUESTIONS,
-                "text/html", title, text)
+            model.append(url, icon, QUESTIONS, "text/html", title, text, url)
         model.flush_revision_queue()
 
     def add_tags_results(self, search, model, _max=None):
         icon_hint = Gio.ThemedIcon.new("tag-new").to_string()  # Tags Icon
         for n, (url, title) in enumerate(askubuntu_bridge.get_tags(search)):
-            model.append(url, icon_hint, GROUP_TAGS,
-                "text/html", title, title)
+            model.append(url, icon_hint, TAGS, "text/html", title, title, url)
             if _max and n + 1 == _max:
                 break
         if not _max:
@@ -333,35 +247,33 @@
     def add_badges_results(self, search, model):
         icon_hint = Gio.ThemedIcon.new("help").to_string()  # Badge Icon
         for url, title in askubuntu_bridge.get_badges(search):
-            model.append(url, icon_hint, GROUP_BADGES,
-                "text/html", title, title)
+            model.append(url, icon_hint, BADGES, "text/html", title, title, url)
 
     def add_users_results(self, search, model):
         for url, icon, title in askubuntu_bridge.get_users(search):
-            model.append(url, icon, GROUP_USERS,
-                "text/html", title, title)
+            model.append(url, icon, USERS, "text/html", title, title, url)
             model.flush_revision_queue()
 
     def _update_results_model(self, search, model, _global=False):
-        print "update results model"
         if _global and search:
-            print "\33[1;34m%s\33[m" % "This is a global search"
             if search != "au":  # for the "au" search, we *do* show a result
                 model.clear()   # in the global dash. Why not? ;-)
                 return
         model.clear()
-        if self.active_section == SECTION_EVERYTHING:
-            if _global == False or search in self.special_searches:
+
+        f = self._scope.get_filter("sites")
+        if f != None:
+            o = f.get_active_option()
+        if o != None:
+            search = o.props.id + " " +  search
+        
+        if _global == False or search in self.special_searches:
                 self.add_default_results(search, model)
         if search and not search.lower() in self.special_searches:
-            if self.active_section in (SECTION_EVERYTHING, SECTION_QUESTIONS):
-                self.add_questions_results(search, model)
-            if self.active_section in (SECTION_EVERYTHING, SECTION_TAGS):
-                self.add_tags_results(search, model)
-            if self.active_section in (SECTION_EVERYTHING, SECTION_BADGES):
-                self.add_badges_results(search, model)
-            if self.active_section in (SECTION_EVERYTHING, SECTION_USERS):
-                self.add_users_results(search, model)
+            self.add_questions_results(search, model)
+            self.add_tags_results(search, model)
+            self.add_badges_results(search, model)
+            self.add_users_results(search, model)
 
 if __name__ == "__main__":
     session_bus_connection = Gio.bus_get_sync(Gio.BusType.SESSION, None)
@@ -381,3 +293,4 @@
     daemon = Daemon()
     print "entering the main loop"
     GObject.MainLoop().run()
+b

=== added file 'unity-lens-askubuntu.service'
--- unity-lens-askubuntu.service	1970-01-01 00:00:00 +0000
+++ unity-lens-askubuntu.service	2011-10-18 22:01:23 +0000
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=net.launchpad.AskUbuntuLens
+Exec=/usr/lib/unity-lens-askubuntu/unity-askubuntu-daemon

=== removed file 'unity-place-askubuntu.service'
--- unity-place-askubuntu.service	2011-03-22 18:21:08 +0000
+++ unity-place-askubuntu.service	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=net.launchpad.AskUbuntuPlace
-Exec=/usr/lib/unity-place-askubuntu/unity-askubuntu-daemon