[maemo-commits] [maemo-commits] r13380 - projects/haf/branches/hildon-desktop/karoliina-safe-mode/src

[From: subversion at stage.maemo.org]

Author: karoliina
Date: 2007-08-23 17:06:24 +0300 (Thu, 23 Aug 2007)
New Revision: 13380

Modified:
   projects/haf/branches/hildon-desktop/karoliina-safe-mode/src/hd-plugin-blacklist.c
   projects/haf/branches/hildon-desktop/karoliina-safe-mode/src/hd-plugin-manager.c
Log:
midtime commit



Modified: projects/haf/branches/hildon-desktop/karoliina-safe-mode/src/hd-plugin-blacklist.c
===================================================================
--- projects/haf/branches/hildon-desktop/karoliina-safe-mode/src/hd-plugin-blacklist.c	2007-08-23 13:42:31 UTC (rev 13379)
+++ projects/haf/branches/hildon-desktop/karoliina-safe-mode/src/hd-plugin-blacklist.c	2007-08-23 14:06:24 UTC (rev 13380)
@@ -50,8 +50,6 @@
 
   g_return_val_if_fail (key_file_name != NULL, NULL);
 
-  printf("hd_plugin_blacklist_transaction_read\n");
-
   keyfile = g_key_file_new ();
 
   g_key_file_load_from_file (keyfile,
@@ -92,41 +90,30 @@
 
   g_return_if_fail (key_file_name != NULL);
 
-  printf("hd_plugin_blacklist_transaction_write\n");
-
   keyfile = g_key_file_new ();
 
   /* Load old keyfile */
-
   g_key_file_load_from_file (keyfile,
                              key_file_name,
                              G_KEY_FILE_NONE,
                              &error);
 
   /* Now set the key in there */
-  printf("g_key_file_set_string begin\n");
   g_key_file_set_string (keyfile, group_name, key, value);
-  printf("g_key_file_set_string end\n");
   buffer = g_key_file_to_data (keyfile, (gsize *) &buffer_size, &error);
 
-  printf("Buffer created. Buffer = %s \n",buffer);
-  /*
   if (error)
   {
-    g_warning ("Error saving desktop blacklist configuration file: %s", error->message);
     g_error_free (error);
+ 
+  }
 
-    return;
-  }*/
-  printf("write buffer\n");
-  printf("Creat\n");
-  //g_creat (key_file_name, O_CREAT);
-  printf("Creat done\n");
-  printf("Write to file \n");
+  error = NULL;
+
   if(g_file_set_contents (key_file_name, buffer, buffer_size, &error)){
-    printf("Something occurred\n");
+    printf("transaction failed in g_file_set_contents\n");
   }
-  printf("buffer written\n");
+
   if (error)
   {
     g_warning ("Error saving desktop blacklist configuration file: %s", error->message);

Modified: projects/haf/branches/hildon-desktop/karoliina-safe-mode/src/hd-plugin-manager.c
===================================================================
--- projects/haf/branches/hildon-desktop/karoliina-safe-mode/src/hd-plugin-manager.c	2007-08-23 13:42:31 UTC (rev 13379)
+++ projects/haf/branches/hildon-desktop/karoliina-safe-mode/src/hd-plugin-manager.c	2007-08-23 14:06:24 UTC (rev 13380)
@@ -251,20 +251,17 @@
       {
           hd_plugin_manager_handle_plugin_failure (pm, container, policy, position);
       }
-    
+
       position++;
 
-      
       hd_plugin_blacklist_transaction_write (HILDON_DESKTOP_BLACKLIST, iter->data, "blacklist-status", "done");
 
-
     }
     else 
     {
     if((strcmp(status,"init"))) 
     { /* if not status init (=not crashed) */
 
-        
         hd_plugin_blacklist_transaction_write (HILDON_DESKTOP_BLACKLIST, iter->data, "blacklist-status", "init");
 
         if (!hd_plugin_manager_load_plugin (pm, 
@@ -285,8 +282,7 @@
       } 
       else /* Actually crashed , init status found */
       {
-        
-      
+        printf("Plugin %s had init status on blacklist and it was not initialized properly on last run, so skipping it now\n", (char *)iter->data);
       }
 
     }