[gtk+/treeview-refactor: 44/44] Merge branch 'master' into treeview-refactor



commit a47a557fc3e17ed99d125df781055a399f72891b
Merge: 5fef00d 13209a9
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Wed Dec 8 15:24:49 2010 +0900

    Merge branch 'master' into treeview-refactor

 NEWS                                             |   42 +
 configure.ac                                     |    4 +-
 docs/reference/gtk/Makefile.am                   |    2 +-
 docs/reference/gtk/gtk3-sections.txt             |    6 +
 docs/reference/gtk/migrating-2to3.xml            |    3 +
 docs/reference/gtk/migrating-GtkStyleContext.xml |   82 +-
 gdk/gdkdisplay.c                                 |   27 +-
 gdk/gdkinternals.h                               |    4 -
 gdk/gdkoffscreenwindow.c                         |    5 +-
 gdk/gdkrgba.c                                    |   22 +-
 gdk/gdkrgba.h                                    |    2 +-
 gdk/gdkscreen.c                                  |    2 +-
 gdk/gdkwindow.c                                  |    9 +-
 gdk/gdkwindow.h                                  |    4 +-
 gdk/gdkwindowimpl.h                              |    3 +-
 gdk/quartz/GdkQuartzView.c                       |    8 +-
 gdk/quartz/GdkQuartzWindow.c                     |   40 +-
 gdk/quartz/Makefile.am                           |    2 -
 gdk/quartz/gdkdevice-core.c                      |   10 +-
 gdk/quartz/gdkdrawable-quartz.c                  |  232 ---
 gdk/quartz/gdkdrawable-quartz.h                  |   71 -
 gdk/quartz/gdkevents-quartz.c                    |   58 +-
 gdk/quartz/gdkgeometry-quartz.c                  |    3 +-
 gdk/quartz/gdkinput.c                            |   14 +-
 gdk/quartz/gdkprivate-quartz.h                   |    6 +-
 gdk/quartz/gdkwindow-quartz.c                    |  748 ++++----
 gdk/quartz/gdkwindow-quartz.h                    |   19 +-
 gdk/win32/gdkwindow-win32.c                      |    5 +-
 gdk/x11/gdkdnd-x11.c                             |    2 +-
 gdk/x11/gdkscreen-x11.c                          |    2 +-
 gdk/x11/gdkwindow-x11.c                          |    9 +-
 gtk/Makefile.am                                  |    2 -
 gtk/gtk.symbols                                  |  185 ++-
 gtk/gtk9slice.c                                  |   34 +-
 gtk/gtk9slice.h                                  |   40 +-
 gtk/gtkanimationdescription.c                    |   26 +-
 gtk/gtkanimationdescription.h                    |   22 +-
 gtk/gtkappchooserdialog.c                        |   16 +-
 gtk/gtkappchooseronline.c                        |   32 +-
 gtk/gtkappchooseronline.h                        |   24 +-
 gtk/gtkappchooseronlinepk.c                      |    4 +-
 gtk/gtkappchooserwidget.c                        |    4 +-
 gtk/gtkassistant.c                               |   10 +-
 gtk/gtkbutton.c                                  |  118 +-
 gtk/gtkcellrendererprogress.c                    |   13 +-
 gtk/gtkcontainer.c                               |   33 +-
 gtk/gtkcssprovider.c                             |  123 +-
 gtk/gtkiconview.c                                |    2 +-
 gtk/gtklabel.c                                   |   60 +-
 gtk/gtkmodifierstyle.c                           |   12 +-
 gtk/gtksizerequest.c                             |   24 +-
 gtk/gtkspinner.c                                 |    8 +-
 gtk/gtkstyle.c                                   |  303 ---
 gtk/gtkstylecontext.c                            |   74 +-
 gtk/gtkthemingengine.c                           |   15 +-
 gtk/gtktimeline.c                                |  222 +-
 gtk/gtktimeline.h                                |   56 +-
 gtk/gtkwidget.c                                  |  106 +-
 gtk/gtkwidget.h                                  |    1 +
 gtk/gtkwidgetpath.h                              |    4 +-
 gtk/gtkwindow-decorate.c                         |  808 --------
 gtk/gtkwindow-decorate.h                         |   41 -
 gtk/gtkwindow.c                                  |   18 +-
 gtk/tests/Makefile.am                            |    1 +
 gtk/tests/stylecontext.c                         |   20 +-
 modules/engines/Makefile.am                      |    6 +-
 po-properties/POTFILES.in                        |    1 -
 po-properties/es.po                              |  906 +++++-----
 po-properties/gl.po                              | 2350 +++++++++++-----------
 po-properties/he.po                              |  870 ++++----
 po/POTFILES.in                                   |    1 -
 po/gl.po                                         |  398 ++--
 po/nb.po                                         |  169 +-
 73 files changed, 3796 insertions(+), 4812 deletions(-)
---



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]