./sapwood/debian r109: merge ubuntu

[Riku Voipio]

------------------------------------------------------------
revno: 109
committer: Riku Voipio <riku.voipio at iki.fi>
branch nick: debian
timestamp: Fri 2007-09-28 23:53:41 +0300
message:
  merge ubuntu
modified:
  debian/changelog
  src/sapwood-draw.c
    ------------------------------------------------------------
    revno: 92.1.1
    committer: Adilson Oliveira <adilson at cartman>
    branch nick: sapwood
    timestamp: Fri 2007-08-10 10:17:04 -0300
    message:
      Applied patch to avoind crash when draw_shadow() is called.
    modified:
      debian/changelog
      src/sapwood-draw.c
    ------------------------------------------------------------
    revno: 92.1.2
    committer: Tollef Fog Heen <tfheen at err.no>
    branch nick: sapwood
    timestamp: Fri 2007-08-10 15:49:48 +0200
    message:
      * Update maintainer to be ubuntu-mobile.
    modified:
      debian/changelog
      debian/control
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2007-07-24 15:15:18 +0000
+++ b/debian/changelog	2007-09-28 20:53:41 +0000
@@ -40,6 +40,16 @@
 
  -- Tommi Komulainen <tommi.komulainen at nokia.com>  Fri,  8 Jun 2007 17:21:39 +0300
 
+sapwood (2.91.4-1ubuntu3) gutsy; urgency=low
+
+  [ Adilson Oliveira ]
+  * Applied patch to prevent sapwood to crash when using draw_shadow().
+
+  [ Tollef Fog Heen ]
+  * Update maintainer to be ubuntu-mobile.
+
+ -- Tollef Fog Heen <tfheen at ubuntu.com>  Fri, 10 Aug 2007 15:47:17 +0200
+
 sapwood (2.91.4-1ubuntu2) gutsy; urgency=low
 
   * Build-Depends: autoconf, automake1.8, libtool to get things building from

=== modified file 'src/sapwood-draw.c'
--- a/src/sapwood-draw.c	2007-06-08 13:50:20 +0000
+++ b/src/sapwood-draw.c	2007-09-28 20:53:41 +0000
@@ -545,9 +545,10 @@
 	    gint          height)
 {
   ThemeMatchData match_data;
-  
+
   g_return_if_fail(style != NULL);
   g_return_if_fail(window != NULL);
+  g_return_if_fail(widget != NULL); 
 
   match_data.function = TOKEN_D_SHADOW;
   match_data.detail = (gchar *)detail;