Merge lp:~alan-griffiths/mir/cherry-pick-fix-1641166-for-0-25 into lp:mir/0.25

[Alan Griffiths]

Fix code to match the documentation of CoordinateTranslator - vis "It is acceptable ...[to] throw a std::runtime_error" (LP: #1641166)

[Daniel van Vugt (vanvugt)]

I'm not familiar with the bug but we should probably land a changelog entry for the fix at the same time.

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

> I'm not familiar with the bug but we should probably land a changelog entry
> for the fix at the same time.

Thanks you

[Andreas Pokorny (andreas-pokorny)]

ok...

review: Approve

[Brandon Schaefer (brandontschaefer)]

lgtm

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-11-09 05:52:05 +0000
+++ debian/changelog	2016-11-14 09:42:57 +0000
@@ -88,6 +88,8 @@
       . mir_connection_create_spec_for_tooltip does not set aux_rect
         (LP: #1632335)
       . VMware virtual connector recognized by Mir as "unknown" (LP: #1248072)
+      . Fix code to match the documentation of CoordinateTranslator - vis "It is
+        acceptable ...[to] throw a std::runtime_error" (LP: #1641166)
       . Test timeout MesaDisplayConfigurationTests.* (LP: #1613352)
       . Tests fail when built against lp:mir (LP: #1621917)
       . CI failure PointerConfinement.* (LP: #1606418)
 
=== removed file 'src/include/server/mir/frontend/unsupported_feature_exception.h'
--- src/include/server/mir/frontend/unsupported_feature_exception.h	2014-09-18 09:18:01 +0000
+++ src/include/server/mir/frontend/unsupported_feature_exception.h	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-/*
- * Copyright © 2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3,
- * as published by the Free Software Foundation.
- *
- * This program 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/>.
- *
- * Authored by: Christopher James Halse Rogers <[e-mail]>
- */
-
-
-#ifndef MIR_FRONTEND_UNSUPPORTED_FEATURE_EXCEPTION_H_
-#define MIR_FRONTEND_UNSUPPORTED_FEATURE_EXCEPTION_H_
-
-#include <stdexcept>
-
-namespace mir
-{
-namespace frontend
-{
-class unsupported_feature : public std::runtime_error
-{
-public:
-    unsupported_feature()
-        : std::runtime_error{"Unsupported feature requested"}
-    {
-    }
-};
-}
-}
-
-
-#endif /* MIR_FRONTEND_UNSUPPORTED_FEATURE_EXCEPTION_H_ */
 
=== modified file 'src/server/frontend/protobuf_message_processor.cpp'
--- src/server/frontend/protobuf_message_processor.cpp	2016-10-12 06:03:15 +0000
+++ src/server/frontend/protobuf_message_processor.cpp	2016-11-14 09:42:57 +0000
@@ -22,7 +22,6 @@
 #include "mir/frontend/message_processor_report.h"
 #include "mir/frontend/protobuf_message_sender.h"
 #include "mir/frontend/template_protobuf_message_processor.h"
-#include "mir/frontend/unsupported_feature_exception.h"
 #include <mir/protobuf/display_server_debug.h>
 #include "mir/client_visible_error.h"
 
@@ -322,7 +321,7 @@
                 auto debug_interface = dynamic_cast<mir::protobuf::DisplayServerDebug*>(display_server.get());
                 invoke(this, debug_interface, &mir::protobuf::DisplayServerDebug::translate_surface_to_screen, invocation);
             }
-            catch (mir::frontend::unsupported_feature const&)
+            catch (std::runtime_error const&)
             {
                 std::string message{"Server does not support the client debugging interface"};
                 invoke(this,
 
=== modified file 'src/server/scene/unsupported_coordinate_translator.cpp'
--- src/server/scene/unsupported_coordinate_translator.cpp	2016-01-29 08:18:22 +0000
+++ src/server/scene/unsupported_coordinate_translator.cpp	2016-11-14 09:42:57 +0000
@@ -17,10 +17,11 @@
  */
 
 #include "unsupported_coordinate_translator.h"
-#include "mir/frontend/unsupported_feature_exception.h"
 
 #include <boost/exception/all.hpp>
 
+#include <stdexcept>
+
 namespace mg = mir::geometry;
 namespace mf = mir::frontend;
 namespace ms = mir::scene;
@@ -29,5 +30,5 @@
         std::shared_ptr<mf::Surface> /*surface*/,
         int32_t /*x*/, int32_t /*y*/)
 {
-    BOOST_THROW_EXCEPTION(mf::unsupported_feature());
+    BOOST_THROW_EXCEPTION(std::runtime_error{"Unsupported feature requested"});
 }