[maemo-commits] [maemo-commits] r8529 - in projects/haf/branches/hildon-control-panel/refactoring: . src

[From: www-data at stage.maemo.org]

Author: lucasr
Date: 2006-12-01 14:17:30 +0200 (Fri, 01 Dec 2006)
New Revision: 8529

Modified:
   projects/haf/branches/hildon-control-panel/refactoring/ChangeLog
   projects/haf/branches/hildon-control-panel/refactoring/src/hcp-program.c
   projects/haf/branches/hildon-control-panel/refactoring/src/hcp-rfs.c
Log:
2006-12-01  Lucas Rocha  <lucas.rocha at nokia.com>

	* src/hcp-rfs.c, src/hcp-program.c: get rid of osso-log.


Modified: projects/haf/branches/hildon-control-panel/refactoring/ChangeLog
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/ChangeLog	2006-12-01 11:45:53 UTC (rev 8528)
+++ projects/haf/branches/hildon-control-panel/refactoring/ChangeLog	2006-12-01 12:17:30 UTC (rev 8529)
@@ -1,3 +1,7 @@
+2006-12-01  Lucas Rocha  <lucas.rocha at nokia.com>
+
+	* src/hcp-rfs.c, src/hcp-program.c: get rid of osso-log.
+
 2006-11-28  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* src/*.[ch]: general code cleanups, improve code reliability, fix

Modified: projects/haf/branches/hildon-control-panel/refactoring/src/hcp-program.c
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/src/hcp-program.c	2006-12-01 11:45:53 UTC (rev 8528)
+++ projects/haf/branches/hildon-control-panel/refactoring/src/hcp-program.c	2006-12-01 12:17:30 UTC (rev 8529)
@@ -24,8 +24,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <osso-log.h>
-
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
@@ -194,7 +192,7 @@
   
   if (!program->osso)
   {
-    ULOG_ERR("Error initializing osso -- check that D-BUS is running");
+    g_warning ("Error initializing osso -- check that D-BUS is running");
     exit(-1);
   }
 

Modified: projects/haf/branches/hildon-control-panel/refactoring/src/hcp-rfs.c
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/src/hcp-rfs.c	2006-12-01 11:45:53 UTC (rev 8528)
+++ projects/haf/branches/hildon-control-panel/refactoring/src/hcp-rfs.c	2006-12-01 12:17:30 UTC (rev 8529)
@@ -28,7 +28,6 @@
 #include <hildon-widgets/hildon-banner.h>
 #include <osso-helplib.h>
 #include <libosso.h>
-#include <osso-log.h>
 
 #include <glib/gi18n.h>
 
@@ -133,7 +132,7 @@
   switch (ret)
   {
     case OSSO_INVALID:
-      ULOG_ERR ("Lockcode query call failed: Invalid parameter");
+      g_warning ("Lockcode query call failed: Invalid parameter");
       osso_rpc_free_val (&returnvalue);
       return -1;
 
@@ -144,12 +143,11 @@
     case OSSO_ERROR_STATE_SIZE:
       if (returnvalue.type == DBUS_TYPE_STRING)
       {
-          ULOG_ERR ("Lockcode query call failed: %s", 
-  		              returnvalue.value.s);
+        g_warning ("Lockcode query call failed: %s", returnvalue.value.s);
       }
       else
       {
-          ULOG_ERR ("Lockcode query call failed: unspecified");
+        g_warning ("Lockcode query call failed: unspecified");
       }
       osso_rpc_free_val (&returnvalue);
       return -1;
@@ -158,16 +156,16 @@
         break;
 
     default:
-      ULOG_ERR ("Lockcode query call failed: unknown"
-  	              " error type %d", ret);
+      g_warning ("Lockcode query call failed: unknown"
+  	         " error type %d", ret);
       osso_rpc_free_val (&returnvalue);
       return -1;
   }
 
   if (returnvalue.type != DBUS_TYPE_BOOLEAN)
   {
-    ULOG_ERR ("Lockcode query call failed: unexpected return "
-              "value type %d", returnvalue.type);
+    g_warning ("Lockcode query call failed: unexpected return "
+               "value type %d", returnvalue.type);
 
     osso_rpc_free_val (&returnvalue);
     return -1;
@@ -250,11 +248,11 @@
 
   if (!g_spawn_command_line_async (script, &error))
   {
-    ULOG_ERR ("Call to RFS or CUD script failed");
+    g_warning ("Call to RFS or CUD script failed");
 
     if (error)
     {
-      ULOG_ERR (error->message);
+      g_warning (error->message);
       g_error_free (error);
     }
   }