[gtk+/quartz-integration: 38/130] Merge branch master into quartz-integration

[John Ralls <jralls src gnome org>]

commit b1339b303c4271dd1e908df82ac3c28f478cf2fa
Merge: f915fe7 32f6070
Author: John Ralls <jralls ceridwen us>
Date:   Sat Jan 29 10:13:08 2011 -0800

    Merge branch master into quartz-integration

 docs/reference/gdk/gdk3-sections.txt  |    2 +
 docs/reference/gtk/migrating-2to3.xml |   11 +
 gdk/gdkdnd.c                          |    2 +-
 gdk/x11/gdkscreen-x11.c               |    4 +-
 gdk/x11/gdkx11utils.h                 |   17 +
 gtk/Makefile.am                       |   13 +-
 gtk/gtk.symbols                       |    2 -
 gtk/gtkcellrenderer.c                 |    4 +-
 gtk/gtkfilefilter.c                   |    2 +-
 gtk/gtkmountoperation.c               |   14 +-
 gtk/gtkplug-stub.c                    |   83 ----
 gtk/gtkplug-win32.c                   |  322 ----------------
 gtk/gtkplug-x11.c                     |  390 -------------------
 gtk/gtkplug.c                         |  584 +++++++++++++++++++++-------
 gtk/gtkplug.h                         |   24 +-
 gtk/gtkplugprivate.h                  |  153 --------
 gtk/gtkprintoperation-win32.c         |    2 +-
 gtk/gtkrecentfilter.c                 |    4 +-
 gtk/gtksocket-stub.c                  |  120 ------
 gtk/gtksocket-win32.c                 |  322 ----------------
 gtk/gtksocket-x11.c                   |  669 --------------------------------
 gtk/gtksocket.c                       |  678 +++++++++++++++++++++++++++++----
 gtk/gtksocket.h                       |   11 +-
 gtk/gtksocketprivate.h                |  138 +-------
 gtk/gtkstatusicon.c                   |    2 -
 gtk/gtktextbuffer.c                   |   16 +-
 gtk/gtktextview.c                     |    5 +-
 gtk/gtkwidget.h                       |    3 +-
 gtk/gtkwin32embedwidget.c             |    9 +-
 gtk/gtkwin32embedwidget.h             |    2 +-
 gtk/gtkwindow.c                       |   16 +-
 gtk/gtkwindowprivate.h                |   15 +-
 gtk/makefile.msc.in                   |    4 -
 po-properties/es.po                   |  511 ++++++++++++-------------
 tests/testsocket.c                    |    2 +-
 35 files changed, 1417 insertions(+), 2739 deletions(-)
---
diff --cc gtk/Makefile.am
index 729594e,b456464..85a2280
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@@ -737,15 -733,10 +732,11 @@@ gtk_use_win32_c_sources = 	
  	gtkmountoperation-stub.c
  gtk_use_quartz_c_sources = 	\
  	gtksearchenginequartz.c	\
 +	gtkquartz.c		\
- 	gtkplug-stub.c		\
- 	gtksocket-stub.c	\
  	gtkmountoperation-stub.c
  gtk_use_stub_c_sources = 	\
- 	gtkplug-stub.c		\
- 	gtksocket-stub.c	\
  	gtkmountoperation-stub.c
 -gtk_all_c_sources += $(gtk_use_x11_c_sources) $(gtk_use_win32_c_sources) $(gtk_use_quartz_c_sources) $(gtk_use_stub_c_sources)
 +gtk_all_c_sources += $(gtk_use_x11_c_sources) $(gtk_use_win32_c_sources) $(gtk_use_stub_c_sources)
  if USE_X11
  gtk_private_h_sources += 	\
  	gtkxembed.h		\