[gnome-control-center] typing-break: use gtk API to determine label layout location

[Benjamin Otte <otte src gnome org>]

commit 6c990cd60c7d5b86294e5b42b33d5df0327353ea
Author: Benjamin Otte <otte redhat com>
Date:   Fri Aug 13 21:14:16 2010 +0200

    typing-break: use gtk API to determine label layout location
    
    The previous code tried to imitate GtkLabel, but failed to account for
    changes to its API. The new code uses gtk_label_get_layout_offsets()
    which is exactly doing the same thing, but compatibly.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=626870

 typing-break/drw-break-window.c |   43 +--------------------------------------
 1 files changed, 1 insertions(+), 42 deletions(-)
---
diff --git a/typing-break/drw-break-window.c b/typing-break/drw-break-window.c
index aaebf74..5a0b1dd 100644
--- a/typing-break/drw-break-window.c
+++ b/typing-break/drw-break-window.c
@@ -542,47 +542,6 @@ postpone_clicked_cb (GtkWidget *button,
 			  bw);
 }
 
-static void
-get_layout_location (GtkLabel *label,
-                     gint     *xp,
-                     gint     *yp)
-{
-	GtkMisc        *misc;
-	GtkWidget      *widget;
-	GtkAllocation  widget_allocation;
-	GtkRequisition widget_requisition;
-	gfloat         xalign, yalign;
-	gint           x, y;
-	gint           xpad, ypad;
-
-	misc = GTK_MISC (label);
-	widget = GTK_WIDGET (label);
-
-	gtk_misc_get_alignment (misc, &xalign, &yalign);
-	gtk_misc_get_padding (misc, &xpad, &ypad);
-	gtk_widget_get_allocation (widget, &widget_allocation);
-	gtk_widget_get_requisition (widget, &widget_requisition);
-
-	if (gtk_widget_get_direction (widget) != GTK_TEXT_DIR_LTR)
-		xalign = 1.0 - xalign;
-
-	x = floor (widget_allocation.x + (int)xpad
-		   + ((widget_allocation.width - widget_requisition.width - 1) * xalign)
-		   + 0.5);
-
-	y = floor (widget_allocation.y + (int)ypad
-		   + ((widget_allocation.height - widget_requisition.height - 1) * yalign)
-		   + 0.5);
-
-	if (xp) {
-		*xp = x;
-	}
-
-	if (yp) {
-		*yp = y;
-	}
-}
-
 static gboolean
 label_expose_event_cb (GtkLabel       *label,
 		       GdkEventExpose *event,
@@ -593,7 +552,7 @@ label_expose_event_cb (GtkLabel       *label,
 	GdkWindow       *window;
         cairo_t         *cr;
 
-	get_layout_location (label, &x, &y);
+        gtk_label_get_layout_offsets (label, &x, &y);
 
 	widget = GTK_WIDGET (label);
 	window = gtk_widget_get_window (widget);