Use const enum ...' instead of const gchar' for the type parameter.

COPYING

@@ -1,15 +1,15 @@
-                  GNU LIBRARY GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
 
  Copyright (C) 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+    		    59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
 [This is the first released version of the library GPL.  It is
  numbered 2 because it goes with version 2 of the ordinary GPL.]
 
-                            Preamble
+			    Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -99,7 +99,7 @@ works together with the library.
   Note that it is possible for a library to be covered by the ordinary
 General Public License rather than by this special one.
 
-                  GNU LIBRARY GENERAL PUBLIC LICENSE
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library which
@@ -411,7 +411,7 @@ decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-                            NO WARRANTY
+			    NO WARRANTY
 
   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -434,7 +434,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-                     END OF TERMS AND CONDITIONS
+		     END OF TERMS AND CONDITIONS
 
            How to Apply These Terms to Your New Libraries
 
@@ -463,8 +463,9 @@ convey the exclusion of warranty; and each file should have at least the
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+    License along with this library; if not, write to the 
+    Free Software Foundation, Inc., 59 Temple Place - Suite 330, 
+    Boston, MA  02111-1307  USA.
 
 Also add information on how to contact you by electronic and paper mail.
 

Makefile.am

@@ -63,6 +63,10 @@ gdk-x11-3.0.pc gdk-win32-3.0.pc gdk-quartz-3.0.pc gdk-broadway-3.0.pc gdk-waylan
 	rm -f $@ && \
 	cp gdk-3.0.pc $@
 
+gtk+-*-3.0-uninstalled.pc: gtk+-3.0-uninstalled.pc
+	rm -f $@ && \
+	cp gtk+-3.0-uninstalled.pc $@
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gdk-3.0.pc gtk+-3.0.pc gail-3.0.pc
 
@@ -80,6 +84,8 @@ DISTCLEANFILES = \
 	gdk-3.0.pc			\
 	gdk-x11-3.0.pc			\
 	gail-3.0.pc			\
+	gtk+-3.0-uninstalled.pc		\
+	gail-3.0-uninstalled.pc		\
 	config.lt
 
 distclean-local:

Makefile.decl

@@ -10,7 +10,7 @@ TEST_PROGS =
 ### testing rules
 
 # Xvfb based test rules
-XVFB = Xvfb -ac -noreset -screen 0 1024x768x16
+XVFB = Xvfb -ac -noreset -screen 0 800x600x16
 XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \
    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \
    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \
@@ -29,7 +29,7 @@ endif
 XVFB_START = \
 	${XVFB} -help 2>/dev/null 1>&2 \
 	&& XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \
-	&& { ${XVFB} :$$XID -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \
+	&& { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \
 	       trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \
 	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
 	&& DISPLAY=:$$XID && export DISPLAY

NEWS

@@ -1,258 +1,3 @@
-Overview of Changes in GTK+ 3.3.18
-==================================
-
-* Add support for touch devices
- - New device types GDK_SOURCE_TOUCHSCREEN and
-   GDK_SOURCE_TOUCHPAD for direct and indirect
-   touch devices
- - New event GdkEventTouch and GDK_TOUCH_MASK
- - New signal GtkWidget::touch-event
-
-* Add support for smooth scrolling
- - Scroll events can contain scroll deltas,
-   obtainable via gdk_event_get_scroll_deltas()
- - Scroll direction for such events is GDK_SCROLL_SMOOTH
- - To receive scroll events, widgets must now
-   set either GDK_SCROLL_MASK or GDK_SMOOTH_SCROLL_MASK
-
-* GtkScrolledWindow will do kinetic scrolling
-  with touch devices
-
-* XInput2 is now required for building the X11
-  backend, support for XInput1 has been removed
-
-* Deprecations are now versioned, and new API is
-  marked with the version it was introduced.
-  Use these with GDK_VERSION_{MIN,MAX}_REQUIRED
-
-* Theming:
- - Memory consumption of the CSS parser has been reduced
- - CSS selectors of the form "a + b" and "a ~ b" work now
-
-* Bug fixes:
- 650693 Drawing errors in column headers when adding...
- 655065 Build failure on OS X 10.7 Lion
- 668141 button: don't be active when holding the mouse...
- 669335 Render a background in the scrollbars junction area
- 669342 overlay: add left/right/top/bottom style classes...
- 670555 I can't change GtkInfoBar text color via the theme
- 670881 Deactivate the menu if the window is withdrawn
- 671057 colorchooser can't remove palette
- 671070 Correct GroupSwitch mask
- 671170 GtkTable and GtkGrid alignment problem
-
-* Translation updates:
- Basque
- Belarusian
- Brazilian Portuguese
- Bulgarian
- Estonian
- Finnish
- Galician
- Hungarian
- Kazakh
- Korean
- Polish
- Persian
- Punjabi
- Serbian
- Slovenian
- Swedish
- Telugu
- Spanish
- Ukranian
- Vietnamese
-
-
-Overview of Changes in GTK+ 3.3.16
-==================================
-
-* The widget-factory theme test is now installed
-  as a demo named gtk3-widget-factory
-
-* The Raleigh theme is now a pure fallback theme
-  that doesn't share any CSS with other themes
-  anymore
-
-* GtkColorSelectionDialog has been deprecated in
-  favor of a new color chooser widget named
-  GtkColorChooserDialog
-
-* The GtkApplication session support has been simplified
-
-* Bug fixes:
- 612283 Clarification for GtkListStore::gtk_list_store_insert_with_values
- 668114 odd spacing in about dialog credits
- 669116 GtkNotebook's child-notify::position not always emitted...
- 669208 x11: Cancel _NET_WM_MOVERESIZE if we get a matching ButtonRelease
- 669511 gtkcsstypes.c: variable is declared at middle of block
- 669636 gtkactiongroup: clarify set_translation_domain docs
- 669638 gtkbuilder-menus: translation-domain can be NULL
- 669794 Orca + Trees/Tables == incorrect cells presented, crashes...
- 669947 gtkuimanager: clarify @pos of insert_action_group
- 670077 license text has poor alignment with close button
- 670078 no stroke around credits scrollable area
- 670400 First shortcut capture is broken
-
-* Translation updates:
- Belarusian
- Bulgarian
- Danish
- Estonian
- Galician
- Hebrew
- Italian
- Japanese
- Kazakh
- Lithuanian
- Norwegian bokmål
- Spanish
- Traditional Chinese
-
-
-Overview of Changes in GTK+ 3.3.14
-==================================
-
-* Theming
- - Fixes for border handling in GtkEntry,
-   GtkCellRendererText, GtkComboBox
- - Parse values more carefully, supporting
-   percentages, angles
- - Implement CSS linear-gradient syntax
- - Support background-size
- - Support a gtk.gresource file in themes
-
-* Bugs fixed
- 543520 Cups custom options are not sent properly
- 649121 Crash in GtkAppChooserDialog packagekit button
- 669176 Regression: atk-add-key-event-listener doesn't work
-
-* Updated translations
- Galician
- Norwegian bokmål
- Spanish
-
-
-Overview of Changes in GTK+ 3.3.10
-==================================
-
-* GtkApplication:
- - Move application menu handling over from GIO
- - Fix resize grip positioning in GtkApplicationWindow
-
-* Wayland:
- - Make combo boxes work
- - Make key modifiers work like on X11
- - Make mouse buttons work correctly
-
-* Quartz:
- - Make key modifiers work more like they do on X11
-
-* Printing:
- - Fix handling of custom cups options
-
-* Accessibility:
- - Bring key snooping support back for now
-
-* Translation updates:
- Spanish
-
-
-Overview of Changes in GTK+ 3.3.8
-=================================
-
-* GtkApplication:
- - Supports logout notification and inhibiting
- - Buttons, toolbuttons and switches can now be connected
-   to GActions
-
-* GtkSpinButton no longer allows to change the value
-  when not editable
-
-* GtkLabel link support has been rewritten to be be
-  more robust
-
-* GtkBuilder:
- - Supports the 'id' in GtkComboBoxText
- - Can parse GVariant-valued properties
- - Support loading from a GResource
-
-* GtkImage:
- - Support loading from a GResource
-
-* GtkUIManager:
- - Support loading from a GResource
-
-* Accessibility:
- - key snooping support has been removed
-
-* Wayland backend:
- - Cursor handling updates
- - Look for cursors in the 'weston' directory
- - Make resize grips work
- - Implement device grabs
- - Implement window geometry hints
- - Set surface type based on window type hint
- - Add basic clipboard and selection implementations
- - Implement client-side keyboard repeat
- - Update GdkWindow focus state to match reality
-
-* Theming:
- - Improved CSS compliance for selector matching
- - Improved CSS compliance for value resolution,
-   including full support for 'inherit', 'initial',
-   'currentColor', 'none'
- - Support border-style properties
- - 'window-unfocused' has been renamed to 'backdrop'
-
-* New deprecations:
- - GdkColor
- - GtkButton::inner-border
-
-* Miscellaneous:
- - Turn default theme css files and dnd cursors into
-   GResources
-
-* Bugs fixed:
- 543520 Cups custom options are not sent properly
- 612396 ...default of entry-text-column for GtkComboBoxText
- 613728 Rationalize GtkTreeView focus
- 620240 GNOME Drag & Drop broken for remote X sessions
- 629878 Missing "Back" and "Forward" icons for Firefox
- 631414 Add symbolic constants for event emission control
- 639875 crashes when unparenting a tab from a window...
- 657367 GtkAction: Hold a reference to proxy widgets
- 659516 gtk_css_provider_to_string lacks "since" tag
- 660139 GtkGrid gives Gtk-Warnings about negative sizes when empty
- 660309 check x11 backend when create xim module
- 663479 "Finishing" ("Completion") and "Advanced" tabs are empty
- 665015 "Widget (%s) has more than one label" unwanted warnings
- 666103 Should be able to match the parent where a dropdown menu...
- 666600 allocate the CSS border and deprecate GtkButton-inner-border
- 666685 SIGSEGV in _gtk_tree_selection_internal_select_node
- 666710 Fix compose sequences disabling other sequences
- 666842 [patch] "sticky" window state reported wrongly on X11
- 667018 Fix compilation on Windows
- 667229 gtkspinbutton: Respect value of inherited 'editable' property
- 667394 Gtk(Tool)Button: add an 'action-name' property
- 667473 gdk_rgba_free (NULL)
- 667485 gdk_rgba_parse error checking
- 667534 Non-XInput2 build fix
- 667546 GApplication doc mentions g_application_set_app_menu
- 667628 GtkWindow:application property should have G_PARAM_CONSTRUCT
- 667695 GAction leaked in examples/plugman.c
- 667705 fix up GtkApplication on OS X
- 666921 Fix the _NET_SUPPORTING_WM_CHECK window fetch to be spec...
-
-* Translation updates:
- Arabic
- Bulgarian
- Finnish
- Hebrew
- Norwegian bokmål
- Spanish
-
-
 Overview of Changes in GTK+ 3.3.6
 =================================
 

README.in

@@ -27,11 +27,6 @@ Installation
 See the file 'INSTALL'
 
 
-Release notes for 3.4
-=====================
-
-* The -uninstalled variants of the pkg-config files have been dropped.
-
 Release notes for 3.2
 =====================
 

build/win32/vs10/gtk+.props

@@ -139,8 +139,6 @@ copy ..\..\..\gtk\gtkaction.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkactiongroup.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkactionable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
 copy ..\..\..\gtk\gtkactivatable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkadjustment.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -157,8 +155,6 @@ copy ..\..\..\gtk\gtkappchooserwidget.h $(CopyDir)\include\gtk-$(GtkApiVersion)\
 
 copy ..\..\..\gtk\gtkapplication.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkapplicationwindow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
 copy ..\..\..\gtk\gtkarrow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkaspectframe.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -221,13 +217,9 @@ copy ..\..\..\gtk\gtkclipboard.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkcolorbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkcolorchooser.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+copy ..\..\..\gtk\gtkcolorsel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkcolorchooserwidget.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
-copy ..\..\..\gtk\gtkcolorchooserdialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
-copy ..\..\..\gtk\gtkcolorutils.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+copy ..\..\..\gtk\gtkcolorseldialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkcombobox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
@@ -237,8 +229,6 @@ copy ..\..\..\gtk\gtkcontainer.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkcssprovider.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkcsssection.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
 copy ..\..\..\gtk\gtkdebug.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkdialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -275,11 +265,7 @@ copy ..\..\..\gtk\gtkfixed.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkfontbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkfontchooser.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
-copy ..\..\..\gtk\gtkfontchooserdialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
-copy ..\..\..\gtk\gtkfontchooserwidget.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+copy ..\..\..\gtk\gtkfontsel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkframe.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
@@ -287,6 +273,22 @@ copy ..\..\..\gtk\gtkgradient.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkgrid.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
+copy ..\..\..\gtk\gtkhandlebox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkhbbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkhbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkhpaned.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkhscale.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkhscrollbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkhseparator.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkhsv.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
 copy ..\..\..\gtk\gtkiconfactory.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkicontheme.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -299,8 +301,6 @@ copy ..\..\..\gtk\gtkimagemenuitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkimcontext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkimcontextinfo.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
 copy ..\..\..\gtk\gtkimcontextsimple.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkimmodule.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -369,8 +369,6 @@ copy ..\..\..\gtk\gtkprintsettings.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkprivate.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkprivatetypebuiltins.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
 copy ..\..\..\gtk\gtkprogressbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkradioaction.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -383,6 +381,8 @@ copy ..\..\..\gtk\gtkradiotoolbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\g
 
 copy ..\..\..\gtk\gtkrange.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
+copy ..\..\..\gtk\gtkrc.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
 copy ..\..\..\gtk\gtkrecentaction.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkrecentchooser.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -435,6 +435,8 @@ copy ..\..\..\gtk\gtkstatusicon.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkstock.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
+copy ..\..\..\gtk\gtkstyle.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
 copy ..\..\..\gtk\gtkstylecontext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkstyleproperties.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -445,6 +447,10 @@ copy ..\..\..\gtk\gtkswitch.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtksymboliccolor.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
+copy ..\..\..\gtk\gtktable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktearoffmenuitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
 copy ..\..\..\gtk\gtktestutils.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtktextattributes.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -513,12 +519,24 @@ copy ..\..\..\gtk\gtktypebuiltins.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkuimanager.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
+copy ..\..\..\gtk\gtkvbbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkvbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
 copy ..\..\..\gtk\gtkversion.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkviewport.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkvolumebutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
+copy ..\..\..\gtk\gtkvpaned.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkvscale.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkvscrollbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkvseparator.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
 copy ..\..\..\gtk\gtkwidget.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkwidgetpath.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -526,51 +544,6 @@ copy ..\..\..\gtk\gtkwidgetpath.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 copy ..\..\..\gtk\gtkwindow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 
-mkdir $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkcolorsel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkcolorseldialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkfontsel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkhandlebox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkhbbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkhbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkhpaned.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkhscale.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkhsv.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkhscrollbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkhseparator.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkrc.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkstyle.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtktable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtktearoffmenuitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkvbbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkvbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkvscale.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkvscrollbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkvseparator.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkvpaned.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-
 mkdir $(CopyDir)\include\gail-$(GtkApiVersion)\libgail-util
 
 copy ..\..\..\libgail-util\gail-util.h $(CopyDir)\include\gail-$(GtkApiVersion)\libgail-util
@@ -592,9 +565,7 @@ mkdir $(CopyDir)\share\glib-2.0\schemas
 
 copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
 
-copy ..\..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
-
-echo "Compiling gsettings XML Files..."
+echo "Compiling gsettings XML File(s)..."
 
 $(CopyDir)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas
 

build/win32/vs10/gtk.vcxprojin

@@ -69,7 +69,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -91,7 +91,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -114,7 +114,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -136,7 +136,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>

build/win32/vs10/gtk3-demo.vcxproj

@@ -164,7 +164,6 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\demos\gtk-demo\application.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\appwindow.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\assistant.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\builder.c" />
@@ -203,7 +202,6 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\textscroll.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\textview.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\toolpalette.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\transparent.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\tree_store.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\ui_manager.c" />
   </ItemGroup>

build/win32/vs10/gtk3-demo.vcxproj.filters

@@ -11,9 +11,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\demos\gtk-demo\application.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\appwindow.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -128,9 +125,6 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\toolpalette.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\transparent.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\tree_store.c">
       <Filter>Source Files</Filter>
     </ClCompile>

build/win32/vs9/gtk+.vsprops

@@ -124,7 +124,6 @@ copy ..\..\..\gtk\gtkaccelmap.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 copy ..\..\..\gtk\gtkaccessible.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkaction.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkactiongroup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

-copy ..\..\..\gtk\gtkactionable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkactivatable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkadjustment.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkalignment.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

@@ -133,7 +132,6 @@ copy ..\..\..\gtk\gtkappchooserbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\g
 copy ..\..\..\gtk\gtkappchooserdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkappchooserwidget.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkapplication.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

-copy ..\..\..\gtk\gtkapplicationwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkarrow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkaspectframe.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkassistant.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

@@ -165,15 +163,12 @@ copy ..\..\..\gtk\gtkcheckbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x
 copy ..\..\..\gtk\gtkcheckmenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkclipboard.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkcolorbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

-copy ..\..\..\gtk\gtkcolorchooser.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

-copy ..\..\..\gtk\gtkcolorchooserwidget.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

-copy ..\..\..\gtk\gtkcolorchooserdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

-copy ..\..\..\gtk\gtkcolorutils.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

+copy ..\..\..\gtk\gtkcolorsel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

+copy ..\..\..\gtk\gtkcolorseldialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkcombobox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkcomboboxtext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkcontainer.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkcssprovider.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

-copy ..\..\..\gtk\gtkcsssection.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkdebug.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkdnd.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

@@ -192,19 +187,24 @@ copy ..\..\..\gtk\gtkfilechooserwidget.h $(OutDir)\include\gtk-$(GtkApiVersion)\
 copy ..\..\..\gtk\gtkfilefilter.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkfixed.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkfontbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

-copy ..\..\..\gtk\gtkfontchooser.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

-copy ..\..\..\gtk\gtkfontchooserdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

-copy ..\..\..\gtk\gtkfontchooserwidget.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

+copy ..\..\..\gtk\gtkfontsel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkframe.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkgradient.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkgrid.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

+copy ..\..\..\gtk\gtkhandlebox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

+copy ..\..\..\gtk\gtkhbbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

+copy ..\..\..\gtk\gtkhbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

+copy ..\..\..\gtk\gtkhpaned.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

+copy ..\..\..\gtk\gtkhscale.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

+copy ..\..\..\gtk\gtkhscrollbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

+copy ..\..\..\gtk\gtkhseparator.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

+copy ..\..\..\gtk\gtkhsv.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkiconfactory.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkicontheme.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkiconview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkimage.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkimagemenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkimcontext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

-copy ..\..\..\gtk\gtkimcontextinfo.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkimcontextsimple.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkimmodule.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkimmulticontext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

@@ -239,13 +239,13 @@ copy ..\..\..\gtk\gtkprintoperation.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 copy ..\..\..\gtk\gtkprintoperationpreview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkprintsettings.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkprivate.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

-copy ..\..\..\gtk\gtkprivatetypebuiltins.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkprogressbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkradioaction.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkradiobutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkradiomenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkradiotoolbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkrange.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

+copy ..\..\..\gtk\gtkrc.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkrecentaction.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkrecentchooser.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkrecentchooserdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

@@ -272,11 +272,14 @@ copy ..\..\..\gtk\gtkspinner.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
&
 copy ..\..\..\gtk\gtkstatusbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkstatusicon.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkstock.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

+copy ..\..\..\gtk\gtkstyle.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkstylecontext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkstyleproperties.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkstyleprovider.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkswitch.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtksymboliccolor.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

+copy ..\..\..\gtk\gtktable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

+copy ..\..\..\gtk\gtktearoffmenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtktestutils.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtktextattributes.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtktextbuffer.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

@@ -311,37 +314,19 @@ copy ..\..\..\gtk\gtktreeview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 copy ..\..\..\gtk\gtktreeviewcolumn.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtktypebuiltins.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkuimanager.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

+copy ..\..\..\gtk\gtkvbbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

+copy ..\..\..\gtk\gtkvbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkversion.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkviewport.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

-copy ..\..\..\gtk\gtkvolumebutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
;
+copy ..\..\..\gtk\gtkvolumebutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

+copy ..\..\..\gtk\gtkvpaned.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

+copy ..\..\..\gtk\gtkvscale.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

+copy ..\..\..\gtk\gtkvscrollbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

+copy ..\..\..\gtk\gtkvseparator.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkwidget.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkwidgetpath.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 copy ..\..\..\gtk\gtkwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk

 
-mkdir $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated

-
-copy ..\..\..\gtk\deprecated\gtkcolorsel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated

-copy ..\..\..\gtk\deprecated\gtkcolorseldialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated

-copy ..\..\..\gtk\deprecated\gtkfontsel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated

-copy ..\..\..\gtk\deprecated\gtkhandlebox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated

-copy ..\..\..\gtk\deprecated\gtkhbbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated

-copy ..\..\..\gtk\deprecated\gtkhbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated

-copy ..\..\..\gtk\deprecated\gtkhpaned.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated

-copy ..\..\..\gtk\deprecated\gtkhscale.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated

-copy ..\..\..\gtk\deprecated\gtkhsv.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated

-copy ..\..\..\gtk\deprecated\gtkhscrollbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated

-copy ..\..\..\gtk\deprecated\gtkhseparator.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated

-copy ..\..\..\gtk\deprecated\gtkrc.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated

-copy ..\..\..\gtk\deprecated\gtkstyle.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated

-copy ..\..\..\gtk\deprecated\gtktable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated

-copy ..\..\..\gtk\deprecated\gtktearoffmenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated

-copy ..\..\..\gtk\deprecated\gtkvbbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated

-copy ..\..\..\gtk\deprecated\gtkvbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated

-copy ..\..\..\gtk\deprecated\gtkvscale.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated

-copy ..\..\..\gtk\deprecated\gtkvscrollbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated

-copy ..\..\..\gtk\deprecated\gtkvseparator.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated

-copy ..\..\..\gtk\deprecated\gtkvpaned.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated

-
 mkdir $(OutDir)\include\gail-$(GtkApiVersion)\libgail-util

 copy ..\..\..\libgail-util\gail-util.h $(OutDir)\include\gail-$(GtkApiVersion)\libgail-util

 copy ..\..\..\libgail-util\gailmisc.h $(OutDir)\include\gail-$(GtkApiVersion)\libgail-util

@@ -354,8 +339,7 @@ copy $(ConfigurationName)\$(PlatformName)\bin\gailutil.lib $(OutDir)\lib
&#
 
 mkdir $(OutDir)\share\glib-2.0\schemas

 copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(OutDir)\share\glib-2.0\schemas

-copy ..\..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(OutDir)\share\glib-2.0\schemas

-echo "Compiling gsettings XML Files..."

+echo "Compiling gsettings XML File(s)..."

 $(OutDir)\bin\glib-compile-schemas.exe $(OutDir)\share\glib-2.0\schemas

 "
 	/>

build/win32/vs9/gtk.vcprojin

@@ -31,7 +31,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
 				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -63,7 +63,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="$(GtkDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -96,7 +96,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -128,7 +128,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="$(GtkDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"

build/win32/vs9/gtk3-demo.vcproj

@@ -160,7 +160,6 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
-			<File RelativePath="..\..\..\demos\gtk-demo\application.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\appwindow.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\assistant.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\builder.c" />
@@ -199,7 +198,6 @@
 			<File RelativePath="..\..\..\demos\gtk-demo\textscroll.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\textview.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\toolpalette.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\transparent.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\tree_store.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\ui_manager.c" />
 		</Filter>

config.h.win32.in

@@ -5,8 +5,8 @@
 /* always defined to indicate that i18n is enabled */
 #define ENABLE_NLS 1
 
-/* define to enable packagekit */
-/* #undef ENABLE_PACKAGEKIT */
+/* Define if gio can sniff image data */
+/* #undef GDK_PIXBUF_USE_GIO_MIME */
 
 /* The prefix for our gettext translation domains. */
 #define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
@@ -20,8 +20,8 @@
 /* Define to 1 if you have the `bind_textdomain_codeset' function. */
 #define HAVE_BIND_TEXTDOMAIN_CODESET 1
 
-/* define if we have colord */
-/* #undef HAVE_COLORD */
+/* Is the wctype implementation broken */
+/* #undef HAVE_BROKEN_WCTYPE */
 
 /* Define to 1 if you have the <crt_externs.h> header file. */
 /* #undef HAVE_CRT_EXTERNS_H */
@@ -73,8 +73,8 @@
 /* #undef HAVE_INTTYPES_H */
 #endif
 
-/* Define to 1 if the system has the type `IPrintDialogCallback'. */
-#define HAVE_IPRINTDIALOGCALLBACK 1
+/* Define to 1 if ipc.h is available */
+/* #undef HAVE_IPC_H */
 
 /* Define if your <locale.h> file defines LC_MESSAGES. */
 /* #undef HAVE_LC_MESSAGES */
@@ -100,14 +100,12 @@
 /* Define to 1 if you have a working `mmap' system call. */
 /* #undef HAVE_MMAP */
 
-/* Define to 1 if nearbyint() is available */
-#ifndef _MSC_VER
-#define HAVE_NEARBYINT 1
-#endif
-
 /* Define to 1 if libpapi available */
 /* #undef HAVE_PAPI */
 
+/* Define to 1 is libjpeg supports progressive JPEG */
+/* #undef HAVE_PROGRESSIVE_JPEG */
+
 /* Define to 1 if you have the <pwd.h> header file. */
 /* #undef HAVE_PWD_H */
 
@@ -151,8 +149,8 @@
 /* Define to 1 if you have the <string.h> header file. */
 #define HAVE_STRING_H 1
 
-/* Define to 1 if you have the <sys/param.h> header file. */
-/* #undef HAVE_SYS_PARAM_H */
+/* Define to 1 if sys/select.h is available */
+/* #undef HAVE_SYS_SELECT_H */
 
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
@@ -173,6 +171,9 @@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #define HAVE_SYS_TYPES_H 1
 
+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+/* #undef HAVE_SYS_WAIT_H */
+
 /* Define to 1 if you have the <unistd.h> header file. */
 #ifndef _MSC_VER
 #define HAVE_UNISTD_H 1
@@ -183,6 +184,12 @@
 /* Have uxtheme.h include file */
 #define HAVE_UXTHEME_H 1
 
+/* Have wchar.h include file */
+#define HAVE_WCHAR_H 1
+
+/* Have wctype.h include file */
+#define HAVE_WCTYPE_H 1
+
 /* Define if we have X11R6 */
 /* #undef HAVE_X11R6 */
 
@@ -204,9 +211,6 @@
 /* Define to 1 if XFree Xinerama is available */
 /* #undef HAVE_XFREE_XINERAMA */
 
-/* Have XGenericEvent */
-/* #undef HAVE_XGENERICEVENTS */
-
 /* Define to 1 if xinerama is available */
 /* #undef HAVE_XINERAMA */
 
@@ -216,6 +220,9 @@
 /* Define to use XKB extension */
 /* #undef HAVE_XKB */
 
+/* Define to 1 if xshm.h is available */
+/* #undef HAVE_XSHM_H */
+
 /* Have the SYNC extension library */
 /* #undef HAVE_XSYNC */
 
@@ -241,6 +248,9 @@
 /* Define if <X11/extensions/XIproto.h> needed for xReply */
 /* #undef NEED_XIPROTO_H_FOR_XREPLY */
 
+/* Define to 1 if fd_set is not available */
+#define NO_FD_SET 1
+
 /* Define to 1 if your C compiler doesn't accept -c and -o together. */
 #ifndef _MSC_VER
 /* #undef NO_MINUS_C_MINUS_O */
@@ -260,15 +270,11 @@
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "gtk+"
 
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
 /* Define to the version of this package. */
 #define PACKAGE_VERSION "@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.@GTK_MICRO_VERSION@"
 
-/* Use NSBundle functions to determine load paths for libraries, translations,
-   etc. */
-/* #undef QUARTZ_RELOCATION */
+/* Define as the return type of signal handlers (`int' or `void'). */
+#define RETSIGTYPE void
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
@@ -276,8 +282,21 @@
 /* Define to 1 if gmodule works and should be used */
 #define USE_GMODULE 1
 
-/* Define to 1 if XInput 2.0 is available */
-/* #undef XINPUT_2 */
+/* Whether to load modules via .la files rather than directly */
+/* #undef USE_LA_MODULES */
+
+/* Define to 1 if XXM is available and should be used */
+#ifndef _MSC_VER
+#  define USE_MMX 1
+#else
+#  undef USE_MMX
+#endif
+
+/* Define to 1 if no XInput should be used */
+/* #undef XINPUT_NONE */
+
+/* Define to 1 if XFree XInput should be used */
+/* #undef XINPUT_XFREE */
 
 /* Define to 1 if the X Window System is missing or not being used. */
 /* #undef X_DISPLAY_MISSING */
@@ -288,6 +307,9 @@
 /* Define for large files, on AIX-style hosts. */
 /* #undef _LARGE_FILES */
 
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
 /* Define to `int' if <sys/types.h> doesn't define. */
 #define gid_t int
 

configure.ac

@@ -10,7 +10,7 @@
 
 m4_define([gtk_major_version], [3])
 m4_define([gtk_minor_version], [3])
-m4_define([gtk_micro_version], [18])
+m4_define([gtk_micro_version], [7])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -39,11 +39,11 @@ AC_CONFIG_AUX_DIR([build-aux])
 m4_define([gtk_binary_version], [3.0.0])
 
 # required versions of other packages
-m4_define([glib_required_version], [2.31.20])
+m4_define([glib_required_version], [2.31.6])
 m4_define([pango_required_version], [1.29.0])
 m4_define([atk_required_version], [2.1.5])
 m4_define([cairo_required_version], [1.10.0])
-m4_define([gdk_pixbuf_required_version], [2.25.2])
+m4_define([gdk_pixbuf_required_version], [2.23.5])
 m4_define([introspection_required_version], [0.10.1])
 GLIB_REQUIRED_VERSION=glib_required_version
 PANGO_REQUIRED_VERSION=pango_required_version
@@ -265,6 +265,10 @@ AC_ARG_ENABLE(xinerama,
               [AS_HELP_STRING([--enable-xinerama],
 	                      [support Xinerama extension [default=maybe]])],,
               [enable_xinerama="maybe"])
+AC_ARG_ENABLE(xinput,
+              [AS_HELP_STRING([--enable-xinput],
+                              [support XInput extension [default=yes]])],,
+              [enable_xinput="maybe"])
 AC_ARG_ENABLE(xrandr,
               [AS_HELP_STRING([--enable-xrandr],
                               [support XRandR extension [default=maybe]])],,
@@ -931,7 +935,7 @@ if test "x$enable_x11_backend" = xyes; then
     have_base_x_pc=true
     X_PACKAGES="$X_PACKAGES x11 xext"
     x_libs="`$PKG_CONFIG --libs x11 xext`"
-    X_CFLAGS="`$PKG_CONFIG --cflags x11 xext` -DXINPUT2_1_USE_UNSTABLE_PROTOCOL -DXINPUT2_2_USE_UNSTABLE_PROTOCOL"
+    X_CFLAGS="`$PKG_CONFIG --cflags x11 xext`"
 
     # Strip out any .la files that pkg-config might give us (this happens
     # with -uninstalled.pc files)
@@ -1107,7 +1111,11 @@ if test "x$enable_x11_backend" = xyes; then
                 AC_DEFINE(HAVE_XGENERICEVENTS, 1, [Have XGenericEvent]))
 
   # set up things for XInput
-  if $PKG_CONFIG --exists "xi" ; then
+  if test "x$enable_xinput" != "xno" && $PKG_CONFIG --exists "xi" ; then
+    have_xinput=yes
+
+    AC_DEFINE(XINPUT_XFREE, 1,
+              [Define to 1 if XFree XInput should be used])
 
     X_PACKAGES="$X_PACKAGES xi"
     GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xi"
@@ -1115,18 +1123,22 @@ if test "x$enable_x11_backend" = xyes; then
     AC_CHECK_HEADER(X11/extensions/XInput2.h,
                     have_xinput2=yes
                     X_EXTENSIONS="$X_EXTENSIONS XI2"
-                    AC_DEFINE(XINPUT_2, 1, [Define to 1 if XInput 2.0 is available]))
+                    AC_DEFINE(XINPUT_2, 1, [Define to 1 if XInput 2.0 is available]),
+                    X_EXTENSIONS="$X_EXTENSIONS XInput")
 
-    gtk_save_LIBS="$LIBS"
-    LIBS="$LIBS -lXi"
-    AC_CHECK_FUNC(XIAllowTouchEvents, AC_DEFINE(XINPUT_2_2, 1, [Define to 1 if XInput 2.2 is available]))
-    LIBS="$gtk_save_LIBS"
+  else
+    AC_DEFINE(XINPUT_NONE, 1,
+              [Define to 1 if no XInput should be used])
   fi
 
+  AM_CONDITIONAL(XINPUT_XFREE, test "x$have_xinput" = "xyes")
   AM_CONDITIONAL(XINPUT_2,     test "x$have_xinput2" = "xyes")
 
-  AS_IF([test "x$have_xinput2" != "xyes"],
-        [AC_MSG_ERROR([*** XInput2 extension not found. Check 'config.log' for more details.])])
+  if test "x$enable_xinput" = "xyes" ; then
+    if test "x$have_xinput" != "xyes" -a "x$have_xinput2" != "xyes" ; then
+      AC_MSG_ERROR([*** XInput extension not found. Check 'config.log' for more details.])
+    fi
+  fi
 
   # Check for the RANDR extension
   if test x"$enable_xrandr" != xno; then
@@ -1207,6 +1219,7 @@ if test "x$enable_x11_backend" = xyes; then
 else
   XPACKAGES=
 
+  AM_CONDITIONAL(XINPUT_XFREE, false)
   AM_CONDITIONAL(XINPUT_2, false)
   AM_CONDITIONAL(USE_X11, false)
   AM_CONDITIONAL(HAVE_X11R6, false)
@@ -1516,13 +1529,6 @@ fi
 
 GLIB_GSETTINGS
 
-#############
-# Resources #
-#############
-
-GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
-AC_SUBST(GLIB_COMPILE_RESOURCES)
-
 ##################################################
 # GObject introspection
 ##################################################
@@ -1659,6 +1665,20 @@ AC_CONFIG_COMMANDS([gdk/gdkconfig.h], [
 
 G_BEGIN_DECLS
 
+/* These macros are used to mark deprecated functions in GDK and
+ * GTK+ headers, and thus have to be exposed in installed headers.
+ * But please do *not* use them in other projects. Instead, use
+ * G_DEPRECATED or define your own wrappers around it.
+ */
+
+#ifdef GDK_DISABLE_DEPRECATION_WARNINGS
+#define GDK_DEPRECATED
+#define GDK_DEPRECATED_FOR(f)
+#else
+#define GDK_DEPRECATED G_DEPRECATED
+#define GDK_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f)
+#endif
+
 _______EOF
 
 	cat >>$outfile <<_______EOF
@@ -1714,6 +1734,8 @@ gdk-3.0.pc
 gtk+-3.0.pc
 gtk+-unix-print-3.0.pc
 gail-3.0.pc
+gtk+-3.0-uninstalled.pc
+gail-3.0-uninstalled.pc
 m4macros/Makefile
 po/Makefile.in
 po-properties/Makefile.in
@@ -1721,14 +1743,12 @@ demos/Makefile
 demos/gtk-demo/Makefile
 demos/gtk-demo/geninclude.pl
 demos/pixbuf-demo/Makefile
-demos/widget-factory/Makefile
 examples/Makefile
 tests/Makefile
 tests/a11y/Makefile
 tests/css/Makefile
 tests/css/parser/Makefile
 tests/reftests/Makefile
-tests/visuals/Makefile
 docs/Makefile
 docs/reference/Makefile
 docs/reference/gdk/Makefile
@@ -1751,7 +1771,6 @@ gdk/win32/rc/gdk.rc
 gdk/quartz/Makefile
 gdk/wayland/Makefile
 gdk/tests/Makefile
-gdk/gdkversionmacros.h
 gtk/Makefile
 gtk/makefile.msc
 gtk/gtkversion.h

debian/README.debian

@@ -0,0 +1,18 @@
+libgtk1 for Debian
+----------------------
+
+The GIMP Tool Kit (gtk) is a set of widgets to help you program
+programs for the X Windowing System easily and powerfully.
+
+gtk is the moving force behind The GNU Image Manipulation Program (The
+GIMP) -- the number one freely-available image editing and creation
+program available. 
+
+gtk is rapidly under development, and the source tree has officially
+been separated from The GIMP now, as other teams of programmers
+are beginning to write software using its great widget set -- like
+GNOME, a desktop interface for X, and gzilla, a freely available
+web browser for X.
+
+Ben Gertzfield <che@debian.org>, Mon, 29 Sep 1997 13:11:45 -0700
+

debian/build

@@ -0,0 +1,62 @@
+#!/usr/bin/perl -w
+
+				# Adjust debian/changelog and build a new
+				# Debian package of a CVS archive.
+
+				# Written 17 November 1998 by Ben Gertzfield
+				# <che@debian.org>
+
+				# This work is released under the GNU
+				# General Public License, version 2 or
+				# later.
+
+use strict;
+use diagnostics;
+use File::Copy;
+
+my $maintainer = 'Ben Gertzfield <che@debian.org>';
+
+my @date = localtime;
+
+my $datestr = sprintf("%d%.2d%.2d", $date[5] + 1900, $date[4] + 1, $date[3]);
+my $revision = '01';
+
+open (CHANGELOG, 'debian/changelog') or die "Couldn't open debian/changelog: $!\n";
+
+$_ = <CHANGELOG>;
+chomp;
+
+close CHANGELOG;
+
+my ($package, $last_date, $last_revision) = /^(.*?) \((.*?)\.(.*)?\)/;
+
+if ($last_date eq $datestr) {
+  $revision = sprintf("%.2d", $last_revision + 1);
+}
+
+my $new_version = "$datestr.$revision";
+
+copy('debian/changelog', 'debian/changelog.old') or die "Couldn't copy debian/changelog to debian/changelog.old: $!\n";
+
+open(NEWCHANGELOG, ">debian/changelog") or die "Couldn't open debian/changelog for writing: $!\n";
+
+print NEWCHANGELOG "$package ($new_version) unstable; urgency=low\n\n  * CVS snapshot build at " . scalar localtime() . "\n\n -- $maintainer  " . `date -R` . "\n";
+
+open(OLDCHANGELOG, "debian/changelog.old") or die "Couldn't open debian/changelog.old: $!\n";
+
+while (<OLDCHANGELOG>) {
+  print NEWCHANGELOG;
+}
+
+close OLDCHANGELOG;
+close NEWCHANGELOG;
+
+unlink('debian/changelog.old') or die "Couldn't unlink debian/changelog.old: $!\n";
+
+open(NEWVERSION, '>debian/version') or die "Couldn't open debian/version for writing: $!\n";
+print NEWVERSION "$new_version\n";
+close NEWVERSION;
+
+system('dpkg-buildpackage -b -rfakeroot -us -uc');
+unlink 'debian/version' or die "Couldn't unlink debian/version: $!\n";
+

debian/changelog

@@ -0,0 +1,10 @@
+gtk+-cvs (19981116.01) unstable; urgency=low
+
+  * First test build from CVS
+
+ -- Ben Gertzfield <che@debian.org>  Tue, 17 Nov 1998 12:02:13 -0800
+
+Local variables:
+mode: debian-changelog
+add-log-mailing-address: "che@debian.org"
+End:

debian/control

@@ -0,0 +1,81 @@
+Source: gtk+-cvs
+Priority: extra
+Section: libs
+Maintainer: Ben Gertzfield <che@debian.org>
+Standards-Version: 2.4.0.0
+
+Package: libgtk-cvs-1.1
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Conflicts: libgtk-dev (<< 1:1.0.2), libgtk1.1
+Description: CVS build of the GIMP Toolkit set of widgets for X
+ **THIS IS NOT AN OFFICIAL DEBIAN PACKAGE! THIS IS AN AUTOMATED CVS
+   BUILD OF THE GTK+ LIBRARIES! BEWARE! IT MAY NOT WORK!**
+ . 
+ The GIMP Toolkit is a freely available set of widgets for X.
+ GTK is easy to use, and has been implemented in such projects as
+ The GNU Image Manipulation Program (The GIMP), GNOME, a GNU
+ desktop set of utilities for X, and gzilla, a GNU web-browser.
+ .
+ This is the unstable 1.1 branch of GTK. It is not intended for use
+ with stable projects!
+
+Package: libgtk-cvs-dev
+Architecture: any
+Section: devel
+Depends: libgtk-cvs-1.1 (=${Source-Version}), libglib-cvs-dev
+Suggests: libgtk-cvs-doc
+Provides: libgtk1.1-dev
+Replaces: libgtk1.1-dev
+Conflicts: libgtk-dev, libgtk1 (<< 1:1.0.4), libgtk1.1-dev
+Description: CVS build of development files for the GIMP Toolkit
+ **THIS IS NOT AN OFFICIAL DEBIAN PACKAGE! THIS IS AN AUTOMATED CVS
+   BUILD OF THE GTK+ LIBRARIES! BEWARE! IT MAY NOT WORK!**
+ .
+ This package contains the header files and static libraries for the
+ GIMP Toolkit set of widgets for X. 
+ .
+ This is the unstable, 1.1 branch of GTK+. This is not intended for
+ use with stable releases of programs! 
+ .
+ Install this package if you wish to develop your own X programs using
+ the GIMP Toolkit 1.1, or if you wish to compile your own plug-ins for
+ The GIMP.
+
+Package: libgtk-cvs-doc
+Architecture: all
+Section: doc
+Conflicts: libgtk-dev (<< 1:0.99.4), libgtk-doc, libgtk1.1-doc
+Description: CVS build of documentation for the GIMP Toolkit
+ **THIS IS NOT AN OFFICIAL DEBIAN PACKAGE! THIS IS AN AUTOMATED CVS
+   BUILD OF THE GTK+ LIBRARIES! BEWARE! IT MAY NOT WORK!**
+ .
+ This package contains lots of info-files, HTML docs, FAQs, and
+ other handy documentation about the GIMP Toolkit set of widgets
+ for X. 
+ .
+ This package documents the unstable 1.1 release of the GIMP Toolkit.
+ . 
+ Install this package if you want to have lots of info about the
+ GIMP toolkit when you're programming.
+
+Package: libgtk-cvs-dbg
+Architecture: any
+Section: devel
+Depends: libgtk-cvs-1.1 (= ${Source-Version}), libgtk-cvs-dev (= ${Source-Version})
+Suggests: libgtk-cvs-doc
+Conflicts: libgtk1.1-dbg
+Description: CVS build of debugging files for the GIMP Toolkit
+ **THIS IS NOT AN OFFICIAL DEBIAN PACKAGE! THIS IS AN AUTOMATED CVS
+   BUILD OF THE GTK+ LIBRARIES! BEWARE! IT MAY NOT WORK!**
+ .
+ This package contains the debugging static libraries for the
+ GIMP Toolkit set of widgets for X. 
+ .
+ This is the unstable, 1.1 branch of GTK+. This is not intended for
+ use with stable releases of programs! 
+ .
+ Install this package if you wish to debug your own X programs using
+ the GIMP Toolkit 1.1, or if you wish to debug your own plug-ins for
+ The GIMP.

debian/copyright

@@ -0,0 +1,8 @@
+This package was debianized by Ben Gertzfield <che@debian.org> on
+Tue, 17 Nov 1998 12:07:17 -0800
+
+It was produced from the CVS repository at cvs.gimp.org.
+
+It may be redistributed under the terms of the GNU LGPL, Version 2 or
+later, found on Debian systems in the file /usr/doc/copyright/LGPL.
+

debian/libgtk-cvs-dev.files

@@ -0,0 +1,9 @@
+usr/lib/libgdk.so
+usr/lib/libgdk.a
+usr/lib/libgtk.so
+usr/lib/libgtk.a
+usr/include/gdk/
+usr/include/gtk/
+usr/bin/gtk-config
+usr/man/man1/gtk-config.1
+usr/share/aclocal/gtk.m4

debian/libgtk-cvs-dev.postinst

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#

debian/libgtk-cvs-dev.prerm

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+set -e
+install-info --quiet --remove gtk
+
+#DEBHELPER#

debian/libgtk-cvs-doc.files

@@ -0,0 +1,8 @@
+usr/info/gdk.info
+usr/info/gtk.info
+usr/info/gtk.info-1
+usr/info/gtk.info-2
+usr/info/gtk.info-3
+usr/info/gtk.info-4
+usr/info/gtk.info-5
+

debian/libgtk-cvs-doc.postinst

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+install-info --quiet --description="The GIMP Toolkit." \
+ --section "The GIMP" "The GIMP" /usr/info/gtk.info.gz
+
+install-info --quiet --description="The GIMP Drawing Kit." \
+ --section "The GIMP" "The GIMP" /usr/info/gdk.info.gz
+
+#DEBHELPER#

debian/libgtk-cvs-doc.prerm

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+install-info --quiet --remove gtk
+install-info --quiet --remove gdk
+
+#DEBHELPER#

debian/postinst

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+ldconfig
+
+#DEBHELPER#

debian/rules

@@ -0,0 +1,160 @@
+#!/usr/bin/make -f
+
+# debian/rules file for gtk+ Debian package
+# written April 1998 by Ben Gertzfield <che@debian.org
+
+build: build-stamp
+build-stamp:
+	dh_testdir
+	./autogen.sh --prefix=/usr --with-xinput=xfree
+	$(MAKE)
+	cd docs && make distdocs
+	cd ..
+	touch build-stamp
+
+build-dbg: build-dbg-stamp
+build-dbg-stamp:
+	dh_testdir
+	./configure --prefix=/usr --with-xinput=xfree --enable-debug=yes
+	$(MAKE)
+	touch build-dbg-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp build-dbg-stamp install-stamp install-dbg-stamp
+	# Add here commands to clean up after the build process.
+	-$(MAKE) clean
+	cd docs 
+	-$(MAKE) maintainer-clean
+	cd ..
+	-$(MAKE) distclean
+	find . -name '*.o' -o -name '_libs' -o -name '*.lo' -o -name '*.a' -o -name '.deps' | xargs rm -rf
+	dh_clean
+
+clean-dbg:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp build-dbg-stamp install-stamp install-dbg-stamp
+	# Add here commands to clean up after the build process.
+	-$(MAKE) clean
+	cd docs
+	-$(MAKE) maintainer-clean
+	cd ..
+	-$(MAKE) distclean
+	find . -name '*.o' -o -name '_libs' -o -name '*.lo' -o -name '*.a' -o -name '.deps' | xargs rm -rf
+	dh_clean -k
+
+install: install-stamp
+install-stamp: build
+	dh_testdir
+	dh_testroot
+	dh_clean
+	$(MAKE) prefix=`pwd`/debian/tmp/usr install
+	touch install-stamp
+
+install-dbg: install-dbg-stamp
+install-dbg-stamp: build-dbg
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	$(MAKE) prefix=`pwd`/debian/libgtk-cvs-dbg/usr install
+	touch install-dbg-stamp
+
+# Build architecture-independent files here.
+binary-indep: build install libgtk-cvs-doc
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install libgtk-cvs-dev libgtk-cvs-1.1 libgtk-cvs-dbg
+
+libgtk-cvs-1.1: build
+	dh_testdir -plibgtk-cvs-1.1 
+	dh_testroot -plibgtk-cvs-1.1
+	dh_installdirs -plibgtk-cvs-1.1
+	# Add here commands to install the files into debian/tmp
+	rm -rf debian/tmp/usr/bin debian/tmp/usr/include debian/tmp/usr/info debian/tmp/usr/lib/glib debian/tmp/usr/share/aclocal debian/tmp/usr/man debian/tmp/usr/lib/*.la
+	dh_installdocs -plibgtk-cvs-1.1
+	dh_installchangelogs -plibgtk-cvs-1.1
+	dh_strip -plibgtk-cvs-1.1
+	dh_compress -plibgtk-cvs-1.1
+	dh_fixperms -plibgtk-cvs-1.1
+	dh_installdeb -plibgtk-cvs-1.1
+	dh_shlibdeps -plibgtk-cvs-1.1
+	dh_gencontrol -plibgtk-cvs-1.1
+	dh_makeshlibs -plibgtk-cvs-1.1 -V 'libgtk-cvs-1.1 (='`cat debian/version`')'
+	dh_md5sums -plibgtk-cvs-1.1
+	dh_builddeb -plibgtk-cvs-1.1
+
+libgtk-cvs-dev: build
+	dh_testdir -plibgtk-cvs-dev
+	dh_testroot -plibgtk-cvs-dev
+	dh_clean -plibgtk-cvs-dev -k
+	dh_installdirs -plibgtk-cvs-dev
+	# Add here commands to install the files into debian/tmp
+	dh_movefiles -plibgtk-cvs-dev
+	cp gtk-config debian/tmp/usr/bin
+	dh_installdocs -plibgtk-cvs-dev 
+	dh_installchangelogs -plibgtk-cvs-dev
+	dh_strip -plibgtk-cvs-dev
+	dh_compress -plibgtk-cvs-dev
+	dh_fixperms -plibgtk-cvs-dev
+	dh_installdeb -plibgtk-cvs-dev
+	dh_shlibdeps -plibgtk-cvs-dev
+	dh_gencontrol -plibgtk-cvs-dev
+	dh_md5sums -plibgtk-cvs-dev
+	dh_builddeb -plibgtk-cvs-dev
+
+libgtk-cvs-doc:
+	dh_testdir -plibgtk-cvs-doc
+	dh_testroot -plibgtk-cvs-doc
+	dh_clean -plibgtk-cvs-doc -k
+	dh_installdirs -plibgtk-cvs-doc usr/doc/libgtk-cvs-doc/faq-html \
+	  usr/doc/libgtk-cvs-doc/tutorial-html usr/doc/libgtk-cvs-doc/italian-tutorial-html usr/doc/libgtk-cvs-doc/french-tutorial-html usr/doc/libgtk-cvs-doc/gdk-html
+	dh_movefiles -plibgtk-cvs-doc
+	cp docs/html/gtkfaq*.html debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/faq-html
+	cp docs/html/gtk_tut-*.html debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/tutorial-html
+	cp docs/html/*.gif debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/tutorial-html
+	cp docs/html/gtk_tut.html debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/tutorial-html
+	cp docs/html/gtk_tut_it*.html debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/italian-tutorial-html
+	cp docs/html/*.gif debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/italian-tutorial-html
+	cp docs/html/gtk_tut_fr*.html debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/french-tutorial-html
+	cp docs/html/*.gif debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/french-tutorial-html
+	cp docs/html/gdk* debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/gdk-html
+	cp docs/text/*.txt debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/
+
+	dh_installdocs -plibgtk-cvs-doc docs/{debugging,developers,styles,text_widget,widget_system,gtk-config,refcounting}.txt TODO NEWS
+	dh_installchangelogs -plibgtk-cvs-doc
+	dh_strip -plibgtk-cvs-doc
+	dh_compress -plibgtk-cvs-doc
+	dh_fixperms -plibgtk-cvs-doc
+	dh_installdeb -plibgtk-cvs-doc
+	dh_shlibdeps -plibgtk-cvs-doc
+	dh_gencontrol -plibgtk-cvs-doc
+	dh_md5sums -plibgtk-cvs-doc
+	dh_builddeb -plibgtk-cvs-doc
+
+libgtk-cvs-dbg: clean-dbg install-dbg
+	dh_testdir -plibgtk-cvs-dbg
+	dh_testroot -plibgtk-cvs-dbg
+	dh_installdirs -plibgtk-cvs-dbg
+	# Add here commands to install the files into debian/libgtk-cvs-dbg
+	rm -rf debian/libgtk-cvs-dbg/usr/bin debian/libgtk-cvs-dbg/usr/include debian/libgtk-cvs-dbg/usr/info debian/libgtk-cvs-dbg/usr/lib/glib debian/libgtk-cvs-dbg/usr/man debian/libgtk-cvs-dbg/usr/share debian/libgtk-cvs-dbg/usr/lib/*.{la,so*}
+	for file in `find debian/libgtk-cvs-dbg/usr/lib -name '*.a'` ; do \
+	  mv $$file debian/libgtk-cvs-dbg/usr/lib/`basename $$file .a`_g.a; \
+        done
+	dh_installdocs -plibgtk-cvs-dbg
+	dh_installchangelogs -plibgtk-cvs-dbg
+	dh_compress -plibgtk-cvs-dbg
+	dh_fixperms -plibgtk-cvs-dbg
+	dh_installdeb -plibgtk-cvs-dbg
+	dh_shlibdeps -plibgtk-cvs-dbg
+	dh_gencontrol -plibgtk-cvs-dbg
+	dh_md5sums -plibgtk-cvs-dbg
+	dh_builddeb -plibgtk-cvs-dbg
+
+source diff:                                                                  
+	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary

demos/Makefile.am

@@ -1,6 +1,6 @@
 ## Makefile.am for gtk+/demos
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = gtk-demo widget-factory pixbuf-demo
+SUBDIRS = gtk-demo pixbuf-demo
 
 -include $(top_srcdir)/git.mk

demos/gtk-demo/Makefile.am

@@ -6,7 +6,6 @@ democodedir=$(datadir)/gtk-$(GTK_API_VERSION)/demo
 ## These should be in the order you want them to appear in the
 ## demo app, which means alphabetized by demo title, not filename
 demos =						\
-	application.c				\
 	appwindow.c				\
 	assistant.c				\
 	builder.c				\
@@ -66,24 +65,13 @@ LDADDS = \
 	$(GTK_DEP_LIBS)				\
 	-lm
 
-bin_PROGRAMS = gtk3-demo gtk3-demo-application
+bin_PROGRAMS = gtk3-demo
 
-BUILT_SOURCES = demos.h application_resources.c
+BUILT_SOURCES = demos.h
 
-EXTRA_DIST += 				\
-	$(IMAGEFILES)			\
-	demo.ui				\
-	application.gresource.xml	\
-	application.ui			\
-	menus.ui			\
-	gtk-logo-24.png			\
-	gtk-logo-48.png			\
-	org.gtk.Demo.gschema.xml
-
-gsettings_SCHEMAS = \
-	org.gtk.Demo.gschema.xml
-
-@GSETTINGS_RULES@
+EXTRA_DIST += 		\
+	$(IMAGEFILES)	\
+	demo.ui
 
 demos.h: @REBUILD@ $(demos) geninclude.pl
 	$(AM_V_GEN) (here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h
@@ -98,17 +86,8 @@ gtk3_demo_DEPENDENCIES = $(DEPS)
 gtk3_demo_LDADD = $(LDADDS)
 gtk3_demo_LDFLAGS = -export-dynamic
 
-gtk3_demo_application_SOURCES = \
-	application-standalone.c \
-	application_resources.c
-
-gtk3_demo_application_LDADD = $(LDADDS)
-
-application_resources.c: application.gresource.xml gtk-logo-24.png gtk-logo-48.png application.ui menus.ui
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $(srcdir)/application.gresource.xml
-
 IMAGEFILES=	alphatest.png		\
-		apple-red.png		\
+	        apple-red.png		\
 		background.jpg		\
 		floppybuddy.gif		\
 		gnome-applets.png	\

demos/gtk-demo/application-standalone.c

@@ -1,3 +0,0 @@
-#define STANDALONE
-
-#include "application.c"

demos/gtk-demo/application.c

@@ -1,479 +0,0 @@
-/* Application class
- *
- * Demonstrates a simple application.
- *
- * This examples uses GtkApplication, GtkApplicationWindow, GtkBuilder
- * as well as GMenu and GResource. Due to the way GtkApplication is structured,
- * it is run as a separate process.
- */
-
-#include "config.h"
-
-#include <gtk/gtk.h>
-
-#ifdef STANDALONE
-
-static void
-show_action_dialog (GSimpleAction *action)
-{
-  const gchar *name;
-  GtkWidget *dialog;
-
-  name = g_action_get_name (G_ACTION (action));
-
-  dialog = gtk_message_dialog_new (NULL,
-                                   GTK_DIALOG_DESTROY_WITH_PARENT,
-                                   GTK_MESSAGE_INFO,
-                                   GTK_BUTTONS_CLOSE,
-                                   "You activated action: \"%s\"",
-                                    name);
-
-  g_signal_connect (dialog, "response",
-                    G_CALLBACK (gtk_widget_destroy), NULL);
-
-  gtk_widget_show (dialog);
-}
-
-static void
-show_action_infobar (GSimpleAction *action,
-                     GVariant      *parameter,
-                     gpointer       window)
-{
-  GtkWidget *infobar;
-  GtkWidget *message;
-  gchar *text;
-  const gchar *name;
-  const gchar *value;
-
-  name = g_action_get_name (G_ACTION (action));
-  value = g_variant_get_string (parameter, NULL);
-
-  message = g_object_get_data (G_OBJECT (window), "message");
-  infobar = g_object_get_data (G_OBJECT (window), "infobar");
-  text = g_strdup_printf ("You activated radio action: \"%s\".\n"
-                          "Current value: %s", name, value);
-  gtk_label_set_text (GTK_LABEL (message), text);
-  gtk_widget_show (infobar);
-  g_free (text);
-}
-
-static void
-activate_action (GSimpleAction  *action,
-                 GVariant       *parameter,
-                 gpointer        user_data)
-{
-  show_action_dialog (action);
-}
-
-static void
-activate_toggle (GSimpleAction *action,
-                 GVariant      *parameter,
-                 gpointer       user_data)
-{
-  GVariant *state;
-
-  show_action_dialog (action);
-
-  state = g_action_get_state (G_ACTION (action));
-  g_action_change_state (G_ACTION (action), g_variant_new_boolean (!g_variant_get_boolean (state)));
-  g_variant_unref (state);
-}
-
-static void
-activate_radio (GSimpleAction *action,
-                GVariant      *parameter,
-                gpointer       user_data)
-{
-  show_action_infobar (action, parameter, user_data);
-
-  g_action_change_state (G_ACTION (action), parameter);
-}
-
-static void
-activate_about (GSimpleAction *action,
-                GVariant      *parameter,
-                gpointer       user_data)
-{
-  GtkWidget *window = user_data;
-  GdkPixbuf *pixbuf;
-
-  const gchar *authors[] = {
-    "Peter Mattis",
-    "Spencer Kimball",
-    "Josh MacDonald",
-    "and many more...",
-    NULL
-  };
-
-  const gchar *documentors[] = {
-    "Owen Taylor",
-    "Tony Gale",
-    "Matthias Clasen <mclasen@redhat.com>",
-    "and many more...",
-    NULL
-  };
-
-  pixbuf = gdk_pixbuf_new_from_resource ("/logos/gtk-logo-48.png", NULL);
-
-  gtk_show_about_dialog (GTK_WINDOW (window),
-                         "program-name", "GTK+ Code Demos",
-                         "version", g_strdup_printf ("%s,\nRunning against GTK+ %d.%d.%d",
-                                                     PACKAGE_VERSION,
-                                                     gtk_get_major_version (),
-                                                     gtk_get_minor_version (),
-                                                     gtk_get_micro_version ()),
-                         "copyright", "(C) 1997-2009 The GTK+ Team",
-                         "license-type", GTK_LICENSE_LGPL_2_1,
-                         "website", "http://www.gtk.org",
-                         "comments", "Program to demonstrate GTK+ functions.",
-                         "authors", authors,
-                         "documenters", documentors,
-                         "logo", pixbuf,
-                         "title", "About GTK+ Code Demos",
-                         NULL);
-  g_object_unref (pixbuf);
-}
-
-static void
-activate_quit (GSimpleAction *action,
-               GVariant      *parameter,
-               gpointer       user_data)
-{
-  GtkApplication *app = user_data;
-  GtkWidget *win;
-  GList *list, *next;
-
-  list = gtk_application_get_windows (app);
-  while (list)
-    {
-      win = list->data;
-      next = list->next;
-
-      gtk_widget_destroy (GTK_WIDGET (win));
-
-      list = next;
-    }
-}
-
-static void
-register_stock_icons (void)
-{
-  static gboolean registered = FALSE;
-
-  if (!registered)
-    {
-      GdkPixbuf *pixbuf;
-      GtkIconFactory *factory;
-      GtkIconSet *icon_set;
-
-      static GtkStockItem items[] = {
-        { "demo-gtk-logo", "_GTK!", 0, 0, NULL }
-      };
-
-      registered = TRUE;
-
-      gtk_stock_add (items, G_N_ELEMENTS (items));
-
-      factory = gtk_icon_factory_new ();
-      gtk_icon_factory_add_default (factory);
-
-      pixbuf = gdk_pixbuf_new_from_resource ("/logos/gtk-logo-24.png", NULL);
-
-      icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
-      gtk_icon_factory_add (factory, "demo-gtk-logo", icon_set);
-      gtk_icon_set_unref (icon_set);
-      g_object_unref (pixbuf);
-
-      /* Drop our reference to the factory, GTK will hold a reference. */
-      g_object_unref (factory);
-    }
-}
-
-static void
-update_statusbar (GtkTextBuffer *buffer,
-                  GtkStatusbar  *statusbar)
-{
-  gchar *msg;
-  gint row, col;
-  gint count;
-  GtkTextIter iter;
-
-  /* clear any previous message, underflow is allowed */
-  gtk_statusbar_pop (statusbar, 0);
-
-  count = gtk_text_buffer_get_char_count (buffer);
-
-  gtk_text_buffer_get_iter_at_mark (buffer,
-                                    &iter,
-                                    gtk_text_buffer_get_insert (buffer));
-
-  row = gtk_text_iter_get_line (&iter);
-  col = gtk_text_iter_get_line_offset (&iter);
-
-  msg = g_strdup_printf ("Cursor at row %d column %d - %d chars in document",
-                         row, col, count);
-
-  gtk_statusbar_push (statusbar, 0, msg);
-
-  g_free (msg);
-}
-
-static void
-mark_set_callback (GtkTextBuffer     *buffer,
-                   const GtkTextIter *new_location,
-                   GtkTextMark       *mark,
-                   gpointer           data)
-{
-  update_statusbar (buffer, GTK_STATUSBAR (data));
-}
-
-static void
-change_theme_state (GSimpleAction *action,
-                    GVariant      *state,
-                    gpointer       user_data)
-{
-  GtkSettings *settings = gtk_settings_get_default ();
-
-  g_object_set (G_OBJECT (settings),
-                "gtk-application-prefer-dark-theme",
-                g_variant_get_boolean (state),
-                NULL);
-
-  g_simple_action_set_state (action, state);
-}
-
-static void
-change_titlebar_state (GSimpleAction *action,
-                       GVariant      *state,
-                       gpointer       user_data)
-{
-  GtkWindow *window = user_data;
-
-  gtk_window_set_hide_titlebar_when_maximized (GTK_WINDOW (window),
-                                               g_variant_get_boolean (state));
-
-  g_simple_action_set_state (action, state);
-}
-
-static void
-change_radio_state (GSimpleAction *action,
-                    GVariant      *state,
-                    gpointer       user_data)
-{
-  g_simple_action_set_state (action, state);
-}
-
-static GActionEntry app_entries[] = {
-  { "new", activate_action, NULL, NULL, NULL },
-  { "open", activate_action, NULL, NULL, NULL },
-  { "save", activate_action, NULL, NULL, NULL },
-  { "save-as", activate_action, NULL, NULL, NULL },
-  { "quit", activate_quit, NULL, NULL, NULL },
-  { "dark", activate_toggle, NULL, "false", change_theme_state }
-};
-
-static GActionEntry win_entries[] = {
-  { "titlebar", activate_toggle, NULL, "false", change_titlebar_state },
-  { "shape", activate_radio, "s", "'oval'", change_radio_state },
-  { "bold", activate_toggle, NULL, "false", NULL },
-  { "about", activate_about, NULL, NULL, NULL },
-  { "file1", activate_action, NULL, NULL, NULL },
-  { "logo", activate_action, NULL, NULL, NULL }
-};
-
-static void
-clicked_cb (GtkWidget *widget, GtkWidget *info)
-{
-  gtk_widget_hide (info);
-}
-
-static void
-startup (GApplication *app)
-{
-  GtkBuilder *builder;
-  GMenuModel *appmenu;
-  GMenuModel *menubar;
-
-  builder = gtk_builder_new ();
-  gtk_builder_add_from_resource (builder, "/ui/menus.ui", NULL);
-
-  appmenu = (GMenuModel *)gtk_builder_get_object (builder, "appmenu");
-  menubar = (GMenuModel *)gtk_builder_get_object (builder, "menubar");
-
-  gtk_application_set_app_menu (GTK_APPLICATION (app), appmenu);
-  gtk_application_set_menubar (GTK_APPLICATION (app), menubar);
-
-  g_object_unref (builder);
-}
-
-static void
-activate (GApplication *app)
-{
-  GtkBuilder *builder;
-  GtkWidget *window;
-  GtkWidget *grid;
-  GtkWidget *contents;
-  GtkWidget *status;
-  GtkWidget *message;
-  GtkWidget *button;
-  GtkWidget *infobar;
-  GtkWidget *menutool;
-  GMenuModel *toolmenu;
-  GtkTextBuffer *buffer;
-
-  window = gtk_application_window_new (GTK_APPLICATION (app));
-  gtk_window_set_title (GTK_WINDOW (window), "Application Class");
-  gtk_window_set_icon_name (GTK_WINDOW (window), "document-open");
-  gtk_window_set_default_size (GTK_WINDOW (window), 200, 200);
-
-  g_action_map_add_action_entries (G_ACTION_MAP (window),
-                                   win_entries, G_N_ELEMENTS (win_entries),
-                                   window);
-
-  builder = gtk_builder_new ();
-  gtk_builder_add_from_resource (builder, "/ui/application.ui", NULL);
-
-  grid = (GtkWidget *)gtk_builder_get_object (builder, "grid");
-  contents = (GtkWidget *)gtk_builder_get_object (builder, "contents");
-  status = (GtkWidget *)gtk_builder_get_object (builder, "status");
-  message = (GtkWidget *)gtk_builder_get_object (builder, "message");
-  button = (GtkWidget *)gtk_builder_get_object (builder, "button");
-  infobar = (GtkWidget *)gtk_builder_get_object (builder, "infobar");
-  menutool = (GtkWidget *)gtk_builder_get_object (builder, "menutool");
-  toolmenu = (GMenuModel *)gtk_builder_get_object (builder, "toolmenu");
-
-  g_object_set_data (G_OBJECT (window), "message", message);
-  g_object_set_data (G_OBJECT (window), "infobar", infobar);
-
-  gtk_container_add (GTK_CONTAINER (window), grid);
-
-  gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (menutool),
-                                 gtk_menu_new_from_model (toolmenu));
-
-  gtk_widget_grab_focus (contents);
-  g_signal_connect (button, "clicked", G_CALLBACK (clicked_cb), infobar);
-
-  /* Show text widget info in the statusbar */
-  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (contents));
-  g_signal_connect_object (buffer, "changed",
-                           G_CALLBACK (update_statusbar), status, 0);
-  g_signal_connect_object (buffer, "mark-set",
-                           G_CALLBACK (mark_set_callback), status, 0);
-
-  update_statusbar (buffer, GTK_STATUSBAR (status));
-
-  gtk_widget_show_all (window);
-
-  g_object_unref (builder);
-}
-
-int
-main (int argc, char *argv[])
-{
-  GtkApplication *app;
-  GSettings *settings;
-  GAction *action;
-
-  gtk_init (NULL, NULL);
-
-  register_stock_icons ();
-
-  app = gtk_application_new ("org.gtk.Demo", 0);
-  settings = g_settings_new ("org.gtk.Demo");
-
-  g_action_map_add_action_entries (G_ACTION_MAP (app),
-                                   app_entries, G_N_ELEMENTS (app_entries),
-                                   app);
-
-  action = g_settings_create_action (settings, "color");
-
-  g_action_map_add_action (G_ACTION_MAP (app), action);
-
-  g_signal_connect (app, "startup", G_CALLBACK (startup), NULL);
-  g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
-
-  g_application_run (G_APPLICATION (app), 0, NULL);
-
-  return 0;
-}
-
-#else /* !STANDALONE */
-
-static gboolean name_seen;
-static GtkWidget *placeholder;
-
-static void
-on_name_appeared (GDBusConnection *connection,
-                  const gchar     *name,
-                  const gchar     *name_owner,
-                  gpointer         user_data)
-{
-  name_seen = TRUE;
-}
-
-static void
-on_name_vanished (GDBusConnection *connection,
-                  const gchar     *name,
-                  gpointer         user_data)
-{
-  if (!name_seen)
-    return;
-
-  if (placeholder)
-    {
-      gtk_widget_destroy (placeholder);
-      g_object_unref (placeholder);
-      placeholder = NULL;
-    }
-}
-
-GtkWidget *
-do_application (GtkWidget *toplevel)
-{
-  static guint watch = 0;
-
-  if (watch == 0)
-    watch = g_bus_watch_name (G_BUS_TYPE_SESSION,
-                              "org.gtk.Demo",
-                              0,
-                              on_name_appeared,
-                              on_name_vanished,
-                              NULL, NULL);
-
-  if (placeholder == NULL)
-    {
-      const gchar *command;
-      GError *error = NULL;
-
-      if (g_file_test ("./gtk3-demo-application", G_FILE_TEST_IS_EXECUTABLE))
-        command = "./gtk3-demo-application";
-      else
-        command = "gtk3-demo-application";
-
-      if (!g_spawn_command_line_async (command, &error))
-        {
-          g_warning ("%s", error->message);
-          g_error_free (error);
-        }
-
-      placeholder = gtk_label_new ("");
-      g_object_ref_sink (placeholder);
-    }
-  else
-    {
-      g_dbus_connection_call_sync (g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL),
-                              "org.gtk.Demo",
-                              "/org/gtk/Demo",
-                              "org.gtk.Actions",
-                              "Activate",
-                              g_variant_new ("(sava{sv})", "quit", NULL, NULL),
-                              NULL,
-                              0,
-                              G_MAXINT,
-                              NULL, NULL);
-    }
-
-  return placeholder;
-}
-
-#endif

demos/gtk-demo/application.gresource.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/logos">
-    <file preprocess="to-pixdata">gtk-logo-24.png</file>
-    <file preprocess="to-pixdata">gtk-logo-48.png</file>
-  </gresource>
-  <gresource prefix="/ui">
-    <file preprocess="xml-stripblanks">application.ui</file>
-    <file preprocess="xml-stripblanks">menus.ui</file>
-  </gresource>
-</gresources>

demos/gtk-demo/application.ui

@@ -1,104 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <object class="GtkGrid" id="grid">
-    <child>
-      <object class="GtkToolbar" id="toolbar">
-        <property name="orientation">horizontal</property>
-        <property name="halign">fill</property>
-        <property name="hexpand">True</property>
-        <child>
-          <object class="GtkMenuToolButton" id="menutool">
-            <property name="stock-id">gtk-open</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkToolButton" id="quit">
-            <property name="stock-id">gtk-quit</property>
-            <property name="action-name">app.quit</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkSeparatorToolItem" id="sep"/>
-        </child>
-        <child>
-          <object class="GtkToolButton" id="logo">
-            <property name="stock-id">demo-gtk-logo</property>
-            <property name="action-name">win.logo</property>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="left-attach">0</property>
-        <property name="top-attach">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkInfoBar" id="infobar">
-        <property name="no-show-all">True</property>
-        <property name="halign">fill</property>
-        <property name="hexpand">True</property>
-        <child internal-child="content_area">
-          <object class="GtkBox" id="content_area">
-            <child>
-              <object class="GtkLabel" id="message">
-                <property name="visible">True</property>
-                <property name="hexpand">True</property>
-                <property name="halign">fill</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkBox" id="action_area">
-            <child>
-              <object class="GtkButton" id="button">
-                <property name="visible">True</property>
-                <property name="valign">center</property>
-                <property name="label">gtk-ok</property>
-                <property name="use-stock">True</property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="left-attach">0</property>
-        <property name="top-attach">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkScrolledWindow" id="sw">
-        <property name="shadow-type">in</property>
-        <child>
-          <object class="GtkTextView" id="contents">
-            <property name="halign">fill</property>
-            <property name="valign">fill</property>
-            <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="left-attach">0</property>
-        <property name="top-attach">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkStatusbar" id="status">
-        <property name="halign">fill</property>
-        <property name="hexpand">True</property>
-        <property name="visible">True</property>
-      </object>
-      <packing>
-        <property name="left-attach">0</property>
-        <property name="top-attach">3</property>
-      </packing>
-    </child>
-  </object>
-  <menu id="toolmenu">
-    <item>
-      <attribute name="label">File1</attribute>
-      <attribute name="action">win.file1</attribute>
-    </item>
-  </menu>
-</interface>

demos/gtk-demo/appwindow.c

@@ -1,8 +1,6 @@
-/* Application window
+/* Application main window
  *
  * Demonstrates a typical application window with menubar, toolbar, statusbar.
- *
- * This example uses GtkUIManager and GtkActionGroup.
  */
 
 #include <gtk/gtk.h>

demos/gtk-demo/assistant.c

@@ -23,14 +23,14 @@ apply_changes_gradually (gpointer data)
   if (fraction < 1.0)
     {
       gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress_bar), fraction);
-      return G_SOURCE_CONTINUE;
+      return TRUE;
     }
   else
     {
       /* Close automatically once changes are fully applied. */
       gtk_widget_destroy (assistant);
       assistant = NULL;
-      return G_SOURCE_REMOVE;
+      return FALSE;
     }
 }
 

demos/gtk-demo/clipboard.c

@@ -172,7 +172,7 @@ button_press (GtkWidget      *widget,
   GtkWidget *menu;
   GtkWidget *item;
 
-  if (button->button != GDK_BUTTON_SECONDARY)
+  if (button->button != 3)
     return FALSE;
 
   menu = gtk_menu_new ();

demos/gtk-demo/colorsel.c

@@ -30,35 +30,36 @@ draw_callback (GtkWidget *widget,
   return TRUE;
 }
 
-static void
-response_cb (GtkDialog *dialog,
-             gint       response_id,
-             gpointer   user_data)
-{
-  if (response_id == GTK_RESPONSE_OK)
-    {
-      gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (dialog), &color);
-      gtk_widget_override_background_color (da, 0, &color);
-    }
-
-  gtk_widget_hide (GTK_WIDGET (dialog));
-}
-
 static void
 change_color_callback (GtkWidget *button,
                        gpointer   data)
 {
   GtkWidget *dialog;
+  GtkColorSelection *colorsel;
+  GtkColorSelectionDialog *selection_dialog;
+  gint response;
 
-  dialog = gtk_color_chooser_dialog_new ("Changing color", GTK_WINDOW (window));
-  gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (dialog), &color);
+  dialog = gtk_color_selection_dialog_new ("Changing color");
 
-  g_signal_connect (dialog,
-                    "response",
-                    G_CALLBACK (response_cb),
-                    NULL);
+  gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
 
-  gtk_widget_show_all (dialog);
+  selection_dialog = GTK_COLOR_SELECTION_DIALOG (dialog);
+  colorsel = GTK_COLOR_SELECTION (gtk_color_selection_dialog_get_color_selection (selection_dialog));
+
+  gtk_color_selection_set_previous_rgba (colorsel, &color);
+  gtk_color_selection_set_current_rgba (colorsel, &color);
+  gtk_color_selection_set_has_palette (colorsel, TRUE);
+
+  response = gtk_dialog_run (GTK_DIALOG (dialog));
+
+  if (response == GTK_RESPONSE_OK)
+    {
+      gtk_color_selection_get_current_rgba (colorsel, &color);
+
+      gtk_widget_override_background_color (da, 0, &color);
+    }
+
+  gtk_widget_destroy (dialog);
 }
 
 GtkWidget *

demos/gtk-demo/drawingarea.c

@@ -97,7 +97,7 @@ scribble_button_press_event (GtkWidget      *widget,
   if (surface == NULL)
     return FALSE; /* paranoia check, in case we haven't gotten a configure event */
 
-  if (event->button == GDK_BUTTON_PRIMARY)
+  if (event->button == 1)
     draw_brush (widget, event->x, event->y);
 
   /* We've handled the event, stop processing */

demos/gtk-demo/geninclude.pl.in

@@ -116,7 +116,7 @@ if (defined @child_arrays) {
 }
 
 # toplevel
-print "\nDemo gtk_demos[] = {\n";
+print "\nDemo testgtk_demos[] = {\n";
 
 $first = 1;
 foreach $href (@demos) {

demos/gtk-demo/hypertext.c

@@ -144,7 +144,7 @@ event_after (GtkWidget *text_view,
 
   event = (GdkEventButton *)ev;
 
-  if (event->button != GDK_BUTTON_PRIMARY)
+  if (event->button != 1)
     return FALSE;
 
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));

demos/gtk-demo/infobar.c

@@ -21,13 +21,8 @@ on_bar_response (GtkInfoBar *info_bar,
                                    "You clicked a button on an info bar");
   gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
                                             "Your response has id %d", response_id);
-
-  g_signal_connect_swapped (dialog,
-                            "response",
-                            G_CALLBACK (gtk_widget_destroy),
-                            dialog);
-
-  gtk_widget_show_all (dialog);
+  gtk_dialog_run (GTK_DIALOG (dialog));
+  gtk_widget_destroy (dialog);
 }
 
 GtkWidget *

demos/gtk-demo/links.c

@@ -63,13 +63,7 @@ do_links (GtkWidget *do_widget)
       label = gtk_label_new ("Some <a href=\"http://en.wikipedia.org/wiki/Text\""
                              "title=\"plain text\">text</a> may be marked up\n"
                              "as hyperlinks, which can be clicked\n"
-                             "or activated via <a href=\"keynav\">keynav</a>\n"
-                             "and they work fine with other markup, like when\n"
-                             "searching on <a href=\"http://www.google.com/\">"
-                             "<span color=\"#0266C8\">G</span><span color=\"#F90101\">o</span>"
-                             "<span color=\"#F2B50F\">o</span><span color=\"#0266C8\">g</span>"
-                             "<span color=\"#00933B\">l</span><span color=\"#F90101\">e</span>"
-                             "</a>.");
+                             "or activated via <a href=\"keynav\">keynav</a>");
       gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
       g_signal_connect (label, "activate-link", G_CALLBACK (activate_link), NULL);
       gtk_container_add (GTK_CONTAINER (window), label);

demos/gtk-demo/list_store.c

@@ -60,7 +60,7 @@ spinner_timeout (gpointer data)
   guint pulse;
 
   if (model == NULL)
-    return G_SOURCE_REMOVE;
+    return FALSE;
 
   gtk_tree_model_get_iter_first (model, &iter);
   gtk_tree_model_get (model, &iter,
@@ -77,7 +77,7 @@ spinner_timeout (gpointer data)
                       COLUMN_ACTIVE, TRUE,
                       -1);
 
-  return G_SOURCE_CONTINUE;
+  return TRUE;
 }
 
 static GtkTreeModel *

demos/gtk-demo/main.c

@@ -782,7 +782,7 @@ create_tree (void)
   GtkTreeIter iter;
   GtkWidget *box, *label, *scrolled_window;
 
-  Demo *d = gtk_demos;
+  Demo *d = testgtk_demos;
 
   model = gtk_tree_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_INT);
   tree_view = gtk_tree_view_new ();
@@ -936,8 +936,10 @@ main (int argc, char **argv)
    * these few lines, which are just a hack so gtk-demo will work
    * in the GTK tree without installing it.
    */
-  if (g_file_test ("../../modules/input/immodules.cache", G_FILE_TEST_EXISTS))
+  if (g_file_test ("../../gdk-pixbuf/libpixbufloader-pnm.la",
+                   G_FILE_TEST_EXISTS))
     {
+      g_setenv ("GDK_PIXBUF_MODULE_FILE", "../../gdk-pixbuf/loaders.cache", TRUE);
       g_setenv ("GTK_IM_MODULE_FILE", "../../modules/input/immodules.cache", TRUE);
     }
   /* -- End of hack -- */
@@ -1000,7 +1002,7 @@ main (int argc, char **argv)
   gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
   gtk_widget_show_all (window);
 
-  load_file (gtk_demos[0].filename);
+  load_file (testgtk_demos[0].filename);
 
   gtk_main ();
 

demos/gtk-demo/menus.ui

@@ -1,107 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <menu id="appmenu">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">_New</attribute>
-        <attribute name="action">app.new</attribute>
-        <attribute name="accel">&lt;Primary&gt;n</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">_Open</attribute>
-        <attribute name="action">app.open</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">_Save</attribute>
-        <attribute name="action">app.save</attribute>
-        <attribute name="accel">&lt;Primary&gt;s</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Save _As...</attribute>
-        <attribute name="action">app.save-as</attribute>
-        <attribute name="accel">&lt;Primary&gt;s</attribute>
-      </item>
-    </section>
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">_Quit</attribute>
-        <attribute name="action">app.quit</attribute>
-        <attribute name="accel">&lt;Primary&gt;q</attribute>
-      </item>
-    </section>
-  </menu>
-  <menu id="menubar">
-    <submenu>
-      <attribute name="label" translatable="yes">_Preferences</attribute>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">_Prefer Dark Theme</attribute>
-          <attribute name="action">app.dark</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">_Hide Titlebar when maximized</attribute>
-          <attribute name="action">win.titlebar</attribute>
-        </item>
-        <submenu>
-          <attribute name="label" translatable="yes">_Color</attribute>
-          <section>
-            <item>
-              <attribute name="label" translatable="yes">_Red</attribute>
-              <attribute name="action">app.color</attribute>
-              <attribute name="target">red</attribute>
-              <attribute name="accel">&lt;Primary&gt;r</attribute>
-            </item>
-            <item>
-              <attribute name="label" translatable="yes">_Green</attribute>
-              <attribute name="action">app.color</attribute>
-              <attribute name="target">green</attribute>
-              <attribute name="accel">&lt;Primary&gt;g</attribute>
-            </item>
-            <item>
-              <attribute name="label" translatable="yes">_Blue</attribute>
-              <attribute name="action">app.color</attribute>
-              <attribute name="target">blue</attribute>
-              <attribute name="accel">&lt;Primary&gt;b</attribute>
-            </item>
-          </section>
-        </submenu>
-        <submenu>
-          <attribute name="label" translatable="yes">_Shape</attribute>
-          <section>
-            <item>
-              <attribute name="label" translatable="yes">_Square</attribute>
-              <attribute name="action">win.shape</attribute>
-              <attribute name="target">square</attribute>
-              <attribute name="accel">&lt;Primary&gt;s</attribute>
-            </item>
-            <item>
-              <attribute name="label" translatable="yes">_Rectangle</attribute>
-              <attribute name="action">win.shape</attribute>
-              <attribute name="target">rectangle</attribute>
-              <attribute name="accel">&lt;Primary&gt;r</attribute>
-            </item>
-            <item>
-              <attribute name="label" translatable="yes">_Oval</attribute>
-              <attribute name="action">win.shape</attribute>
-              <attribute name="target">oval</attribute>
-              <attribute name="accel">&lt;Primary&gt;o</attribute>
-            </item>
-          </section>
-        </submenu>
-        <item>
-          <attribute name="label" translatable="yes">_Bold</attribute>
-          <attribute name="action">win.bold</attribute>
-          <attribute name="accel">&lt;Primary&gt;b</attribute>
-        </item>
-      </section>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">_Help</attribute>
-      <item>
-        <attribute name="label" translatable="yes">_About</attribute>
-        <attribute name="action">win.about</attribute>
-        <attribute name="accel">&lt;Primary&gt;a</attribute>
-      </item>
-    </submenu>
-  </menu>
-</interface>

demos/gtk-demo/org.gtk.Demo.gschema.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<schemalist>
-
-  <enum id='org.gtk.Demo.Color'>
-    <value nick='red'   value='0'/>
-    <value nick='green' value='1'/>
-    <value nick='blue'  value='2'/>
-  </enum>
-
-  <schema id='org.gtk.Demo' path='/org/gtk/Demo/'>
-    <key name='color' enum='org.gtk.Demo.Color'>
-      <default>'red'</default>
-    </key>
-  </schema>
-
-</schemalist>

demos/gtk-demo/pixbufs.c

@@ -180,7 +180,7 @@ timeout (gpointer data)
   GDK_THREADS_LEAVE ();
 
   frame_num++;
-  return G_SOURCE_CONTINUE;
+  return TRUE;
 }
 
 static guint timeout_id;

demos/gtk-demo/search_entry.c

@@ -29,7 +29,8 @@ static gboolean
 search_progress (gpointer data)
 {
   gtk_entry_progress_pulse (GTK_ENTRY (data));
-  return G_SOURCE_CONTINUE;
+
+  return TRUE;
 }
 
 static void

demos/gtk-demo/textscroll.c

@@ -49,7 +49,7 @@ scroll_to_end (GtkTextView *textview)
   if (count > 150)
     count = 0;
 
-  return G_SOURCE_CONTINUE;
+  return TRUE;
 }
 
 /* Scroll to the bottom of the buffer.
@@ -100,7 +100,7 @@ scroll_to_bottom (GtkTextView *textview)
   if (count > 40)
     count = 0;
 
-  return G_SOURCE_CONTINUE;
+  return TRUE;
 }
 
 static guint

demos/gtk-demo/toolpalette.c

@@ -350,7 +350,7 @@ interactive_canvas_real_drag_leave (gpointer data)
       gtk_widget_queue_draw (widget);
     }
 
-  return G_SOURCE_REMOVE;
+  return FALSE;
 }
 
 static void

demos/pixbuf-demo/pixbuf-demo.c

@@ -15,7 +15,9 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 #include "config.h"

demos/widget-factory/Makefile.am

@@ -1,31 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-bin_PROGRAMS = gtk3-widget-factory
-
-gtk3_widget_factory_SOURCES = \
-	widget-factory.c	\
-	widget_factory_resources.c
-
-BUILT_SOURCES = \
-	widget_factory_resources.c
-
-gtk3_widget_factory_DEPENDENCIES = \
-	$(top_builddir)/gtk/libgtk-3.la
-
-gtk3_widget_factory_CPPFLAGS = \
-	-I$(top_srcdir)			\
-	$(GTK_DEBUG_FLAGS)		\
-	$(GTK_DEP_CFLAGS)
-
-gtk3_widget_factory_LDADD = \
-	$(top_builddir)/gdk/libgdk-3.la \
-	$(top_builddir)/gtk/libgtk-3.la \
-	$(GTK_DEP_LIBS)
-
-widget_factory_resources.c: widget-factory.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies $(srcdir)/widget-factory.gresource.xml)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
-
-EXTRA_DIST += \
-	widget-factory.ui \
-	widget-factory.gresource.xml \
-	gtk-logo-256.png

demos/widget-factory/widget-factory.gresource.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/logos">
-    <file>gtk-logo-256.png</file>
-  </gresource>
-  <gresource prefix="/ui">
-    <file preprocess="xml-stripblanks">widget-factory.ui</file>
-  </gresource>
-</gresources>

docs/reference/gdk/gdk3-sections.txt

@@ -52,14 +52,6 @@ GDK_WINDOWING_X11
 GDK_WINDOWING_WIN32
 GDK_WINDOWING_QUARTZ
 
-<SUBSECTION>
-GDK_VERSION_3_0
-GDK_VERSION_3_2
-GDK_VERSION_3_4
-GDK_VERSION_MIN_REQUIRED
-GDK_VERSION_MAX_ALLOWED
-GDK_DISABLE_DEPRECATION_WARNINGS
-
 <SUBSECTION Standard>
 GDK_TYPE_GRAB_STATUS
 
@@ -639,7 +631,6 @@ gdk_keymap_get_direction
 gdk_keymap_have_bidi_layouts
 gdk_keymap_get_caps_lock_state
 gdk_keymap_get_num_lock_state
-gdk_keymap_get_modifier_state
 gdk_keymap_add_virtual_modifiers
 gdk_keymap_map_virtual_modifiers
 gdk_keymap_get_modifier_mask
@@ -766,11 +757,6 @@ GdkEventMask
 GDK_CURRENT_TIME
 GDK_PRIORITY_EVENTS
 GDK_PRIORITY_REDRAW
-GDK_EVENT_PROPAGATE
-GDK_EVENT_STOP
-GDK_BUTTON_PRIMARY
-GDK_BUTTON_MIDDLE
-GDK_BUTTON_SECONDARY
 
 <SUBSECTION>
 gdk_events_pending
@@ -788,11 +774,8 @@ gdk_event_get_keycode
 gdk_event_get_keyval
 gdk_event_get_root_coords
 gdk_event_get_scroll_direction
-gdk_event_get_scroll_deltas
 gdk_event_get_state
 gdk_event_get_time
-GdkEventSequence
-gdk_event_get_event_sequence
 gdk_event_request_motions
 gdk_events_get_angle
 gdk_events_get_center
@@ -830,7 +813,6 @@ GdkEvent
 GdkEventAny
 GdkEventKey
 GdkEventButton
-GdkEventTouch
 GdkEventScroll
 GdkEventMotion
 GdkEventExpose
@@ -1147,4 +1129,4 @@ gdk_app_launch_context_get_type
 gdk_test_render_sync
 gdk_test_simulate_button
 gdk_test_simulate_key
-
+</SECTION>

docs/reference/gtk/Makefile.am

@@ -123,8 +123,7 @@ content_files =					\
 	glossary.xml				\
 	migrating-2to3.xml			\
 	migrating-checklist.sgml		\
-	migrating-unique-GtkApplication.xml	\
-	migrating-smclient-GtkApplication.xml	\
+	migrating-GtkApplication.xml		\
 	migrating-GtkGrid.xml			\
 	migrating-GtkStyleContext.xml		\
 	objects_grouped.sgml			\
@@ -142,14 +141,12 @@ content_files =					\
 	overview.xml
 
 expand_content_files = 				\
-	compiling.sgml				\
 	drawing-model.xml			\
 	getting_started.xml			\
 	glossary.xml				\
 	migrating-2to3.xml			\
 	migrating-checklist.sgml		\
-	migrating-unique-GtkApplication.xml	\
-	migrating-smclient-GtkApplication.xml	\
+	migrating-GtkApplication.xml		\
 	migrating-GtkGrid.xml			\
 	migrating-GtkStyleContext.xml		\
 	question_index.sgml			\
@@ -288,7 +285,6 @@ HTML_IMAGES = \
 	$(srcdir)/images/check-button.png				\
 	$(srcdir)/images/color-button.png				\
 	$(srcdir)/images/colorsel.png					\
-	$(srcdir)/images/colorchooser.png				\
 	$(srcdir)/images/combo-box.png					\
 	$(srcdir)/images/combo-box-entry.png				\
 	$(srcdir)/images/entry.png					\
@@ -298,7 +294,6 @@ HTML_IMAGES = \
 	$(srcdir)/images/filechooser.png				\
 	$(srcdir)/images/font-button.png				\
 	$(srcdir)/images/fontsel.png					\
-	$(srcdir)/images/fontchooser.png				\
 	$(srcdir)/images/frame.png					\
 	$(srcdir)/images/icon-view.png					\
 	$(srcdir)/images/image.png					\

docs/reference/gtk/compiling.sgml

@@ -51,18 +51,10 @@ Deprecated GTK+ functions are annotated to make the compiler
 emit warnings when they are used (e.g. with gcc, you need to use
 the -Wdeprecated-declarations option). If these warnings are
 problematic, they can be turned off by defining the preprocessor
-symbol %GDK_DISABLE_DEPRECATION_WARNINGS by using the commandline
+symbol GDK_DISABLE_DEPRECATION_WARNINGS by using the commandline
 option <literal>-DGDK_DISABLE_DEPRECATION_WARNINGS</literal>
 </para>
 
-<para>
-GTK+ deprecation annotations are versioned; by defining the
-macros %GDK_VERSION_MIN_REQUIRED and %GDK_VERSION_MAX_ALLOWED,
-you can specify the range of GTK+ versions whose API you want
-to use. APIs that were deprecated before or introduced after
-this range will trigger compiler warnings.
-</para>
-
 <para>
 The older deprecation mechanism of hiding deprecated interfaces
 entirely from the compiler by using the preprocessor symbol

docs/reference/gtk/gtk-docs.sgml

@@ -23,7 +23,7 @@
     <xi:include href="overview.xml"/>
     <xi:include href="xml/getting_started.xml"/>
     <xi:include href="building.sgml" />
-    <xi:include href="xml/compiling.sgml" />
+    <xi:include href="compiling.sgml" />
     <xi:include href="running.sgml" />
     <xi:include href="x11.sgml" />
     <xi:include href="windows.sgml" />
@@ -209,22 +209,18 @@
 
     <chapter id="SelectorWidgets">
       <title>Selectors (Color/File/Font)</title>
-      <xi:include href="xml/gtkcolorchooser.xml" />
       <xi:include href="xml/gtkcolorbutton.xml" />
-      <xi:include href="xml/gtkcolorchooserwidget.xml" />
-      <xi:include href="xml/gtkcolorchooserdialog.xml" />
-      <xi:include href="xml/gtkcolorsel.xml" />
       <xi:include href="xml/gtkcolorseldlg.xml" />
+      <xi:include href="xml/gtkcolorsel.xml" />
       <xi:include href="xml/gtkhsv.xml" />
       <xi:include href="xml/gtkfilechooser.xml" />
       <xi:include href="xml/gtkfilechooserbutton.xml" />
       <xi:include href="xml/gtkfilechooserdialog.xml" />
       <xi:include href="xml/gtkfilechooserwidget.xml" />
       <xi:include href="xml/gtkfilefilter.xml" />
-      <xi:include href="xml/gtkfontchooser.xml" />
       <xi:include href="xml/gtkfontbutton.xml" />
-      <xi:include href="xml/gtkfontchooserwidget.xml" />
-      <xi:include href="xml/gtkfontchooserdialog.xml" />
+      <xi:include href="xml/gtkfontchooser.xml" />
+      <xi:include href="xml/gtkfontchooserdlg.xml" />
       <xi:include href="xml/gtkfontsel.xml" />
       <xi:include href="xml/gtkfontseldlg.xml" />
     </chapter>
@@ -343,7 +339,6 @@
       <title>Application support</title>
       <xi:include href="xml/gtkapplication.xml" />
       <xi:include href="xml/gtkapplicationwindow.xml" />
-      <xi:include href="xml/gtkactionable.xml" />
     </chapter>
   </part>
 
@@ -360,12 +355,11 @@
       </para>
     </partintro>
 
+    <xi:include href="xml/migrating-checklist.sgml" />
     <xi:include href="xml/migrating-2to3.xml" />
     <xi:include href="xml/migrating-GtkStyleContext.xml" />
-    <xi:include href="xml/migrating-unique-GtkApplication.xml" />
-    <xi:include href="xml/migrating-smclient-GtkApplication.xml" />
+    <xi:include href="xml/migrating-GtkApplication.xml" />
     <xi:include href="xml/migrating-GtkGrid.xml" />
-    <xi:include href="xml/migrating-checklist.sgml" />
   </part>
 
   <part>

docs/reference/gtk/gtk3-sections.txt

@@ -37,7 +37,6 @@ gtk_about_dialog_get_logo
 gtk_about_dialog_set_logo
 gtk_about_dialog_get_logo_icon_name
 gtk_about_dialog_set_logo_icon_name
-gtk_about_dialog_add_credit_section
 gtk_show_about_dialog
 <SUBSECTION Standard>
 GTK_ABOUT_DIALOG
@@ -1535,7 +1534,7 @@ gtk_font_chooser_widget_get_type
 </SECTION>
 
 <SECTION>
-<FILE>gtkfontchooserdialog</FILE>
+<FILE>gtkfontchooserdlg</FILE>
 <TITLE>GtkFontChooserDialog</TITLE>
 GtkFontChooserDialog
 gtk_font_chooser_dialog_new
@@ -2060,7 +2059,6 @@ gtk_link_button_get_type
 <TITLE>GtkMenu</TITLE>
 GtkMenu
 gtk_menu_new
-gtk_menu_new_from_model
 gtk_menu_set_screen
 gtk_menu_reorder_child
 gtk_menu_attach
@@ -2105,7 +2103,6 @@ gtk_menu_get_type
 <TITLE>GtkMenuBar</TITLE>
 GtkMenuBar
 gtk_menu_bar_new
-gtk_menu_bar_new_from_model
 GtkPackDirection
 gtk_menu_bar_set_pack_direction
 gtk_menu_bar_get_pack_direction
@@ -2939,10 +2936,6 @@ gtk_scrolled_window_get_min_content_width
 gtk_scrolled_window_set_min_content_width
 gtk_scrolled_window_get_min_content_height
 gtk_scrolled_window_set_min_content_height
-gtk_scrolled_window_set_kinetic_scrolling
-gtk_scrolled_window_get_kinetic_scrolling
-gtk_scrolled_window_set_capture_button_press
-gtk_scrolled_window_get_capture_button_press
 
 <SUBSECTION Standard>
 GTK_SCROLLED_WINDOW
@@ -5301,7 +5294,6 @@ gtk_window_set_gravity
 gtk_window_get_gravity
 gtk_window_set_position
 gtk_window_set_transient_for
-gtk_window_set_attached_to
 gtk_window_set_destroy_with_parent
 gtk_window_set_hide_titlebar_when_maximized
 gtk_window_set_screen
@@ -5360,7 +5352,6 @@ gtk_window_get_role
 gtk_window_get_size
 gtk_window_get_title
 gtk_window_get_transient_for
-gtk_window_get_attached_to
 gtk_window_get_type_hint
 gtk_window_get_skip_taskbar_hint
 gtk_window_get_skip_pager_hint
@@ -5637,7 +5628,6 @@ GTK_STYLE_CLASS_MENU
 GTK_STYLE_CLASS_RADIO
 GTK_STYLE_CLASS_RUBBERBAND
 GTK_STYLE_CLASS_SCROLLBAR
-GTK_STYLE_CLASS_SCROLLBARS_JUNCTION
 GTK_STYLE_CLASS_SLIDER
 GTK_STYLE_CLASS_TOOLTIP
 GTK_STYLE_CLASS_TROUGH
@@ -5690,7 +5680,6 @@ gtk_style_context_add_provider_for_screen
 gtk_style_context_get
 gtk_style_context_get_direction
 gtk_style_context_get_junction_sides
-gtk_style_context_set_parent
 gtk_style_context_get_path
 gtk_style_context_get_property
 gtk_style_context_get_screen
@@ -5699,7 +5688,6 @@ gtk_style_context_get_style
 gtk_style_context_get_style_property
 gtk_style_context_get_style_valist
 gtk_style_context_get_valist
-gtk_style_context_get_section
 gtk_style_context_get_color
 gtk_style_context_get_background_color
 gtk_style_context_get_border_color
@@ -5724,7 +5712,6 @@ gtk_style_context_restore
 gtk_style_context_save
 gtk_style_context_set_direction
 gtk_style_context_set_junction_sides
-gtk_style_context_set_parent
 gtk_style_context_set_path
 gtk_style_context_add_class
 gtk_style_context_remove_class
@@ -7019,12 +7006,6 @@ gtk_application_add_window
 gtk_application_remove_window
 gtk_application_get_windows
 
-<SUBSECTION>
-GtkApplicationInhibitFlags
-gtk_application_inhibit
-gtk_application_uninhibit
-gtk_application_is_inhibited
-
 <SUBSECTION>
 gtk_application_get_app_menu
 gtk_application_set_app_menu
@@ -7066,32 +7047,6 @@ gtk_application_window_get_type
 GtkApplicationWindowPrivate
 </SECTION>
 
-<SECTION>
-<FILE>gtkactionable</FILE>
-<TITLE>GtkActionable</TITLE>
-GtkActionable
-GtkActionableInterface
-
-<SUBSECTION>
-gtk_actionable_get_action_name
-gtk_actionable_set_action_name
-
-<SUBSECTION>
-gtk_actionable_get_action_target_value
-gtk_actionable_set_action_target_value
-gtk_actionable_set_action_target
-
-<SUBSECTION>
-gtk_actionable_set_detailed_action_name
-
-<SUBSECTION Standard>
-gtk_actionable_get_type
-GTK_ACTIONABLE
-GTK_ACTIONABLE_GET_IFACE
-GTK_IS_ACTIONABLE
-GTK_TYPE_ACTIONABLE
-</SECTION>
-
 <SECTION>
 <FILE>gtkgrid</FILE>
 <TITLE>GtkGrid</TITLE>
@@ -7301,61 +7256,3 @@ GtkOverlayClass
 gtk_overlay_get_type
 GtkOverlayPrivate
 </SECTION>
-
-<SECTION>
-<FILE>gtkcolorchooser</FILE>
-<TITLE>GtkColorChooser</TITLE>
-GtkColorChooser
-gtk_color_chooser_get_rgba
-gtk_color_chooser_set_rgba
-gtk_color_chooser_get_use_alpha
-gtk_color_chooser_set_use_alpha
-gtk_color_chooser_add_palette
-
-<SUBSECTION Standard>
-GTK_TYPE_COLOR_CHOOSER
-GTK_COLOR_CHOOSER
-GTK_IS_COLOR_CHOOSER
-GTK_COLOR_CHOOSER_GET_IFACE
-
-<SUBSECTION Private>
-gtk_color_chooser_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkcolorchooserwidget</FILE>
-<TITLE>GtkColorChooserWidget</TITLE>
-GtkColorChooserWidget
-gtk_color_chooser_widget_new
-
-<SUBSECTION Standard>
-GTK_TYPE_COLOR_CHOOSER_WIDGET
-GTK_COLOR_CHOOSER_WIDGET
-GTK_COLOR_CHOOSER_WIDGET_CLASS
-GTK_IS_COLOR_CHOOSER_WIDGET
-GTK_IS_COLOR_CHOOSER_WIDGET_CLASS
-GTK_COLOR_CHOOSER_WIDGET_GET_CLASS
-
-<SUBSECTION Private>
-gtk_color_chooser_widget_get_type
-GtkColorChooserWidgetPrivate
-</SECTION>
-
-<SECTION>
-<FILE>gtkcolorchooserdialog</FILE>
-<TITLE>GtkColorChooserDialog</TITLE>
-GtkColorChooserDialog
-gtk_color_chooser_dialog_new
-
-<SUBSECTION Standard>
-GTK_TYPE_COLOR_CHOOSER_DIALOG
-GTK_COLOR_CHOOSER_DIALOG
-GTK_COLOR_CHOOSER_DIALOG_CLASS
-GTK_IS_COLOR_CHOOSER_DIALOG
-GTK_IS_COLOR_CHOOSER_DIALOG_CLASS
-GTK_COLOR_CHOOSER_DIALOG_GET_CLASS
-
-<SUBSECTION Private>
-GtkColorChooserDialogPrivate
-gtk_color_chooser_dialog_get_type
-</SECTION>

docs/reference/gtk/gtk3.types

@@ -6,7 +6,6 @@ gtk_accel_group_get_type
 gtk_accel_label_get_type
 gtk_accel_map_get_type
 gtk_accessible_get_type
-gtk_actionable_get_type
 gtk_action_get_type
 gtk_action_group_get_type
 gtk_activatable_get_type
@@ -47,9 +46,6 @@ gtk_check_button_get_type
 gtk_check_menu_item_get_type
 gtk_clipboard_get_type
 gtk_color_button_get_type
-gtk_color_chooser_get_type
-gtk_color_chooser_dialog_get_type
-gtk_color_chooser_widget_get_type
 gtk_color_selection_dialog_get_type
 gtk_color_selection_get_type
 gtk_combo_box_get_type

docs/reference/gtk/migrating-GtkApplication.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
                "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
-<chapter id="gtk-migrating-unique-GtkApplication">
+<chapter id="gtk-migrating-GtkApplication">
 
   <title>Migrating from libunique to GApplication or GtkApplication</title>
 
@@ -20,7 +20,7 @@
 
   <example><title>A unique application</title>
   <para>Here is a simple application using libunique:
-  <informalexample><programlisting>
+  <programlisting>
 int
 main (int argc, char *argv[])
 {
@@ -53,9 +53,9 @@ main (int argc, char *argv[])
 
   return 0;
 }
-</programlisting></informalexample>
+</programlisting>
 The same application using GtkApplication:
-<informalexample><programlisting>
+<programlisting>
 static void
 activate (GtkApplication *app)
 {
@@ -85,13 +85,13 @@ main (int argc, char *argv[])
   app = gtk_application_new ("org.gtk.TestApplication", 0);
   g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
 
-  status = g_application_run (G_APPLICATION (app), argc, argv);
+  status = g_application_run (app);
 
   g_object_unref (app);
 
   return status;
 }
-</programlisting></informalexample>
+</programlisting>
 </para>
 </example>
   <section><title>Uniqueness</title>

docs/reference/gtk/migrating-checklist.sgml

@@ -3,10 +3,10 @@
                "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
 <chapter id="gtk-migrating-checklist">
-  <title>Migration Details Checklist</title>
+  <title>Migration Checklist</title>
 
   <para>
-    This chapter includes a checklist of smaller things you need to do to
+    This chapter includes a checklist of things you need to do to
     ensure that your programs are good citizens in the GTK+ world.  By
     paying attention to the points in the checklist, you ensure that
     many automatic features of GTK+ will work correctly in your

docs/reference/gtk/migrating-smclient-GtkApplication.xml

@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<chapter id="gtk-migrating-smclient-GtkApplication">
-
-  <title>Migrating from EggSMClient to GtkApplication</title>
-
-  <para>
-    EggSMClient provides 'session management' support for applications.
-    This means a number of things:
-    <itemizedlist>
-      <listitem>logout notification and negotiation</listitem>
-      <listitem>application state saving</listitem>
-      <listitem>restarting of applications with saved state</listitem>
-    </itemizedlist>
-    EggSMClient supports this functionality to varying degrees on
-    Windows and OS X, as well as with XSMP and D-Bus based session
-    managers in X11.
-  </para>
-
-  <para>
-    Starting with GTK+ 3.4, #GtkApplication supports logout notification
-    and negotiation similar to EggSMClient.
-  </para>
-  <table>
-    <tgroup cols="2">
-      <title>EggSMClient to GtkApplication</title>
-      <thead>
-        <row><entry>EggSMClient</entry><entry>GtkApplication</entry></row>
-      </thead>
-      <tbody>
-        <row><entry>EggSMClient::quit-requested</entry><entry>instead of calling will_quit (FALSE,...) in response to this signal, install an inhibitor</entry></row>
-        <row><entry>EggSMClient::quit</entry><entry>the #GtkApplication::quit signal</entry></row>
-        <row><entry>EggSMClient::quit-cancelled</entry><entry></entry></row>
-        <row><entry>egg_sm_client_will_quit</entry><entry>instead of calling will_quit (FALSE,...), install an inhibitor</entry></row>
-        <row><entry>egg_sm_client_end_session</entry><entry>gtk_application_end_session()</entry></row>
-      </tbody>
-    </tgroup>
-  </table>
-
-  <para>
-    At this point, GtkApplication has no special support for state saving.
-    Applications can use GSettings or GKeyFile and save as much state as
-    they see fit in response to #GtkApplication::quit or whenever they
-    consider appropriate.
-  </para>
-</chapter>

docs/reference/gtk/other_software.sgml

@@ -121,9 +121,9 @@ Here's a simple example:
     do_small_part_of_task ();
   
     if (task_complete)
-      return G_SOURCE_REMOVE; /* removes the idle handler */
+      return FALSE; /* removes the idle handler */
     else
-      return G_SOURCE_CONTINUE;  /* runs the idle handler again */
+      return TRUE;  /* runs the idle handler again */
   }
 
   g_idle_add (my_idle_handler, NULL);

docs/reference/gtk/visual_index.xml

@@ -135,10 +135,4 @@
   <link linkend="GtkSwitch">
     <inlinegraphic fileref="switch.png" format="PNG"></inlinegraphic>
   </link>
-  <link linkend="GtkColorChooserDialog">
-    <inlinegraphic fileref="colorchooser.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkFontChooserDialog">
-    <inlinegraphic fileref="fontchooser.png" format="PNG"></inlinegraphic>
-  </link>
 </para>

docs/tools/widgets.c

@@ -1154,33 +1154,6 @@ create_appchooserdialog (void)
   return info;
 }
 
-static WidgetInfo *
-create_fontchooserdialog (void)
-{
-  WidgetInfo *info;
-  GtkWidget *widget;
-
-  widget = gtk_font_chooser_dialog_new ("Font Chooser Dialog", NULL);
-  gtk_window_set_default_size (GTK_WINDOW (widget), 200, 300);
-  info = new_widget_info ("fontchooser", widget, ASIS);
-  info->include_decorations = TRUE;
-
-  return info;
-}
-
-static WidgetInfo *
-create_colorchooserdialog (void)
-{
-  WidgetInfo *info;
-  GtkWidget *widget;
-
-  widget = gtk_color_chooser_dialog_new ("Color Chooser Dialog", NULL);
-  info = new_widget_info ("colorchooser", widget, ASIS);
-  info->include_decorations = TRUE;
-
-  return info;
-}
-
 GList *
 get_all_widgets (void)
 {
@@ -1231,8 +1204,6 @@ get_all_widgets (void)
   retval = g_list_prepend (retval, create_appchooserbutton ());
   retval = g_list_prepend (retval, create_appchooserdialog ());
   retval = g_list_prepend (retval, create_lockbutton ());
-  retval = g_list_prepend (retval, create_fontchooserdialog ());
-  retval = g_list_prepend (retval, create_colorchooserdialog ());
 
   return retval;
 }

examples/bloatpad.c

@@ -13,14 +13,6 @@ activate_toggle (GSimpleAction *action,
   g_variant_unref (state);
 }
 
-static void
-activate_radio (GSimpleAction *action,
-                GVariant      *parameter,
-                gpointer       user_data)
-{
-  g_action_change_state (G_ACTION (action), parameter);
-}
-
 static void
 change_fullscreen_state (GSimpleAction *action,
                          GVariant      *state,
@@ -34,29 +26,6 @@ change_fullscreen_state (GSimpleAction *action,
   g_simple_action_set_state (action, state);
 }
 
-static void
-change_justify_state (GSimpleAction *action,
-                      GVariant      *state,
-                      gpointer       user_data)
-{
-  GtkTextView *text = g_object_get_data (user_data, "bloatpad-text");
-  const gchar *str;
-
-  str = g_variant_get_string (state, NULL);
-
-  if (g_str_equal (str, "left"))
-    gtk_text_view_set_justification (text, GTK_JUSTIFY_LEFT);
-  else if (g_str_equal (str, "center"))
-    gtk_text_view_set_justification (text, GTK_JUSTIFY_CENTER);
-  else if (g_str_equal (str, "right"))
-    gtk_text_view_set_justification (text, GTK_JUSTIFY_RIGHT);
-  else
-    /* ignore this attempted change */
-    return;
-
-  g_simple_action_set_state (action, state);
-}
-
 static GtkClipboard *
 get_clipboard (GtkWidget *widget)
 {
@@ -93,8 +62,7 @@ window_paste (GSimpleAction *action,
 static GActionEntry win_entries[] = {
   { "copy", window_copy, NULL, NULL, NULL },
   { "paste", window_paste, NULL, NULL, NULL },
-  { "fullscreen", activate_toggle, NULL, "false", change_fullscreen_state },
-  { "justify", activate_radio, "s", "'left'", change_justify_state }
+  { "fullscreen", activate_toggle, NULL, "false", change_fullscreen_state }
 };
 
 static void
@@ -102,9 +70,6 @@ new_window (GApplication *app,
             GFile        *file)
 {
   GtkWidget *window, *grid, *scrolled, *view;
-  GtkWidget *toolbar;
-  GtkToolItem *button;
-  GtkWidget *sw, *box, *label;
 
   window = gtk_application_window_new (GTK_APPLICATION (app));
   gtk_window_set_default_size ((GtkWindow*)window, 640, 480);
@@ -114,36 +79,6 @@ new_window (GApplication *app,
   grid = gtk_grid_new ();
   gtk_container_add (GTK_CONTAINER (window), grid);
 
-  toolbar = gtk_toolbar_new ();
-  button = gtk_toggle_tool_button_new_from_stock (GTK_STOCK_JUSTIFY_LEFT);
-  gtk_actionable_set_detailed_action_name (GTK_ACTIONABLE (button), "win.justify::left");
-  gtk_container_add (GTK_CONTAINER (toolbar), GTK_WIDGET (button));
-
-  button = gtk_toggle_tool_button_new_from_stock (GTK_STOCK_JUSTIFY_CENTER);
-  gtk_actionable_set_detailed_action_name (GTK_ACTIONABLE (button), "win.justify::center");
-  gtk_container_add (GTK_CONTAINER (toolbar), GTK_WIDGET (button));
-
-  button = gtk_toggle_tool_button_new_from_stock (GTK_STOCK_JUSTIFY_RIGHT);
-  gtk_actionable_set_detailed_action_name (GTK_ACTIONABLE (button), "win.justify::right");
-  gtk_container_add (GTK_CONTAINER (toolbar), GTK_WIDGET (button));
-
-  button = gtk_separator_tool_item_new ();
-  gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (button), FALSE);
-  gtk_tool_item_set_expand (GTK_TOOL_ITEM (button), TRUE);
-  gtk_container_add (GTK_CONTAINER (toolbar), GTK_WIDGET (button));
-
-  button = gtk_tool_item_new ();
-  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-  gtk_container_add (GTK_CONTAINER (button), box);
-  label = gtk_label_new ("Fullscreen:");
-  gtk_container_add (GTK_CONTAINER (box), label);
-  sw = gtk_switch_new ();
-  gtk_actionable_set_action_name (GTK_ACTIONABLE (sw), "win.fullscreen");
-  gtk_container_add (GTK_CONTAINER (box), sw);
-  gtk_container_add (GTK_CONTAINER (toolbar), GTK_WIDGET (button));
-
-  gtk_grid_attach (GTK_GRID (grid), toolbar, 0, 0, 1, 1);
-
   scrolled = gtk_scrolled_window_new (NULL, NULL);
   gtk_widget_set_hexpand (scrolled, TRUE);
   gtk_widget_set_vexpand (scrolled, TRUE);
@@ -153,7 +88,7 @@ new_window (GApplication *app,
 
   gtk_container_add (GTK_CONTAINER (scrolled), view);
 
-  gtk_grid_attach (GTK_GRID (grid), scrolled, 0, 1, 1, 1);
+  gtk_grid_attach (GTK_GRID (grid), scrolled, 0, 0, 1, 1);
 
   if (file != NULL)
     {
@@ -207,15 +142,13 @@ new_activated (GSimpleAction *action,
                GVariant      *parameter,
                gpointer       user_data)
 {
-  GApplication *app = user_data;
-
-  g_application_activate (app);
+  g_application_activate (user_data);
 }
 
 static void
-about_activated (GSimpleAction *action,
-                 GVariant      *parameter,
-                 gpointer       user_data)
+show_about (GSimpleAction *action,
+            GVariant      *parameter,
+            gpointer       user_data)
 {
   gtk_show_about_dialog (NULL,
                          "program-name", "Bloatpad",
@@ -225,19 +158,31 @@ about_activated (GSimpleAction *action,
 }
 
 static void
-quit_activated (GSimpleAction *action,
-                GVariant      *parameter,
-                gpointer       user_data)
+quit_app (GSimpleAction *action,
+          GVariant      *parameter,
+          gpointer       user_data)
 {
-  GApplication *app = user_data;
+  GList *list, *next;
+  GtkWindow *win;
 
-  g_application_quit (app);
+  g_print ("Going down...\n");
+
+  list = gtk_application_get_windows (GTK_APPLICATION (g_application_get_default ()));
+  while (list)
+    {
+      win = list->data;
+      next = list->next;
+
+      gtk_widget_destroy (GTK_WIDGET (win));
+
+      list = next;
+    }
 }
 
 static GActionEntry app_entries[] = {
   { "new", new_activated, NULL, NULL, NULL },
-  { "about", about_activated, NULL, NULL, NULL },
-  { "quit", quit_activated, NULL, NULL, NULL },
+  { "about", show_about, NULL, NULL, NULL },
+  { "quit", quit_app, NULL, NULL, NULL },
 };
 
 static void
@@ -255,50 +200,25 @@ bloat_pad_startup (GApplication *application)
                                "<interface>"
                                "  <menu id='app-menu'>"
                                "    <section>"
-                               "      <item>"
-                               "        <attribute name='label' translatable='yes'>_New Window</attribute>"
-                               "        <attribute name='action'>app.new</attribute>"
-                               "        <attribute name='accel'>&lt;Primary&gt;n</attribute>"
-                               "      </item>"
+                               "      <item label='_New Window' action='app.new' accel='<Primary>n'/>"
                                "    </section>"
                                "    <section>"
-                               "      <item>"
-                               "        <attribute name='label' translatable='yes'>_About Bloatpad</attribute>"
-                               "        <attribute name='action'>app.about</attribute>"
-                               "      </item>"
+                               "      <item label='_About Bloatpad' action='app.about'/>"
                                "    </section>"
                                "    <section>"
-                               "      <item>"
-                               "        <attribute name='label' translatable='yes'>_Quit</attribute>"
-                               "        <attribute name='action'>app.quit</attribute>"
-                               "        <attribute name='accel'>&lt;Primary&gt;q</attribute>"
-                               "      </item>"
+                               "      <item label='_Quit' action='app.quit' accel='<Primary>q'/>"
                                "    </section>"
                                "  </menu>"
                                "  <menu id='menubar'>"
-                               "    <submenu>"
-                               "      <attribute name='label' translatable='yes'>_Edit</attribute>"
+                               "    <submenu label='_Edit'>"
                                "      <section>"
-                               "        <item>"
-                               "          <attribute name='label' translatable='yes'>_Copy</attribute>"
-                               "          <attribute name='action'>win.copy</attribute>"
-                               "          <attribute name='accel'>&lt;Primary&gt;c</attribute>"
-                               "        </item>"
-                               "        <item>"
-                               "          <attribute name='label' translatable='yes'>_Parse</attribute>"
-                               "          <attribute name='action'>win.parse</attribute>"
-                               "          <attribute name='accel'>&lt;Primary&gt;v</attribute>"
-                               "        </item>"
+                               "        <item label='_Copy' action='win.copy' accel='<Primary>c'/>"
+                               "        <item label='_Paste' action='win.paste' accel='<Primary>v'/>"
                                "      </section>"
                                "    </submenu>"
-                               "    <submenu>"
-                               "      <attribute name='label' translatable='yes'>_View</attribute>"
+                               "    <submenu label='_View'>"
                                "      <section>"
-                               "        <item>"
-                               "          <attribute name='label' translatable='yes'>_Fullscreen</attribute>"
-                               "          <attribute name='action'>win.fullscreen</attribute>"
-                               "          <attribute name='accel'>F11</attribute>"
-                               "        </item>"
+                               "        <item label='_Fullscreen' action='win.fullscreen'/>"
                                "      </section>"
                                "    </submenu>"
                                "  </menu>"
@@ -330,20 +250,12 @@ bloat_pad_class_init (BloatPadClass *class)
 BloatPad *
 bloat_pad_new (void)
 {
-  GtkApplication *bloat_pad;
-
   g_type_init ();
 
-  g_set_application_name ("Bloatpad");
-
-  bloat_pad = g_object_new (bloat_pad_get_type (),
-                            "application-id", "org.gtk.Test.bloatpad",
-                            "flags", G_APPLICATION_HANDLES_OPEN,
-                            "inactivity-timeout", 30000,
-                            "register-session", TRUE,
-                            NULL);
-
-  return bloat_pad;
+  return g_object_new (bloat_pad_get_type (),
+                       "application-id", "org.gtk.Test.bloatpad",
+                       "flags", G_APPLICATION_HANDLES_OPEN,
+                       NULL);
 }
 
 int
@@ -353,12 +265,9 @@ main (int argc, char **argv)
   int status;
 
   bloat_pad = bloat_pad_new ();
-
   gtk_application_add_accelerator (GTK_APPLICATION (bloat_pad),
                                    "F11", "win.fullscreen", NULL);
-
   status = g_application_run (G_APPLICATION (bloat_pad), argc, argv);
-
   g_object_unref (bloat_pad);
 
   return status;

examples/drawing.c

@@ -86,11 +86,11 @@ button_press_event_cb (GtkWidget      *widget,
   if (surface == NULL)
     return FALSE;
 
-  if (event->button == GDK_BUTTON_PRIMARY)
+  if (event->button == 1)
     {
       draw_brush (widget, event->x, event->y);
     }
-  else if (event->button == GDK_BUTTON_SECONDARY)
+  else if (event->button == 3)
     {
       clear_surface ();
       gtk_widget_queue_draw (widget);

examples/plugman.c

@@ -223,7 +223,6 @@ enable_plugin (const gchar *name)
   g_signal_connect (action, "activate", G_CALLBACK (plugin_action), (gpointer)name);
   g_action_map_add_action (G_ACTION_MAP (g_application_get_default ()), action);
   g_print ("Actions of '%s' plugin added\n", name);
-  g_object_unref (action);
 
   plugin_menu = find_plugin_menu ();
   if (plugin_menu)
@@ -231,14 +230,14 @@ enable_plugin (const gchar *name)
       GMenu *section;
       GMenuItem *item;
       gchar *label;
-      gchar *action_name;
+      gchar *action;
 
       section = g_menu_new ();
       label = g_strdup_printf ("Turn text %s", name);
-      action_name = g_strconcat ("app.", name, NULL);
-      g_menu_insert (section, 0, label, action_name);
+      action = g_strconcat ("app.", name, NULL);
+      g_menu_insert (section, 0, label, action);
       g_free (label);
-      g_free (action_name);
+      g_free (action);
       item = g_menu_item_new_section (NULL, (GMenuModel*)section);
       g_menu_item_set_attribute (item, "id", "s", name);
       g_menu_append_item (G_MENU (plugin_menu), item);

gail-3.0-uninstalled.pc.in

@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Gail
+Description: GNOME Accessibility Implementation Library
+Version: @VERSION@
+Requires: atk gtk+-3.0
+Libs: ${pc_top_builddir}/${pcfiledir}/modules/other/gail/libgail.la ${pc_top_builddir}/${pcfiledir}/modules/other/gail/libgail-util/libgailutil.la
+Cflags: -I${pc_top_builddir}/${pcfiledir}/modules/other/gail

gdk/COPYING

@@ -1,8 +1,8 @@
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -10,7 +10,7 @@
  as the successor of the GNU Library Public License, version 2, hence
  the version number 2.1.]
 
-                            Preamble
+			    Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -112,7 +112,7 @@ modification follow.  Pay close attention to the difference between a
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
 
-                  GNU LESSER GENERAL PUBLIC LICENSE
+		  GNU LESSER GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library or other
@@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based
 on the Library (independent of the use of the Library in a tool for
 writing it).  Whether that is true depends on what the Library does
 and what the program that uses the Library does.
-
+  
   1. You may copy and distribute verbatim copies of the Library's
 complete source code as you receive it, in any medium, provided that
 you conspicuously and appropriately publish on each copy an
@@ -432,7 +432,7 @@ decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-                            NO WARRANTY
+			    NO WARRANTY
 
   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -455,7 +455,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-                     END OF TERMS AND CONDITIONS
+		     END OF TERMS AND CONDITIONS
 
            How to Apply These Terms to Your New Libraries
 
@@ -476,7 +476,7 @@ convey the exclusion of warranty; and each file should have at least the
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
     License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
+    version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -485,7 +485,7 @@ convey the exclusion of warranty; and each file should have at least the
 
     You should have received a copy of the GNU Lesser General Public
     License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -500,3 +500,5 @@ necessary.  Here is a sample; alter the names:
   Ty Coon, President of Vice
 
 That's all there is to it!
+
+

gdk/Makefile.am

@@ -30,7 +30,6 @@ EXTRA_DIST += 			\
 	gdk.symbols		\
 	gdkenumtypes.c.template	\
 	gdkenumtypes.h.template	\
-	gdkversionmacros.h.in	\
 	abicheck.sh
 
 AM_CPPFLAGS = 				\
@@ -139,7 +138,6 @@ gdk_built_sources = 				\
 	gdkenumtypes.c				\
 	gdkmarshalers.h 			\
 	gdkmarshalers.c				\
-	gdkversionmacros.h			\
 	gdkenumtypes.h
 
 #
@@ -147,7 +145,7 @@ gdk_built_sources = 				\
 #
 
 gdkincludedir = $(includedir)/gtk-3.0/gdk
-gdkinclude_HEADERS = $(gdk_public_h_sources) gdkenumtypes.h gdkversionmacros.h
+gdkinclude_HEADERS = $(gdk_public_h_sources) gdkenumtypes.h
 nodist_gdkinclude_HEADERS = gdkconfig.h
 
 common_sources = 		\
@@ -211,8 +209,10 @@ x11_introspection_files = 		\
 	x11/gdkdevice-core-x11.c	\
 	x11/gdkdevicemanager-core-x11.c	\
 	x11/gdkdevicemanager-x11.c	\
+	x11/gdkdevicemanager-xi.c	\
 	x11/gdkdevicemanager-xi2.c	\
 	x11/gdkdevice-xi2.c		\
+	x11/gdkdevice-xi.c		\
 	x11/gdkdisplay-x11.c		\
 	x11/gdkdnd-x11.c		\
 	x11/gdkeventsource.c		\

gdk/broadway/gdkbroadway.h

@@ -12,7 +12,9 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 /*

gdk/broadway/gdkbroadwaycursor.h

@@ -12,7 +12,9 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 /*

gdk/broadway/gdkbroadwaydisplaymanager.h

@@ -14,7 +14,9 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 #if !defined(__GDKBROADWAY_H_INSIDE__) && !defined (GDK_COMPILATION)

gdk/broadway/gdkbroadwayvisual.h

@@ -13,7 +13,9 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 #ifndef __GDK_BROADWAY_VISUAL_H__

gdk/broadway/gdkbroadwaywindow.h

@@ -12,7 +12,9 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 /*

gdk/broadway/gdkcursor-broadway.c

@@ -12,7 +12,9 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 /*

gdk/broadway/gdkdevice-broadway.c

@@ -12,7 +12,9 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 #include "config.h"

gdk/broadway/gdkdevice-broadway.h

@@ -12,7 +12,9 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 #ifndef __GDK_DEVICE_BROADWAY_H__

gdk/broadway/gdkdevicemanager-broadway.c

@@ -12,7 +12,9 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 #include "config.h"

gdk/broadway/gdkdevicemanager-broadway.h

@@ -12,7 +12,9 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 #ifndef __GDK_DEVICE_MANAGER_BROADWAY_H__

gdk/broadway/gdkdisplay-broadway.c

@@ -17,7 +17,9 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 #include "config.h"
@@ -360,7 +362,7 @@ parse_input (BroadwayInput *input)
 	  gsize len, payload_len;
 	  BroadwayWSOpCode code;
 	  gboolean is_mask, fin;
-	  guchar *buf, *data, *mask;
+	  guchar *buf, *data;
 
 	  buf = input->buffer->data;
 	  len = input->buffer->len;
@@ -389,16 +391,6 @@ parse_input (BroadwayInput *input)
 	      payload_len = GUINT64_FROM_BE( *(guint64 *) data );
 	      data += 8;
 	    }
-
-	  mask = NULL;
-	  if (is_mask)
-	    {
-	      if (data - buf + 4 > len)
-		return;
-	      mask = data;
-	      data += 4;
-	    }
-
 	  if (data - buf + payload_len > len)
 	    return; /* wait to accumulate more */
 
@@ -406,7 +398,8 @@ parse_input (BroadwayInput *input)
 	    {
 	      gsize i;
 	      for (i = 0; i < payload_len; i++)
-		data[i] ^= mask[i%4];
+		data[i + 4] ^= data[i%4];
+	      data += 4;
 	    }
 
 	  switch (code) {
@@ -420,11 +413,7 @@ parse_input (BroadwayInput *input)
 #endif
 	      }
 	    else
-	      {
-		char *terminated = g_strndup((char *)data, payload_len);
-	        parse_input_message (input, terminated);
-		g_free (terminated);
-	      }
+	      parse_input_message (input, (char *)data);
 	    break;
 	  case BROADWAY_WS_CNX_PING:
 	    broadway_output_pong (broadway_display->output);
@@ -485,7 +474,7 @@ process_input_idle_cb (GdkBroadwayDisplay *display)
 {
   display->process_input_idle = 0;
   process_input_messages (display);
-  return G_SOURCE_REMOVE;
+  return FALSE;
 }
 
 static void
@@ -1014,7 +1003,7 @@ got_http_request_line (GInputStream *stream,
       /* Protect against overflow in request length */
       if (request->request->len > 1024 * 5)
 	{
-	  send_error (request, 400, "Request too long");
+	  send_error (request, 400, "Request to long");
 	}
       else
 	{
@@ -1224,7 +1213,8 @@ gdk_broadway_display_finalize (GObject *object)
   _gdk_broadway_cursor_display_finalize (GDK_DISPLAY_OBJECT(broadway_display));
 
   /* input GdkDevice list */
-  g_list_free_full (broadway_display->input_devices, g_object_unref);
+  g_list_foreach (broadway_display->input_devices, (GFunc) g_object_unref, NULL);
+  g_list_free (broadway_display->input_devices);
   /* Free all GdkScreens */
   g_object_unref (broadway_display->screens[0]);
   g_free (broadway_display->screens);

gdk/broadway/gdkdisplay-broadway.h

@@ -16,7 +16,9 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 #ifndef __GDK_BROADWAY_DISPLAY__

gdk/broadway/gdkdisplaymanager-broadway.c

@@ -17,7 +17,9 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 #include "config.h"

gdk/broadway/gdkdnd-broadway.c

@@ -12,7 +12,9 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 /*

gdk/broadway/gdkeventsource.c

@@ -12,7 +12,9 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 #include "config.h"

gdk/broadway/gdkeventsource.h

@@ -12,7 +12,9 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 #ifndef __GDK_EVENT_SOURCE_H__

gdk/broadway/gdkglobals-broadway.c

@@ -12,7 +12,9 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 /*

gdk/broadway/gdkim-broadway.c

@@ -12,7 +12,9 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 /*

gdk/broadway/gdkkeys-broadway.c

@@ -12,7 +12,9 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 /*

gdk/broadway/gdkmain-broadway.c

@@ -12,7 +12,9 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 /*

gdk/broadway/gdkprivate-broadway.h

@@ -12,7 +12,9 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 /*

gdk/broadway/gdkproperty-broadway.c

@@ -12,7 +12,9 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 /*

gdk/broadway/gdkscreen-broadway.c

@@ -16,7 +16,9 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 #include "config.h"
@@ -32,8 +34,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-static void   gdk_broadway_screen_dispose     (GObject *object);
-static void   gdk_broadway_screen_finalize    (GObject *object);
+static void         gdk_broadway_screen_dispose     (GObject		  *object);
+static void         gdk_broadway_screen_finalize    (GObject		  *object);
 
 G_DEFINE_TYPE (GdkBroadwayScreen, gdk_broadway_screen, GDK_TYPE_SCREEN)
 
@@ -47,48 +49,61 @@ gdk_broadway_screen_init (GdkBroadwayScreen *screen)
 static GdkDisplay *
 gdk_broadway_screen_get_display (GdkScreen *screen)
 {
+  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
+
   return GDK_BROADWAY_SCREEN (screen)->display;
 }
 
 static gint
 gdk_broadway_screen_get_width (GdkScreen *screen)
 {
+  g_return_val_if_fail (GDK_IS_SCREEN (screen), 0);
+
   return GDK_BROADWAY_SCREEN (screen)->width;
 }
 
 static gint
 gdk_broadway_screen_get_height (GdkScreen *screen)
 {
+  g_return_val_if_fail (GDK_IS_SCREEN (screen), 0);
+
   return GDK_BROADWAY_SCREEN (screen)->height;
 }
 
 static gint
 gdk_broadway_screen_get_width_mm (GdkScreen *screen)
 {
+  g_return_val_if_fail (GDK_IS_SCREEN (screen), 0);
+
   return gdk_screen_get_width (screen) * 25.4 / 96;
 }
 
 static gint
 gdk_broadway_screen_get_height_mm (GdkScreen *screen)
 {
+  g_return_val_if_fail (GDK_IS_SCREEN (screen), 0);
+
   return gdk_screen_get_height (screen) * 25.4 / 96;
 }
 
 static gint
 gdk_broadway_screen_get_number (GdkScreen *screen)
 {
+  g_return_val_if_fail (GDK_IS_SCREEN (screen), 0);
+
   return 0;
 }
 
 static GdkWindow *
 gdk_broadway_screen_get_root_window (GdkScreen *screen)
 {
+  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
+
   return GDK_BROADWAY_SCREEN (screen)->root_window;
 }
 
 void
-_gdk_broadway_screen_size_changed (GdkScreen                       *screen,
-                                   BroadwayInputScreenResizeNotify *msg)
+_gdk_broadway_screen_size_changed (GdkScreen *screen, BroadwayInputScreenResizeNotify *msg)
 {
   GdkBroadwayScreen *broadway_screen = GDK_BROADWAY_SCREEN (screen);
   gint width, height;
@@ -135,12 +150,16 @@ gdk_broadway_screen_finalize (GObject *object)
 static gint
 gdk_broadway_screen_get_n_monitors (GdkScreen *screen)
 {
+  g_return_val_if_fail (GDK_IS_SCREEN (screen), 0);
+
   return 1;
 }
 
 static gint
 gdk_broadway_screen_get_primary_monitor (GdkScreen *screen)
 {
+  g_return_val_if_fail (GDK_IS_SCREEN (screen), 0);
+
   return 0;
 }
 
@@ -148,6 +167,9 @@ static gint
 gdk_broadway_screen_get_monitor_width_mm (GdkScreen *screen,
 					  gint       monitor_num)
 {
+  g_return_val_if_fail (GDK_IS_SCREEN (screen), -1);
+  g_return_val_if_fail (monitor_num == 0, -1);
+
   return gdk_screen_get_width_mm (screen);
 }
 
@@ -155,6 +177,9 @@ static gint
 gdk_broadway_screen_get_monitor_height_mm (GdkScreen *screen,
 					   gint       monitor_num)
 {
+  g_return_val_if_fail (GDK_IS_SCREEN (screen), -1);
+  g_return_val_if_fail (monitor_num == 0, -1);
+
   return gdk_screen_get_height_mm (screen);
 }
 
@@ -162,6 +187,9 @@ static gchar *
 gdk_broadway_screen_get_monitor_plug_name (GdkScreen *screen,
 					   gint       monitor_num)
 {
+  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
+  g_return_val_if_fail (monitor_num == 0, NULL);
+
   return g_strdup ("browser");
 }
 
@@ -172,6 +200,9 @@ gdk_broadway_screen_get_monitor_geometry (GdkScreen    *screen,
 {
   GdkBroadwayScreen *broadway_screen = GDK_BROADWAY_SCREEN (screen);
 
+  g_return_if_fail (GDK_IS_SCREEN (screen));
+  g_return_if_fail (monitor_num == 0);
+
   if (dest)
     {
       dest->x = 0;
@@ -184,7 +215,11 @@ gdk_broadway_screen_get_monitor_geometry (GdkScreen    *screen,
 static GdkVisual *
 gdk_broadway_screen_get_rgba_visual (GdkScreen *screen)
 {
-  GdkBroadwayScreen *broadway_screen = GDK_BROADWAY_SCREEN (screen);
+  GdkBroadwayScreen *broadway_screen;
+
+  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
+
+  broadway_screen = GDK_BROADWAY_SCREEN (screen);
 
   return broadway_screen->rgba_visual;
 }
@@ -219,6 +254,8 @@ _gdk_broadway_screen_setup (GdkScreen *screen)
 static gboolean
 gdk_broadway_screen_is_composited (GdkScreen *screen)
 {
+  g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE);
+
   return FALSE;
 }
 
@@ -226,6 +263,8 @@ gdk_broadway_screen_is_composited (GdkScreen *screen)
 static gchar *
 gdk_broadway_screen_make_display_name (GdkScreen *screen)
 {
+  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
+
   return g_strdup ("browser");
 }
 

gdk/broadway/gdkscreen-broadway.h

@@ -16,7 +16,9 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 #ifndef __GDK_BROADWAY_SCREEN_H__