X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=hal.c;h=7720d09bf2584f078d951aac85c09e840b42ff2a;hb=HEAD;hp=ff8eb57a941f078ad61715e37fd902cc0ea078ac;hpb=c855fc4dc204f7fc78e16bdc5b43cf5e5ae8d444;p=mtetherd

diff --git a/hal.c b/hal.c
index ff8eb57..7720d09 100644
--- a/hal.c
+++ b/hal.c
@@ -29,11 +29,11 @@ static void mtetherd_hal_device_condition(LibHalContext *ctx, const char *udi, c
 	MTetherDStatusPlugin *plugin = MTETHERD_STATUS_PLUGIN(libhal_ctx_get_user_data(ctx));
 	
 	if (plugin) {
-		g_message("Got HAL condition %s on %s: %s", condition, udi, detail);
-		//hildon_banner_show_informationf(GTK_WIDGET(plugin), NULL, "Got HAL condition %s on %s: %s", condition, udi, detail);
-		if (strcmp("ButtonPressed", condition) == 0) {
-			if (strcmp(USBDEV_PATH, udi) == 0) {
-				//mtetherd_status_plugin_usb_plugged_show(plugin);
+		g_log(MTETHERD_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Got HAL condition %s on %s: %s", condition, udi, detail);
+		if (g_strcmp0("ButtonPressed", condition) == 0) {
+			g_log(MTETHERD_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "is ButtonPressed");
+			if (g_strcmp0(USBDEV_PATH, udi) == 0) {
+				g_log(MTETHERD_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "is %s", USBDEV_PATH);
 				mtetherd_status_plugin_usb_plugged(plugin);
 			}
 		}
@@ -44,12 +44,12 @@ static void mtetherd_hal_device_added(LibHalContext *ctx, const char *udi) {
 	MTetherDStatusPlugin *plugin = MTETHERD_STATUS_PLUGIN(libhal_ctx_get_user_data(ctx));
 	
 	if (plugin) {
-		g_message("Got HAL device added on %s", udi);
+		g_log(MTETHERD_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Got HAL device added on %s", udi);
 		DBusError derr;
 		dbus_error_init(&derr);
 		char *interface = libhal_device_get_property_string(plugin->hal_context, udi, "net.interface", &derr);
 		if (dbus_error_is_set(&derr)) {
-			g_warning("Error getting interface name of %s (%s): %s", udi, derr.name, derr.message);
+			g_log(MTETHERD_LOG_DOMAIN, G_LOG_LEVEL_WARNING, "Error getting interface name of %s (%s): %s", udi, derr.name, derr.message);
 			dbus_error_free(&derr);
 		}
 		if (interface) {
@@ -59,8 +59,6 @@ static void mtetherd_hal_device_added(LibHalContext *ctx, const char *udi) {
 			}
 			libhal_free_string(interface);
 		}
-		//plugin->priv->net_on = TRUE;
- 		//enable_button_set_text(plugin->priv->enable_button, plugin->priv->net_on);
 	}
 }
 
@@ -68,10 +66,8 @@ static void mtetherd_hal_device_removed(LibHalContext *ctx, const char *udi) {
 	MTetherDStatusPlugin *plugin = MTETHERD_STATUS_PLUGIN(libhal_ctx_get_user_data(ctx));
 	
 	if (plugin) {
-		g_message("Got HAL device added on %s", udi);
+		g_log(MTETHERD_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Got HAL device removed on %s", udi);
 		mtetherd_status_plugin_device_removed(plugin, udi);
-		//plugin->priv->net_on = FALSE;
- 		//enable_button_set_text(plugin->priv->enable_button, plugin->priv->net_on);
 	}
 }
 
@@ -80,53 +76,55 @@ gboolean mtetherd_hal_init(MTetherDStatusPlugin *plugin) {
 		GError *err = NULL;
 		plugin->dbus_connection = hd_status_plugin_item_get_dbus_g_connection(HD_STATUS_PLUGIN_ITEM(plugin), DBUS_BUS_SYSTEM, &err);
 		if (err) {
-			g_warning("Can't open DBUS connection: %s", err->message);
+			g_log(MTETHERD_LOG_DOMAIN, G_LOG_LEVEL_WARNING, "Can't open DBUS connection: %s", err->message);
 			g_error_free(err);
 			err = NULL;
 			return FALSE;
 		} else {
-			g_message("Got DBUS Glib connection: %p", plugin->dbus_connection);
+			g_log(MTETHERD_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Got GDBUS connection: %p", plugin->dbus_connection);
 		}
 		if (plugin->dbus_connection) {
 			plugin->hal_context = libhal_ctx_new();
 			if (plugin->hal_context) {
+				g_log(MTETHERD_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Got HAL context: %p", plugin->hal_context);
 				if (libhal_ctx_set_dbus_connection(plugin->hal_context, dbus_g_connection_get_connection(plugin->dbus_connection))) {
 					if (!libhal_ctx_set_user_data(plugin->hal_context, plugin)) {
-						g_warning("Can't set user data of HAL context");
+						g_log(MTETHERD_LOG_DOMAIN, G_LOG_LEVEL_WARNING, "Can't set user data of HAL context");
 					}
 					if (!libhal_ctx_set_device_condition(plugin->hal_context, mtetherd_hal_device_condition)) {
-						g_warning("Error assigning device condition callback");
+						g_log(MTETHERD_LOG_DOMAIN, G_LOG_LEVEL_WARNING, "Error assigning device condition callback");
 					}
 					if (!libhal_ctx_set_device_added(plugin->hal_context, mtetherd_hal_device_added)) {
-						g_warning("Error assigning device added callback");
+						g_log(MTETHERD_LOG_DOMAIN, G_LOG_LEVEL_WARNING, "Error assigning device added callback");
 					}
 					if (!libhal_ctx_set_device_removed(plugin->hal_context, mtetherd_hal_device_removed)) {
-						g_warning("Error assigning device removed callback");
+						g_log(MTETHERD_LOG_DOMAIN, G_LOG_LEVEL_WARNING, "Error assigning device removed callback");
 					}
 					DBusError derr;
 					dbus_error_init(&derr);
 					if (!libhal_ctx_init(plugin->hal_context, &derr)) {
 						if (dbus_error_is_set(&derr)) {
-							g_warning("Error initializing HAL context (%s): %s", derr.name, derr.message);
+							g_log(MTETHERD_LOG_DOMAIN, G_LOG_LEVEL_WARNING, "Error initializing HAL context (%s): %s", derr.name, derr.message);
 							dbus_error_free(&derr);
 						} else {
-							g_warning("Error initializing HAL context: unknown error");
+							g_log(MTETHERD_LOG_DOMAIN, G_LOG_LEVEL_WARNING, "Error initializing HAL context: unknown error");
 						}
 						libhal_ctx_free(plugin->hal_context);
 						plugin->hal_context = NULL;
 						return FALSE;
 					}
 				} else {
-					g_warning("Can't set DBUS connection of HAL context");
+					g_log(MTETHERD_LOG_DOMAIN, G_LOG_LEVEL_WARNING, "Can't set DBUS connection of HAL context");
 					libhal_ctx_free(plugin->hal_context);
 					plugin->hal_context = NULL;
 					return FALSE;
 				}
 			} else {
-				g_warning("Can't allocate HAL context");
+				g_log(MTETHERD_LOG_DOMAIN, G_LOG_LEVEL_WARNING, "Can't allocate HAL context");
 				return FALSE;
 			}
 		}
+		g_log(MTETHERD_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "HAL context initialized and connected");
 		return TRUE;
 		
 	}
@@ -152,7 +150,7 @@ void mtetherd_hal_device_scan(MTetherDStatusPlugin *plugin) {
 		int ndevices = 0;
 		char **udis = libhal_find_device_by_capability(plugin->hal_context, "net", &ndevices, &derr);
 		if (dbus_error_is_set(&derr)) {
-			g_warning("Error loading list of network devices (%s): %s", derr.name, derr.message);
+			g_log(MTETHERD_LOG_DOMAIN, G_LOG_LEVEL_WARNING, "Error loading list of network devices (%s): %s", derr.name, derr.message);
 			dbus_error_free(&derr);
 		}
 		if (udis) {
@@ -160,7 +158,7 @@ void mtetherd_hal_device_scan(MTetherDStatusPlugin *plugin) {
 			for (i = 0; i < ndevices; i++) {
 				char *interface = libhal_device_get_property_string(plugin->hal_context, udis[i], "net.interface", &derr);
 				if (dbus_error_is_set(&derr)) {
-					g_warning("Error getting interface name of %s (%s): %s", udis[i], derr.name, derr.message);
+					g_log(MTETHERD_LOG_DOMAIN, G_LOG_LEVEL_WARNING, "Error getting interface name of %s (%s): %s", udis[i], derr.name, derr.message);
 					dbus_error_free(&derr);
 				}
 				if (interface) {
@@ -183,7 +181,7 @@ gboolean mtetherd_usb_state(MTetherDStatusPlugin *plugin) {
 			dbus_error_init(&derr);
 			dbus_bool_t plugged = libhal_device_get_property_bool(plugin->hal_context, USBDEV_PATH, "button.state.value", &derr);
 			if (dbus_error_is_set(&derr)) {
-				g_warning("Error getting USB plugged status (%s): %s", derr.name, derr.message);
+				g_log(MTETHERD_LOG_DOMAIN, G_LOG_LEVEL_WARNING, "Error getting USB plugged status (%s): %s", derr.name, derr.message);
 				//hildon_banner_show_informationf(GTK_WIDGET(plugin), NULL, "Error getting USB plugged status (%s): %s", derr.name, derr.message);
 				dbus_error_free(&derr);
 			} else {