summaryrefslogtreecommitdiffstats
path: root/client/application.cpp
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2010-05-03 12:08:00 +0200
committerAlexander Larsson <alexl@redhat.com>2010-05-03 12:38:02 +0200
commitae40f270cfbe4629c041074e2b0c28dfd3f554b8 (patch)
tree5bfcd3f0e129f3c098eb26334b71af54762356d2 /client/application.cpp
parent295c8ed8bc508d69c88ec83b82afc4573500ff12 (diff)
downloadspice-ae40f270cfbe4629c041074e2b0c28dfd3f554b8.tar.gz
spice-ae40f270cfbe4629c041074e2b0c28dfd3f554b8.tar.xz
spice-ae40f270cfbe4629c041074e2b0c28dfd3f554b8.zip
Remove all mentions of "cairo" from the code
The command line option is renamed from "cairo" to "sw", and similarly all filenames and types from Cairo to Sw (and similar).
Diffstat (limited to 'client/application.cpp')
-rw-r--r--client/application.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/client/application.cpp b/client/application.cpp
index efada344..4eb8ac88 100644
--- a/client/application.cpp
+++ b/client/application.cpp
@@ -35,7 +35,7 @@
#include "red_gdi_canvas.h"
#endif
#include "platform.h"
-#include "cairo_canvas.h"
+#include "sw_canvas.h"
#include "gl_canvas.h"
#include "quic.h"
#include "mutex.h"
@@ -378,7 +378,7 @@ Application::Application()
#ifdef WIN32
_canvas_types[0] = CANVAS_OPTION_GDI;
#else
- _canvas_types[0] = CANVAS_OPTION_CAIRO;
+ _canvas_types[0] = CANVAS_OPTION_SW;
#endif
_host_auth_opt.type_flags = RedPeer::HostAuthOptions::HOST_AUTH_OP_NAME;
@@ -1793,7 +1793,7 @@ bool Application::set_canvas_option(CmdLineParser& parser, char *val, const char
typedef std::map< std::string, CanvasOption> CanvasNamesMap;
CanvasNamesMap canvas_types;
- canvas_types["cairo"] = CANVAS_OPTION_CAIRO;
+ canvas_types["sw"] = CANVAS_OPTION_SW;
#ifdef WIN32
canvas_types["gdi"] = CANVAS_OPTION_GDI;
#endif
@@ -2130,7 +2130,7 @@ void Application::init_globals()
SSL_library_init();
SSL_load_error_strings();
- cairo_canvas_init();
+ sw_canvas_init();
#ifdef USE_OGL
gl_canvas_init();
#endif