[gnome-bluetooth] Avoid crashes when spinner is NULL



commit 24441027b6fd43f5124be9554601c1419b0a1758
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Jun 16 17:15:56 2009 +0100

    Avoid crashes when spinner is NULL

 lib/bling-spinner.c |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/lib/bling-spinner.c b/lib/bling-spinner.c
index ecd5901..ea99de8 100644
--- a/lib/bling-spinner.c
+++ b/lib/bling-spinner.c
@@ -188,7 +188,7 @@ bling_spinner_expose (GtkWidget *widget, GdkEventExpose *event)
 
 static void 
 bling_spinner_screen_changed (GtkWidget* widget, GdkScreen* old_screen)
-{                       
+{
 	BlingSpinner *spinner;
 	BlingSpinnerPrivate *priv;
 	GdkScreen* new_screen;
@@ -199,7 +199,7 @@ bling_spinner_screen_changed (GtkWidget* widget, GdkScreen* old_screen)
 
 	new_screen = gtk_widget_get_screen (widget);
 	colormap = gdk_screen_get_rgba_colormap (new_screen);
-      
+
 	if (!colormap) {
 		colormap = gdk_screen_get_rgb_colormap (new_screen);
 		priv->have_alpha = FALSE;
@@ -209,7 +209,7 @@ bling_spinner_screen_changed (GtkWidget* widget, GdkScreen* old_screen)
 	gtk_widget_set_colormap (widget, colormap);
 }
 
-gboolean
+static gboolean
 bling_spinner_timeout (gpointer data)
 {
 	BlingSpinner *spinner;
@@ -276,6 +276,8 @@ bling_spinner_start (BlingSpinner *spinner)
 {
 	BlingSpinnerPrivate *priv;
 
+	g_return_if_fail (BLING_IS_SPINNER (spinner));
+
 	priv = BLING_SPINNER_GET_PRIVATE (spinner);
 	if (priv->timeout != 0)
 		return;
@@ -286,11 +288,14 @@ bling_spinner_start (BlingSpinner *spinner)
  * bling_spinner_stop
  *
  * Stops the animation
- */void
+ */
+void
 bling_spinner_stop (BlingSpinner *spinner)
 {
 	BlingSpinnerPrivate *priv;
 
+	g_return_if_fail (BLING_IS_SPINNER (spinner));
+
 	priv = BLING_SPINNER_GET_PRIVATE (spinner);
 	if (priv->timeout == 0)
 		return;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]