X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fflashlight_applet.c;h=240ab28597264a15157677a4d481922527d449db;hb=d1cc22e68f4ae1a419c79600adacf261a86bc6fc;hp=c907c1c2a7e6760a4d0df6fd22d615a851bcb038;hpb=ecc2ea19d4b6dbb646532bbf53b5460262714074;p=flashlight-appl

diff --git a/src/flashlight_applet.c b/src/flashlight_applet.c
index c907c1c..240ab28 100644
--- a/src/flashlight_applet.c
+++ b/src/flashlight_applet.c
@@ -68,6 +68,7 @@ flashlight_status_plugin_show_notification (FlashlightPlugin *plugin,
 	GtkWidget *banner;
 
 	g_return_if_fail (priv);
+	g_return_if_fail (priv->button);
 
 	banner = hildon_banner_show_information (GTK_WIDGET (priv->button), NULL, text);
 	hildon_banner_set_timeout (HILDON_BANNER (banner), 3000);
@@ -80,6 +81,7 @@ flashlight_status_plugin_enable (FlashlightPlugin *plugin,
 	FlashlightPluginPrivate *priv = FLASHLIGHT_STATUS_PLUGIN_GET_PRIVATE (plugin);
 
 	g_return_if_fail (priv);
+	g_return_if_fail (priv->button);
 
 	if (enable) {
 		if (flashlight_open (priv->flashlight, "/dev/video0") < 0) {
@@ -135,7 +137,7 @@ flashlight_status_plugin_on_hal_property_modified (LibHalContext *ctx,
 {
 	FlashlightPlugin *plugin = libhal_ctx_get_user_data (ctx);
 	FlashlightPluginPrivate *priv = FLASHLIGHT_STATUS_PLUGIN_GET_PRIVATE (plugin);
-	gboolean is_open;
+	gboolean is_open = FALSE;
 	int intensity = 0;
 
 	g_return_if_fail (priv);
@@ -256,7 +258,6 @@ static void
 flashlight_status_plugin_init (FlashlightPlugin *plugin)
 {
 	FlashlightPluginPrivate *priv = FLASHLIGHT_STATUS_PLUGIN_GET_PRIVATE (plugin);
-	DBusConnection *dbus_connection;
 	DBusError error;
 
 	/* initialize dbus */
@@ -341,11 +342,13 @@ flashlight_status_plugin_finalize (GObject *object)
 	if (priv->status_timer) {
 		g_source_remove (priv->status_timer);
 	}
+	priv->status_timer = 0;
 
 	/* deinitialize flashlight */
 	if (priv->flashlight) {
 		flashlight_deinit (priv->flashlight);
 	}
+	priv->flashlight = NULL;
 
 	G_OBJECT_CLASS (flashlight_status_plugin_parent_class)->finalize (object);
 }