diff --git a/ChangeLog b/ChangeLog
index a97e6d790c..c6f4d9e1fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-03-27  Anders Carlsson  <andersca@imendio.com>
+
+        * gtk/Makefile.am:
+        Add -xobjective-c to cflags.
+        (#335956, Lllian Angel)
+        
+        * gtk/gtkdnd-quartz.c:
+        (gtk_drag_dest_set_track_motion):
+        (gtk_drag_dest_get_track_motion):
+        Add stubs for new functions.
+        (#335955, Lillian Angel)
+        
 2006-03-27  Richard Hult  <richard@imendio.com>
 
 	* gdk/quartz: Add more stubs.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a97e6d790c..c6f4d9e1fb 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,15 @@
+2006-03-27  Anders Carlsson  <andersca@imendio.com>
+
+        * gtk/Makefile.am:
+        Add -xobjective-c to cflags.
+        (#335956, Lllian Angel)
+        
+        * gtk/gtkdnd-quartz.c:
+        (gtk_drag_dest_set_track_motion):
+        (gtk_drag_dest_get_track_motion):
+        Add stubs for new functions.
+        (#335955, Lillian Angel)
+        
 2006-03-27  Richard Hult  <richard@imendio.com>
 
 	* gdk/quartz: Add more stubs.
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 9f4a942ba9..4d24311b87 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -27,7 +27,8 @@ INCLUDES =						\
 	-DGTK_DISABLE_DEPRECATED			\
 	-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED		\
 	$(GTK_DEBUG_FLAGS)				\
-	$(GTK_DEP_CFLAGS)
+	$(GTK_DEP_CFLAGS)				\
+	$(gtk_clipboard_dnd_c_sources_CFLAGS)
 
 gtarget=$(gdktarget)
 
@@ -566,6 +567,7 @@ gtk_clipboard_dnd_c_sources = gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c
 gtk_clipboard_dnd_c_sources_CFLAGS = "-xobjective-c"
 else
 gtk_clipboard_dnd_c_sources = gtkclipboard.c gtkdnd.c
+gtk_clipboard_dnd_c_sources_CFLAGS = 
 endif
 
 # we use our own built_sources variable rules to avoid automake's
diff --git a/gtk/gtkdnd-quartz.c b/gtk/gtkdnd-quartz.c
index 2000b1efe1..c868674603 100644
--- a/gtk/gtkdnd-quartz.c
+++ b/gtk/gtkdnd-quartz.c
@@ -845,6 +845,25 @@ gtk_drag_dest_drop (GtkWidget	     *widget,
   return (site->flags & GTK_DEST_DEFAULT_DROP) ? TRUE : retval;
 }
 
+void
+gtk_drag_dest_set_track_motion (GtkWidget *widget,
+				gboolean   track_motion)
+{
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  /* FIXME: Implement */
+}
+
+gboolean
+gtk_drag_dest_get_track_motion (GtkWidget *widget)
+{
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
+
+  /* FIXME: Implement */
+
+  return FALSE;
+}
+
 void
 _gtk_drag_dest_handle_event (GtkWidget *toplevel,
 			     GdkEvent  *event)