[gtk+/client-side-windows: 196/197] Merge branch 'master' into client-side-windows
- From: Alexander Larsson <alexl src gnome org>
- To: svn-commits-list gnome org
- Subject: [gtk+/client-side-windows: 196/197] Merge branch 'master' into client-side-windows
- Date: Tue, 26 May 2009 05:42:59 -0400 (EDT)
commit 7698daf97aced5c22aeeb7bfbf02567b61cebaef
Merge: 1288ef1... d0f887d...
Author: Alexander Larsson <alexl redhat com>
Date: Mon May 25 14:30:01 2009 +0200
Merge branch 'master' into client-side-windows
Conflicts:
gdk/x11/gdkwindow-x11.c
ChangeLog => ChangeLog.pre-2-16 | 0
HACKING | 7 +-
INSTALL | 41 -
Makefile.am | 56 +-
NEWS | 121 +
README | 401 --
README.in | 22 +-
configure.in | 27 +-
contrib/Makefile.am | 2 +
contrib/gdk-pixbuf-xlib/Makefile.am | 2 +
demos/Makefile.am | 2 +
demos/gtk-demo/Makefile.am | 5 +-
demos/gtk-demo/links.c | 85 +
demos/testgtk/main.c | 1 +
docs/Makefile.am | 2 +
docs/RELEASE-HOWTO | 81 +-
docs/faq/Makefile.am | 2 +
docs/faq/gtk-faq.sgml | 4 +-
docs/reference/Makefile.am | 3 +
docs/reference/gdk-pixbuf/Makefile.am | 10 +-
docs/reference/gdk-pixbuf/gdk-pixbuf-csource.1 | 138 -
.../gdk-pixbuf/gdk-pixbuf-query-loaders.1 | 50 -
docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt | 2 +
docs/reference/gdk-pixbuf/tmpl/animation.sgml | 18 +
docs/reference/gdk/Makefile.am | 2 +
docs/reference/gtk/Makefile.am | 21 +-
docs/reference/gtk/gtk-builder-convert.1 | 51 -
docs/reference/gtk/gtk-docs.sgml | 5 +
docs/reference/gtk/gtk-query-immodules-2.0.1 | 43 -
docs/reference/gtk/gtk-sections.txt | 1 +
docs/reference/gtk/gtk-update-icon-cache.1 | 51 -
docs/reference/gtk/gtk.types | 1 +
docs/reference/gtk/migrating-GtkBuilder.sgml | 79 +-
docs/reference/gtk/migrating-GtkLabel-links.sgml | 24 +
docs/reference/gtk/tmpl/filesystem.sgml | 108 +
docs/reference/gtk/tmpl/gtkaboutdialog.sgml | 12 +-
docs/reference/gtk/tmpl/gtkactivatable.sgml | 100 +
docs/reference/gtk/tmpl/gtkassistant.sgml | 10 +
docs/reference/gtk/tmpl/gtkbuilder.sgml | 93 +-
docs/reference/gtk/tmpl/gtkentry.sgml | 5 +
docs/reference/gtk/tmpl/gtkenums.sgml | 8 +-
docs/reference/gtk/tmpl/gtkhsv.sgml | 16 +-
docs/reference/gtk/tmpl/gtkimcontext.sgml | 212 +
docs/reference/gtk/tmpl/gtklabel.sgml | 18 +
docs/reference/gtk/tmpl/gtkprintoperation.sgml | 10 +
docs/reference/gtk/tmpl/gtkscale.sgml | 19 +-
docs/reference/gtk/tmpl/gtktoolshell.sgml | 82 +
docs/reference/gtk/tmpl/gtkwidget.sgml | 2 +-
docs/reference/libgail-util/Makefile.am | 2 +
docs/tools/Makefile.am | 2 +
docs/tutorial/Makefile.am | 2 +
examples/gtkdial/gtkdial.c | 10 +-
gdk-pixbuf/Makefile.am | 2 +
gdk-pixbuf/gdk-pixbuf-simple-anim.c | 119 +-
gdk-pixbuf/gdk-pixbuf-simple-anim.h | 3 +
gdk-pixbuf/gdk-pixbuf.symbols | 2 +
gdk-pixbuf/io-jasper.c | 10 +-
gdk-pixbuf/io-jpeg.c | 1 +
gdk-pixbuf/pixops/Makefile.am | 2 +
gdk-pixbuf/pixops/pixops.c | 5 +-
gdk/Makefile.am | 2 +
gdk/directfb/Makefile.am | 2 +
gdk/directfb/gdktestutils-directfb.c | 12 +-
gdk/gdkmedialib.c | 5 +-
gdk/quartz/Makefile.am | 2 +
gdk/tests/Makefile.am | 2 +
gdk/win32/Makefile.am | 2 +
gdk/win32/gdkdisplay-win32.c | 2 +-
gdk/win32/rc/Makefile.am | 2 +
gdk/x11/Makefile.am | 2 +
gdk/x11/gdkdnd-x11.c | 7 +-
gdk/x11/gdkevents-x11.c | 5 +-
gdk/x11/gdkproperty-x11.c | 16 +-
gdk/x11/gdkscreen-x11.c | 36 +-
gdk/x11/gdkselection-x11.c | 5 +-
gdk/x11/gdkvisual-x11.c | 2 +-
gdk/x11/gdkwindow-x11.c | 61 +-
gdk/x11/gdkxid.c | 13 +-
git.mk | 182 +
gtk/Makefile.am | 12 +-
gtk/gtk-builder-convert | 30 +-
gtk/gtk.symbols | 2 +
gtk/gtkaboutdialog.c | 294 +-
gtk/gtkaccelgroup.c | 3 +
gtk/gtkadjustment.c | 6 +-
gtk/gtkassistant.c | 108 +-
gtk/gtkbuilder.c | 9 +-
gtk/gtkbuilder.h | 3 +-
gtk/gtkbuilderparser.c | 39 +-
gtk/gtkbuilderprivate.h | 2 +
gtk/gtkcellrendereraccel.c | 16 +-
gtk/gtkclipboard.c | 1 +
gtk/gtkcombobox.c | 11 +-
gtk/gtkdialog.c | 2 +-
gtk/gtkentry.c | 30 +-
gtk/gtkexpander.c | 6 +
gtk/gtkfilechooserdefault.c | 9 +-
gtk/gtkfilesel.c | 4 +-
gtk/gtkhandlebox.c | 1 +
gtk/gtkiconview.c | 65 +-
gtk/gtkitemfactory.h | 5 +-
gtk/gtklabel.c | 1546 ++++++-
gtk/gtklabel.h | 6 +-
gtk/gtkmarshalers.list | 2 +
gtk/gtkmodules.c | 11 +-
gtk/gtkmountoperation.c | 9 +-
gtk/gtknotebook.c | 35 +-
gtk/gtkprintbackend.c | 182 +
gtk/gtkprintbackend.h | 16 +-
gtk/gtkprintjob.c | 2 +
gtk/gtkprintjob.h | 2 +
gtk/gtkprintoperation-private.h | 5 +
gtk/gtkprintoperation-unix.c | 71 +-
gtk/gtkprintoperation-win32.c | 4 +
gtk/gtkprintoperation.c | 465 ++-
gtk/gtkprintoperation.h | 8 +-
gtk/gtkprintunixdialog.c | 144 +-
gtk/gtkrange.c | 6 +
gtk/gtkscale.c | 260 ++-
gtk/gtkscrolledwindow.c | 8 +-
gtk/gtkselection.c | 12 +-
gtk/gtkspinbutton.c | 9 +
gtk/gtktextlayout.c | 50 +-
gtk/gtktextview.c | 23 +-
gtk/gtktooltip.c | 8 +-
gtk/gtktreeview.c | 22 +-
gtk/gtkwidget.c | 153 +-
gtk/gtkwindow.c | 24 +-
gtk/tests/Makefile.am | 2 +
gtk/tests/builder.c | 15 +-
gtk/theme-bits/Makefile.am | 2 +
gtk/updateiconcache.c | 10 +-
m4macros/Makefile.am | 2 +
modules/Makefile.am | 2 +
modules/engines/Makefile.am | 2 +
modules/engines/ms-windows/Makefile.am | 2 +
modules/engines/ms-windows/Theme/Makefile.am | 2 +
.../engines/ms-windows/Theme/gtk-2.0/Makefile.am | 2 +
modules/engines/pixbuf/Makefile.am | 2 +
modules/input/Makefile.am | 2 +
modules/other/Makefile.am | 2 +
modules/other/gail/Makefile.am | 2 +
modules/other/gail/gailbutton.c | 4 +-
modules/other/gail/gailcombobox.c | 1 +
modules/other/gail/libgail-util/Makefile.am | 2 +
modules/other/gail/tests/Makefile.am | 2 +
modules/printbackends/Makefile.am | 8 +-
modules/printbackends/cups/Makefile.am | 2 +
modules/printbackends/cups/gtkcupsutils.c | 353 ++-
modules/printbackends/cups/gtkcupsutils.h | 29 +-
modules/printbackends/cups/gtkprintbackendcups.c | 340 ++-
modules/printbackends/file/Makefile.am | 2 +
modules/printbackends/file/gtkprintbackendfile.c | 6 +
modules/printbackends/lpr/Makefile.am | 2 +
modules/printbackends/lpr/gtkprintbackendlpr.c | 13 +-
modules/printbackends/papi/Makefile.am | 34 +
modules/printbackends/papi/gtkprintbackendpapi.c | 862 ++++
modules/printbackends/papi/gtkprintbackendpapi.h | 44 +
modules/printbackends/papi/gtkprinterpapi.c | 116 +
modules/printbackends/papi/gtkprinterpapi.h | 61 +
modules/printbackends/test/Makefile.am | 2 +
perf/Makefile.am | 2 +
po-properties/af.po | 308 +-
po-properties/am.po | 308 +-
po-properties/ang.po | 308 +-
po-properties/ar.po | 308 +-
po-properties/as.po | 698 ++--
po-properties/ast.po | 308 +-
po-properties/az.po | 308 +-
po-properties/az_IR.po | 308 +-
po-properties/be.po | 308 +-
po-properties/be latin po | 308 +-
po-properties/bg.po | 3392 +++++++--------
po-properties/bn.po | 308 +-
po-properties/bn_IN.po | 308 +-
po-properties/br.po | 308 +-
po-properties/bs.po | 308 +-
po-properties/ca.po | 308 +-
po-properties/ca valencia po | 308 +-
po-properties/crh.po | 3521 ++++++++--------
po-properties/cs.po | 308 +-
po-properties/cy.po | 308 +-
po-properties/da.po | 3392 +++++++--------
po-properties/de.po | 3392 +++++++--------
po-properties/dz.po | 308 +-
po-properties/el.po | 3392 +++++++--------
po-properties/en_CA.po | 308 +-
po-properties/en_GB.po | 308 +-
po-properties/eo.po | 308 +-
po-properties/es.po | 308 +-
po-properties/et.po | 308 +-
po-properties/eu.po | 3723 ++++++++--------
po-properties/fa.po | 308 +-
po-properties/fi.po | 308 +-
po-properties/fr.po | 308 +-
po-properties/ga.po | 308 +-
po-properties/gl.po | 3392 +++++++--------
po-properties/gu.po | 3567 ++++++++--------
po-properties/he.po | 308 +-
po-properties/hi.po | 308 +-
po-properties/hr.po | 308 +-
po-properties/hu.po | 308 +-
po-properties/hy.po | 308 +-
po-properties/ia.po | 308 +-
po-properties/id.po | 308 +-
po-properties/io.po | 308 +-
po-properties/is.po | 308 +-
po-properties/it.po | 308 +-
po-properties/ja.po | 3392 +++++++--------
po-properties/ka.po | 308 +-
po-properties/kn.po | 3937 +++++++++--------
po-properties/ko.po | 308 +-
po-properties/ku.po | 308 +-
po-properties/li.po | 308 +-
po-properties/lt.po | 308 +-
po-properties/lv.po | 308 +-
po-properties/mai.po | 308 +-
po-properties/mi.po | 308 +-
po-properties/mk.po | 308 +-
po-properties/ml.po | 308 +-
po-properties/mn.po | 308 +-
po-properties/mr.po | 3579 ++++++++--------
po-properties/ms.po | 308 +-
po-properties/nb.po | 308 +-
po-properties/ne.po | 308 +-
po-properties/nl.po | 308 +-
po-properties/nn.po | 308 +-
po-properties/nso.po | 308 +-
po-properties/oc.po | 308 +-
po-properties/or.po | 3821 ++++++++--------
po-properties/pa.po | 3395 +++++++--------
po-properties/pl.po | 308 +-
po-properties/ps.po | 605 ++--
po-properties/pt.po | 308 +-
po-properties/pt_BR.po | 308 +-
po-properties/ro.po | 308 +-
po-properties/ru.po | 3470 ++++++++--------
po-properties/rw.po | 308 +-
po-properties/si.po | 308 +-
po-properties/sk.po | 308 +-
po-properties/sl.po | 4601 ++++++++++----------
po-properties/sq.po | 308 +-
po-properties/sr.po | 308 +-
po-properties/sr ije po | 308 +-
po-properties/sr latin po | 308 +-
po-properties/sv.po | 308 +-
po-properties/ta.po | 4477 ++++++++++----------
po-properties/te.po | 373 +-
po-properties/th.po | 308 +-
po-properties/tk.po | 308 +-
po-properties/tr.po | 3392 +++++++--------
po-properties/tt.po | 308 +-
po-properties/uk.po | 498 +--
po-properties/ur.po | 308 +-
po-properties/uz.po | 308 +-
po-properties/uz cyrillic po | 308 +-
po-properties/vi.po | 308 +-
po-properties/wa.po | 308 +-
po-properties/xh.po | 308 +-
po-properties/yi.po | 308 +-
po-properties/zh_CN.po | 3395 +++++++--------
po-properties/zh_HK.po | 308 +-
po-properties/zh_TW.po | 308 +-
po/af.po | 417 ++-
po/am.po | 417 ++-
po/ang.po | 417 ++-
po/ar.po | 2818 ++++++-------
po/as.po | 419 ++-
po/ast.po | 419 ++-
po/az.po | 419 ++-
po/az_IR.po | 411 ++-
po/be.po | 417 ++-
po/be latin po | 419 ++-
po/bg.po | 2250 +++++-----
po/bn.po | 417 ++-
po/bn_IN.po | 419 ++-
po/br.po | 417 ++-
po/bs.po | 419 ++-
po/ca.po | 422 ++-
po/ca valencia po | 419 ++-
po/crh.po | 2294 +++++-----
po/cs.po | 420 ++-
po/cy.po | 417 ++-
po/da.po | 586 ++-
po/de.po | 461 ++-
po/dz.po | 417 ++-
po/el.po | 4454 ++++++++-----------
po/en_CA.po | 419 ++-
po/en_GB.po | 419 ++-
po/eo.po | 417 ++-
po/es.po | 584 ++-
po/et.po | 491 ++-
po/eu.po | 419 ++-
po/fa.po | 417 ++-
po/fi.po | 419 ++-
po/fr.po | 2254 +++++-----
po/ga.po | 3344 ++++++---------
po/gl.po | 2162 +++++-----
po/gu.po | 425 ++-
po/he.po | 419 ++-
po/hi.po | 419 ++-
po/hr.po | 419 ++-
po/hu.po | 424 ++-
po/hy.po | 417 ++-
po/ia.po | 417 ++-
po/id.po | 419 ++-
po/io.po | 417 ++-
po/is.po | 417 ++-
po/it.po | 429 ++-
po/ja.po | 419 ++-
po/ka.po | 419 ++-
po/kn.po | 419 ++-
po/ko.po | 419 ++-
po/ku.po | 419 ++-
po/li.po | 419 ++-
po/lt.po | 419 ++-
po/lv.po | 419 ++-
po/mai.po | 419 ++-
po/mi.po | 417 ++-
po/mk.po | 419 ++-
po/ml.po | 500 ++-
po/mn.po | 424 ++-
po/mr.po | 2215 +++++-----
po/ms.po | 419 ++-
po/nb.po | 419 ++-
po/ne.po | 416 ++-
po/nl.po | 420 ++-
po/nn.po | 423 ++-
po/nso.po | 419 ++-
po/oc.po | 416 ++-
po/or.po | 419 ++-
po/pa.po | 419 ++-
po/pl.po | 419 ++-
po/ps.po | 2163 +++++-----
po/pt.po | 419 ++-
po/pt_BR.po | 424 ++-
po/ro.po | 419 ++-
po/ru.po | 2181 +++++-----
po/rw.po | 421 ++-
po/si.po | 417 ++-
po/sk.po | 419 ++-
po/sl.po | 419 ++-
po/sq.po | 420 ++-
po/sr.po | 983 +++---
po/sr ije po | 419 ++-
po/sr latin po | 959 ++--
po/sv.po | 420 ++-
po/ta.po | 419 ++-
po/te.po | 419 ++-
po/th.po | 419 ++-
po/tk.po | 417 ++-
po/tr.po | 2166 +++++-----
po/tt.po | 416 ++-
po/uk.po | 1045 ++---
po/ur.po | 411 ++-
po/uz.po | 417 ++-
po/uz cyrillic po | 417 ++-
po/vi.po | 419 ++-
po/wa.po | 417 ++-
po/xh.po | 417 ++-
po/yi.po | 419 ++-
po/zh_CN.po | 2168 +++++-----
po/zh_HK.po | 419 ++-
po/zh_TW.po | 419 ++-
tests/Makefile.am | 2 +
tests/testgtk.c | 48 +
tests/testgtkrc | 10 +
tests/testmerge.c | 9 +-
tests/teststatusicon.c | 2 +-
tests/testvolumebutton.c | 6 +-
370 files changed, 91220 insertions(+), 78837 deletions(-)
diff --cc gdk/x11/gdkwindow-x11.c
index 7f783a9,77033fe..e29dc7b
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@@ -3323,8 -3564,9 +3325,8 @@@ gdk_window_x11_set_events (GdkWindo
if (!GDK_WINDOW_DESTROYED (window))
{
- xevent_mask = StructureNotifyMask | PropertyChangeMask;
-
- GDK_WINDOW_OBJECT (window)->event_mask = event_mask;
+ if (GDK_WINDOW_XID (window) != GDK_WINDOW_XROOTWIN (window))
+ xevent_mask = StructureNotifyMask | PropertyChangeMask;
for (i = 0; i < _gdk_nenvent_masks; i++)
{
if (event_mask & (1 << (i + 1)))
@@@ -3860,9 -4219,10 +3869,9 @@@ gdk_window_set_icon_name (GdkWindow *
const gchar *name)
{
GdkDisplay *display;
-
+
- g_return_if_fail (GDK_IS_WINDOW (window));
-
- if (GDK_WINDOW_DESTROYED (window))
+ if (GDK_WINDOW_DESTROYED (window) ||
+ WINDOW_IS_TOPLEVEL (window))
return;
display = gdk_drawable_get_display (window);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
