Merge lp:~cjcurran/indicator-sound/segfault-cairo-context-fix into lp:~indicator-applet-developers/indicator-sound/trunk_3

[Conor Curran]

Protects against attached null cairo pointer bug.

[Andrea Cimitan (cimi)]

seems correct to me, we need a not-NULL cairo context

[Andrea Cimitan (cimi)]

review: Approve

=== modified file 'src/transport-widget.c'
--- src/transport-widget.c	2010-12-07 14:18:28 +0000
+++ src/transport-widget.c	2010-12-22 17:00:41 +0000
@@ -4,6 +4,7 @@
 Authors:
     Conor Curran <[e-mail]>
     Mirco Müller <[e-mail]>
+    Andrea Cimitan <[e-mail]>
 
 This program is free software: you can redistribute it and/or modify it 
 under the terms of the GNU General Public License version 3, as published 
@@ -1156,6 +1157,7 @@
 draw (GtkWidget* button, cairo_t *cr)
 {
   g_return_if_fail(IS_TRANSPORT_WIDGET(button));
+  g_return_if_fail( cr != NULL );
   TransportWidgetPrivate* priv = TRANSPORT_WIDGET_GET_PRIVATE(button);  
 
   cairo_surface_t*  surf = NULL;