gnome-control-center r9283 - in trunk: . capplets/appearance capplets/mouse typing-break

[thomashpa svn gnome org]

Author: thomashpa
Date: Sun Feb 22 22:01:40 2009
New Revision: 9283
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=9283&view=rev

Log:
Replace deprecated GTK symbols. Fixes part of bug #572325

Modified:
   trunk/ChangeLog
   trunk/capplets/appearance/appearance-font.c
   trunk/capplets/mouse/gnome-mouse-properties.c
   trunk/typing-break/drw-utils.c

Modified: trunk/capplets/appearance/appearance-font.c
==============================================================================
--- trunk/capplets/appearance/appearance-font.c	(original)
+++ trunk/capplets/appearance/appearance-font.c	Sun Feb 22 22:01:40 2009
@@ -105,9 +105,8 @@
 		      0, 0,
 		      darea->allocation.width - 1, darea->allocation.height - 1);
 
-  gdk_pixbuf_render_to_drawable (pixbuf, darea->window, NULL,
-				 0, 0, x, y, width, height,
-				 GDK_RGB_DITHER_NORMAL, 0, 0);
+  gdk_draw_pixbuf (darea->window, NULL, pixbuf, 0, 0, x, y, width, height,
+                   GDK_RGB_DITHER_NORMAL, 0, 0);
 }
 
 typedef enum {

Modified: trunk/capplets/mouse/gnome-mouse-properties.c
==============================================================================
--- trunk/capplets/mouse/gnome-mouse-properties.c	(original)
+++ trunk/capplets/mouse/gnome-mouse-properties.c	Sun Feb 22 22:01:40 2009
@@ -235,23 +235,23 @@
 		double_click_time = gconf_value_get_int (value);
 
 	if (test_maybe_timeout_id != 0)
-		gtk_timeout_remove  (test_maybe_timeout_id);
+		g_source_remove  (test_maybe_timeout_id);
 	if (test_on_timeout_id != 0)
-		gtk_timeout_remove (test_on_timeout_id);
+		g_source_remove (test_on_timeout_id);
 
 	switch (double_click_state) {
 	case DOUBLE_CLICK_TEST_OFF:
 		double_click_state = DOUBLE_CLICK_TEST_MAYBE;
 		data.image = image;
 		data.timeout_id = &test_maybe_timeout_id;
-		test_maybe_timeout_id = gtk_timeout_add (double_click_time, (GtkFunction) test_maybe_timeout, &data);
+		test_maybe_timeout_id = g_timeout_add (double_click_time, (GtkFunction) test_maybe_timeout, &data);
 		break;
 	case DOUBLE_CLICK_TEST_MAYBE:
 		if (event->time - double_click_timestamp < double_click_time) {
 			double_click_state = DOUBLE_CLICK_TEST_ON;
 			data.image = image;
 			data.timeout_id = &test_on_timeout_id;
-			test_on_timeout_id = gtk_timeout_add (2500, (GtkFunction) test_maybe_timeout, &data);
+			test_on_timeout_id = g_timeout_add (2500, (GtkFunction) test_maybe_timeout, &data);
 		}
 		break;
 	case DOUBLE_CLICK_TEST_ON:

Modified: trunk/typing-break/drw-utils.c
==============================================================================
--- trunk/typing-break/drw-utils.c	(original)
+++ trunk/typing-break/drw-utils.c	Sun Feb 22 22:01:40 2009
@@ -205,19 +205,19 @@
 				 height,
 				 -1);
 
-	gdk_pixbuf_render_to_drawable_alpha (tmp_pixbuf,
-					     pixmap,
-					     0,
-					     0,
-					     0,
-					     0,
-					     width,
-					     height,
-					     GDK_PIXBUF_ALPHA_BILEVEL,
-					     0,
-					     GDK_RGB_DITHER_NONE,
-					     0,
-					     0);
+	gdk_draw_pixbuf (pixmap,
+                         NULL, 
+                         tmp_pixbuf,
+                         0,
+                         0,
+                         0,
+                         0,
+                         width,
+                         height,
+                         GDK_RGB_DITHER_NONE,
+                         0,
+                         0);
+
 	g_object_unref (tmp_pixbuf);
 
 	gdk_window_set_back_pixmap (window->window, pixmap, FALSE);