[gtk+/xi2: 83/84] Merge branch 'master' into xi2

[Carlos Garnacho <carlosg src gnome org>]

commit c29a7498f96d86468dfce5607f4e647b8a59e9b4
Merge: db45548... 97b7cdd...
Author: Carlos Garnacho <carlos lanedo com>
Date:   Sun Nov 1 11:39:17 2009 +0100

    Merge branch 'master' into xi2
    
    Conflicts:
    	gtk/Makefile.am

 configure.in                                     |    3 +-
 docs/reference/gtk/tmpl/gtkbutton.sgml           |    5 +
 docs/reference/gtk/tmpl/gtkcurve.sgml            |   21 +-
 docs/reference/gtk/tmpl/gtkgamma.sgml            |   15 +-
 docs/reference/gtk/tmpl/gtknotebook.sgml         |    3 +-
 gdk-pixbuf/Makefile.am                           |   16 +
 gdk-pixbuf/gdk-pixbuf-io.c                       |    7 +
 gdk-pixbuf/gdk-pixbuf-util.c                     |    2 +-
 gdk-pixbuf/io-ani.c                              |    2 +-
 gdk-pixbuf/io-bmp.c                              |    4 +-
 gdk-pixbuf/io-gif.c                              |    4 +-
 gdk-pixbuf/io-jpeg.c                             |    2 +-
 gdk-pixbuf/io-pnm.c                              |    2 +-
 gdk-pixbuf/io-qtif.c                             |  608 +++
 gdk/directfb/gdkdrawable-directfb.c              |   22 +-
 gdk/directfb/gdkevents-directfb.c                |    2 +-
 gdk/directfb/gdkimage-directfb.c                 |    4 +-
 gdk/directfb/gdkinput-directfb.c                 |    4 +-
 gdk/directfb/gdkpixmap-directfb.c                |    2 +-
 gdk/directfb/gdkwindow-directfb.c                |   65 +-
 gdk/gdkscreen.c                                  |    4 +-
 gdk/quartz/GdkQuartzWindow.c                     |   21 +-
 gdk/quartz/Makefile.am                           |    1 +
 gdk/quartz/gdkdisplay-quartz.c                   |   12 +-
 gdk/quartz/gdkevents-quartz.c                    |    3 +-
 gdk/quartz/gdkinput.c                            |    6 +
 gdk/quartz/gdkinputprivate.h                     |    3 +
 gdk/quartz/gdkprivate-quartz.h                   |   25 +-
 gdk/quartz/gdkscreen-quartz.c                    |  408 ++-
 gdk/quartz/gdkscreen-quartz.h                    |   68 +
 gdk/quartz/gdkwindow-quartz.c                    |  200 +-
 gdk/testgdk.c                                    |    4 +-
 gdk/win32/gdkmain-win32.c                        |    6 +-
 gdk/win32/gdkprivate-win32.h                     |   12 +-
 gdk/win32/gdkselection-win32.c                   |    2 +-
 gdk/x11/gdkim-x11.c                              |    2 +-
 gdk/x11/gdkkeys-x11.c                            |    8 +-
 gdk/x11/gdkwindow-x11.c                          |    2 -
 gtk/Makefile.am                                  |   24 +-
 gtk/compose-parse.py                             |   47 +-
 gtk/gtk.h                                        |    4 +-
 gtk/gtk.symbols                                  |   15 +
 gtk/gtkaboutdialog.c                             |   26 -
 gtk/gtkaccelgroup.c                              |    7 +-
 gtk/gtkbutton.h                                  |    4 +
 gtk/gtkcelleditable.c                            |   29 +-
 gtk/gtkcellrendererspinner.c                     |   11 +-
 gtk/gtkcellrendererspinner.h                     |    7 +-
 gtk/gtkclist.c                                   |   16 +-
 gtk/gtkcolorsel.c                                |    2 +-
 gtk/gtkcombo.c                                   |    4 +-
 gtk/gtkcombobox.c                                |  116 +-
 gtk/gtkctree.c                                   |    8 +-
 gtk/gtkcurve.c                                   |    2 +
 gtk/gtkcurve.h                                   |   16 +-
 gtk/gtkentry.c                                   |   12 +-
 gtk/gtkfilechooserbutton.c                       |   12 +-
 gtk/gtkgamma.c                                   |    2 +
 gtk/gtkgamma.h                                   |   16 +-
 gtk/gtkiconview.c                                |    5 +
 gtk/gtkimcontextsimple.c                         |    5 +-
 gtk/gtkimcontextsimpleseqs.h                     |   91 +-
 gtk/gtkinfobar.c                                 |    5 +
 gtk/gtkmain.c                                    |    5 +-
 gtk/gtkmain.h                                    |    4 +-
 gtk/gtkmenu.c                                    |    5 +
 gtk/gtkmountoperation.c                          |   19 +-
 gtk/gtknotebook.c                                |    4 +
 gtk/gtknotebook.h                                |    2 +
 gtk/gtkobject.c                                  |    4 +-
 gtk/gtkprintoperation-unix.c                     |   26 +-
 gtk/gtkprintoperation-win32.c                    |    5 +
 gtk/gtkprintoperation.c                          |  163 +-
 gtk/gtkprintsettings.c                           |    2 +-
 gtk/gtkprintunixdialog.c                         |   45 +-
 gtk/gtkprivate.h                                 |    9 +
 gtk/gtkrc.c                                      |   16 +-
 gtk/gtkrc.key.mac                                |  240 ++
 gtk/gtkselection.c                               |    2 +-
 gtk/gtksettings.c                                |   57 +-
 gtk/gtksocket.c                                  |   27 +-
 gtk/gtkspinner.c                                 |    2 +-
 gtk/gtkspinner.h                                 |    2 +-
 gtk/gtkstatusicon.c                              |   20 +-
 gtk/gtkstock.c                                   |    1 +
 gtk/gtktext.c                                    |    8 +-
 gtk/gtktoolbutton.c                              |   11 +-
 gtk/gtktreeprivate.h                             |   14 +-
 gtk/gtktreeview.c                                |    4 +-
 gtk/gtkviewport.c                                |   18 +
 gtk/gtkviewport.h                                |    1 +
 gtk/gtkwindow.c                                  |    4 +-
 gtk/tests/filtermodel.c                          |    1 -
 modules/other/gail/gailbutton.c                  |    8 +-
 modules/other/gail/gailoptionmenu.c              |    2 +-
 modules/other/gail/tests/ferret.c                |    5 +-
 modules/printbackends/cups/gtkprintbackendcups.c |    8 +-
 modules/printbackends/lpr/gtkprintbackendlpr.c   |    4 +-
 po-properties/es.po                              | 3488 +++++++++---------
 po/LINGUAS                                       |    1 +
 po/ar.po                                         | 2291 ++++++------
 po/en shaw po                                    | 4492 ++++++++++++++++++++++
 po/it.po                                         | 2215 ++++++------
 po/ro.po                                         | 2271 ++++++------
 tests/testfilechooserbutton.c                    |    9 +-
 105 files changed, 11767 insertions(+), 5814 deletions(-)
---
diff --cc gtk/Makefile.am
index 4629174,f10bb19..254383e
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@@ -191,9 -191,7 +191,8 @@@ gtk_public_h_sources =          
  	gtkcombobox.h		\
  	gtkcomboboxentry.h	\
  	gtkcontainer.h		\
- 	gtkcurve.h		\
  	gtkdebug.h              \
 +	gtkdevicegroup.h	\
  	gtkdialog.h		\
  	gtkdnd.h		\
  	gtkdrawingarea.h	\
@@@ -447,8 -444,6 +445,7 @@@ gtk_base_c_sources =            
  	gtkcombobox.c		\
  	gtkcomboboxentry.c	\
  	gtkcontainer.c		\
- 	gtkcurve.c		\
 +	gtkdevicegroup.c	\
  	gtkdialog.c		\
  	gtkdrawingarea.c	\
  	gtkeditable.c           \