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

[Alberts Muktupāvels]

Fix some deprecation warnings.

Fix some deprecation warnings.

[Dmitry Shachnev (mitya57)]

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

[lp:~muktupavels/notify-osd/fix-deprecation-warnings]

492. By Alberts Muktupāvels on 2014-12-21

bump required versions also in configure.in.

[Alberts Muktupāvels (muktupavels)]

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

OK.

[Dmitry Shachnev (mitya57)]

review: Approve

[Lars Karlitski (larsu)]

Looks good to me, thanks!

review: Approve

=== modified file 'configure.in'
--- configure.in	2012-03-23 14:35:42 +0000
+++ configure.in	2014-12-21 14:35:42 +0000
@@ -31,7 +31,7 @@
 #
 # glib, we need 2.16.0 for the unit-tests
 #
-PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.16.0 gthread-2.0 gio-2.0])
+PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.36.0 gthread-2.0 gio-2.0])
 
 #
 # libwnck used by the dnd code
@@ -69,7 +69,7 @@
 
 AM_PATH_GTK_3_0
 
-PKG_CHECK_MODULES([NOTIFY_OSD], [pixman-1 gtk+-3.0 >= 3.1.6])
+PKG_CHECK_MODULES([NOTIFY_OSD], [pixman-1 gtk+-3.0 >= 3.8.0])
 AC_SUBST(NOTIFY_OSD_CFLAGS)
 AC_SUBST(NOTIFY_OSD_LIBS)
 
 
=== modified file 'debian/control'
--- debian/control	2013-05-01 21:17:07 +0000
+++ debian/control	2014-12-21 14:35:42 +0000
@@ -8,8 +8,8 @@
                intltool,
                libdbus-1-dev (>= 0.36),
                libdbus-glib-1-dev (>= 0.60),
-               libglib2.0-dev (>= 2.4),
-               libgtk-3-dev (>= 3.1.6),
+               libglib2.0-dev (>= 2.36),
+               libgtk-3-dev (>= 3.8.0),
                libnotify-dev (>= 0.6.1),
                libwnck-3-dev,
 XS-Testsuite: autopkgtest
 
=== modified file 'egg/egg-hack.c'
--- egg/egg-hack.c	2009-02-06 11:12:41 +0000
+++ egg/egg-hack.c	2014-12-21 14:35:42 +0000
@@ -61,7 +61,6 @@
 
 static guint egg_main_loop_level    = 0;
 static GSList *main_loops               = NULL;
-static gboolean egg_is_initialized  = FALSE;
 
 
 /**
@@ -79,13 +78,6 @@
   EGG_CONTEXT ();
 #endif
 
-  if (!egg_is_initialized)
-    {
-      g_warning ("Called egg_main() but Egg wasn't initialised.  "
-		 "You must call egg_init() first.");
-      return;
-    }
-
   EGG_MARK ();
 
   egg_main_loop_level++;
@@ -116,22 +108,6 @@
   EGG_MARK ();
 }
 
-EggInitError
-egg_init (int    *argc,
-              char ***argv)
-{
-	if (!egg_is_initialized)
-	{
-		/* initialise GLib type system */
-		g_type_init ();
-
-		egg_is_initialized = TRUE;
-	}
-
-	return EGG_INIT_SUCCESS;
-}
-
-
 /* -------------------------------------------------------------------------- */
 
 /* auto-generated code taken from egg-enum-types.c */
 
=== modified file 'egg/egg-hack.h'
--- egg/egg-hack.h	2009-02-06 11:12:41 +0000
+++ egg/egg-hack.h	2014-12-21 14:35:42 +0000
@@ -52,16 +52,6 @@
 void
 egg_threads_leave (void);
 
-typedef enum {
-  EGG_INIT_SUCCESS        =  1,
-  EGG_INIT_ERROR_UNKNOWN  =  0,
-  EGG_INIT_ERROR_THREADS  = -1,
-  EGG_INIT_ERROR_BACKEND  = -2,
-  EGG_INIT_ERROR_INTERNAL = -3
-} EggInitError;
-
-EggInitError egg_init             (int          *argc,
-                                           char       ***argv);
 void             egg_main                       (void);
 
 
 
=== modified file 'egg/test-timeline-dup-frames.c'
--- egg/test-timeline-dup-frames.c	2009-02-06 11:12:41 +0000
+++ egg/test-timeline-dup-frames.c	2014-12-21 14:35:42 +0000
@@ -69,8 +69,6 @@
 {
   TestState state;
 
-  egg_init(&argc, &argv);
-  
   state.timeline = 
     egg_timeline_new (TEST_TIMELINE_FRAME_COUNT,
                           TEST_TIMELINE_FPS);
 
=== modified file 'egg/test-timeline-interpolate.c'
--- egg/test-timeline-interpolate.c	2009-02-06 11:12:41 +0000
+++ egg/test-timeline-interpolate.c	2014-12-21 14:35:42 +0000
@@ -125,8 +125,6 @@
 {
   TestState state;
 
-  egg_init (&argc, &argv);
-
   state.timeline = 
     egg_timeline_new (TEST_TIMELINE_FRAME_COUNT,
                           TEST_TIMELINE_FPS);
 
=== modified file 'egg/test-timeline-rewind.c'
--- egg/test-timeline-rewind.c	2009-02-06 11:12:41 +0000
+++ egg/test-timeline-rewind.c	2014-12-21 14:35:42 +0000
@@ -72,8 +72,6 @@
 {
   TestState state;
 
-  egg_init (&argc, &argv);
-  
   state.timeline = 
     egg_timeline_new (TEST_TIMELINE_FRAME_COUNT,
                           TEST_TIMELINE_FPS);
 
=== modified file 'egg/test-timeline-smoothness.c'
--- egg/test-timeline-smoothness.c	2009-02-06 11:12:41 +0000
+++ egg/test-timeline-smoothness.c	2014-12-21 14:35:42 +0000
@@ -84,8 +84,6 @@
 {
   TestState state;
 
-  egg_init (&argc, &argv);
-
   state.timeline = 
     egg_timeline_new (TEST_TIMELINE_FRAME_COUNT,
                           TEST_TIMELINE_FPS);
 
=== modified file 'egg/test-timeline.c'
--- egg/test-timeline.c	2009-02-06 11:12:41 +0000
+++ egg/test-timeline.c	2014-12-21 14:35:42 +0000
@@ -72,8 +72,6 @@
   gchar **markers;
   gsize n_markers;
 
-  egg_init (&argc, &argv);
-
   timeline_1 = egg_timeline_new (10, 120);
   egg_timeline_add_marker_at_frame (timeline_1, "foo", 5);
   egg_timeline_add_marker_at_frame (timeline_1, "bar", 5);
 
=== modified file 'src/bubble.c'
--- src/bubble.c	2013-12-04 16:43:44 +0000
+++ src/bubble.c	2014-12-21 14:35:42 +0000
@@ -1802,7 +1802,7 @@
 	{
 		if (priv->distance < 1.0f && !priv->prevent_fade)
 		{
-			gtk_window_set_opacity (window,
+			gtk_widget_set_opacity (priv->widget,
 			                        WINDOW_MIN_OPACITY +
 			                        priv->distance *
 			                        (WINDOW_MAX_OPACITY -
@@ -1810,7 +1810,7 @@
 			bubble_refresh (bubble);
 		}
 		else
-			gtk_window_set_opacity (window, WINDOW_MAX_OPACITY);
+			gtk_widget_set_opacity (priv->widget, WINDOW_MAX_OPACITY);
 	}
 
 	return TRUE;
@@ -1905,10 +1905,19 @@
 
 	if (gtk_widget_get_realized (window))
 	{
-		gint distance_x = 0;
-		gint distance_y = 0;
-
-		gtk_widget_get_pointer (window, &pointer_rel_x, &pointer_rel_y);
+		GdkDeviceManager *device_manager;
+		GdkDevice        *device;
+		gint              distance_x;
+		gint              distance_y;
+
+		device_manager = gdk_display_get_device_manager (gtk_widget_get_display (window));
+		device = gdk_device_manager_get_client_pointer (device_manager);
+		gdk_window_get_device_position (gtk_widget_get_window (window),
+		                                device,
+		                                &pointer_rel_x,
+		                                &pointer_rel_y,
+		                                NULL);
+
 		gtk_window_get_position (GTK_WINDOW (window), &win_x, &win_y);
 		pointer_abs_x = win_x + pointer_rel_x;
 		pointer_abs_y = win_y + pointer_rel_y;
@@ -2259,7 +2268,7 @@
 	gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 	gtk_window_set_focus_on_map (GTK_WINDOW (window), FALSE);
 	gtk_window_set_accept_focus (GTK_WINDOW (window), FALSE);
-	gtk_window_set_opacity (GTK_WINDOW (window), 0.0f);
+	gtk_widget_set_opacity (window, 0.0f);
 
 	// TODO: fold some of that back into bubble_init
 	this->priv = GET_PRIVATE (this);
@@ -2891,10 +2900,10 @@
 		* WINDOW_MAX_OPACITY;
 
 	if (bubble_is_mouse_over (bubble))
-		gtk_window_set_opacity (bubble_get_window (bubble),
+		gtk_widget_set_opacity (GET_PRIVATE (bubble)->widget,
 		                        WINDOW_MIN_OPACITY);
 	else
-		gtk_window_set_opacity (bubble_get_window (bubble), opacity);
+		gtk_widget_set_opacity (GET_PRIVATE (bubble)->widget, opacity);
 }
 
 static void
@@ -2936,10 +2945,10 @@
 	}
 
 	if (bubble_is_mouse_over (bubble))
-		gtk_window_set_opacity (bubble_get_window (bubble),
+		gtk_widget_set_opacity (GET_PRIVATE (bubble)->widget,
 		                        WINDOW_MIN_OPACITY);
 	else
-		gtk_window_set_opacity (bubble_get_window (bubble),
+		gtk_widget_set_opacity (GET_PRIVATE (bubble)->widget,
 		                        WINDOW_MAX_OPACITY);
 
 	bubble_start_timer (bubble, TRUE);
@@ -2990,7 +2999,7 @@
 
 	egg_timeline_start (timeline);
 
-	gtk_window_set_opacity (bubble_get_window (self), 0.0f);
+	gtk_widget_set_opacity (GET_PRIVATE (self)->widget, 0.0f);
 
 	bubble_show (self);
 }
 
=== modified file 'src/defaults.c'
--- src/defaults.c	2014-02-13 12:45:13 +0000
+++ src/defaults.c	2014-12-21 14:35:42 +0000
@@ -1865,6 +1865,8 @@
 {
 	GdkRectangle rect;
 	GdkWindow*   active_window    = NULL;
+	GdkDeviceManager* device_manager;
+	GdkDevice*   device;
 	gint         mx;
 	gint         my;
 	gint         monitor          = 0;
@@ -1875,11 +1877,9 @@
 
 	g_return_if_fail (self != NULL && IS_DEFAULTS (self));
 
-	gdk_display_get_pointer (gdk_display_get_default (),
-	                         screen,
-	                         &mx,
-	                         &my,
-	                         NULL);
+	device_manager = gdk_display_get_device_manager (gdk_display_get_default ());
+	device = gdk_device_manager_get_client_pointer (device_manager);
+	gdk_device_get_position (device, screen, &mx, &my);
 
 	is_composited = gdk_screen_is_composited (*screen);
 
 
=== modified file 'src/dialog.c'
--- src/dialog.c	2010-10-05 17:54:42 +0000
+++ src/dialog.c	2014-12-21 14:35:42 +0000
@@ -176,7 +176,8 @@
 
 	dialog = gtk_dialog_new ();
 
-	hbox = g_object_new (GTK_TYPE_HBOX,
+	hbox = g_object_new (GTK_TYPE_BOX,
+	                     "orientation", GTK_ORIENTATION_HORIZONTAL,
 			     "spacing", gap,
 			     "border-width", 12,
 			     NULL);
@@ -190,7 +191,8 @@
 	gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
 	gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
 
-	vbox = g_object_new (GTK_TYPE_VBOX,
+	vbox = g_object_new (GTK_TYPE_BOX,
+	                     "orientation", GTK_ORIENTATION_VERTICAL,
 			     NULL);
 
 	title = gtk_label_new (NULL);
 
=== modified file 'src/main.c'
--- src/main.c	2013-10-29 18:26:05 +0000
+++ src/main.c	2014-12-21 14:35:42 +0000
@@ -48,7 +48,6 @@
 	Observer*        observer   = NULL;
 	DBusGConnection* connection = NULL;
 
-	g_thread_init (NULL);
 	dbus_g_thread_init ();
 	log_init ();
 
 
=== modified file 'tests/test-alpha-animation.c'
--- tests/test-alpha-animation.c	2009-02-13 14:32:02 +0000
+++ tests/test-alpha-animation.c	2014-12-21 14:35:42 +0000
@@ -56,8 +56,6 @@
   EggTimeline *timeline;
   EggAlpha *alpha;
 
-  egg_init (&argc, &argv);
-
   timeline = egg_timeline_new_for_duration (700);
   alpha = egg_alpha_new_full (timeline,
 				  EGG_ALPHA_SINE_DEC,
 
=== modified file 'tests/test-grow-bubble.c'
--- tests/test-grow-bubble.c	2011-07-08 08:34:52 +0000
+++ tests/test-grow-bubble.c	2014-12-21 14:35:42 +0000
@@ -328,7 +328,7 @@
 					 a.height,
 					 g_distance,
 					 1.0f - g_distance);
-		gtk_window_set_opacity (GTK_WINDOW (window), 0.3f + g_distance * 0.7f);
+		gtk_widget_set_opacity (window, 0.3f + g_distance * 0.7f);
 	}
 	else
 	{
@@ -340,7 +340,7 @@
 					 a.height,
 					 g_distance,
 					 0.0f);
-		gtk_window_set_opacity (GTK_WINDOW (window), 1.0f);
+		gtk_widget_set_opacity (window, 1.0f);
 	}
 
 	return TRUE;
@@ -482,10 +482,19 @@
 
 	if (gtk_widget_get_realized (window))
 	{
-		gint distance_x = 0;
-		gint distance_y = 0;
-
-		gtk_widget_get_pointer (window, &pointer_rel_x, &pointer_rel_y);
+		GdkDeviceManager *device_manager;
+		GdkDevice        *device;
+		gint              distance_x;
+		gint              distance_y;
+
+		device_manager = gdk_display_get_device_manager (gtk_widget_get_display (window));
+		device = gdk_device_manager_get_client_pointer (device_manager);
+		gdk_window_get_device_position (gtk_widget_get_window (window),
+		                                device,
+		                                &pointer_rel_x,
+		                                &pointer_rel_y,
+		                                NULL);
+
 		gtk_window_get_position (GTK_WINDOW (window), &win_x, &win_y);
 		pointer_abs_x = win_x + pointer_rel_x;
 		pointer_abs_y = win_y + pointer_rel_y;
@@ -714,7 +723,7 @@
 	gtk_window_set_keep_above (GTK_WINDOW (window), TRUE);
 	gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 	gtk_window_set_accept_focus (GTK_WINDOW (window), FALSE);
-	gtk_window_set_opacity (GTK_WINDOW (window), 1.0f);
+	gtk_widget_set_opacity (window, 1.0f);
 	gtk_widget_set_size_request (window,
 				     (gint) (BUBBLE_WIDTH + 2.0f *
 					     BUBBLE_SHADOW_SIZE),
 
=== modified file 'tests/test-scroll-text.c'
--- tests/test-scroll-text.c	2011-07-08 08:34:52 +0000
+++ tests/test-scroll-text.c	2014-12-21 14:35:42 +0000
@@ -442,7 +442,7 @@
 		cairo_pattern_destroy (mask);
 		cairo_pattern_destroy (pattern);
 
-		gtk_window_set_opacity (GTK_WINDOW (window),
+		gtk_widget_set_opacity (window,
 					0.3f + g_distance * 0.7f);
 	}
 	else
@@ -461,7 +461,7 @@
 		cairo_mask (cr, mask);
 		cairo_pattern_destroy (pattern);
 
-		gtk_window_set_opacity (GTK_WINDOW (window), 1.0f);
+		gtk_widget_set_opacity (window, 1.0f);
 	}
 
 	return TRUE;
@@ -542,10 +542,19 @@
 
 	if (gtk_widget_get_realized (window))
 	{
-		gint distance_x = 0;
-		gint distance_y = 0;
-
-		gtk_widget_get_pointer (window, &pointer_rel_x, &pointer_rel_y);
+		GdkDeviceManager *device_manager;
+		GdkDevice        *device;
+		gint              distance_x;
+		gint              distance_y;
+
+		device_manager = gdk_display_get_device_manager (gtk_widget_get_display (window));
+		device = gdk_device_manager_get_client_pointer (device_manager);
+		gdk_window_get_device_position (gtk_widget_get_window (window),
+		                                device,
+		                                &pointer_rel_x,
+		                                &pointer_rel_y,
+		                                NULL);
+
 		gtk_window_get_position (GTK_WINDOW (window), &win_x, &win_y);
 		pointer_abs_x = win_x + pointer_rel_x;
 		pointer_abs_y = win_y + pointer_rel_y;
@@ -911,7 +920,7 @@
 	gtk_window_set_keep_above (GTK_WINDOW (window), TRUE);
 	gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 	gtk_window_set_accept_focus (GTK_WINDOW (window), FALSE);
-	gtk_window_set_opacity (GTK_WINDOW (window), 1.0f);
+	gtk_widget_set_opacity (window, 1.0f);
 	gtk_widget_set_size_request (window,
 				     (gint) (BUBBLE_WIDTH + 2.0f *
 					     BUBBLE_SHADOW_SIZE),