gnome-bluetooth r326 - trunk/properties

[hadess svn gnome org]

Author: hadess
Date: Wed Feb 25 14:39:01 2009
New Revision: 326
URL: http://svn.gnome.org/viewvc/gnome-bluetooth?rev=326&view=rev

Log:
Remove HAL ifdefs

It's a hard requirement now.

Modified:
   trunk/properties/killswitch.c

Modified: trunk/properties/killswitch.c
==============================================================================
--- trunk/properties/killswitch.c	(original)
+++ trunk/properties/killswitch.c	Wed Feb 25 14:39:01 2009
@@ -31,14 +31,11 @@
 
 #include <dbus/dbus-glib-lowlevel.h>
 
-#ifdef HAVE_HAL
 #include <hal/libhal.h>
-#endif
 
 #include "general.h"
 #include "killswitch.h"
 
-#ifdef HAVE_HAL
 static LibHalContext *halctx = NULL;
 
 static void setpower_reply(DBusPendingCall *call, void *user_data)
@@ -186,9 +183,6 @@
 
 	return result;
 }
-#else
-#define detect_killswitch(widget) FALSE
-#endif
 
 GtkWidget *create_killswitch(void)
 {
@@ -213,7 +207,6 @@
 	if (connection == NULL)
 		return;
 
-#ifdef HAVE_HAL
 	halctx = libhal_ctx_new();
 	if (halctx == NULL)
 		return;
@@ -230,18 +223,15 @@
 		halctx = NULL;
 		return;
 	}
-#endif
 }
 
 void cleanup_killswitch(void)
 {
-#ifdef HAVE_HAL
 	if (halctx != NULL) {
 		libhal_ctx_shutdown(halctx, NULL);
 		libhal_ctx_free(halctx);
 		halctx = NULL;
 	}
-#endif
 
 	if (connection != NULL)
 		dbus_connection_unref(connection);