callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gtk+2.0 (2.6.7-2) unstable; urgency=low

Browse Source 
* Upload to unstable.
  * Forward patches from 2.6.4 branch:
    + 003_focus_issues.patch: stolen from CVS HEAD to fix focus issues.
    + debian/gtk-tutorial.devhelp: updated to reflect the reality of the
      html files.
  * Loïc Minier:
    + Document the configuration of Emacs-style key bindings in README.Debian,
      with additional instructions for GNOME users. [debian/README.Debian]
      (Closes: #309530)

 -- Josselin Mouette <joss@debian.org>  Mon,  6 Jun 2005 22:39:27 +0200
This commit is contained in:
Josselin Mouette
2005-06-06 20:46:35 +00:00
parent 0492fc07d3
commit 5ff09a6bb5
13 changed files with 455 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
debian/README.Debian vendored
View File

@ -30,5 +30,21 @@ Please use gnome-keybinding-properties instead of gtk-key-theme-name in your
gtkrc.
-- Akira TAGOH <tagoh@debian.org>, Mon, 03 Mar 2003 00:49:13 +0900
Emacs-style key bindings
========================
Gtk provides a way of configuring key bindings in Gtk Widgets, especially
to move the cursor in text fields. The default behavior in older Gtk versions
was similar to Emacs, and still available for users to configure. You can
configure the Emacs-style key binding theme in your ~/.gtkrc-2.0 file as
follows:
gtk-key-theme-name = "Emacs"
Please note that applications can still override this configuration, and this
is the case of the GNOME Desktop: gnome-settings-daemon loads the key theme
from the "/desktop/gnome/interface/gtk_key_theme" GConf entry. This can be
modified with gconf-editor.
This file is the initial work of Akira TAGOH <tagoh@debian.org> and was updated
by Loic Minier <lool@dooz.org>.

27
debian/changelog vendored
View File

@ -1,3 +1,30 @@
gtk+2.0 (2.6.7-2) unstable; urgency=low
* Upload to unstable.
* Forward patches from 2.6.4 branch:
+ 003_focus_issues.patch: stolen from CVS HEAD to fix focus issues.
+ debian/gtk-tutorial.devhelp: updated to reflect the reality of the
html files.
* Loïc Minier:
+ Document the configuration of Emacs-style key bindings in README.Debian,
with additional instructions for GNOME users. [debian/README.Debian]
(Closes: #309530)
-- Josselin Mouette <joss@debian.org> Mon, 6 Jun 2005 22:39:27 +0200
gtk+2.0 (2.6.7-1) experimental; urgency=low
* New upstream version:
- Fix compilation with gcc 4.0 (Closes: #303646).
* debian/rules:
- clean from the mips changes.
* debian/patches/002_bmp.patch:
- the new version fixes that.
* debian/patches/004_fs_newdir.patch:
- the new version fixes that.
-- Sebastien Bacher <seb128@debian.org> Thu, 14 Apr 2005 22:06:53 +0200
gtk+2.0 (2.6.4-1) unstable; urgency=medium
* New upstream release.

4
debian/control vendored
View File

@ -2,7 +2,7 @@ Source: gtk+2.0
Section: libs
Priority: optional
Maintainer: Sebastien Bacher <seb128@debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Akira TAGOH <tagoh@debian.org>, Andreas Rottmann <rotty@debian.org>, Andrew Lau <netsnipe@users.sourceforge.net>, Carlos Perelló Marín <carlos@pemas.net>, Edd Dumbill <ejad@debian.org>, Emil Soleyman-Zomalan <emil@nishra.com>, Gustavo Noronha Silva <kov@debian.org>, J.H.M. Dassen (Ray) <jdassen@debian.org>, Joe Drew <drew@debian.org>, Johannes Rohr <j.rohr@comlink.org>, Jordi Mallach <jordi@debian.org>, Jose Carlos Garcia Sogo <jsogo@debian.org>, Josselin Mouette <joss@debian.org>, Marc HE Brockschmidt <he@debian.org>, Ondřej Surý <ondrej@debian.org>, Rob Bradford <rob@debianplanet.org>, Robert McQueen <robot101@debian.org>, Ross Burton <ross@debian.org>, Takuo KITAME <kitame@debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Akira TAGOH <tagoh@debian.org>, Andreas Rottmann <rotty@debian.org>, Andrew Lau <netsnipe@users.sourceforge.net>, Carlos Perelló Marín <carlos@pemas.net>, Ed Boraas <ed@debian.org>, Edd Dumbill <ejad@debian.org>, Emil Soleyman-Zomalan <emil@nishra.com>, Gustavo Noronha Silva <kov@debian.org>, J.H.M. Dassen (Ray) <jdassen@debian.org>, Joe Drew <drew@debian.org>, Johannes Rohr <j.rohr@comlink.org>, Jordi Mallach <jordi@debian.org>, Jose Carlos Garcia Sogo <jsogo@debian.org>, Josselin Mouette <joss@debian.org>, Marc HE Brockschmidt <he@debian.org>, Ondřej Surý <ondrej@debian.org>, Rob Bradford <rob@debianplanet.org>, Robert McQueen <robot101@debian.org>, Ross Burton <ross@debian.org>, Sjoerd Simons <sjoerd@debian.org>, Takuo KITAME <kitame@debian.org>
Build-Depends: debhelper (>> 4.0.0), gettext, pkg-config, libglib2.0-dev (>= 2.6.0), libpango1.0-dev (>= 1.7.0), libatk1.0-dev (>= 1.6.1-2), xlibs-static-pic | xlibs-pic (>= 4.2.1-6), libx11-dev | xlibs-dev, libxext-dev | xlibs-dev, libxi-dev | xlibs-dev, libxrandr-dev | xlibs-dev, libxt-dev | xlibs-dev, libxrender-dev, libxft-dev, libxcursor-dev, libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools
Build-Depends-Indep: gtk-doc-tools, docbook-xml
Standards-Version: 3.6.1.0
@ -54,7 +54,7 @@ Description: The programs for the GTK+ graphical user interface library
Package: libgtk2.0-dev
Section: libdevel
Architecture: any
Depends: libgtk2.0-0 (= ${Source-Version}), libglib2.0-dev (>= 2.4.1-2), libpango1.0-dev (>= 1.4.0-3), libatk1.0-dev (>= 1.6.1-2), libx11-dev | xlibs-dev, libxext-dev | xlibs-dev, pkg-config
Depends: libgtk2.0-0 (= ${Source-Version}), libglib2.0-dev (>= 2.4.1-2), libpango1.0-dev (>= 1.5.1), libatk1.0-dev (>= 1.6.1-2), libx11-dev | xlibs-dev, libxext-dev | xlibs-dev, pkg-config
Suggests: libgtk2.0-doc
Replaces: libgtk1.3-dev
Conflicts: libgtk1.3-dev

2
debian/control.in vendored
View File

@ -54,7 +54,7 @@ Description: The programs for the GTK+ graphical user interface library
Package: libgtk2.0-dev
Section: libdevel
Architecture: any
Depends: libgtk2.0-@SONAME@ (= ${Source-Version}), libglib2.0-dev (>= 2.4.1-2), libpango1.0-dev (>= 1.4.0-3), libatk1.0-dev (>= 1.6.1-2), libx11-dev | xlibs-dev, libxext-dev | xlibs-dev, pkg-config
Depends: libgtk2.0-@SONAME@ (= ${Source-Version}), libglib2.0-dev (>= 2.4.1-2), libpango1.0-dev (>= 1.5.1), libatk1.0-dev (>= 1.6.1-2), libx11-dev | xlibs-dev, libxext-dev | xlibs-dev, pkg-config
Suggests: libgtk2.0-doc
Replaces: libgtk1.3-dev
Conflicts: libgtk1.3-dev

398
debian/gtk-tutorial.devhelp vendored
View File

@ -14,268 +14,268 @@
<sub name="Hello World in GTK" link="c58.html#SEC-HELLOWORLD"/>
<sub name="Compiling Hello World" link="x130.html"/>
<sub name="Theory of Signals and Callbacks" link="x178.html"/>
<sub name="Events" link="x200.html"/>
<sub name="Stepping Through Hello World" link="x299.html"/>
<sub name="Events" link="x201.html"/>
<sub name="Stepping Through Hello World" link="x300.html"/>
</sub>
<sub name="Moving On" link="c344.html">
<sub name="Data Types" link="c344.html#SEC-DATATYPES"/>
<sub name="More on Signal Handlers" link="x353.html"/>
<sub name="An Upgraded Hello World" link="x363.html"/>
<sub name="Moving On" link="c345.html">
<sub name="Data Types" link="c345.html#SEC-DATATYPES"/>
<sub name="More on Signal Handlers" link="x354.html"/>
<sub name="An Upgraded Hello World" link="x364.html"/>
</sub>
<sub name="Packing Widgets" link="c373.html">
<sub name="Theory of Packing Boxes" link="c373.html#SEC-THEORYOFPACKINGBOXES"/>
<sub name="Details of Boxes" link="x382.html"/>
<sub name="Packing Demonstration Program" link="x405.html"/>
<sub name="Packing Using Tables" link="x408.html"/>
<sub name="Table Packing Example" link="x460.html"/>
<sub name="Packing Widgets" link="c374.html">
<sub name="Theory of Packing Boxes" link="c374.html#SEC-THEORYOFPACKINGBOXES"/>
<sub name="Details of Boxes" link="x383.html"/>
<sub name="Packing Demonstration Program" link="x406.html"/>
<sub name="Packing Using Tables" link="x409.html"/>
<sub name="Table Packing Example" link="x461.html"/>
</sub>
<sub name="Widget Overview" link="c469.html">
<sub name="Casting" link="c469.html#SEC-CASTING"/>
<sub name="Widget Hierarchy" link="x497.html"/>
<sub name="Widgets Without Windows" link="x501.html"/>
<sub name="Widget Overview" link="c470.html">
<sub name="Casting" link="c470.html#SEC-CASTING"/>
<sub name="Widget Hierarchy" link="x498.html"/>
<sub name="Widgets Without Windows" link="x502.html"/>
</sub>
<sub name="The Button Widget" link="c509.html">
<sub name="Normal Buttons" link="c509.html#SEC-NORMALBUTTONS"/>
<sub name="Toggle Buttons" link="x538.html"/>
<sub name="Check Buttons" link="x555.html"/>
<sub name="Radio Buttons" link="x562.html"/>
<sub name="The Button Widget" link="c510.html">
<sub name="Normal Buttons" link="c510.html#SEC-NORMALBUTTONS"/>
<sub name="Toggle Buttons" link="x539.html"/>
<sub name="Check Buttons" link="x556.html"/>
<sub name="Radio Buttons" link="x563.html"/>
</sub>
<sub name="Adjustments" link="c583.html">
<sub name="Creating an Adjustment" link="c583.html#SEC-CREATINGANADJUSTMENT"/>
<sub name="Using Adjustments the Easy Way" link="x607.html"/>
<sub name="Adjustment Internals" link="x622.html"/>
<sub name="Adjustments" link="c584.html">
<sub name="Creating an Adjustment" link="c584.html#SEC-CREATINGANADJUSTMENT"/>
<sub name="Using Adjustments the Easy Way" link="x608.html"/>
<sub name="Adjustment Internals" link="x623.html"/>
</sub>
<sub name="Range Widgets" link="c653.html">
<sub name="Scrollbar Widgets" link="c653.html#SEC-SCROLLBARWIDGETS"/>
<sub name="Scale Widgets" link="x665.html">
<sub name="Creating a Scale Widget" link="x665.html#AEN668"/>
<sub name="Functions and Signals (well, functions, at least)" link="x665.html#AEN680"/>
<sub name="Range Widgets" link="c654.html">
<sub name="Scrollbar Widgets" link="c654.html#SEC-SCROLLBARWIDGETS"/>
<sub name="Scale Widgets" link="x666.html">
<sub name="Creating a Scale Widget" link="x666.html#AEN669"/>
<sub name="Functions and Signals (well, functions, at least)" link="x666.html#AEN681"/>
</sub>
<sub name="Common Range Functions" link="x704.html">
<sub name="Setting the Update Policy" link="x704.html#AEN708"/>
<sub name="Getting and Setting Adjustments" link="x704.html#AEN733"/>
<sub name="Common Range Functions" link="x705.html">
<sub name="Setting the Update Policy" link="x705.html#AEN709"/>
<sub name="Getting and Setting Adjustments" link="x705.html#AEN734"/>
</sub>
<sub name="Key and Mouse bindings" link="x745.html"/>
<sub name="Example" link="x763.html"/>
<sub name="Key and Mouse bindings" link="x746.html"/>
<sub name="Example" link="x764.html"/>
</sub>
<sub name="Miscellaneous Widgets" link="c773.html">
<sub name="Labels" link="c773.html#SEC-LABELS"/>
<sub name="Arrows" link="x813.html"/>
<sub name="The Tooltips Object" link="x830.html"/>
<sub name="Progress Bars" link="x849.html"/>
<sub name="Dialogs" link="x881.html"/>
<sub name="Rulers" link="x911.html"/>
<sub name="Statusbars" link="x939.html"/>
<sub name="Text Entries" link="x959.html"/>
<sub name="Spin Buttons" link="x987.html"/>
<sub name="Combo Box" link="x1083.html"/>
<sub name="Calendar" link="x1120.html"/>
<sub name="Color Selection" link="x1204.html"/>
<sub name="File Selections" link="x1227.html"/>
<sub name="Miscellaneous Widgets" link="c774.html">
<sub name="Labels" link="c774.html#SEC-LABELS"/>
<sub name="Arrows" link="x814.html"/>
<sub name="The Tooltips Object" link="x831.html"/>
<sub name="Progress Bars" link="x850.html"/>
<sub name="Dialogs" link="x882.html"/>
<sub name="Rulers" link="x912.html"/>
<sub name="Statusbars" link="x940.html"/>
<sub name="Text Entries" link="x960.html"/>
<sub name="Spin Buttons" link="x988.html"/>
<sub name="Combo Box" link="x1084.html"/>
<sub name="Calendar" link="x1121.html"/>
<sub name="Color Selection" link="x1205.html"/>
<sub name="File Selections" link="x1228.html"/>
</sub>
<sub name="Container Widgets" link="c1246.html">
<sub name="The EventBox" link="c1246.html#SEC-EVENTBOX"/>
<sub name="The Alignment widget" link="x1263.html"/>
<sub name="Fixed Container" link="x1278.html"/>
<sub name="Layout Container" link="x1299.html"/>
<sub name="Frames" link="x1311.html"/>
<sub name="Aspect Frames" link="x1337.html"/>
<sub name="Paned Window Widgets" link="x1355.html"/>
<sub name="Viewports" link="x1372.html"/>
<sub name="Scrolled Windows" link="x1388.html"/>
<sub name="Button Boxes" link="x1410.html"/>
<sub name="Toolbar" link="x1422.html"/>
<sub name="Notebooks" link="x1470.html"/>
<sub name="Container Widgets" link="c1247.html">
<sub name="The EventBox" link="c1247.html#SEC-EVENTBOX"/>
<sub name="The Alignment widget" link="x1264.html"/>
<sub name="Fixed Container" link="x1279.html"/>
<sub name="Layout Container" link="x1300.html"/>
<sub name="Frames" link="x1312.html"/>
<sub name="Aspect Frames" link="x1338.html"/>
<sub name="Paned Window Widgets" link="x1356.html"/>
<sub name="Viewports" link="x1373.html"/>
<sub name="Scrolled Windows" link="x1389.html"/>
<sub name="Button Boxes" link="x1411.html"/>
<sub name="Toolbar" link="x1423.html"/>
<sub name="Notebooks" link="x1471.html"/>
</sub>
<sub name="Menu Widget" link="c1519.html">
<sub name="Manual Menu Creation" link="c1519.html#SEC-MANUALMENUCREATION"/>
<sub name="Manual Menu Example" link="x1597.html"/>
<sub name="Using ItemFactory" link="x1606.html">
<sub name="ItemFactory entries" link="x1606.html#SEC-ITEMFACTORYENTRIES"/>
<sub name="Creating an ItemFactory" link="x1606.html#SEC-ITEMFACTORYCREATION"/>
<sub name="Making use of the menu and its menu items" link="x1606.html#SEC-USINGMENUANDITEMS"/>
<sub name="Menu Widget" link="c1520.html">
<sub name="Manual Menu Creation" link="c1520.html#SEC-MANUALMENUCREATION"/>
<sub name="Manual Menu Example" link="x1598.html"/>
<sub name="Using ItemFactory" link="x1607.html">
<sub name="ItemFactory entries" link="x1607.html#SEC-ITEMFACTORYENTRIES"/>
<sub name="Creating an ItemFactory" link="x1607.html#SEC-ITEMFACTORYCREATION"/>
<sub name="Making use of the menu and its menu items" link="x1607.html#SEC-USINGMENUANDITEMS"/>
</sub>
<sub name="Item Factory Example" link="x1717.html"/>
<sub name="Item Factory Example" link="x1718.html"/>
</sub>
<sub name="Undocumented Widgets" link="c1721.html">
<sub name="Accel Label" link="c1721.html#SEC-ACCELLABEL"/>
<sub name="Option Menu" link="x1729.html"/>
<sub name="Menu Items" link="x1732.html">
<sub name="Check Menu Item" link="x1732.html#SEC-CHECKMENUITEM"/>
<sub name="Radio Menu Item" link="x1732.html#SEC-RADIOMENUITEM"/>
<sub name="Separator Menu Item" link="x1732.html#SEC-SEPARATORMENUITEM"/>
<sub name="Tearoff Menu Item" link="x1732.html#SEC-TEAROFFMENUITEM"/>
<sub name="Undocumented Widgets" link="c1722.html">
<sub name="Accel Label" link="c1722.html#SEC-ACCELLABEL"/>
<sub name="Option Menu" link="x1730.html"/>
<sub name="Menu Items" link="x1733.html">
<sub name="Check Menu Item" link="x1733.html#SEC-CHECKMENUITEM"/>
<sub name="Radio Menu Item" link="x1733.html#SEC-RADIOMENUITEM"/>
<sub name="Separator Menu Item" link="x1733.html#SEC-SEPARATORMENUITEM"/>
<sub name="Tearoff Menu Item" link="x1733.html#SEC-TEAROFFMENUITEM"/>
</sub>
<sub name="Curves" link="x1747.html"/>
<sub name="Drawing Area" link="x1750.html"/>
<sub name="Font Selection Dialog" link="x1753.html"/>
<sub name="Message Dialog" link="x1756.html"/>
<sub name="Gamma Curve" link="x1759.html"/>
<sub name="Image" link="x1762.html"/>
<sub name="Plugs and Sockets" link="x1765.html"/>
<sub name="Tree View" link="x1768.html"/>
<sub name="Text View" link="x1771.html"/>
<sub name="Curves" link="x1748.html"/>
<sub name="Drawing Area" link="x1751.html"/>
<sub name="Font Selection Dialog" link="x1754.html"/>
<sub name="Message Dialog" link="x1757.html"/>
<sub name="Gamma Curve" link="x1760.html"/>
<sub name="Image" link="x1763.html"/>
<sub name="Plugs and Sockets" link="x1766.html"/>
<sub name="Tree View" link="x1769.html"/>
<sub name="Text View" link="x1772.html"/>
</sub>
<sub name="Setting Widget Attributes" link="c1774.html">
<sub name="Setting Widget Attributes" link="c1775.html">
</sub>
<sub name="Timeouts, IO and Idle Functions" link="c1779.html">
<sub name="Timeouts" link="c1779.html#SEC-TIMEOUTS"/>
<sub name="Monitoring IO" link="x1790.html"/>
<sub name="Idle Functions" link="x1810.html"/>
<sub name="Timeouts, IO and Idle Functions" link="c1780.html">
<sub name="Timeouts" link="c1780.html#SEC-TIMEOUTS"/>
<sub name="Monitoring IO" link="x1791.html"/>
<sub name="Idle Functions" link="x1811.html"/>
</sub>
<sub name="Advanced Event and Signal Handling" link="c1817.html">
<sub name="Signal Functions" link="c1817.html#SEC-SIGNALFUNCTIONS">
<sub name="Connecting and Disconnecting Signal Handlers" link="c1817.html#AEN1821"/>
<sub name="Blocking and Unblocking Signal Handlers" link="c1817.html#AEN1824"/>
<sub name="Emitting and Stopping Signals" link="c1817.html#AEN1827"/>
<sub name="Advanced Event and Signal Handling" link="c1818.html">
<sub name="Signal Functions" link="c1818.html#SEC-SIGNALFUNCTIONS">
<sub name="Connecting and Disconnecting Signal Handlers" link="c1818.html#AEN1822"/>
<sub name="Blocking and Unblocking Signal Handlers" link="c1818.html#AEN1825"/>
<sub name="Emitting and Stopping Signals" link="c1818.html#AEN1828"/>
</sub>
<sub name="Signal Emission and Propagation" link="x1830.html"/>
<sub name="Signal Emission and Propagation" link="x1831.html"/>
</sub>
<sub name="Managing Selections" link="c1854.html">
<sub name="Overview" link="c1854.html#SEC-SELECTIONSOVERVIEW"/>
<sub name="Retrieving the selection" link="x1870.html"/>
<sub name="Supplying the selection" link="x1893.html"/>
<sub name="Managing Selections" link="c1855.html">
<sub name="Overview" link="c1855.html#SEC-SELECTIONSOVERVIEW"/>
<sub name="Retrieving the selection" link="x1871.html"/>
<sub name="Supplying the selection" link="x1894.html"/>
</sub>
<sub name="Drag-and-drop (DND)" link="c1919.html">
<sub name="Overview" link="c1919.html#SEC-DRAGANDDROPOVERVIEW"/>
<sub name="Properties" link="x1941.html"/>
<sub name="Functions" link="x1959.html">
<sub name="Setting up the source widget" link="x1959.html#SEC-DNDSOURCEWIDGETS"/>
<sub name="Signals on the source widget:" link="x1959.html#SEC-SIGNALSONSOURCEWIDGETS"/>
<sub name="Setting up a destination widget:" link="x1959.html#SEC-DNDDESTWIDGETS"/>
<sub name="Signals on the destination widget:" link="x1959.html#SEC-SIGNALSONDESTWIDGETS"/>
<sub name="Drag-and-drop (DND)" link="c1920.html">
<sub name="Overview" link="c1920.html#SEC-DRAGANDDROPOVERVIEW"/>
<sub name="Properties" link="x1942.html"/>
<sub name="Functions" link="x1960.html">
<sub name="Setting up the source widget" link="x1960.html#SEC-DNDSOURCEWIDGETS"/>
<sub name="Signals on the source widget:" link="x1960.html#SEC-SIGNALSONSOURCEWIDGETS"/>
<sub name="Setting up a destination widget:" link="x1960.html#SEC-DNDDESTWIDGETS"/>
<sub name="Signals on the destination widget:" link="x1960.html#SEC-SIGNALSONDESTWIDGETS"/>
</sub>
</sub>
<sub name="GLib" link="c2043.html">
<sub name="Definitions" link="c2043.html#SEC-DEFINITIONS"/>
<sub name="Doubly Linked Lists" link="x2055.html"/>
<sub name="Singly Linked Lists" link="x2075.html"/>
<sub name="Memory Management" link="x2079.html"/>
<sub name="Timers" link="x2096.html"/>
<sub name="String Handling" link="x2100.html"/>
<sub name="Utility and Error Functions" link="x2115.html"/>
<sub name="GLib" link="c2044.html">
<sub name="Definitions" link="c2044.html#SEC-DEFINITIONS"/>
<sub name="Doubly Linked Lists" link="x2056.html"/>
<sub name="Singly Linked Lists" link="x2076.html"/>
<sub name="Memory Management" link="x2080.html"/>
<sub name="Timers" link="x2097.html"/>
<sub name="String Handling" link="x2101.html"/>
<sub name="Utility and Error Functions" link="x2116.html"/>
</sub>
<sub name="GTK's rc Files" link="c2136.html">
<sub name="Functions For rc Files" link="c2136.html#SEC-FUNCTIONSFORRCFILES"/>
<sub name="GTK's rc File Format" link="x2156.html"/>
<sub name="Example rc file" link="x2197.html"/>
<sub name="GTK's rc Files" link="c2137.html">
<sub name="Functions For rc Files" link="c2137.html#SEC-FUNCTIONSFORRCFILES"/>
<sub name="GTK's rc File Format" link="x2157.html"/>
<sub name="Example rc file" link="x2198.html"/>
</sub>
<sub name="Writing Your Own Widgets" link="c2200.html">
<sub name="Overview" link="c2200.html#SEC-WIDGETSOVERVIEW"/>
<sub name="The Anatomy Of A Widget" link="x2209.html"/>
<sub name="Creating a Composite widget" link="x2220.html">
<sub name="Introduction" link="x2220.html#AEN2222"/>
<sub name="Choosing a parent class" link="x2220.html#AEN2233"/>
<sub name="The header file" link="x2220.html#AEN2236"/>
<sub name="The" link="x2220.html#AEN2313"/>
<sub name="_get_type()" link="x2220.html#AEN2248"/>
<sub name="function" link="x2220.html#AEN2313"/>
<sub name="The" link="x2220.html#AEN2313"/>
<sub name="_class_init()" link="x2220.html#AEN2260"/>
<sub name="function" link="x2220.html#AEN2313"/>
<sub name="The" link="x2220.html#AEN2313"/>
<sub name="_init()" link="x2220.html#AEN2313"/>
<sub name="function" link="x2220.html#AEN2313"/>
<sub name="And the rest..." link="x2220.html#AEN2318"/>
<sub name="Writing Your Own Widgets" link="c2201.html">
<sub name="Overview" link="c2201.html#SEC-WIDGETSOVERVIEW"/>
<sub name="The Anatomy Of A Widget" link="x2210.html"/>
<sub name="Creating a Composite widget" link="x2221.html">
<sub name="Introduction" link="x2221.html#AEN2223"/>
<sub name="Choosing a parent class" link="x2221.html#AEN2234"/>
<sub name="The header file" link="x2221.html#AEN2237"/>
<sub name="The" link="x2221.html#AEN2314"/>
<sub name="_get_type()" link="x2221.html#AEN2249"/>
<sub name="function" link="x2221.html#AEN2314"/>
<sub name="The" link="x2221.html#AEN2314"/>
<sub name="_class_init()" link="x2221.html#AEN2261"/>
<sub name="function" link="x2221.html#AEN2314"/>
<sub name="The" link="x2221.html#AEN2314"/>
<sub name="_init()" link="x2221.html#AEN2314"/>
<sub name="function" link="x2221.html#AEN2314"/>
<sub name="And the rest..." link="x2221.html#AEN2319"/>
</sub>
<sub name="Creating a widget from scratch" link="x2330.html">
<sub name="Introduction" link="x2330.html#AEN2332"/>
<sub name="Displaying a widget on the screen" link="x2330.html#AEN2339"/>
<sub name="The origins of the Dial Widget" link="x2330.html#AEN2372"/>
<sub name="The Basics" link="x2330.html#AEN2376"/>
<sub name="gtk_dial_realize()" link="x2330.html#AEN2388"/>
<sub name="Size negotiation" link="x2330.html#AEN2397"/>
<sub name="gtk_dial_expose()" link="x2330.html#AEN2405"/>
<sub name="Event handling" link="x2330.html#AEN2411"/>
<sub name="Possible Enhancements" link="x2330.html#AEN2427"/>
<sub name="Creating a widget from scratch" link="x2331.html">
<sub name="Introduction" link="x2331.html#AEN2333"/>
<sub name="Displaying a widget on the screen" link="x2331.html#AEN2340"/>
<sub name="The origins of the Dial Widget" link="x2331.html#AEN2373"/>
<sub name="The Basics" link="x2331.html#AEN2377"/>
<sub name="gtk_dial_realize()" link="x2331.html#AEN2389"/>
<sub name="Size negotiation" link="x2331.html#AEN2398"/>
<sub name="gtk_dial_expose()" link="x2331.html#AEN2406"/>
<sub name="Event handling" link="x2331.html#AEN2412"/>
<sub name="Possible Enhancements" link="x2331.html#AEN2428"/>
</sub>
<sub name="Learning More" link="x2439.html"/>
<sub name="Learning More" link="x2440.html"/>
</sub>
<sub name="Scribble, A Simple Example Drawing Program" link="c2442.html">
<sub name="Overview" link="c2442.html#SEC-SCRIBBLEOVERVIEW"/>
<sub name="Event Handling" link="x2451.html"/>
<sub name="The DrawingArea Widget, And Drawing" link="x2490.html"/>
<sub name="Adding XInput support" link="x2546.html">
<sub name="Enabling extended device information" link="x2546.html#AEN2574"/>
<sub name="Using extended device information" link="x2546.html#AEN2587"/>
<sub name="Finding out more about a device" link="x2546.html#AEN2605"/>
<sub name="Further sophistications" link="x2546.html#SEC-FURTHERSOPHISTICATIONS"/>
<sub name="Scribble, A Simple Example Drawing Program" link="c2443.html">
<sub name="Overview" link="c2443.html#SEC-SCRIBBLEOVERVIEW"/>
<sub name="Event Handling" link="x2452.html"/>
<sub name="The DrawingArea Widget, And Drawing" link="x2491.html"/>
<sub name="Adding XInput support" link="x2550.html">
<sub name="Enabling extended device information" link="x2550.html#AEN2578"/>
<sub name="Using extended device information" link="x2550.html#AEN2591"/>
<sub name="Finding out more about a device" link="x2550.html#AEN2609"/>
<sub name="Further sophistications" link="x2550.html#SEC-FURTHERSOPHISTICATIONS"/>
</sub>
</sub>
<sub name="Tips For Writing GTK Applications" link="c2632.html">
<sub name="Tips For Writing GTK Applications" link="c2636.html">
</sub>
<sub name="Contributing" link="c2637.html">
<sub name="Contributing" link="c2641.html">
</sub>
<sub name="Credits" link="c2644.html">
<sub name="Credits" link="c2648.html">
</sub>
<sub name="Tutorial Copyright and Permissions Notice" link="c2706.html">
<sub name="Tutorial Copyright and Permissions Notice" link="c2710.html">
</sub>
<sub name="GTK Signals" link="a2715.html">
<sub name="GtkObject" link="a2715.html#SEC-GTKOBJECT"/>
<sub name="GtkWidget" link="x2721.html"/>
<sub name="GtkData" link="x2724.html"/>
<sub name="GtkContainer" link="x2727.html"/>
<sub name="GtkCalendar" link="x2730.html"/>
<sub name="GtkEditable" link="x2733.html"/>
<sub name="GtkNotebook" link="x2736.html"/>
<sub name="GtkList" link="x2739.html"/>
<sub name="GtkMenuShell" link="x2742.html"/>
<sub name="GtkToolbar" link="x2745.html"/>
<sub name="GtkButton" link="x2748.html"/>
<sub name="GtkItem" link="x2751.html"/>
<sub name="GtkWindow" link="x2754.html"/>
<sub name="GtkHandleBox" link="x2757.html"/>
<sub name="GtkToggleButton" link="x2760.html"/>
<sub name="GtkMenuItem" link="x2763.html"/>
<sub name="GtkCheckMenuItem" link="x2766.html"/>
<sub name="GtkInputDialog" link="x2769.html"/>
<sub name="GtkColorSelection" link="x2772.html"/>
<sub name="GtkStatusBar" link="x2775.html"/>
<sub name="GtkCurve" link="x2778.html"/>
<sub name="GtkAdjustment" link="x2781.html"/>
<sub name="GTK Signals" link="a2719.html">
<sub name="GtkObject" link="a2719.html#SEC-GTKOBJECT"/>
<sub name="GtkWidget" link="x2725.html"/>
<sub name="GtkData" link="x2728.html"/>
<sub name="GtkContainer" link="x2731.html"/>
<sub name="GtkCalendar" link="x2734.html"/>
<sub name="GtkEditable" link="x2737.html"/>
<sub name="GtkNotebook" link="x2740.html"/>
<sub name="GtkList" link="x2743.html"/>
<sub name="GtkMenuShell" link="x2746.html"/>
<sub name="GtkToolbar" link="x2749.html"/>
<sub name="GtkButton" link="x2752.html"/>
<sub name="GtkItem" link="x2755.html"/>
<sub name="GtkWindow" link="x2758.html"/>
<sub name="GtkHandleBox" link="x2761.html"/>
<sub name="GtkToggleButton" link="x2764.html"/>
<sub name="GtkMenuItem" link="x2767.html"/>
<sub name="GtkCheckMenuItem" link="x2770.html"/>
<sub name="GtkInputDialog" link="x2773.html"/>
<sub name="GtkColorSelection" link="x2776.html"/>
<sub name="GtkStatusBar" link="x2779.html"/>
<sub name="GtkCurve" link="x2782.html"/>
<sub name="GtkAdjustment" link="x2785.html"/>
</sub>
<sub name="GDK Event Types" link="a2784.html">
<sub name="GDK Event Types" link="a2788.html">
</sub>
<sub name="Code Examples" link="a2918.html">
<sub name="Tictactoe" link="a2918.html#SEC-TICTACTOE">
<sub name="tictactoe.h" link="a2918.html#AEN2923"/>
<sub name="tictactoe.c" link="a2918.html#AEN2926"/>
<sub name="ttt_test.c" link="a2918.html#AEN2929"/>
<sub name="Code Examples" link="a2922.html">
<sub name="Tictactoe" link="a2922.html#SEC-TICTACTOE">
<sub name="tictactoe.h" link="a2922.html#AEN2927"/>
<sub name="tictactoe.c" link="a2922.html#AEN2930"/>
<sub name="ttt_test.c" link="a2922.html#AEN2933"/>
</sub>
<sub name="GtkDial" link="x2932.html">
<sub name="gtkdial.h" link="x2932.html#AEN2934"/>
<sub name="gtkdial.c" link="x2932.html#AEN2937"/>
<sub name="dial_test.c" link="x2932.html#AEN2940"/>
<sub name="GtkDial" link="x2936.html">
<sub name="gtkdial.h" link="x2936.html#AEN2938"/>
<sub name="gtkdial.c" link="x2936.html#AEN2941"/>
<sub name="dial_test.c" link="x2936.html#AEN2944"/>
</sub>
<sub name="Scribble" link="x2943.html">
<sub name="scribble-simple.c" link="x2943.html#AEN2945"/>
<sub name="scribble-xinput.c" link="x2943.html#AEN2948"/>
<sub name="Scribble" link="x2947.html">
<sub name="scribble-simple.c" link="x2947.html#AEN2949"/>
<sub name="scribble-xinput.c" link="x2947.html#AEN2952"/>
</sub>
</sub>

1
debian/libgtk2.0-dbg.dirs vendored
View File

@ -1 +0,0 @@
usr/lib/debug

1
debian/libgtk2.0-dbg.files vendored
View File

@ -1 +0,0 @@
usr/lib/debug/*

36
debian/patches/001_gtk+-ximian-gtk2-filesel-navbutton-5.patch vendored
View File

@ -1,7 +1,7 @@
diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk+-2.2.1.orig/gtk/gtkfilesel.c gtk+-2.2.1/gtk/gtkfilesel.c
--- gtk+-2.2.1.orig/gtk/gtkfilesel.c 2003-01-30 15:49:14.000000000 -0500
+++ gtk+-2.2.1/gtk/gtkfilesel.c 2003-05-14 15:55:33.000000000 -0400
@@ -82,9 +82,13 @@
diff -Nur gtk+-2.6.7.orig/gtk/gtkfilesel.c gtk+-2.6.7/gtk/gtkfilesel.c
--- gtk+-2.6.7.orig/gtk/gtkfilesel.c 2005-04-07 06:45:30.000000000 +0200
+++ gtk+-2.6.7/gtk/gtkfilesel.c 2005-04-14 22:33:08.956692576 +0200
@@ -83,9 +83,13 @@
#include "gtkoptionmenu.h"
#define GTK_DISABLE_DEPRECATED
@ -12,10 +12,10 @@ diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk+-2.2.1.orig/gtk/gtkfilesel
+#include "stock-icons/ximian-icons.h"
+
#include "gtkalias.h"
#ifdef G_OS_WIN32
#include <direct.h>
#include <io.h>
@@ -319,6 +323,9 @@
@@ -321,6 +325,9 @@
*/
static gchar* cmpl_completion_fullname (const gchar*, CompletionState* cmpl_state);
@ -25,7 +25,7 @@ diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk+-2.2.1.orig/gtk/gtkfilesel
/* Directory operations. */
static CompletionDir* open_ref_dir (gchar* text_to_complete,
@@ -663,6 +670,10 @@
@@ -665,6 +672,10 @@
GtkWidget *spacer;
GtkDialog *dialog;
@ -36,7 +36,7 @@ diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk+-2.2.1.orig/gtk/gtkfilesel
GtkListStore *model;
GtkTreeViewColumn *column;
@@ -676,18 +687,9 @@
@@ -678,18 +689,9 @@
filesel->main_vbox = dialog->vbox;
gtk_container_set_border_width (GTK_CONTAINER (filesel), 10);
@ -56,7 +56,7 @@ diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk+-2.2.1.orig/gtk/gtkfilesel
gtk_box_pack_start (GTK_BOX (filesel->main_vbox), pulldown_hbox, FALSE, FALSE, 0);
gtk_widget_show (pulldown_hbox);
@@ -699,14 +701,27 @@
@@ -701,14 +703,27 @@
/* The horizontal box containing the directory and file listboxes */
@ -86,7 +86,7 @@ diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk+-2.2.1.orig/gtk/gtkfilesel
if (WANT_HPANED)
list_container = g_object_new (GTK_TYPE_HPANED,
"visible", TRUE,
@@ -718,9 +733,78 @@
@@ -720,9 +735,78 @@
spacer = gtk_hbox_new (FALSE, 0);
gtk_widget_set_size_request (spacer, -1, 5);
@ -166,7 +166,7 @@ diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk+-2.2.1.orig/gtk/gtkfilesel
/* The directories list */
model = gtk_list_store_new (1, G_TYPE_STRING);
@@ -793,6 +877,15 @@
@@ -795,6 +879,15 @@
gtk_widget_show (filesel->file_list);
gtk_widget_show (scrolled_win);
@ -182,7 +182,7 @@ diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk+-2.2.1.orig/gtk/gtkfilesel
/* action area for packing buttons into. */
filesel->action_area = gtk_hbox_new (TRUE, 0);
gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->action_area,
@@ -1107,39 +1200,94 @@
@@ -1114,39 +1207,94 @@
void
gtk_file_selection_show_fileop_buttons (GtkFileSelection *filesel)
{
@ -291,7 +291,7 @@ diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk+-2.2.1.orig/gtk/gtkfilesel
gtk_widget_show (filesel->fileop_ren_file);
}
@@ -1841,6 +1989,95 @@
@@ -1848,6 +1996,95 @@
gtk_widget_set_sensitive (fs->fileop_ren_file, sensitive);
}
@ -387,9 +387,9 @@ diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk+-2.2.1.orig/gtk/gtkfilesel
static gint
gtk_file_selection_key_press (GtkWidget *widget,
GdkEventKey *event,
diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk+-2.2.1.orig/gtk/stock-icons/ximian-icons.h gtk+-2.2.1/gtk/stock-icons/ximian-icons.h
--- gtk+-2.2.1.orig/gtk/stock-icons/ximian-icons.h 1969-12-31 19:00:00.000000000 -0500
+++ gtk+-2.2.1/gtk/stock-icons/ximian-icons.h 2003-05-14 14:39:18.000000000 -0400
diff -Nur gtk+-2.6.7.orig/gtk/stock-icons/ximian-icons.h gtk+-2.6.7/gtk/stock-icons/ximian-icons.h
--- gtk+-2.6.7.orig/gtk/stock-icons/ximian-icons.h 1970-01-01 01:00:00.000000000 +0100
+++ gtk+-2.6.7/gtk/stock-icons/ximian-icons.h 2005-04-14 22:31:10.372720080 +0200
@@ -0,0 +1,825 @@
+/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */
+
@ -1216,5 +1216,3 @@ diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk+-2.2.1.orig/gtk/stock-icon
+ "\377\0\0\0\0\345\0\0\0\0"};
+
+
--- gtkfilesel.c.orig 2004-03-11 19:04:42.000000000 +0000
+++ gtkfilesel.c 2004-03-20 09:18:50.000000000 +0000

36
debian/patches/002_bmp.patch vendored
View File

@ -1,36 +0,0 @@
Index: io-bmp.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk-pixbuf/io-bmp.c,v
retrieving revision 1.47
diff -u -p -r1.47 io-bmp.c
--- io-bmp.c 24 Feb 2005 04:41:35 -0000 1.47
+++ gtk+-2.6.4/gdk-pixbuf/io-bmp.c 26 Mar 2005 08:47:56 -0000
@@ -219,7 +219,19 @@ lsb_16 (guchar *src)
static gboolean grow_buffer (struct bmp_progressive_state *State,
GError **error)
{
- guchar *tmp = g_try_realloc (State->buff, State->BufferSize);
+ guchar *tmp;
+
+ if (State->BufferSize == 0) {
+ g_set_error (error,
+ GDK_PIXBUF_ERROR,
+ GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
+ _("BMP image has bogus header data"));
+ State->read_state = READ_STATE_ERROR;
+ return FALSE;
+ }
+
+ tmp = g_try_realloc (State->buff, State->BufferSize);
+
if (!tmp) {
g_set_error (error,
GDK_PIXBUF_ERROR,
@@ -228,6 +240,7 @@ static gboolean grow_buffer (struct bmp_
State->read_state = READ_STATE_ERROR;
return FALSE;
}
+
State->buff = tmp;
return TRUE;
}

185
debian/patches/003_focus_issues.patch vendored Normal file
View File

@ -0,0 +1,185 @@
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtk+/ChangeLog,v
retrieving revision 1.6286.2.213
diff -u -p -r1.6286.2.213 ChangeLog
--- old/ChangeLog.orig 2005-03-01 14:01:24.000000000 -0300
+++ new/ChangeLog 2005-05-09 21:52:46.869360538 -0300
@@ -1,1 +1,13 @@
+2005-05-04 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/x11/gdkevents-x11.c gdk/x11/gdkwindow-x11.h: Fix a bug
+ in focus tracking when we move between has_pointer_focus and
+ has_focus_window directly. (#109246, Billy Biggs, Niko Tyni
+ and others)
+
+ * gdk/x11/gdkevents-x11.c: Also fix some extremely confusion
+ that could happen in the case of no window manager + keyboard grabs,
+ by moving to a more consistent model of when we pay attention
+ to mode=NotifyGrab/NotifyUngrab events.
+
2005-03-01 Matthias Clasen <mclasen@redhat.com>
* === Released 2.6.4 ===
Index: gdk/x11/gdkevents-x11.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/x11/gdkevents-x11.c,v
retrieving revision 1.144.2.2
diff -u -p -r1.144.2.2 gdkevents-x11.c
--- old/gdk/x11/gdkevents-x11.c 16 Mar 2005 03:25:09 -0000 1.144.2.2
+++ new/gdk/x11/gdkevents-x11.c 5 May 2005 00:01:43 -0000
@@ -1218,16 +1218,19 @@ gdk_event_translate (GdkDisplay *display
}
/* Handle focusing (in the case where no window manager is running */
- if (toplevel &&
- xevent->xcrossing.detail != NotifyInferior &&
- xevent->xcrossing.focus && !toplevel->has_focus_window)
+ if (toplevel && xevent->xcrossing.detail != NotifyInferior)
{
- gboolean had_focus = HAS_FOCUS (toplevel);
-
- toplevel->has_pointer_focus = TRUE;
+ toplevel->has_pointer = TRUE;
- if (HAS_FOCUS (toplevel) != had_focus)
- generate_focus_event (window, TRUE);
+ if (xevent->xcrossing.focus && !toplevel->has_focus_window)
+ {
+ gboolean had_focus = HAS_FOCUS (toplevel);
+
+ toplevel->has_pointer_focus = TRUE;
+
+ if (HAS_FOCUS (toplevel) != had_focus)
+ generate_focus_event (window, TRUE);
+ }
}
/* Tell XInput stuff about it if appropriate */
@@ -1312,16 +1315,19 @@ gdk_event_translate (GdkDisplay *display
}
/* Handle focusing (in the case where no window manager is running */
- if (toplevel &&
- xevent->xcrossing.detail != NotifyInferior &&
- xevent->xcrossing.focus && !toplevel->has_focus_window)
+ if (toplevel && xevent->xcrossing.detail != NotifyInferior)
{
- gboolean had_focus = HAS_FOCUS (toplevel);
-
- toplevel->has_pointer_focus = FALSE;
-
- if (HAS_FOCUS (toplevel) != had_focus)
- generate_focus_event (window, FALSE);
+ toplevel->has_pointer = FALSE;
+
+ if (xevent->xcrossing.focus && !toplevel->has_focus_window)
+ {
+ gboolean had_focus = HAS_FOCUS (toplevel);
+
+ toplevel->has_pointer_focus = FALSE;
+
+ if (HAS_FOCUS (toplevel) != had_focus)
+ generate_focus_event (window, FALSE);
+ }
}
event->crossing.type = GDK_LEAVE_NOTIFY;
@@ -1404,10 +1410,25 @@ gdk_event_translate (GdkDisplay *display
switch (xevent->xfocus.detail)
{
case NotifyAncestor:
- case NotifyNonlinear:
case NotifyVirtual:
+ /* When the focus moves from an ancestor of the window to
+ * the window or a descendent of the window, *and* the
+ * pointer is inside the window, then we were previously
+ * receiving keystroke events in the has_pointer_focus
+ * case and are now receiving them in the
+ * has_focus_window case.
+ */
+ if (toplevel->has_pointer &&
+ xevent->xfocus.mode != NotifyGrab &&
+ xevent->xfocus.mode != NotifyUngrab)
+ toplevel->has_pointer_focus = FALSE;
+
+ /* fall through */
+ case NotifyNonlinear:
case NotifyNonlinearVirtual:
- toplevel->has_focus_window = TRUE;
+ if (xevent->xfocus.mode != NotifyGrab &&
+ xevent->xfocus.mode != NotifyUngrab)
+ toplevel->has_focus_window = TRUE;
/* We pretend that the focus moves to the grab
* window, so we pay attention to NotifyGrab
* NotifyUngrab, and ignore NotifyWhileGrabbed
@@ -1420,7 +1441,8 @@ gdk_event_translate (GdkDisplay *display
* but the pointer focus is ignored while a
* grab is in effect
*/
- if (xevent->xfocus.mode != NotifyGrab)
+ if (xevent->xfocus.mode != NotifyGrab &&
+ xevent->xfocus.mode != NotifyUngrab)
toplevel->has_pointer_focus = TRUE;
break;
case NotifyInferior:
@@ -1447,15 +1469,31 @@ gdk_event_translate (GdkDisplay *display
switch (xevent->xfocus.detail)
{
case NotifyAncestor:
- case NotifyNonlinear:
case NotifyVirtual:
+ /* When the focus moves from the window or a descendent
+ * of the window to an ancestor of the window, *and* the
+ * pointer is inside the window, then we were previously
+ * receiving keystroke events in the has_focus_window
+ * case and are now receiving them in the
+ * has_pointer_focus case.
+ */
+ if (toplevel->has_pointer &&
+ xevent->xfocus.mode != NotifyGrab &&
+ xevent->xfocus.mode != NotifyUngrab)
+ toplevel->has_pointer_focus = TRUE;
+
+ /* fall through */
+ case NotifyNonlinear:
case NotifyNonlinearVirtual:
- toplevel->has_focus_window = FALSE;
+ if (xevent->xfocus.mode != NotifyGrab &&
+ xevent->xfocus.mode != NotifyUngrab)
+ toplevel->has_focus_window = FALSE;
if (xevent->xfocus.mode != NotifyWhileGrabbed)
toplevel->has_focus = FALSE;
break;
case NotifyPointer:
- if (xevent->xfocus.mode != NotifyUngrab)
+ if (xevent->xfocus.mode != NotifyGrab &&
+ xevent->xfocus.mode != NotifyUngrab)
toplevel->has_pointer_focus = FALSE;
break;
case NotifyInferior:
Index: gdk/x11/gdkwindow-x11.h
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/x11/gdkwindow-x11.h,v
retrieving revision 1.18
diff -u -p -r1.18 gdkwindow-x11.h
--- old/gdk/x11/gdkwindow-x11.h 18 Oct 2004 21:02:37 -0000 1.18
+++ new/gdk/x11/gdkwindow-x11.h 5 May 2005 00:01:43 -0000
@@ -96,9 +96,14 @@ struct _GdkToplevelX11
*/
guint has_focus : 1;
- /* Set if !window->has_focus_window, but events are being sent to the
- * window because the pointer is in it. (Typically, no window
- * manager is running.
+ /* Set if the pointer is inside this window. (This is needed for
+ * for focus tracking)
+ */
+ guint has_pointer : 1;
+
+ /* Set if the window is a descendent of the focus window and the pointer is
+ * inside it. (This is the case where the window will receive keystroke
+ * events even window->has_focus_window is FALSE)
*/
guint has_pointer_focus : 1;

15
debian/rules vendored
View File

@ -26,10 +26,6 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
ifneq (,$(findstring $(DEB_HOST_GNU_TYPE),mipsel-linux mips-linux))
STATIC_CONFIG_ARGS = --disable-testsuite
endif
##
version=$(shell dpkg-parsechangelog | grep '^Version: ' | sed -e 's/^Version: //' -e 's/-[A-Za-z0-9\.\+]*$$//g' -e 's/+[A-Za-z0-9\.]*$$//g')
major=$(shell echo ${version} | sed -e 's/\(^[0-9]*\)\.[0-9]*\.[0-9]*$$/\1/')
@ -110,8 +106,7 @@ $(STAMP_DIR)/configure-static-stamp:
--with-included-loaders=yes \
--disable-modules \
--disable-shared \
--enable-static \
$(STATIC_CONFIG_ARGS)
--enable-static
cd $(BUILD_STATIC_DIR) && \
sed < libtool > libtool-2 \
@ -121,7 +116,7 @@ $(STAMP_DIR)/configure-static-stamp:
touch $@
configure: configure-shared
configure: configure-static configure-shared
build-shared: debian/control configure-shared $(STAMP_DIR)/build-shared-stamp
$(STAMP_DIR)/build-shared-stamp:
@ -147,7 +142,7 @@ $(STAMP_DIR)/build-static-stamp:
touch $@
build: build-shared
build: build-static build-shared
clean:: debian/control
dh_testdir
@ -182,7 +177,7 @@ install-static: build-static install-test
RUN_QUERY_IMMODULES_TEST=false \
RUN_QUERY_LOADER_TEST=false
install: install-shared
install: install-static install-shared
# generating debian files from .in
for f in `find debian/ -name "[^c]*.in"`; do \
sed -e "s/@VERSION@/${version}/g" -e "s/@MODVER@/${modver}/g" -e "s/@APIVER@/${apiver}/g" $$f > `echo $$f | sed -e "s/\.in//"`; \
@ -302,4 +297,4 @@ binary-arch: build install
dh_builddeb -a
binary: binary-indep binary-arch
.PHONY: build build-shared clean binary-indep binary-arch binary install install-shared configure configure-shared debian/control
.PHONY: build build-shared build-static clean binary-indep binary-arch binary install install-shared install-static configure configure-shared configure-static debian/control

2
debian/scripts/vars vendored
View File

@ -8,7 +8,7 @@
SOURCE_DIR=build-tree
# For a single pkg, this is the directory that is embedded in the tarball.
# For multiple pkgs, this is null.
TAR_DIR=gtk+-2.6.2
TAR_DIR=gtk+-2.6.7
# Where to place all the stamp files. This directory can be removed, and
# all the targets will then be rerun.
STAMP_DIR=debian/stampdir

2
debian/sources vendored
View File

@ -1 +1 @@
upstream tar ../gtk+-2.6.4.tar.gz
upstream tar ../gtk+-2.6.7.tar.gz