Photos

Merge lp:~elementary-apps/pantheon-photos/gdk-cursor into lp:~pantheon-photos/pantheon-photos/trunk

  1. gdk-cursor
  2. Merge into trunk
Proposed by Danielle Foré
Status: Merged
Approved by: Felipe Escoto
Approved revision: 3068
Merged at revision: 3068
Proposed branch: lp:~elementary-apps/pantheon-photos/gdk-cursor
Merge into: lp:~pantheon-photos/pantheon-photos/trunk
Diff against target: 190 lines (+18/-18)
9 files modified
plugins/pantheon-photos-publishing-extras/RESTSupport.vala (+2/-2)
plugins/pantheon-photos-publishing-extras/YandexPublishing.vala (+3/-3)
plugins/pantheon-photos-publishing/FacebookPublishing.vala (+2/-2)
plugins/pantheon-photos-publishing/RESTSupport.vala (+2/-2)
src/AppWindow.vala (+2/-2)
src/Page.vala (+2/-2)
src/editing_tools/CropTool.vala (+2/-2)
src/editing_tools/RedEyeTool.vala (+2/-2)
src/editing_tools/StraightenTool.vala (+1/-1)
To merge this branch: bzr merge lp:~elementary-apps/pantheon-photos/gdk-cursor
Reviewer Review Type Date Requested Status
Felipe Escoto (community) Approve
Review via email: mp+311454@code.launchpad.net

Commit message

Fix deprecation warnings about Gdk.Cursor

To post a comment you must log in.
Revision history for this message
Felipe Escoto (philip.scott) wrote :

looks good to me! :)

review: Approve
lp:~elementary-apps/pantheon-photos/gdk-cursor updated
3068. By Danielle Foré

fix warnings about gdk.cursor

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/pantheon-photos-publishing-extras/RESTSupport.vala'
2--- plugins/pantheon-photos-publishing-extras/RESTSupport.vala 2016-01-14 12:35:35 +0000
3+++ plugins/pantheon-photos-publishing-extras/RESTSupport.vala 2016-11-22 01:50:26 +0000
4@@ -758,7 +758,7 @@
5 }
6
7 private void on_page_load () {
8- pane_widget.get_window ().set_cursor (new Gdk.Cursor (Gdk.CursorType.LEFT_PTR));
9+ pane_widget.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.LEFT_PTR));
10
11 string page_title = webview.get_title ();
12 if (page_title.index_of ("state=connect") > 0) {
13@@ -776,7 +776,7 @@
14 }
15
16 private void on_load_started () {
17- pane_widget.get_window ().set_cursor (new Gdk.Cursor (Gdk.CursorType.WATCH));
18+ pane_widget.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH));
19 }
20
21 public Spit.Publishing.DialogPane.GeometryOptions get_preferred_geometry () {
22
23=== modified file 'plugins/pantheon-photos-publishing-extras/YandexPublishing.vala'
24--- plugins/pantheon-photos-publishing-extras/YandexPublishing.vala 2016-01-29 03:10:35 +0000
25+++ plugins/pantheon-photos-publishing-extras/YandexPublishing.vala 2016-11-22 01:50:26 +0000
26@@ -136,7 +136,7 @@
27 }
28
29 private void on_page_load () {
30- pane_widget.get_window ().set_cursor (new Gdk.Cursor (Gdk.CursorType.LEFT_PTR));
31+ pane_widget.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.LEFT_PTR));
32 }
33
34 private bool decide_policy (WebKit.PolicyDecision decision, WebKit.PolicyDecisionType type) {
35@@ -154,7 +154,7 @@
36 string access_token = info.fetch_all ()[2];
37
38 debug ("Load completed: %s", access_token);
39- pane_widget.get_window ().set_cursor (new Gdk.Cursor (Gdk.CursorType.LEFT_PTR));
40+ pane_widget.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.LEFT_PTR));
41 if (access_token != null) {
42 login_succeeded (access_token);
43 return false;
44@@ -165,7 +165,7 @@
45 }
46
47 private void on_load_started () {
48- pane_widget.get_window ().set_cursor (new Gdk.Cursor (Gdk.CursorType.WATCH));
49+ pane_widget.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH));
50 }
51
52 public Gtk.Widget get_widget () {
53
54=== modified file 'plugins/pantheon-photos-publishing/FacebookPublishing.vala'
55--- plugins/pantheon-photos-publishing/FacebookPublishing.vala 2016-08-06 19:52:08 +0000
56+++ plugins/pantheon-photos-publishing/FacebookPublishing.vala 2016-11-22 01:50:26 +0000
57@@ -949,7 +949,7 @@
58
59 private void on_page_load (string url) {
60 var loaded_url = url;
61- pane_widget.get_window ().set_cursor (new Gdk.Cursor (Gdk.CursorType.LEFT_PTR));
62+ pane_widget.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.LEFT_PTR));
63
64 // strip parameters from the loaded url
65 if (loaded_url.contains ("?")) {
66@@ -973,7 +973,7 @@
67 }
68
69 private void on_load_started () {
70- pane_widget.get_window ().set_cursor (new Gdk.Cursor (Gdk.CursorType.WATCH));
71+ pane_widget.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH));
72 }
73
74 public static bool is_cache_dirty () {
75
76=== modified file 'plugins/pantheon-photos-publishing/RESTSupport.vala'
77--- plugins/pantheon-photos-publishing/RESTSupport.vala 2016-07-30 17:03:44 +0000
78+++ plugins/pantheon-photos-publishing/RESTSupport.vala 2016-11-22 01:50:26 +0000
79@@ -758,7 +758,7 @@
80 }
81
82 private void on_page_load () {
83- pane_widget.get_window ().set_cursor (new Gdk.Cursor (Gdk.CursorType.LEFT_PTR));
84+ pane_widget.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.LEFT_PTR));
85
86 string page_title = webview.get_title ();
87 if (page_title.index_of ("state=connect") > 0) {
88@@ -776,7 +776,7 @@
89 }
90
91 private void on_load_started () {
92- pane_widget.get_window ().set_cursor (new Gdk.Cursor (Gdk.CursorType.WATCH));
93+ pane_widget.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH));
94 }
95
96 public Spit.Publishing.DialogPane.GeometryOptions get_preferred_geometry () {
97
98=== modified file 'src/AppWindow.vala'
99--- src/AppWindow.vala 2016-11-21 04:25:34 +0000
100+++ src/AppWindow.vala 2016-11-22 01:50:26 +0000
101@@ -373,7 +373,7 @@
102 if (busy_counter++ > 0)
103 return;
104
105- get_window ().set_cursor (new Gdk.Cursor (Gdk.CursorType.WATCH));
106+ get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH));
107 spin_event_loop ();
108 }
109
110@@ -385,7 +385,7 @@
111 return;
112 }
113
114- get_window ().set_cursor (new Gdk.Cursor (Gdk.CursorType.LEFT_PTR));
115+ get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.LEFT_PTR));
116 spin_event_loop ();
117 }
118
119
120=== modified file 'src/Page.vala'
121--- src/Page.vala 2016-09-19 21:18:06 +0000
122+++ src/Page.vala 2016-11-22 01:50:26 +0000
123@@ -1207,7 +1207,7 @@
124 last_cursor = cursor_type;
125
126 if (!cursor_hidden && event_source != null)
127- event_source.get_window ().set_cursor (new Gdk.Cursor (cursor_type));
128+ event_source.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), cursor_type));
129 }
130
131 private void check_cursor_hiding () {
132@@ -1227,7 +1227,7 @@
133 cursor_hidden = true;
134
135 if (event_source != null)
136- event_source.get_window ().set_cursor (new Gdk.Cursor (Gdk.CursorType.BLANK_CURSOR));
137+ event_source.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.BLANK_CURSOR));
138
139 return false;
140 }
141
142=== modified file 'src/editing_tools/CropTool.vala'
143--- src/editing_tools/CropTool.vala 2016-09-24 19:18:52 +0000
144+++ src/editing_tools/CropTool.vala 2016-11-22 01:50:26 +0000
145@@ -665,7 +665,7 @@
146
147 // make sure the cursor isn't set to a modify indicator
148 if (canvas != null)
149- canvas.get_drawing_window ().set_cursor (new Gdk.Cursor (Gdk.CursorType.LEFT_PTR));
150+ canvas.get_drawing_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.LEFT_PTR));
151
152 crop_surface = null;
153
154@@ -856,7 +856,7 @@
155 }
156
157 if (cursor_type != current_cursor_type) {
158- Gdk.Cursor cursor = new Gdk.Cursor (cursor_type);
159+ Gdk.Cursor cursor = new Gdk.Cursor.for_display (Gdk.Display.get_default (), cursor_type);
160 canvas.get_drawing_window ().set_cursor (cursor);
161 current_cursor_type = cursor_type;
162 }
163
164=== modified file 'src/editing_tools/RedEyeTool.vala'
165--- src/editing_tools/RedEyeTool.vala 2016-09-24 19:18:52 +0000
166+++ src/editing_tools/RedEyeTool.vala 2016-11-22 01:50:26 +0000
167@@ -247,8 +247,8 @@
168
169 bind_window_handlers ();
170
171- cached_arrow_cursor = new Gdk.Cursor (Gdk.CursorType.LEFT_PTR);
172- cached_grab_cursor = new Gdk.Cursor (Gdk.CursorType.FLEUR);
173+ cached_arrow_cursor = new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.LEFT_PTR);
174+ cached_grab_cursor = new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.FLEUR);
175
176 DataCollection? owner = canvas.get_photo ().get_membership ();
177 if (owner != null)
178
179=== modified file 'src/editing_tools/StraightenTool.vala'
180--- src/editing_tools/StraightenTool.vala 2016-03-20 12:45:41 +0000
181+++ src/editing_tools/StraightenTool.vala 2016-11-22 01:50:26 +0000
182@@ -356,7 +356,7 @@
183 prepare_image ();
184
185 // set crosshair cursor
186- canvas.get_drawing_window ().set_cursor (new Gdk.Cursor (Gdk.CursorType.CROSSHAIR));
187+ canvas.get_drawing_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.CROSSHAIR));
188
189 window = new StraightenToolWindow (canvas.get_container ());
190 bind_window_handlers ();

Subscribers

People subscribed via source and target branches