1
=== modified file 'pasted/pasted.cpp'
2
--- pasted/pasted.cpp	2016-09-12 17:59:56 +0000
3
+++ pasted/pasted.cpp	2017-03-20 19:23:05 +0000
4
@@ -66,6 +66,29 @@
5
66
  return persistentSurfaceId;
66
  return persistentSurfaceId;
6
67
}
67
}
7
68
68
8
69
9
70
void checkXServer()
10
71
{
11
72
  char *display = getenv("DISPLAY");
12
73
13
74
  if (display == nullptr)
14
75
  {
15
76
    qCritical() << "DISPLAY environment variable not set!";
16
77
    exit(-1);
17
78
  }
18
79
19
80
  Display *dpy = XOpenDisplay(display);
20
81
  if (dpy == nullptr)
21
82
  {
22
83
    qCritical() << "Xmir is not running on DISPLAY" << display << "!";
23
84
    exit(-1);
24
85
  }
25
86
26
87
  XCloseDisplay(dpy);
27
88
28
89
  return;
29
90
}
30
91
31
69
} //anonymous namespace
92
} //anonymous namespace
32
70
93
33
71
94
34
@@ -252,6 +275,8 @@
35
252
{
275
{
36
253
  qSetMessagePattern(QString("%{appname}: %{message}"));
276
  qSetMessagePattern(QString("%{appname}: %{message}"));
37
254
277
38
278
  checkXServer();
39
279
40
255
  Pasted pasted(argc, argv);
280
  Pasted pasted(argc, argv);
41
256
281
42
257
  QThread t;
282
  QThread t;
Reviewer	Review Type	Date Requested	Status
Libertine CI Bot	continuous-integration		Approve on 2017-03-20
Larry Price		2017-03-20	Approve on 2017-03-20
Review via email: mp+320394@code.launchpad.net
1	=== modified file 'pasted/pasted.cpp'
2	--- pasted/pasted.cpp 2016-09-12 17:59:56 +0000
3	+++ pasted/pasted.cpp 2017-03-20 19:23:05 +0000
4	@@ -66,6 +66,29 @@
5	66	return persistentSurfaceId;	66	return persistentSurfaceId;
6	67	}	67	}
7	68		68
8			69
9			70	void checkXServer()
10			71	{
11			72	char *display = getenv("DISPLAY");
12			73
13			74	if (display == nullptr)
14			75	{
15			76	qCritical() << "DISPLAY environment variable not set!";
16			77	exit(-1);
17			78	}
18			79
19			80	Display *dpy = XOpenDisplay(display);
20			81	if (dpy == nullptr)
21			82	{
22			83	qCritical() << "Xmir is not running on DISPLAY" << display << "!";
23			84	exit(-1);
24			85	}
25			86
26			87	XCloseDisplay(dpy);
27			88
28			89	return;
29			90	}
30			91
31	69	} //anonymous namespace	92	} //anonymous namespace
32	70		93
33	71		94
34	@@ -252,6 +275,8 @@
35	252	{	275	{
36	253	qSetMessagePattern(QString("%{appname}: %{message}"));	276	qSetMessagePattern(QString("%{appname}: %{message}"));
37	254		277
38			278	checkXServer();
39			279
40	255	Pasted pasted(argc, argv);	280	Pasted pasted(argc, argv);
41	256		281
42	257	QThread t;	282	QThread t;