Merge lp:~cimi/notify-osd/no-deprecated-functions into lp:~canonical-dx-team/notify-osd/precise

[Andrea Cimitan]

Use the proper not-deprecated functions.

Please make sure egg_timeout_pool_get_ticks is returning the difference with the required scale, since I didn't pay much attention in the right conversion.

[Mirco Müller (macslow)]

Your branch is breaking the timing calculations. Very obvious e.g. in the much too short throbbing animation of the volume over- and undershoot animations.

review: Needs Fixing

[Andrea Cimitan (cimi)]

Exactly as I said in the description: egg_timeout_pool_get_ticks needs the right scale, could you please help me on that? I will multiply the value returned by the function.

[Mirco Müller (macslow)]

Dash corners first :) So either this evening or tomorrow.

[Andrea Cimitan (cimi)]

Indeed, while the color branch has to come in 12.04, this could be added to trunk for 12.10 branch

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:457
http://s-jenkins:8080/job/notify-osd-ci/1/

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:457
http://jenkins.qa.ubuntu.com/job/notify-osd-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-ci/./build=pbuilder,distribution=quantal,flavor=amd64/5/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-ci/./build=pbuilder,distribution=quantal,flavor=i386/5/console

review: Approve (continuous-integration)

Unmerged revisions

457. By Andrea Cimitan on 2012-04-02

Don't use deprecated functions

=== modified file 'egg/egg-timeout-pool.c'
--- egg/egg-timeout-pool.c	2009-02-06 11:12:41 +0000
+++ egg/egg-timeout-pool.c	2012-04-02 13:47:22 +0000
@@ -63,7 +63,7 @@
 
   guint next_id;
 
-  GTimeVal start_time;
+  guint64 start_time;
   GList *timeouts, *dispatched_timeouts;
   gint ready;
 
@@ -127,12 +127,11 @@
 static guint
 egg_timeout_pool_get_ticks (EggTimeoutPool *pool)
 {
-  GTimeVal time_now;
-
-  g_source_get_current_time ((GSource *) pool, &time_now);
-  
-  return (time_now.tv_sec - pool->start_time.tv_sec) * 1000
-    + (time_now.tv_usec - pool->start_time.tv_usec) / 1000;
+  gint64 time_now;
+
+  time_now = g_source_get_time ((GSource *) pool);
+
+  return time_now - pool->start_time;
 }
 
 static gboolean
@@ -448,7 +447,7 @@
 
   pool = (EggTimeoutPool *) source;
 
-  g_get_current_time (&pool->start_time);
+  pool->start_time = g_get_monotonic_time ();
   pool->next_id = 1;
   pool->id = g_source_attach (source, NULL);
 

=== modified file 'src/bubble.c'
--- src/bubble.c	2012-03-09 21:20:47 +0000
+++ src/bubble.c	2012-04-02 13:47:22 +0000
@@ -1864,10 +1864,17 @@
 
 	if (gtk_widget_get_realized (window))
 	{
+		GdkDeviceManager *device_manager;
+		GdkDevice        *device;
+		GdkWindow        *widget_window;
 		gint distance_x = 0;
 		gint distance_y = 0;
 
-		gtk_widget_get_pointer (window, &pointer_rel_x, &pointer_rel_y);
+		widget_window = gtk_widget_get_window (window);
+		device_manager = gdk_display_get_device_manager (gdk_window_get_display (widget_window));
+		device = gdk_device_manager_get_client_pointer (device_manager);
+
+		gdk_window_get_device_position (widget_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;

=== modified file 'src/defaults.c'
--- src/defaults.c	2012-03-23 11:04:46 +0000
+++ src/defaults.c	2012-04-02 13:47:22 +0000
@@ -2212,6 +2212,8 @@
 	GdkScreen*   screen           = NULL;
 	GdkWindow*   active_window    = NULL;
 	GdkWindow*   panel_window     = NULL;
+	GdkDeviceManager* device_manager = NULL;
+	GdkDevice*        device = NULL;
 	gint         mx;
 	gint         my;
 	gint         monitor          = 0;
@@ -2222,11 +2224,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);
 
 	panel_window = get_panel_window ();
 

=== modified file 'tests/test-grow-bubble.c'
--- tests/test-grow-bubble.c	2011-07-08 08:34:52 +0000
+++ tests/test-grow-bubble.c	2012-04-02 13:47:22 +0000
@@ -482,10 +482,17 @@
 
 	if (gtk_widget_get_realized (window))
 	{
+		GdkDeviceManager *device_manager;
+		GdkDevice        *device;
+		GdkWindow        *widget_window;
 		gint distance_x = 0;
 		gint distance_y = 0;
 
-		gtk_widget_get_pointer (window, &pointer_rel_x, &pointer_rel_y);
+		widget_window = gtk_widget_get_window (window);
+		device_manager = gdk_display_get_device_manager (gdk_window_get_display (widget_window));
+		device = gdk_device_manager_get_client_pointer (device_manager);
+
+		gdk_window_get_device_position (widget_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;

=== modified file 'tests/test-scroll-text.c'
--- tests/test-scroll-text.c	2011-07-08 08:34:52 +0000
+++ tests/test-scroll-text.c	2012-04-02 13:47:22 +0000
@@ -542,10 +542,17 @@
 
 	if (gtk_widget_get_realized (window))
 	{
+		GdkDeviceManager *device_manager;
+		GdkDevice        *device;
+		GdkWindow        *widget_window;
 		gint distance_x = 0;
 		gint distance_y = 0;
 
-		gtk_widget_get_pointer (window, &pointer_rel_x, &pointer_rel_y);
+		widget_window = gtk_widget_get_window (window);
+		device_manager = gdk_display_get_device_manager (gdk_window_get_display (widget_window));
+		device = gdk_device_manager_get_client_pointer (device_manager);
+
+		gdk_window_get_device_position (widget_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;