author | Niveditha Rau <Niveditha.Rau@Oracle.COM> |
Fri, 28 Oct 2016 14:58:48 -0700 | |
changeset 7197 | 5001d53d2e77 |
permissions | -rw-r--r-- |
7197
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
1 |
Fix compiler warnings. |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
2 |
|
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
3 |
meta-cursor-renderer.c is already fixed upstream in a later release: |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
4 |
https://git.gnome.org/browse/mutter/commit?id=ff312b69585cb0ec9f53483baa47678db8d44306 |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
5 |
|
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
6 |
Other two files need to be submitted upstream still. |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
7 |
|
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
8 |
--- mutter-3.18.0/src/backends/meta-cursor-renderer.c Sun Oct 4 19:47:56 2015 |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
9 |
+++ mutter-3.18.0/src/backends/meta-cursor-renderer.c Sun Oct 4 19:48:42 2015 |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
10 |
@@ -26,6 +26,7 @@ |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
11 |
|
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
12 |
#include "meta-cursor-renderer.h" |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
13 |
|
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
14 |
+#include <math.h> |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
15 |
#include <meta/meta-backend.h> |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
16 |
#include <meta/util.h> |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
17 |
|
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
18 |
--- mutter-3.18.0/src/core/window.c Mon Sep 21 12:48:51 2015 |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
19 |
+++ mutter-3.18.0/src/core/window.c Tue Jan 5 13:34:16 2016 |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
20 |
@@ -3488,7 +3488,7 @@ |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
21 |
{ |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
22 |
MetaMonitorInfo *info = &window->screen->monitor_infos[i]; |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
23 |
|
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
24 |
- if (info->winsys_id == winsys_id) |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
25 |
+ if ((size_t)info->winsys_id == winsys_id) |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
26 |
return info; |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
27 |
} |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
28 |
|
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
29 |
@@ -3697,7 +3697,7 @@ |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
30 |
|
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
31 |
meta_window_update_monitor (window, flags & META_MOVE_RESIZE_USER_ACTION); |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
32 |
|
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
33 |
- if (old_output_winsys_id != window->monitor->winsys_id && |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
34 |
+ if (old_output_winsys_id != (size_t) window->monitor->winsys_id && |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
35 |
flags & META_MOVE_RESIZE_MOVE_ACTION && flags & META_MOVE_RESIZE_USER_ACTION) |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
36 |
window->preferred_output_winsys_id = window->monitor->winsys_id; |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
37 |
|
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
38 |
--- mutter-3.18.1/src/x11/session.c Tue Jan 5 13:40:50 2016 |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
39 |
+++ mutter-3.18.1/src/x11/session.c Tue Jan 5 13:41:09 2016 |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
40 |
@@ -336,7 +336,7 @@ |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
41 |
prop3val.value = &hint; |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
42 |
prop3val.length = 1; |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
43 |
|
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
44 |
- sprintf (pid, "%d", getpid ()); |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
45 |
+ sprintf (pid, "%ld", (long)getpid ()); |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
46 |
prop4.name = (char *)SmProcessID; |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
47 |
prop4.type = (char *)SmARRAY8; |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
48 |
prop4.num_vals = 1; |