tracker r1845 - in branches/indexer-split: . src/libtracker-common src/tracker-indexer

[mr svn gnome org]

Author: mr
Date: Thu Jul  3 11:22:29 2008
New Revision: 1845
URL: http://svn.gnome.org/viewvc/tracker?rev=1845&view=rev

Log:
	* src/libtracker-common/tracker-hal.c: (hal_setup_batteries),
	(hal_device_property_modified_cb): Fixed some debugging.
	* src/tracker-indexer/tracker-indexer.c: (set_up_throttle): Make
	sure we set to the right the default when we come off battery only
	use.


Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/libtracker-common/tracker-hal.c
   branches/indexer-split/src/tracker-indexer/tracker-indexer.c

Modified: branches/indexer-split/src/libtracker-common/tracker-hal.c
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-hal.c	(original)
+++ branches/indexer-split/src/libtracker-common/tracker-hal.c	Thu Jul  3 11:22:29 2008
@@ -408,12 +408,13 @@
                                                                  priv->battery_udi, 
                                                                  PROP_AC_ADAPTER_ON, 
                                                                  NULL);
-	g_object_notify (G_OBJECT (hal), "battery-in-use");
-        
-        g_message ("HAL reports system is currently powered by %s",
-                     priv->battery_in_use ? "battery" : "AC adapter");
+	
+	g_message ("HAL reports system is currently powered by %s",
+		   priv->battery_in_use ? "battery" : "AC adapter");
 
-        return TRUE;
+	g_object_notify (G_OBJECT (hal), "battery-in-use");
+	
+	return TRUE;
 }
 
 static void
@@ -754,17 +755,17 @@
                                                                          priv->battery_udi, 
                                                                          PROP_AC_ADAPTER_ON, 
                                                                          &error);
+                g_message ("HAL reports system is now powered by %s",
+			   priv->battery_in_use ? "battery" : "AC adapter");
+
 		g_object_notify (G_OBJECT (hal), "battery-in-use");
 
                 if (dbus_error_is_set (&error)) {
-                        g_critical ("Could not device property:'%s' for udi:'%s', %s",
+                        g_critical ("Could not get device property:'%s' for udi:'%s', %s",
 				    udi, PROP_AC_ADAPTER_ON, error.message);
                         dbus_error_free (&error);
                         return;
                 }
-                
-                g_message ("HAL reports system is now powered by %s",
-			   priv->battery_in_use ? "battery" : "AC adapter");
         } else {
                 gboolean is_mounted;
                

Modified: branches/indexer-split/src/tracker-indexer/tracker-indexer.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-indexer.c	(original)
+++ branches/indexer-split/src/tracker-indexer/tracker-indexer.c	Thu Jul  3 11:22:29 2008
@@ -274,10 +274,10 @@
 
 		if (throttle == THROTTLE_DEFAULT_ON_BATTERY) {
 			tracker_config_set_throttle (priv->config, 
-						     THROTTLE_DEFAULT_ON_BATTERY);
+						     THROTTLE_DEFAULT);
 			g_message ("Setting throttle from %d to %d", 
 				   throttle, 
-				   THROTTLE_DEFAULT_ON_BATTERY);
+				   THROTTLE_DEFAULT);
 		} else {
 			g_message ("Not setting throttle, it is currently set to %d", 
 				   throttle);