diff --git a/ChangeLog b/ChangeLog
index 6fa1a5f2e..32edb9f76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-11-05  Priit Laes  <amd@store20.com>
+
+	* src/main.c, src/ui.c: remove deprecated gtk stuff.
+
+2006-11-05  Bruno Boaventura  <brunoboaventura@gmail.com>
+
+	* src/theme.c, src/testgradient.c: remove deprecated gtk stuff.
+
 2006-11-05  Kjartan Maraas  <kmaraas@gnome.org>
 
         * src/ui.c: use g_strdup to allocate a string, not strdup. Fixes
diff --git a/src/main.c b/src/main.c
index 9b6c4a5c0..6c93e74c4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -126,7 +126,7 @@ meta_print_self_identity (void)
 
   /* Version and current date. */
   g_date_clear (&d, 1);
-  g_date_set_time (&d, time (NULL));
+  g_date_set_time_t (&d, time (NULL));
   g_date_strftime (buf, sizeof (buf), "%x", &d);
   meta_verbose ("Metacity version %s running on %s\n",
     VERSION, buf);
@@ -388,7 +388,7 @@ main (int argc, char **argv)
   if (!meta_display_open ())
     meta_exit (META_EXIT_ERROR);
   
-  g_main_run (meta_main_loop);
+  g_main_loop_run (meta_main_loop);
 
   {
     GSList *displays;
@@ -446,8 +446,8 @@ meta_quit (MetaExitCode code)
 {
   meta_exit_code = code;
 
-  if (g_main_is_running (meta_main_loop))
-    g_main_quit (meta_main_loop);
+  if (g_main_loop_is_running (meta_main_loop))
+    g_main_loop_quit (meta_main_loop);
 }
 
 void
diff --git a/src/testgradient.c b/src/testgradient.c
index 6ecc4b8ed..28de317da 100644
--- a/src/testgradient.c
+++ b/src/testgradient.c
@@ -131,13 +131,13 @@ render_simple (GdkDrawable *drawable,
       draw_checkerboard (drawable, width, height);
     }
     
-  gdk_pixbuf_render_to_drawable (pixbuf,
-                                 drawable,
-                                 gc,
-                                 0, 0,
-                                 0, 0, width, height,
-                                 GDK_RGB_DITHER_MAX,
-                                 0, 0);
+  gdk_draw_pixbuf (drawable,
+                   gc,
+                   pixbuf,
+                   0, 0,
+                   0, 0, width, height,
+                   GDK_RGB_DITHER_MAX,
+                   0, 0);
 
   g_object_unref (G_OBJECT (pixbuf));
 }
diff --git a/src/theme.c b/src/theme.c
index 702344f18..4ca628c81 100644
--- a/src/theme.c
+++ b/src/theme.c
@@ -2815,18 +2815,17 @@ render_pixbuf (GdkDrawable        *drawable,
       draw_rect = pixbuf_rect;
     }
 
-  gdk_pixbuf_render_to_drawable_alpha (pixbuf,
-                                       drawable,
-                                       draw_rect.x - pixbuf_rect.x,
-                                       draw_rect.y - pixbuf_rect.y,
-                                       draw_rect.x, draw_rect.y,
-                                       draw_rect.width,
-                                       draw_rect.height,
-                                       GDK_PIXBUF_ALPHA_FULL, /* ignored */
-                                       128,                   /* ignored */
-                                       GDK_RGB_DITHER_NORMAL,
-                                       draw_rect.x - pixbuf_rect.x,
-                                       draw_rect.y - pixbuf_rect.y);
+  gdk_draw_pixbuf (drawable,
+                   NULL,
+                   pixbuf,
+                   draw_rect.x - pixbuf_rect.x,
+                   draw_rect.y - pixbuf_rect.y,
+                   draw_rect.x, draw_rect.y,
+                   draw_rect.width,
+                   draw_rect.height,
+                   GDK_RGB_DITHER_NORMAL,
+                   draw_rect.x - pixbuf_rect.x,
+                   draw_rect.y - pixbuf_rect.y);
 }
 
 static GdkPixbuf*
diff --git a/src/ui.c b/src/ui.c
index fc6c76410..57530f4f1 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -437,16 +437,16 @@ meta_image_window_set (MetaImageWindow *iw,
    * and this way flicker is genuinely zero.
    */
 
-  gdk_pixbuf_render_to_drawable (pixbuf,
-                                 iw->pixmap,
-                                 iw->window->style->black_gc,
-                                 0, 0,
-                                 0, 0,
-                                 gdk_pixbuf_get_width (pixbuf),
-                                 gdk_pixbuf_get_height (pixbuf),
-                                 GDK_RGB_DITHER_NORMAL,
-                                 0, 0);
-  
+  gdk_draw_pixbuf (iw->pixmap,
+                   iw->window->style->black_gc,
+		   pixbuf,
+                   0, 0,
+                   0, 0,
+                   gdk_pixbuf_get_width (pixbuf),
+                   gdk_pixbuf_get_height (pixbuf),
+                   GDK_RGB_DITHER_NORMAL,
+                   0, 0);
+
   gdk_window_set_back_pixmap (iw->window->window,
                               iw->pixmap,
                               FALSE);