diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,26 +1,28 @@ Copyright © 2007–2009 Brandenburgische Technische Universität Cottbus -Copyright © 2011–2012 Wolfgang Jeltsch +Copyright © 2011–2014 Wolfgang Jeltsch All rights reserved. -Redistribution and use in source and binary forms, with or without modification, are permitted -provided that the following conditions are met: +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this list of conditions - and the following disclaimer. + • Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list of - conditions and the following disclaimer in the documentation and/or other materials provided - with the distribution. + • Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. - * Neither the name of the copyright holders nor the names of the contributors may be used to - endorse or promote products derived from this software without specific prior written - permission. + • Neither the name of the copyright holders nor the names of the + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR -CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF -THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR +TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/grapefruit-ui-gtk.cabal b/grapefruit-ui-gtk.cabal --- a/grapefruit-ui-gtk.cabal +++ b/grapefruit-ui-gtk.cabal @@ -1,20 +1,21 @@ Name: grapefruit-ui-gtk -Version: 0.1.0.4 -Cabal-Version: >= 1.6 +Version: 0.1.0.5 +Cabal-Version: >= 1.8 Build-Type: Simple License: BSD3 License-File: LICENSE Copyright: © 2007–2009 Brandenburgische Technische Universität Cottbus - © 2011–2013 Wolfgang Jeltsch + © 2011–2014 Wolfgang Jeltsch Author: Wolfgang Jeltsch Maintainer: wolfgang@cs.ioc.ee Stability: provisional Homepage: http://grapefruit-project.org/ -Package-URL: http://hackage.haskell.org/packages/archive/grapefruit-ui-gtk/0.1.0.4/grapefruit-ui-gtk-0.1.0.4.tar.gz +Package-URL: http://hackage.haskell.org/packages/archive/grapefruit-ui-gtk/0.1.0.5/grapefruit-ui-gtk-0.1.0.5.tar.gz Synopsis: GTK+-based backend for declarative user interface programming -Description: Grapefruit is a library for Functional Reactive Programming (FRP) with a focus on - user interfaces. FRP makes it possible to implement reactive and interactive systems - in a declarative style. To learn more about FRP, have a look at +Description: Grapefruit is a library for Functional Reactive Programming (FRP) + with a focus on user interfaces. FRP makes it possible to + implement reactive and interactive systems in a declarative + style. To learn more about FRP, have a look at . . This package contains the GTK+-based user interface backend. @@ -22,9 +23,9 @@ Tested-With: GHC == 7.6.3 Source-Repository this - type: darcs - location: http://darcs.grapefruit-project.org/monolithic/0.1 - tag: grapefruit-0.1.0.4 + Type: darcs + Location: http://darcs.grapefruit-project.org/monolithic/0.1 + Tag: grapefruit-0.1.0.5 Library Build-Depends: base >= 3.0 && < 5, @@ -34,8 +35,8 @@ grapefruit-frp >= 0.1 && < 0.2, grapefruit-records >= 0.1 && < 0.2, grapefruit-ui >= 0.1 && < 0.2, - glib >= 0.9.13 && < 0.13, - gtk >= 0.9.13 && < 0.13 + glib >= 0.9.13 && < 0.14, + gtk >= 0.9.13 && < 0.14 Extensions: Arrows ExistentialQuantification FlexibleContexts diff --git a/src/Graphics/UI/Grapefruit/GTK.hs b/src/Graphics/UI/Grapefruit/GTK.hs --- a/src/Graphics/UI/Grapefruit/GTK.hs +++ b/src/Graphics/UI/Grapefruit/GTK.hs @@ -82,7 +82,7 @@ instance BasicUIBackend GTK where - label = widgetBrick (Gtk.labelNew Nothing) + label = widgetBrick (Gtk.labelNew (Nothing :: Maybe String)) Gtk.toWidget (X :& Text := attrConsumer Gtk.labelLabel) X