diff -Nru unity-askubuntu-lens-0.2/debian/bzr-builder.manifest unity-askubuntu-lens-0.2/debian/bzr-builder.manifest --- unity-askubuntu-lens-0.2/debian/bzr-builder.manifest 2011-11-18 20:54:13.000000000 +0000 +++ unity-askubuntu-lens-0.2/debian/bzr-builder.manifest 2011-11-21 23:33:07.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.3 deb-version {debupstream}-0~49 -lp:~markjtully/askubuntu-lens/layout revid:markjtully@gmail.com-20111118174911-fac02043ukjab71v +# bzr-builder format 0.3 deb-version {debupstream}-0~50 +lp:~markjtully/askubuntu-lens/layout revid:markjtully@gmail.com-20111121122133-q4k6plawqtbp67i5 diff -Nru unity-askubuntu-lens-0.2/debian/changelog unity-askubuntu-lens-0.2/debian/changelog --- unity-askubuntu-lens-0.2/debian/changelog 2011-11-18 20:54:13.000000000 +0000 +++ unity-askubuntu-lens-0.2/debian/changelog 2011-11-21 23:33:07.000000000 +0000 @@ -1,8 +1,8 @@ -unity-askubuntu-lens (0.2-0~49~oneiric1) oneiric; urgency=low +unity-askubuntu-lens (0.2-0~50~oneiric1) oneiric; urgency=low * Auto build. - -- Teester Fri, 18 Nov 2011 20:54:13 +0000 + -- Teester Mon, 21 Nov 2011 23:33:07 +0000 unity-askubuntu-lens (0.2) oneiric; urgency=low diff -Nru unity-askubuntu-lens-0.2/unity-askubuntu-daemon unity-askubuntu-lens-0.2/unity-askubuntu-daemon --- unity-askubuntu-lens-0.2/unity-askubuntu-daemon 2011-11-18 20:54:13.000000000 +0000 +++ unity-askubuntu-lens-0.2/unity-askubuntu-daemon 2011-11-21 23:33:07.000000000 +0000 @@ -104,13 +104,13 @@ cats.append (Unity.Category.new ("Actions", Gio.ThemedIcon.new("help"), Unity.CategoryRenderer.HORIZONTAL_TILE)) - cats.append (Unity.Category.new ("Questions With Solutions", + cats.append (Unity.Category.new ("Question With Accepted Answers", Gio.ThemedIcon.new("gtk-ok"), Unity.CategoryRenderer.HORIZONTAL_TILE)) - cats.append (Unity.Category.new ("Questions With Responses", + cats.append (Unity.Category.new ("Answered Questions", Gio.ThemedIcon.new("help"), Unity.CategoryRenderer.HORIZONTAL_TILE)) - cats.append (Unity.Category.new ("Questions Without Responses", + cats.append (Unity.Category.new ("Unanswered Questions", Gio.ThemedIcon.new("help"), Unity.CategoryRenderer.HORIZONTAL_TILE)) cats.append (Unity.Category.new ("Tags", @@ -174,16 +174,16 @@ Gio.ThemedIcon.new("help-faq").to_string(), EVERYTHING, "text/html", - "Ask your own question", + "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(), - EVERYTHING, + EVERYTHING, "text/html", - "Search on Ask Ubuntu", + "Search on Ask Ubuntu", "Find '%s' on Ask Ubuntu" % search, "") @@ -192,7 +192,7 @@ Gio.ThemedIcon.new("applications-chat").to_string(), EVERYTHING, "text/html", - "Join the Ask Ubuntu Chat", + "Join the Ask Ubuntu Chat", "Join the Ask Ubuntu General Chat Room", "") @@ -201,7 +201,7 @@ Gio.ThemedIcon.new("gnome-fs-bookmark-missing").to_string(), EVERYTHING, "text/html", - "Visit Ask Ubuntu - Meta", + "Visit Ask Ubuntu - Meta", "Visit Ask Ubuntu - Meta", "") @@ -211,7 +211,7 @@ Gio.ThemedIcon.new("distributor-logo").to_string(), EVERYTHING, "text/html", - "Ask Ubuntu", + "Ask Ubuntu", "Ask Ubuntu", "") @@ -221,8 +221,8 @@ Gio.ThemedIcon.new("user-info").to_string(), EVERYTHING, "text/html", - "Your Responses", - "Your Responses", + "Your Responses", + "Your Responses", "") if ("askubuntu" in search.lower() and "lens" in search.lower() or @@ -242,7 +242,6 @@ def add_questions_results(self, search, model): for url, icon, title, text, category in askubuntu_bridge.get_questions(search): # No need to be including questions marked as [closed] in the results - print title if title.lower().find("[closed]") == -1: model.append(url, icon, category, "text/html", title, text, url) model.flush_revision_queue() @@ -280,7 +279,8 @@ search = o.props.id + " " + search if _global == False or search in self.special_searches: - self.add_default_results(search, model) + self.add_default_results(search, model) + if search and not search.lower() in self.special_searches: self.add_questions_results(search, model) self.add_tags_results(search, model) @@ -305,4 +305,3 @@ daemon = Daemon() print "entering the main loop" GObject.MainLoop().run() -b