r13225 - in software/ui: debian/patches src

[Petter Reinholdtsen]

Author: pere
Date: 2012-02-12 05:13:26 +0000 (Sun, 12 Feb 2012)
New Revision: 13225

Removed:
   software/ui/debian/patches/goscience.patch
Modified:
   software/ui/debian/patches/series
   software/ui/src/GamesOptions.h
   software/ui/src/goplay.cpp
Log:
Apply goscience.patch.

Deleted: software/ui/debian/patches/goscience.patch
===================================================================
--- software/ui/debian/patches/goscience.patch	2012-02-12 05:10:01 UTC (rev 13224)
+++ software/ui/debian/patches/goscience.patch	2012-02-12 05:13:26 UTC (rev 13225)
@@ -1,45 +0,0 @@
-Author: Dmitry Smirnov <onlyjob at member.fsf.org>
-From: Frederic Daniel Luc Lehobey <Frederic at Lehobey.net>
-Bug-Debian: http://bugs.debian.org/474603
-Last-Update: 2012-02-08
-Forwarded: no
-Description: add goscience browser
-
-
---- a/goplay.1
-+++ b/goplay.1
-@@ -32,7 +32,7 @@
- enable debugging output (including verbose output).
- .TP
- .B \-\-go=\fIwhere\fP
--change the interface flavour. Available flavours are: play, learn, admin, net, office, safe, web.
-+change the interface flavour. Available flavours are: play, learn, admin, net, office, safe, web, science.
- .TP
- .B \-\-primary=\fIfacet\fP
- use the given facet instead of 'games'.
---- a/src/GamesOptions.h
-+++ b/src/GamesOptions.h
-@@ -51,7 +51,7 @@
- 						"enable debugging output (including verbose output)");
- 		gowhere = add<StringOption>("go", 0, "go", "where",
- 						"change the interface flavour. "
--						"Available flavours are: play, learn, admin, net, office, safe, web");
-+						"Available flavours are: play, learn, admin, net, office, safe, web, science");
- 		mainFacet = add<StringOption>("primary", 0, "primary", "facet",
- 						"use the given facet instead of 'games'");
- 		secondaryFacet = add<StringOption>("secondary", 0, "secondary", "facet",
---- a/src/goplay.cpp
-+++ b/src/goplay.cpp
-@@ -397,6 +397,12 @@
- 			engine.globalFilter = Xapian::Query(Xapian::Query::OP_OR,
- 										Xapian::Query("XTrole::documentation"),
- 										Xapian::Query("XTrole::program"));
-+		} else if (wibble::str::endsWith(argv[0], "science") || opts.gowhere->stringValue() == "science") {
-+			engine.mainFacet = "field";
-+			engine.secondaryFacet = "interface";
-+			engine.globalFilter = Xapian::Query(Xapian::Query::OP_OR,
-+										Xapian::Query("XTrole::documentation"),
-+										Xapian::Query("XTrole::program"));
- 		} else {
- 			engine.mainFacet = "game";
- 			engine.secondaryFacet = "interface";

Modified: software/ui/debian/patches/series
===================================================================
--- software/ui/debian/patches/series	2012-02-12 05:10:01 UTC (rev 13224)
+++ software/ui/debian/patches/series	2012-02-12 05:13:26 UTC (rev 13225)
@@ -1,4 +1,3 @@
-goscience.patch
 gui-resize.patch
 strtol-warnings.patch
 clicktorun.patch

Modified: software/ui/src/GamesOptions.h
===================================================================
--- software/ui/src/GamesOptions.h	2012-02-12 05:10:01 UTC (rev 13224)
+++ software/ui/src/GamesOptions.h	2012-02-12 05:13:26 UTC (rev 13225)
@@ -51,7 +51,7 @@
 						"enable debugging output (including verbose output)");
 		gowhere = add<StringOption>("go", 0, "go", "where",
 						"change the interface flavour. "
-						"Available flavours are: play, learn, admin, net, office, safe, web");
+						"Available flavours are: play, learn, admin, net, office, safe, web, science");
 		mainFacet = add<StringOption>("primary", 0, "primary", "facet",
 						"use the given facet instead of 'games'");
 		secondaryFacet = add<StringOption>("secondary", 0, "secondary", "facet",

Modified: software/ui/src/goplay.cpp
===================================================================
--- software/ui/src/goplay.cpp	2012-02-12 05:10:01 UTC (rev 13224)
+++ software/ui/src/goplay.cpp	2012-02-12 05:13:26 UTC (rev 13225)
@@ -397,6 +397,12 @@
 			engine.globalFilter = Xapian::Query(Xapian::Query::OP_OR,
 										Xapian::Query("XTrole::documentation"),
 										Xapian::Query("XTrole::program"));
+		} else if (wibble::str::endsWith(argv[0], "science") || opts.gowhere->stringValue() == "science") {
+			engine.mainFacet = "field";
+			engine.secondaryFacet = "interface";
+			engine.globalFilter = Xapian::Query(Xapian::Query::OP_OR,
+										Xapian::Query("XTrole::documentation"),
+										Xapian::Query("XTrole::program"));
 		} else {
 			engine.mainFacet = "game";
 			engine.secondaryFacet = "interface";