[gtk+/combo-refactor: 130/172] Merge branch 'master' into treeview-refactor

[Tristan Van Berkom <tvb src gnome org>]

commit 03a72118add37e6df51c12dba6c62298e810d41a
Merge: a9fd00a dd678ac
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Thu Dec 2 13:58:02 2010 +0900

    Merge branch 'master' into treeview-refactor
    
    Conflicts:
    	tests/Makefile.am

 NEWS                                          |   47 +
 configure.ac                                  |   25 +-
 demos/gtk-demo/combobox.c                     |   21 +-
 docs/reference/gtk/Makefile.am                |    3 +-
 docs/reference/gtk/gtk-docs.sgml              |   16 +-
 docs/reference/gtk/gtk3-sections.txt          |  126 +-
 docs/reference/gtk/gtk3.types                 |    8 +-
 docs/reference/gtk/images/switch.png          |  Bin 0 -> 1875 bytes
 docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml |   20 +-
 docs/reference/gtk/visual_index.xml           |    3 +
 docs/tools/widgets.c                          |   22 +
 gdk/gdk.symbols                               |    3 +
 gdk/gdkrgba.c                                 |    6 +-
 gdk/gdkrgba.h                                 |    4 +-
 gdk/tests/gdk-color.c                         |   16 +-
 gdk/x11/gdkapplaunchcontext-x11.c             |  187 +-
 gtk/Makefile.am                               |   37 +-
 gtk/abicheck.sh                               |    2 +-
 gtk/gtk.h                                     |    5 +
 gtk/gtk.symbols                               |   51 +-
 gtk/gtkappchooser.c                           |  109 +
 gtk/gtkappchooser.h                           |   51 +
 gtk/gtkappchooserbutton.c                     |  784 +++++
 gtk/gtkappchooserbutton.h                     |   78 +
 gtk/gtkappchooserdialog.c                     |  787 +++++
 gtk/gtkappchooserdialog.h                     |   73 +
 gtk/gtkappchoosermodule.c                     |   59 +
 gtk/gtkappchoosermodule.h                     |   35 +
 gtk/gtkappchooseronline.c                     |  106 +
 gtk/gtkappchooseronline.h                     |   73 +
 gtk/gtkappchooseronlinepk.c                   |  263 ++
 gtk/gtkappchooseronlinepk.h                   |   53 +
 gtk/gtkappchooserprivate.h                    |   45 +
 gtk/gtkappchooserwidget.c                     | 1503 +++++++++
 gtk/gtkappchooserwidget.h                     |  101 +
 gtk/gtkassistant.c                            |  166 +-
 gtk/gtkbuilder.c                              |    2 +-
 gtk/gtkcellrenderer.c                         |    2 +-
 gtk/gtkcellrenderertext.c                     |    4 +-
 gtk/gtkcombobox.c                             |  212 ++-
 gtk/gtkcombobox.h                             |    6 +
 gtk/gtkcomboboxtext.c                         |  101 +-
 gtk/gtkcomboboxtext.h                         |   10 +
 gtk/gtkenums.h                                |    1 -
 gtk/gtkiconview.c                             |   45 +-
 gtk/gtkrange.c                                |   20 +-
 gtk/gtkscale.c                                |    5 +
 gtk/gtkselection.h                            |    6 +-
 gtk/gtkspinner.c                              |  203 +-
 gtk/gtkswitch.c                               |  997 ++++++
 gtk/gtkswitch.h                               |   94 +
 gtk/gtktoolbar.c                              |    8 +-
 po-properties/POTFILES.in                     |    4 +-
 po-properties/POTFILES.skip                   |    9 -
 po-properties/ro.po                           | 4391 ++++++++++++-------------
 po/POTFILES.in                                |    4 +-
 po/POTFILES.skip                              |    1 -
 po/et.po                                      |   28 +-
 po/fa.po                                      | 4017 ++++++++++-------------
 po/id.po                                      | 1897 ++++++------
 po/ro.po                                      | 1826 ++++++-----
 po/sl.po                                      |   10 +-
 po/th.po                                      |   56 +-
 tests/Makefile.am                             |   19 +-
 tests/testappchooser.c                        |  218 ++
 tests/testappchooserbutton.c                  |  136 +
 tests/testmerge.c                             |   10 +
 tests/testscale.c                             |   24 +
 tests/testswitch.c                            |   86 +
 69 files changed, 12503 insertions(+), 6837 deletions(-)
---
diff --cc tests/Makefile.am
index 7815104,4d63c11..2832853
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -96,7 -98,7 +98,8 @@@ noinst_PROGRAMS =  $(TEST_PROGS)	
  	testexpander			\
  	testvolumebutton		\
  	testscrolledwindow		\
- 	testcellarea
++	testcellarea			\
+ 	testswitch
  
  if USE_X11
  noinst_PROGRAMS += testerrors