Notify OSD

Merge lp:~muktupavels/notify-osd/fix-deprecation-warnings into lp:notify-osd

  1. fix-deprecation-warnings
  2. Merge into trunk
Proposed by Alberts Muktupāvels
Status: Merged
Approved by: Lars Karlitski
Approved revision: 492
Merged at revision: 486
Proposed branch: lp:~muktupavels/notify-osd/fix-deprecation-warnings
Merge into: lp:notify-osd
Diff against target: 448 lines (+66/-84)
16 files modified
configure.in (+2/-2)
debian/control (+2/-2)
egg/egg-hack.c (+0/-24)
egg/egg-hack.h (+0/-10)
egg/test-timeline-dup-frames.c (+0/-2)
egg/test-timeline-interpolate.c (+0/-2)
egg/test-timeline-rewind.c (+0/-2)
egg/test-timeline-smoothness.c (+0/-2)
egg/test-timeline.c (+0/-2)
src/bubble.c (+21/-12)
src/defaults.c (+5/-5)
src/dialog.c (+4/-2)
src/main.c (+0/-1)
tests/test-alpha-animation.c (+0/-2)
tests/test-grow-bubble.c (+16/-7)
tests/test-scroll-text.c (+16/-7)
To merge this branch: bzr merge lp:~muktupavels/notify-osd/fix-deprecation-warnings
Reviewer Review Type Date Requested Status
Lars Karlitski (community) Approve
Dmitry Shachnev Approve
Review via email: mp+245267@code.launchpad.net

Commit message

Fix some deprecation warnings.

Description of the change

Fix some deprecation warnings.

To post a comment you must log in.
Revision history for this message
Dmitry Shachnev (mitya57) wrote :

Can you please bump required glib/gtk+ versions in configure.in as well?

lp:~muktupavels/notify-osd/fix-deprecation-warnings updated
492. By Alberts Muktupāvels

bump required versions also in configure.in.

Revision history for this message
Alberts Muktupāvels (muktupavels) wrote :

> Can you please bump required glib/gtk+ versions in configure.in as well?

OK.

Revision history for this message
Dmitry Shachnev (mitya57) :
review: Approve
Revision history for this message
Lars Karlitski (larsu) wrote :

Looks good to me, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.in'
2--- configure.in 2012-03-23 14:35:42 +0000
3+++ configure.in 2014-12-21 14:35:42 +0000
4@@ -31,7 +31,7 @@
5 #
6 # glib, we need 2.16.0 for the unit-tests
7 #
8-PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.16.0 gthread-2.0 gio-2.0])
9+PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.36.0 gthread-2.0 gio-2.0])
10
11 #
12 # libwnck used by the dnd code
13@@ -69,7 +69,7 @@
14
15 AM_PATH_GTK_3_0
16
17-PKG_CHECK_MODULES([NOTIFY_OSD], [pixman-1 gtk+-3.0 >= 3.1.6])
18+PKG_CHECK_MODULES([NOTIFY_OSD], [pixman-1 gtk+-3.0 >= 3.8.0])
19 AC_SUBST(NOTIFY_OSD_CFLAGS)
20 AC_SUBST(NOTIFY_OSD_LIBS)
21
22
23=== modified file 'debian/control'
24--- debian/control 2013-05-01 21:17:07 +0000
25+++ debian/control 2014-12-21 14:35:42 +0000
26@@ -8,8 +8,8 @@
27 intltool,
28 libdbus-1-dev (>= 0.36),
29 libdbus-glib-1-dev (>= 0.60),
30- libglib2.0-dev (>= 2.4),
31- libgtk-3-dev (>= 3.1.6),
32+ libglib2.0-dev (>= 2.36),
33+ libgtk-3-dev (>= 3.8.0),
34 libnotify-dev (>= 0.6.1),
35 libwnck-3-dev,
36 XS-Testsuite: autopkgtest
37
38=== modified file 'egg/egg-hack.c'
39--- egg/egg-hack.c 2009-02-06 11:12:41 +0000
40+++ egg/egg-hack.c 2014-12-21 14:35:42 +0000
41@@ -61,7 +61,6 @@
42
43 static guint egg_main_loop_level = 0;
44 static GSList *main_loops = NULL;
45-static gboolean egg_is_initialized = FALSE;
46
47
48 /**
49@@ -79,13 +78,6 @@
50 EGG_CONTEXT ();
51 #endif
52
53- if (!egg_is_initialized)
54- {
55- g_warning ("Called egg_main() but Egg wasn't initialised. "
56- "You must call egg_init() first.");
57- return;
58- }
59-
60 EGG_MARK ();
61
62 egg_main_loop_level++;
63@@ -116,22 +108,6 @@
64 EGG_MARK ();
65 }
66
67-EggInitError
68-egg_init (int *argc,
69- char ***argv)
70-{
71- if (!egg_is_initialized)
72- {
73- /* initialise GLib type system */
74- g_type_init ();
75-
76- egg_is_initialized = TRUE;
77- }
78-
79- return EGG_INIT_SUCCESS;
80-}
81-
82-
83 /* -------------------------------------------------------------------------- */
84
85 /* auto-generated code taken from egg-enum-types.c */
86
87=== modified file 'egg/egg-hack.h'
88--- egg/egg-hack.h 2009-02-06 11:12:41 +0000
89+++ egg/egg-hack.h 2014-12-21 14:35:42 +0000
90@@ -52,16 +52,6 @@
91 void
92 egg_threads_leave (void);
93
94-typedef enum {
95- EGG_INIT_SUCCESS = 1,
96- EGG_INIT_ERROR_UNKNOWN = 0,
97- EGG_INIT_ERROR_THREADS = -1,
98- EGG_INIT_ERROR_BACKEND = -2,
99- EGG_INIT_ERROR_INTERNAL = -3
100-} EggInitError;
101-
102-EggInitError egg_init (int *argc,
103- char ***argv);
104 void egg_main (void);
105
106
107
108=== modified file 'egg/test-timeline-dup-frames.c'
109--- egg/test-timeline-dup-frames.c 2009-02-06 11:12:41 +0000
110+++ egg/test-timeline-dup-frames.c 2014-12-21 14:35:42 +0000
111@@ -69,8 +69,6 @@
112 {
113 TestState state;
114
115- egg_init(&argc, &argv);
116-
117 state.timeline =
118 egg_timeline_new (TEST_TIMELINE_FRAME_COUNT,
119 TEST_TIMELINE_FPS);
120
121=== modified file 'egg/test-timeline-interpolate.c'
122--- egg/test-timeline-interpolate.c 2009-02-06 11:12:41 +0000
123+++ egg/test-timeline-interpolate.c 2014-12-21 14:35:42 +0000
124@@ -125,8 +125,6 @@
125 {
126 TestState state;
127
128- egg_init (&argc, &argv);
129-
130 state.timeline =
131 egg_timeline_new (TEST_TIMELINE_FRAME_COUNT,
132 TEST_TIMELINE_FPS);
133
134=== modified file 'egg/test-timeline-rewind.c'
135--- egg/test-timeline-rewind.c 2009-02-06 11:12:41 +0000
136+++ egg/test-timeline-rewind.c 2014-12-21 14:35:42 +0000
137@@ -72,8 +72,6 @@
138 {
139 TestState state;
140
141- egg_init (&argc, &argv);
142-
143 state.timeline =
144 egg_timeline_new (TEST_TIMELINE_FRAME_COUNT,
145 TEST_TIMELINE_FPS);
146
147=== modified file 'egg/test-timeline-smoothness.c'
148--- egg/test-timeline-smoothness.c 2009-02-06 11:12:41 +0000
149+++ egg/test-timeline-smoothness.c 2014-12-21 14:35:42 +0000
150@@ -84,8 +84,6 @@
151 {
152 TestState state;
153
154- egg_init (&argc, &argv);
155-
156 state.timeline =
157 egg_timeline_new (TEST_TIMELINE_FRAME_COUNT,
158 TEST_TIMELINE_FPS);
159
160=== modified file 'egg/test-timeline.c'
161--- egg/test-timeline.c 2009-02-06 11:12:41 +0000
162+++ egg/test-timeline.c 2014-12-21 14:35:42 +0000
163@@ -72,8 +72,6 @@
164 gchar **markers;
165 gsize n_markers;
166
167- egg_init (&argc, &argv);
168-
169 timeline_1 = egg_timeline_new (10, 120);
170 egg_timeline_add_marker_at_frame (timeline_1, "foo", 5);
171 egg_timeline_add_marker_at_frame (timeline_1, "bar", 5);
172
173=== modified file 'src/bubble.c'
174--- src/bubble.c 2013-12-04 16:43:44 +0000
175+++ src/bubble.c 2014-12-21 14:35:42 +0000
176@@ -1802,7 +1802,7 @@
177 {
178 if (priv->distance < 1.0f && !priv->prevent_fade)
179 {
180- gtk_window_set_opacity (window,
181+ gtk_widget_set_opacity (priv->widget,
182 WINDOW_MIN_OPACITY +
183 priv->distance *
184 (WINDOW_MAX_OPACITY -
185@@ -1810,7 +1810,7 @@
186 bubble_refresh (bubble);
187 }
188 else
189- gtk_window_set_opacity (window, WINDOW_MAX_OPACITY);
190+ gtk_widget_set_opacity (priv->widget, WINDOW_MAX_OPACITY);
191 }
192
193 return TRUE;
194@@ -1905,10 +1905,19 @@
195
196 if (gtk_widget_get_realized (window))
197 {
198- gint distance_x = 0;
199- gint distance_y = 0;
200-
201- gtk_widget_get_pointer (window, &pointer_rel_x, &pointer_rel_y);
202+ GdkDeviceManager *device_manager;
203+ GdkDevice *device;
204+ gint distance_x;
205+ gint distance_y;
206+
207+ device_manager = gdk_display_get_device_manager (gtk_widget_get_display (window));
208+ device = gdk_device_manager_get_client_pointer (device_manager);
209+ gdk_window_get_device_position (gtk_widget_get_window (window),
210+ device,
211+ &pointer_rel_x,
212+ &pointer_rel_y,
213+ NULL);
214+
215 gtk_window_get_position (GTK_WINDOW (window), &win_x, &win_y);
216 pointer_abs_x = win_x + pointer_rel_x;
217 pointer_abs_y = win_y + pointer_rel_y;
218@@ -2259,7 +2268,7 @@
219 gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
220 gtk_window_set_focus_on_map (GTK_WINDOW (window), FALSE);
221 gtk_window_set_accept_focus (GTK_WINDOW (window), FALSE);
222- gtk_window_set_opacity (GTK_WINDOW (window), 0.0f);
223+ gtk_widget_set_opacity (window, 0.0f);
224
225 // TODO: fold some of that back into bubble_init
226 this->priv = GET_PRIVATE (this);
227@@ -2891,10 +2900,10 @@
228 * WINDOW_MAX_OPACITY;
229
230 if (bubble_is_mouse_over (bubble))
231- gtk_window_set_opacity (bubble_get_window (bubble),
232+ gtk_widget_set_opacity (GET_PRIVATE (bubble)->widget,
233 WINDOW_MIN_OPACITY);
234 else
235- gtk_window_set_opacity (bubble_get_window (bubble), opacity);
236+ gtk_widget_set_opacity (GET_PRIVATE (bubble)->widget, opacity);
237 }
238
239 static void
240@@ -2936,10 +2945,10 @@
241 }
242
243 if (bubble_is_mouse_over (bubble))
244- gtk_window_set_opacity (bubble_get_window (bubble),
245+ gtk_widget_set_opacity (GET_PRIVATE (bubble)->widget,
246 WINDOW_MIN_OPACITY);
247 else
248- gtk_window_set_opacity (bubble_get_window (bubble),
249+ gtk_widget_set_opacity (GET_PRIVATE (bubble)->widget,
250 WINDOW_MAX_OPACITY);
251
252 bubble_start_timer (bubble, TRUE);
253@@ -2990,7 +2999,7 @@
254
255 egg_timeline_start (timeline);
256
257- gtk_window_set_opacity (bubble_get_window (self), 0.0f);
258+ gtk_widget_set_opacity (GET_PRIVATE (self)->widget, 0.0f);
259
260 bubble_show (self);
261 }
262
263=== modified file 'src/defaults.c'
264--- src/defaults.c 2014-02-13 12:45:13 +0000
265+++ src/defaults.c 2014-12-21 14:35:42 +0000
266@@ -1865,6 +1865,8 @@
267 {
268 GdkRectangle rect;
269 GdkWindow* active_window = NULL;
270+ GdkDeviceManager* device_manager;
271+ GdkDevice* device;
272 gint mx;
273 gint my;
274 gint monitor = 0;
275@@ -1875,11 +1877,9 @@
276
277 g_return_if_fail (self != NULL && IS_DEFAULTS (self));
278
279- gdk_display_get_pointer (gdk_display_get_default (),
280- screen,
281- &mx,
282- &my,
283- NULL);
284+ device_manager = gdk_display_get_device_manager (gdk_display_get_default ());
285+ device = gdk_device_manager_get_client_pointer (device_manager);
286+ gdk_device_get_position (device, screen, &mx, &my);
287
288 is_composited = gdk_screen_is_composited (*screen);
289
290
291=== modified file 'src/dialog.c'
292--- src/dialog.c 2010-10-05 17:54:42 +0000
293+++ src/dialog.c 2014-12-21 14:35:42 +0000
294@@ -176,7 +176,8 @@
295
296 dialog = gtk_dialog_new ();
297
298- hbox = g_object_new (GTK_TYPE_HBOX,
299+ hbox = g_object_new (GTK_TYPE_BOX,
300+ "orientation", GTK_ORIENTATION_HORIZONTAL,
301 "spacing", gap,
302 "border-width", 12,
303 NULL);
304@@ -190,7 +191,8 @@
305 gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
306 gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
307
308- vbox = g_object_new (GTK_TYPE_VBOX,
309+ vbox = g_object_new (GTK_TYPE_BOX,
310+ "orientation", GTK_ORIENTATION_VERTICAL,
311 NULL);
312
313 title = gtk_label_new (NULL);
314
315=== modified file 'src/main.c'
316--- src/main.c 2013-10-29 18:26:05 +0000
317+++ src/main.c 2014-12-21 14:35:42 +0000
318@@ -48,7 +48,6 @@
319 Observer* observer = NULL;
320 DBusGConnection* connection = NULL;
321
322- g_thread_init (NULL);
323 dbus_g_thread_init ();
324 log_init ();
325
326
327=== modified file 'tests/test-alpha-animation.c'
328--- tests/test-alpha-animation.c 2009-02-13 14:32:02 +0000
329+++ tests/test-alpha-animation.c 2014-12-21 14:35:42 +0000
330@@ -56,8 +56,6 @@
331 EggTimeline *timeline;
332 EggAlpha *alpha;
333
334- egg_init (&argc, &argv);
335-
336 timeline = egg_timeline_new_for_duration (700);
337 alpha = egg_alpha_new_full (timeline,
338 EGG_ALPHA_SINE_DEC,
339
340=== modified file 'tests/test-grow-bubble.c'
341--- tests/test-grow-bubble.c 2011-07-08 08:34:52 +0000
342+++ tests/test-grow-bubble.c 2014-12-21 14:35:42 +0000
343@@ -328,7 +328,7 @@
344 a.height,
345 g_distance,
346 1.0f - g_distance);
347- gtk_window_set_opacity (GTK_WINDOW (window), 0.3f + g_distance * 0.7f);
348+ gtk_widget_set_opacity (window, 0.3f + g_distance * 0.7f);
349 }
350 else
351 {
352@@ -340,7 +340,7 @@
353 a.height,
354 g_distance,
355 0.0f);
356- gtk_window_set_opacity (GTK_WINDOW (window), 1.0f);
357+ gtk_widget_set_opacity (window, 1.0f);
358 }
359
360 return TRUE;
361@@ -482,10 +482,19 @@
362
363 if (gtk_widget_get_realized (window))
364 {
365- gint distance_x = 0;
366- gint distance_y = 0;
367-
368- gtk_widget_get_pointer (window, &pointer_rel_x, &pointer_rel_y);
369+ GdkDeviceManager *device_manager;
370+ GdkDevice *device;
371+ gint distance_x;
372+ gint distance_y;
373+
374+ device_manager = gdk_display_get_device_manager (gtk_widget_get_display (window));
375+ device = gdk_device_manager_get_client_pointer (device_manager);
376+ gdk_window_get_device_position (gtk_widget_get_window (window),
377+ device,
378+ &pointer_rel_x,
379+ &pointer_rel_y,
380+ NULL);
381+
382 gtk_window_get_position (GTK_WINDOW (window), &win_x, &win_y);
383 pointer_abs_x = win_x + pointer_rel_x;
384 pointer_abs_y = win_y + pointer_rel_y;
385@@ -714,7 +723,7 @@
386 gtk_window_set_keep_above (GTK_WINDOW (window), TRUE);
387 gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
388 gtk_window_set_accept_focus (GTK_WINDOW (window), FALSE);
389- gtk_window_set_opacity (GTK_WINDOW (window), 1.0f);
390+ gtk_widget_set_opacity (window, 1.0f);
391 gtk_widget_set_size_request (window,
392 (gint) (BUBBLE_WIDTH + 2.0f *
393 BUBBLE_SHADOW_SIZE),
394
395=== modified file 'tests/test-scroll-text.c'
396--- tests/test-scroll-text.c 2011-07-08 08:34:52 +0000
397+++ tests/test-scroll-text.c 2014-12-21 14:35:42 +0000
398@@ -442,7 +442,7 @@
399 cairo_pattern_destroy (mask);
400 cairo_pattern_destroy (pattern);
401
402- gtk_window_set_opacity (GTK_WINDOW (window),
403+ gtk_widget_set_opacity (window,
404 0.3f + g_distance * 0.7f);
405 }
406 else
407@@ -461,7 +461,7 @@
408 cairo_mask (cr, mask);
409 cairo_pattern_destroy (pattern);
410
411- gtk_window_set_opacity (GTK_WINDOW (window), 1.0f);
412+ gtk_widget_set_opacity (window, 1.0f);
413 }
414
415 return TRUE;
416@@ -542,10 +542,19 @@
417
418 if (gtk_widget_get_realized (window))
419 {
420- gint distance_x = 0;
421- gint distance_y = 0;
422-
423- gtk_widget_get_pointer (window, &pointer_rel_x, &pointer_rel_y);
424+ GdkDeviceManager *device_manager;
425+ GdkDevice *device;
426+ gint distance_x;
427+ gint distance_y;
428+
429+ device_manager = gdk_display_get_device_manager (gtk_widget_get_display (window));
430+ device = gdk_device_manager_get_client_pointer (device_manager);
431+ gdk_window_get_device_position (gtk_widget_get_window (window),
432+ device,
433+ &pointer_rel_x,
434+ &pointer_rel_y,
435+ NULL);
436+
437 gtk_window_get_position (GTK_WINDOW (window), &win_x, &win_y);
438 pointer_abs_x = win_x + pointer_rel_x;
439 pointer_abs_y = win_y + pointer_rel_y;
440@@ -911,7 +920,7 @@
441 gtk_window_set_keep_above (GTK_WINDOW (window), TRUE);
442 gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
443 gtk_window_set_accept_focus (GTK_WINDOW (window), FALSE);
444- gtk_window_set_opacity (GTK_WINDOW (window), 1.0f);
445+ gtk_widget_set_opacity (window, 1.0f);
446 gtk_widget_set_size_request (window,
447 (gint) (BUBBLE_WIDTH + 2.0f *
448 BUBBLE_SHADOW_SIZE),

Subscribers

People subscribed via source and target branches