[gtk+/client-side-decorations: 193/194] Merge branch 'master' into client-side-decorations
- From: Cody Russell <bratsche src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gtk+/client-side-decorations: 193/194] Merge branch 'master' into client-side-decorations
- Date: Fri, 4 Dec 2009 16:07:35 +0000 (UTC)
commit 904a6a290d87e375d9c2f8f6bdd0872eec5764dc
Merge: 7ac9773... 7e7c23d...
Author: Cody Russell <bratsche gnome org>
Date: Wed Dec 2 17:35:23 2009 -0600
Merge branch 'master' into client-side-decorations
NEWS | 152 +
README.in | 10 +
configure.in | 8 +-
contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c | 41 +-
demos/gtk-demo/Makefile.am | 1 +
demos/gtk-demo/printing.c | 3 +-
demos/gtk-demo/toolpalette.c | 792 +++
demos/testpixbuf-save.c | 4 +-
docs/reference/gdk-pixbuf/gdk-pixbuf.types | 2 +
docs/reference/gtk/Makefile.am | 2 +
docs/reference/gtk/gtk-docs.sgml | 2 +
docs/reference/gtk/gtk-sections.txt | 99 +-
docs/reference/gtk/gtk.types | 2 +
docs/reference/gtk/images/toolpalette.png | Bin 0 -> 10010 bytes
docs/reference/gtk/running.sgml | 31 +-
docs/reference/gtk/tmpl/gtkbutton.sgml | 1 -
docs/reference/gtk/tmpl/gtkcelleditable.sgml | 5 +
docs/reference/gtk/tmpl/gtkdialog.sgml | 10 +
docs/reference/gtk/tmpl/gtkicontheme.sgml | 2 +-
docs/reference/gtk/tmpl/gtkinputdialog.sgml | 4 +
docs/reference/gtk/tmpl/gtknotebook.sgml | 7 +-
docs/reference/gtk/tmpl/gtkstock.sgml | 1020 ---
docs/reference/gtk/tmpl/gtkstyle.sgml | 15 +
docs/reference/gtk/tmpl/gtktexttag.sgml | 4 +-
docs/reference/gtk/tmpl/gtktooltip.sgml | 10 +
docs/reference/gtk/tmpl/gtkuimanager.sgml | 3 +-
docs/reference/gtk/tmpl/gtkviewport.sgml | 9 +
docs/reference/gtk/tmpl/gtkwidget.sgml | 2867 --------
docs/reference/gtk/visual_index.xml | 3 +
docs/tools/widgets.c | 29 +
docs/tutorial/gtk-tut.sgml | 6 +-
examples/gtkdial/gtkdial.c | 2 +-
examples/tictactoe/tictactoe.c | 2 +-
gdk-pixbuf/gdk-pixbuf-io.c | 4 +
gdk-pixbuf/io-ani-animation.c | 4 +-
gdk-pixbuf/io-gdip-animation.c | 4 +-
gdk-pixbuf/io-gif-animation.c | 4 +-
gdk-pixbuf/io-gif.c | 2 +-
gdk-pixbuf/io-ico.c | 6 +-
gdk-pixbuf/io-jpeg.c | 1 +
gdk-pixbuf/io-tiff.c | 33 +
gdk/directfb/gdkcolor-directfb.c | 2 +-
gdk/directfb/gdkdisplay-directfb.c | 2 +-
gdk/directfb/gdkdnd-directfb.c | 2 +-
gdk/directfb/gdkdrawable-directfb.c | 2 +-
gdk/directfb/gdkevents-directfb.c | 4 +
gdk/directfb/gdkgc-directfb.c | 2 +-
gdk/directfb/gdkimage-directfb.c | 2 +-
gdk/directfb/gdkinput-directfb.c | 2 +-
gdk/directfb/gdkpixmap-directfb.c | 2 +-
gdk/directfb/gdkvisual-directfb.c | 2 +-
gdk/directfb/gdkwindow-directfb.c | 6 +-
gdk/gdkcolor.c | 10 +-
gdk/gdkdraw.c | 11 +-
gdk/gdkgc.c | 4 +-
gdk/gdkimage.c | 9 +-
gdk/gdktypes.h | 6 +
gdk/gdkwindow.c | 248 +-
gdk/gdkwindowimpl.h | 1 +
gdk/quartz/gdkcolor-quartz.c | 2 +-
gdk/quartz/gdkdnd-quartz.c | 2 +-
gdk/quartz/gdkdrawable-quartz.c | 2 +-
gdk/quartz/gdkgc-quartz.c | 2 +-
gdk/quartz/gdkimage-quartz.c | 2 +-
gdk/quartz/gdkinput-old.c | 2 +-
gdk/quartz/gdkinput.c | 2 +-
gdk/quartz/gdkpixmap-quartz.c | 2 +-
gdk/quartz/gdkscreen-quartz.c | 34 +
gdk/quartz/gdkvisual-quartz.c | 2 +-
gdk/quartz/gdkwindow-quartz.c | 1 +
gdk/win32/gdkcolor-win32.c | 2 +-
gdk/win32/gdkdnd-win32.c | 78 +-
gdk/win32/gdkgc-win32.c | 2 +-
gdk/win32/gdkimage-win32.c | 2 +-
gdk/win32/gdkinput.c | 2 +-
gdk/win32/gdkpixmap-win32.c | 2 +-
gdk/win32/gdkvisual-win32.c | 2 +-
gdk/win32/gdkwindow-win32.c | 2 +-
gdk/x11/gdkdnd-x11.c | 8 +-
gdk/x11/gdkevents-x11.c | 9 +-
gdk/x11/gdkinput-xfree.c | 3 +-
gdk/x11/gdkinput.c | 8 +-
gdk/x11/gdkkeys-x11.c | 2 +-
gdk/x11/gdkscreen-x11.c | 102 +-
gdk/x11/gdkvisual-x11.c | 2 +-
gdk/x11/gdkwindow-x11.c | 5 +-
gtk/Makefile.am | 5 +
gtk/gtk-compose-lookaside.txt | 8 +-
gtk/gtk.h | 2 +
gtk/gtk.symbols | 67 +
gtk/gtkaboutdialog.c | 1164 ++--
gtk/gtkaccessible.h | 3 +-
gtk/gtkaction.c | 86 +-
gtk/gtkaction.h | 3 +
gtk/gtkactiongroup.c | 2 +-
gtk/gtkbutton.c | 20 +-
gtk/gtkcellrenderer.c | 2 +-
gtk/gtkcellrendererspinner.c | 3 +
gtk/gtkclipboard-quartz.c | 361 +-
gtk/gtkclipboard.c | 21 +-
gtk/gtkcolorsel.c | 35 +-
gtk/gtkcontainer.c | 2 +-
gtk/gtkcustompaperunixdialog.c | 3 +-
gtk/gtkdnd.c | 22 +
gtk/gtkenums.h | 2 +-
gtk/gtkfilechooserdefault.c | 22 +-
gtk/gtkfilechooserdialog.c | 2 +-
gtk/gtkfilechooserentry.c | 2 +-
gtk/gtkfilechooserwidget.c | 2 +-
gtk/gtkfilesel.c | 4 +-
gtk/gtkfilesystemmodel.c | 28 +-
gtk/gtkiconview.c | 22 +-
gtk/gtkimage.c | 6 +-
gtk/gtkimagemenuitem.c | 5 +-
gtk/gtkimcontextsimple.c | 9 +-
gtk/gtkimcontextsimpleseqs.h | 14 +-
gtk/gtkimmodule.c | 2 +-
gtk/gtkkeyhash.c | 2 +-
gtk/gtklabel.c | 4 +-
gtk/gtknotebook.c | 458 ++-
gtk/gtknotebook.h | 6 +
gtk/gtkprintbackend.c | 14 +-
gtk/gtkprintbackend.h | 10 +-
gtk/gtkprinter-private.h | 5 -
gtk/gtkprinter.c | 38 +-
gtk/gtkprinter.h | 5 +
gtk/gtkprintoperation-unix.c | 13 +
gtk/gtkselection.c | 5 +-
gtk/gtksettings.c | 39 +-
gtk/gtksocket-x11.c | 19 +-
gtk/gtkspinner.c | 10 +-
gtk/gtkstatusbar.c | 56 +-
gtk/gtkstatusbar.h | 2 +
gtk/gtkstock.c | 25 +
gtk/gtkstock.h | 857 +++-
gtk/gtkstyle.c | 59 +-
gtk/gtkstyle.h | 22 +-
gtk/gtktext.c | 2 +-
gtk/gtktextbtree.c | 4 +
gtk/gtktextview.c | 8 +-
gtk/gtktoolbar.c | 14 -
gtk/gtktoolbutton.c | 75 +-
gtk/gtktoolitem.c | 127 +-
gtk/gtktoolitem.h | 5 +
gtk/gtktoolitemgroup.c | 2426 +++++++
gtk/gtktoolitemgroup.h | 99 +
gtk/gtktoolpalette.c | 1924 ++++++
gtk/gtktoolpalette.h | 144 +
gtk/gtktoolpaletteprivate.h | 55 +
gtk/gtktoolshell.c | 94 +-
gtk/gtktoolshell.h | 46 +-
gtk/gtktooltip.c | 9 +-
gtk/gtktooltip.h | 6 +-
gtk/gtktreemodelfilter.c | 8 -
gtk/gtktreeprivate.h | 148 +-
gtk/gtktreestore.c | 2 -
gtk/gtktreeview.c | 134 +-
gtk/gtkuimanager.c | 69 +-
gtk/gtkwidget.c | 184 +-
gtk/gtkwidget.h | 359 +-
gtk/gtkwindow.c | 20 +-
gtk/gtkwindow.h | 2 +
gtk/stock-icons/16/gtk-orientation-landscape.png | Bin 608 -> 756 bytes
gtk/stock-icons/16/gtk-orientation-landscape.svg | 10 +-
.../16/gtk-orientation-reverse-landscape.png | Bin 599 -> 751 bytes
.../16/gtk-orientation-reverse-landscape.svg | 10 +-
gtk/stock-icons/24/gtk-orientation-landscape.png | Bin 932 -> 1097 bytes
gtk/stock-icons/24/gtk-orientation-landscape.svg | 10 +-
.../24/gtk-orientation-reverse-landscape.png | Bin 920 -> 1059 bytes
.../24/gtk-orientation-reverse-landscape.svg | 10 +-
gtk/tests/defaultvalue.c | 4 +
gtk/tests/object.c | 18 +-
m4macros/gtk-2.0.m4 | 2 +-
modules/engines/ms-windows/msw_rc_style.c | 2 +-
modules/engines/ms-windows/msw_style.c | 2 +-
modules/engines/pixbuf/pixbuf-draw.c | 2 +-
modules/engines/pixbuf/pixbuf-rc-style.c | 2 +-
modules/input/gtkimcontextime.c | 2 +-
modules/input/gtkimcontextmultipress.c | 2 +-
modules/input/gtkimcontextthai.c | 2 +-
modules/input/gtkimcontextxim.c | 2 +-
modules/input/imam-et.c | 2 +-
modules/input/imcedilla.c | 2 +-
modules/input/imcyrillic-translit.c | 2 +-
modules/input/iminuktitut.c | 2 +-
modules/input/imipa.c | 2 +-
modules/input/imti-er.c | 2 +-
modules/input/imti-et.c | 2 +-
modules/input/imviqr.c | 2 +-
modules/other/gail/gailbutton.c | 4 +-
modules/other/gail/gailimage.c | 14 +-
modules/other/gail/gailtreeview.c | 2 +
modules/other/gail/libgail-util/gailtextutil.c | 2 +-
modules/printbackends/cups/gtkprintbackendcups.c | 18 +-
modules/printbackends/cups/gtkprintercups.c | 2 +-
modules/printbackends/file/gtkprintbackendfile.c | 2 +-
modules/printbackends/lpr/gtkprintbackendlpr.c | 4 +-
modules/printbackends/papi/gtkprintbackendpapi.c | 2 +-
modules/printbackends/papi/gtkprinterpapi.c | 2 +-
modules/printbackends/test/gtkprintbackendtest.c | 2 +-
po-properties/af.po | 1227 ++--
po-properties/am.po | 1221 ++--
po-properties/ang.po | 1220 ++--
po-properties/ar.po | 1234 ++--
po-properties/as.po | 1229 ++--
po-properties/ast.po | 1220 ++--
po-properties/az.po | 1231 ++--
po-properties/az_IR.po | 1220 ++--
po-properties/be.po | 1231 ++--
po-properties/be latin po | 1234 ++--
po-properties/bg.po | 1227 ++--
po-properties/bn.po | 1232 ++--
po-properties/bn_IN.po | 1227 ++--
po-properties/br.po | 1221 ++--
po-properties/bs.po | 1231 ++--
po-properties/ca.po | 3533 +++++-----
po-properties/ca valencia po | 1227 ++--
po-properties/crh.po | 1240 ++--
po-properties/cs.po | 1229 ++--
po-properties/cy.po | 1234 ++--
po-properties/da.po | 1232 ++--
po-properties/de.po | 1232 ++--
po-properties/dz.po | 1234 ++--
po-properties/el.po | 1229 ++--
po-properties/en shaw po | 5767 ++++++++++++++++
po-properties/en_CA.po | 1232 ++--
po-properties/en_GB.po | 1230 ++--
po-properties/eo.po | 1220 ++--
po-properties/es.po | 3538 +++++-----
po-properties/et.po | 1232 ++--
po-properties/eu.po | 1229 ++--
po-properties/fa.po | 1223 ++--
po-properties/fi.po | 1232 ++--
po-properties/fr.po | 1229 ++--
po-properties/ga.po | 1221 ++--
po-properties/gl.po | 1274 ++--
po-properties/gu.po | 1225 ++--
po-properties/he.po | 1230 ++--
po-properties/hi.po | 1225 ++--
po-properties/hr.po | 1235 ++--
po-properties/hu.po | 1229 ++--
po-properties/hy.po | 1226 ++--
po-properties/ia.po | 1221 ++--
po-properties/id.po | 1231 ++--
po-properties/io.po | 1220 ++--
po-properties/is.po | 1228 ++--
po-properties/it.po | 1232 ++--
po-properties/ja.po | 1229 ++--
po-properties/ka.po | 1231 ++--
po-properties/kn.po | 1229 ++--
po-properties/ko.po | 1229 ++--
po-properties/ku.po | 1221 ++--
po-properties/li.po | 1231 ++--
po-properties/lt.po | 1232 ++--
po-properties/lv.po | 1229 ++--
po-properties/mai.po | 1225 ++--
po-properties/mi.po | 1226 ++--
po-properties/mk.po | 1232 ++--
po-properties/ml.po | 1229 ++--
po-properties/mn.po | 1239 ++--
po-properties/mr.po | 1227 ++--
po-properties/ms.po | 1227 ++--
po-properties/nb.po | 1227 ++--
po-properties/nds.po | 7029 ++++++++++++++++++++
po-properties/ne.po | 1227 ++--
po-properties/nl.po | 1232 ++--
po-properties/nn.po | 1227 ++--
po-properties/nso.po | 1231 ++--
po-properties/oc.po | 1225 ++--
po-properties/or.po | 1229 ++--
po-properties/pa.po | 3699 ++++++-----
po-properties/pl.po | 1230 ++--
po-properties/ps.po | 1226 ++--
po-properties/pt.po | 1232 ++--
po-properties/pt_BR.po | 1232 ++--
po-properties/ro.po | 1229 ++--
po-properties/ru.po | 3535 +++++-----
po-properties/rw.po | 1233 ++--
po-properties/si.po | 1225 ++--
po-properties/sk.po | 1232 ++--
po-properties/sl.po | 1381 ++--
po-properties/sq.po | 1233 ++--
po-properties/sr.po | 3540 +++++-----
po-properties/sr ije po | 1231 ++--
po-properties/sr latin po | 3650 +++++-----
po-properties/sv.po | 1232 ++--
po-properties/ta.po | 1229 ++--
po-properties/te.po | 1229 ++--
po-properties/th.po | 1222 ++--
po-properties/tk.po | 1226 ++--
po-properties/tr.po | 1242 ++--
po-properties/tt.po | 1223 ++--
po-properties/uk.po | 1230 ++--
po-properties/ur.po | 1220 ++--
po-properties/uz.po | 1224 ++--
po-properties/uz cyrillic po | 1224 ++--
po-properties/vi.po | 1227 ++--
po-properties/wa.po | 1224 ++--
po-properties/xh.po | 1231 ++--
po-properties/yi.po | 1231 ++--
po-properties/zh_CN.po | 1228 ++--
po-properties/zh_HK.po | 1228 ++--
po-properties/zh_TW.po | 1228 ++--
po/LINGUAS | 1 +
po/af.po | 679 +-
po/am.po | 678 +-
po/ang.po | 687 +-
po/ar.po | 481 +-
po/as.po | 679 +-
po/ast.po | 679 +-
po/az.po | 685 +-
po/az_IR.po | 674 +-
po/be.po | 685 +-
po/be latin po | 679 +-
po/bg.po | 2253 ++++----
po/bn.po | 681 +-
po/bn_IN.po | 681 +-
po/br.po | 677 +-
po/bs.po | 685 +-
po/ca.po | 2253 ++++----
po/ca valencia po | 679 +-
po/crh.po | 682 +-
po/cs.po | 679 +-
po/cy.po | 681 +-
po/da.po | 679 +-
po/de.po | 679 +-
po/dz.po | 681 +-
po/el.po | 2239 ++++---
po/en shaw po | 4492 +++++++++++++
po/en_CA.po | 679 +-
po/en_GB.po | 679 +-
po/eo.po | 681 +-
po/es.po | 2250 ++++----
po/et.po | 674 +-
po/eu.po | 679 +-
po/fa.po | 685 +-
po/fi.po | 2271 ++++----
po/fr.po | 679 +-
po/ga.po | 679 +-
po/gl.po | 826 ++--
po/gu.po | 679 +-
po/he.po | 679 +-
po/hi.po | 679 +-
po/hr.po | 682 +-
po/hu.po | 679 +-
po/hy.po | 683 +-
po/ia.po | 678 +-
po/id.po | 681 +-
po/io.po | 679 +-
po/is.po | 685 +-
po/it.po | 2270 ++++----
po/ja.po | 686 +-
po/ka.po | 679 +-
po/kn.po | 679 +-
po/ko.po | 679 +-
po/ku.po | 679 +-
po/li.po | 682 +-
po/lt.po | 679 +-
po/lv.po | 678 +-
po/mai.po | 679 +-
po/mi.po | 685 +-
po/mk.po | 679 +-
po/ml.po | 679 +-
po/mn.po | 688 +-
po/mr.po | 679 +-
po/ms.po | 685 +-
po/nb.po | 2254 ++++----
po/nds.po | 5178 ++++++++++++++
po/ne.po | 681 +-
po/nl.po | 683 +-
po/nn.po | 685 +-
po/nso.po | 685 +-
po/oc.po | 679 +-
po/or.po | 2300 ++++----
po/pa.po | 2311 ++++----
po/pl.po | 679 +-
po/ps.po | 678 +-
po/pt.po | 679 +-
po/pt_BR.po | 2253 ++++----
po/ro.po | 2236 ++++----
po/ru.po | 2325 ++++----
po/rw.po | 681 +-
po/si.po | 681 +-
po/sk.po | 679 +-
po/sl.po | 2861 +++++----
po/sq.po | 679 +-
po/sr.po | 679 +-
po/sr ije po | 685 +-
po/sr latin po | 679 +-
po/sv.po | 2866 +++++----
po/ta.po | 679 +-
po/te.po | 681 +-
po/th.po | 679 +-
po/tk.po | 681 +-
po/tr.po | 682 +-
po/tt.po | 681 +-
po/uk.po | 679 +-
po/ur.po | 674 +-
po/uz.po | 678 +-
po/uz cyrillic po | 678 +-
po/vi.po | 679 +-
po/wa.po | 681 +-
po/xh.po | 681 +-
po/yi.po | 682 +-
po/zh_CN.po | 679 +-
po/zh_HK.po | 679 +-
po/zh_TW.po | 679 +-
tests/merge-2.ui | 2 +-
tests/testtreecolumns.c | 8 +-
tests/testtreeview.c | 8 +-
410 files changed, 149948 insertions(+), 118509 deletions(-)
---
diff --cc gtk/Makefile.am
index c26c382,7114da8..6b447bc
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@@ -391,8 -393,10 +393,9 @@@ gtk_private_h_sources =
gtktextutil.h \
gtkthemes.h \
gtktoggleactionprivate.h\
+ gtktoolpaletteprivate.h \
gtktreedatalist.h \
gtktreeprivate.h \
- gtkwindow-decorate.h \
$(gtk_clipboard_dnd_h_sources)
# GTK+ C sources to build the library from
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
