[maemo-commits] [maemo-commits] r18188 - in projects/haf/trunk/libosso: debian ut/osso-hw

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-04-29 11:11:17 +0300 (Wed, 29 Apr 2009)
New Revision: 18188

Modified:
   projects/haf/trunk/libosso/debian/changelog
   projects/haf/trunk/libosso/ut/osso-hw/test-hw-prog.c
Log:
fixes to ut/osso-hw/test-hw-prog.c


Modified: projects/haf/trunk/libosso/debian/changelog
===================================================================
--- projects/haf/trunk/libosso/debian/changelog	2009-04-28 15:22:26 UTC (rev 18187)
+++ projects/haf/trunk/libosso/debian/changelog	2009-04-29 08:11:17 UTC (rev 18188)
@@ -1,3 +1,9 @@
+libosso (2.20-1~unreleased) unstable; urgency=low
+
+  * Fix test-hw-prog.c test program.
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Wed, 29 Apr 2009 11:00:49 +0300
+
 libosso (2.19-1) unstable; urgency=low
 
   * Removed auto-generated files and added autogen.sh run.

Modified: projects/haf/trunk/libosso/ut/osso-hw/test-hw-prog.c
===================================================================
--- projects/haf/trunk/libosso/ut/osso-hw/test-hw-prog.c	2009-04-28 15:22:26 UTC (rev 18187)
+++ projects/haf/trunk/libosso/ut/osso-hw/test-hw-prog.c	2009-04-29 08:11:17 UTC (rev 18188)
@@ -18,8 +18,8 @@
  * 02110-1301 USA
  */
 
-#include "osso-internal.h"
-
+#include <libosso.h>
+#include <stdio.h>
 #include <unistd.h>
 
 #define APP_NAME "test_hw"
@@ -37,7 +37,6 @@
 
     osso = osso_initialize(APP_NAME, APP_VER, TRUE, NULL);
     if(osso == NULL) {
-	dprint("no D-BUS found!!\n");
 	return 1;
     }
 
@@ -56,38 +55,34 @@
     GMainLoop *loop;
     FILE *f;
     
-    dprint("got a signal");
     loop = (GMainLoop *)data;
 
     f = fopen(TESTFILE, "w");
     if(f == NULL) {
-	dprint("unable to open file %s", TESTFILE);
+	g_debug("unable to open file %s", TESTFILE);
     }
     else {
 	if(state->shutdown_ind) {
-	    fprintf(f,"reboot\n");
-	    dprint("reboot");
+	    fprintf(f,"shutdown_ind\n");
+	    g_debug("shutdown_ind");
 	}
 	if(state->memory_low_ind) {
 	    fprintf(f,"memlow\n");
-	    dprint("memlow");
+	    g_debug("memlow");
 	}
 	if(state->save_unsaved_data_ind) {
-	    fprintf(f,"batlow\n");
-	    dprint("batlow");
+	    fprintf(f,"save_unsaved_data_ind\n");
+	    g_debug("save_unsaved_data_ind");
 	}
 	if(state->system_inactivity_ind) {
 	    fprintf(f,"minact\n");
-	    dprint("minact");
+	    g_debug("minact");
 	}
 	if(state->sig_device_mode_ind) {
-	    fprintf(f,"flightmode\n");
-	    dprint("flightmode");
+	    fprintf(f,"device_mode_ind\n");
+	    g_debug("device_mode_ind");
 	}
 	fclose(f);
-	fflush(f);
 	sync();
     }
-    g_main_loop_quit((GMainLoop *)data);
-    return;
 }