[gtk+/broadway: 212/246] Merge branch 'gtk-3-0' into broadway
- From: Alexander Larsson <alexl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/broadway: 212/246] Merge branch 'gtk-3-0' into broadway
- Date: Tue, 15 Mar 2011 11:58:51 +0000 (UTC)
commit 4765f37484b28b99b18b8e7c96bc71754cfe9ebd
Merge: d8f061a 934f4e5
Author: Alexander Larsson <alexl redhat com>
Date: Thu Mar 10 10:51:04 2011 +0100
Merge branch 'gtk-3-0' into broadway
Conflicts:
gdk/gdkdisplaymanager.c
NEWS | 92 +
configure.ac | 110 +-
demos/gtk-demo/editable_cells.c | 10 +-
demos/gtk-demo/iconview.c | 1 +
demos/gtk-demo/menus.c | 44 +-
docs/reference/gdk/gdk-docs.sgml | 8 +-
docs/reference/gtk/compiling.sgml | 29 +
docs/reference/gtk/gtk-docs.sgml | 8 +-
docs/reference/gtk/gtk3-sections.txt | 2 +
docs/reference/gtk/migrating-2to3.xml | 137 +-
docs/reference/gtk/running.sgml | 26 +-
gdk/Makefile.am | 13 +-
gdk/gdk.c | 4 +-
gdk/gdkdevice.c | 5 +-
gdk/gdkdevicemanager.c | 16 +-
gdk/gdkdisplay.c | 83 +-
gdk/gdkdisplaymanager.c | 10 +-
gdk/gdkevents.c | 4 +
gdk/gdkglobals.c | 1 -
gdk/gdkinternals.h | 1 -
gdk/gdkwindow.c | 98 +-
gdk/quartz/gdkeventloop-quartz.c | 2 +-
gdk/win32/gdkdevicemanager-win32.c | 5 +-
gdk/win32/gdkevents-win32.c | 18 +-
gdk/win32/gdkkeys-win32.c | 2 +-
gdk/win32/gdkwindow-win32.c | 1 -
gdk/x11/Makefile.am | 30 +-
gdk/x11/gdkasync.c | 93 -
gdk/x11/gdkasync.h | 4 -
gdk/x11/gdkcursor-x11.c | 2 +-
gdk/x11/gdkdevice-xi.c | 25 +-
gdk/x11/gdkdevice-xi2.c | 39 +-
gdk/x11/gdkdevicemanager-xi.c | 34 +-
gdk/x11/gdkdevicemanager-xi2.c | 52 +-
gdk/x11/gdkdisplay-x11.c | 13 +-
gdk/x11/gdkgeometry-x11.c | 18 +-
gdk/x11/gdkprivate-x11.h | 8 +
gdk/x11/gdkscreen-x11.c | 14 +-
gdk/x11/gdktestutils-x11.c | 9 +-
gdk/x11/gdkwindow-x11.c | 11 +-
gtk/Makefile.am | 19 +-
gtk/gtkaccessible.c | 39 +-
gtk/gtkaccessibleprivate.h | 31 +
gtk/gtkappchooserbutton.c | 25 +-
gtk/gtkappchooserdialog.c | 37 +-
gtk/gtkappchooserwidget.c | 20 +-
gtk/gtkarrow.c | 7 +-
gtk/gtkassistant.c | 24 +-
gtk/gtkbox.c | 4 +-
gtk/gtkbuildable.c | 2 +-
gtk/gtkbutton.c | 4 +-
gtk/gtkcellarea.c | 34 +-
gtk/gtkcellareabox.c | 2 +-
gtk/gtkcellareacontext.c | 6 +-
gtk/gtkcellrenderer.c | 4 +-
gtk/gtkcellrenderertoggle.c | 2 +-
gtk/gtkcellview.c | 11 +-
gtk/gtkcheckbutton.c | 2 +-
gtk/gtkcheckmenuitem.c | 4 +-
gtk/gtkclipboard.c | 2 +-
gtk/gtkcolorsel.c | 2 -
gtk/gtkcombobox.c | 24 +-
gtk/gtkcomboboxtext.c | 20 +-
gtk/gtkcontainer.c | 2 +-
gtk/gtkcssprovider.c | 13 +-
gtk/gtkdialog.c | 2 +-
gtk/gtkdnd.c | 4 +-
gtk/gtkentry.c | 71 +-
gtk/gtkentrycompletion.c | 3 +
gtk/gtkfilechooserdefault.c | 50 +-
gtk/gtkgrid.c | 8 +
gtk/gtkiconfactory.c | 2 +-
gtk/gtkicontheme.c | 16 +-
gtk/gtkicontheme.h | 8 +-
gtk/gtkiconview.c | 162 +-
gtk/gtkmain.c | 25 +-
gtk/gtkmenu.c | 8 +-
gtk/gtkmenuitem.c | 7 +
gtk/gtknotebook.c | 196 +-
gtk/gtkrange.c | 16 +-
gtk/gtkrecentmanager.c | 2 +-
gtk/gtkscale.c | 100 +-
gtk/gtksearchenginetracker.c | 2 +-
gtk/gtkseparator.c | 4 +
gtk/gtkseparatormenuitem.c | 86 +
gtk/gtkseparatortoolitem.c | 5 +
gtk/gtksettings.c | 52 +-
gtk/gtksocket.c | 5 +-
gtk/gtkspinbutton.c | 106 +-
gtk/gtkstatusicon.c | 9 +-
gtk/gtkstylecontext.c | 78 +-
gtk/gtkstylecontext.h | 43 +-
gtk/gtkstyleprovider.c | 4 +-
gtk/gtkswitch.c | 270 +-
gtk/gtkswitch.h | 3 +-
gtk/gtktestutils.c | 2 +-
gtk/gtktextdisplay.c | 49 +-
gtk/gtktextview.c | 2 +-
gtk/gtkthemingengine.c | 26 +-
gtk/gtktoolpalette.c | 4 +-
gtk/gtktrayicon-x11.c | 2 +
gtk/gtktreemenu.c | 12 +-
gtk/gtktreemodel.c | 9 +-
gtk/gtktreemodelfilter.c | 59 +-
gtk/gtktreeview.c | 17 +-
gtk/gtktreeviewcolumn.c | 5 +-
gtk/gtkwidget.c | 155 +-
gtk/gtkwindow.c | 21 +-
.../{document-x-generic.png => text-x-generic.png} | Bin 569 -> 569 bytes
.../{document-x-generic.svg => text-x-generic.svg} | 0
.../{document-x-generic.png => text-x-generic.png} | Bin 736 -> 736 bytes
.../{document-x-generic.svg => text-x-generic.svg} | 0
gtk/tests/testing.c | 41 +
m4macros/gtk-3.0.m4 | 23 +
modules/other/gail/Makefile.am | 2 +
modules/other/gail/gail.c | 6 +
modules/other/gail/gail.h | 1 +
modules/other/gail/gailcheckmenuitem.c | 25 +-
modules/other/gail/gailchecksubmenuitem.c | 25 +-
modules/other/gail/gailentry.c | 8 +
modules/other/gail/gaillinkbutton.c | 255 +
modules/other/gail/gaillinkbutton.h | 53 +
modules/other/gail/gailprogressbar.c | 6 +
modules/other/gail/gailstatusbar.c | 16 +-
modules/other/gail/gailtextcell.c | 34 +-
modules/other/gail/gailtoplevel.c | 12 +-
modules/other/gail/gailtreeview.c | 4 +-
modules/other/gail/gailutil.c | 98 +-
modules/other/gail/gailwindow.c | 2 +
modules/other/gail/libgail-util/gailmisc.c | 58 +-
po-properties/bg.po | 4470 ++++---
po-properties/en_GB.po | 2012 ++--
po-properties/eo.po | 5186 ++++----
po-properties/es.po | 1276 +-
po-properties/lv.po | 4643 ++++---
po-properties/pl.po | 970 +-
po-properties/pt.po | 4697 ++++---
po-properties/ug.po |14737 ++++++++++----------
po-properties/uk.po | 4999 ++++---
po-properties/zh_CN.po | 4837 ++++---
po/bg.po | 2039 ++--
po/bn_IN.po | 2088 ++-
po/de.po | 578 +-
po/en_GB.po | 1025 +-
po/es.po | 146 +-
po/he.po | 767 +-
po/hu.po | 1370 ++-
po/ko.po | 312 +-
po/nb.po | 106 +-
po/pa.po | 547 +-
po/pt.po | 2087 ++--
po/ru.po | 2966 ++---
po/sl.po |11652 +++++++++-------
po/ug.po | 1015 +-
po/uk.po | 2535 ++--
po/vi.po | 2153 ++--
tests/cellareascaffold.c | 4 +-
tests/simple.c | 33 +-
tests/testcombo.c | 2 -
tests/testexpand.c | 10 -
tests/testfilechooser.c | 3 +-
tests/testgtk.c | 17 +-
tests/testnouiprint.c | 12 +-
tests/testrecentchooser.c | 3 +-
tests/testscale.c | 25 +
tests/teststatusicon.c | 4 +-
166 files changed, 46296 insertions(+), 36831 deletions(-)
---
diff --cc gdk/gdkdisplaymanager.c
index 43dff5b,1c44204..11b899c
--- a/gdk/gdkdisplaymanager.c
+++ b/gdk/gdkdisplaymanager.c
@@@ -244,11 -235,11 +239,16 @@@ gdk_display_manager_get (void
manager = g_object_new (gdk_win32_display_manager_get_type (), NULL);
else
#endif
+ #ifdef GDK_WINDOWING_X11
+ if (backend == NULL || strcmp (backend, "x11") == 0)
+ manager = g_object_new (gdk_x11_display_manager_get_type (), NULL);
+ else
+ #endif
+#ifdef GDK_WINDOWING_BROADWAY
+ if (backend == NULL || strcmp (backend, "broadway") == 0)
+ manager = g_object_new (gdk_broadway_display_manager_get_type (), NULL);
+ else
+#endif
if (backend != NULL)
g_error ("Unsupported GDK backend: %s", backend);
else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
