[pkg-fso-commits] [SCM] libframeworkd-phonegui branch, upstream, updated. 640da47bfcff755388d0fb8f443eb34e0dea3c72

[Didier 'Ptitjes]

The following commit has been merged in the upstream branch:
commit b3961977c3c2b3ce8fabded3a7cbea9115b4ca6f
Author: Didier 'Ptitjes <ptitjes at free.fr>
Date:   Tue Dec 16 13:07:26 2008 +0100

    Fixed database closing at end of ophonekitd
    Signed-off-by: Didier 'Ptitjes <ptitjes at free.fr>

diff --git a/ophonekitd/src/ophonekitd-main.c b/ophonekitd/src/ophonekitd-main.c
index 956f0ef..e4321ac 100644
--- a/ophonekitd/src/ophonekitd-main.c
+++ b/ophonekitd/src/ophonekitd-main.c
@@ -90,7 +90,12 @@ int main(int argc, char ** argv) {
     g_timeout_add(0, list_resources, NULL);
     g_main_loop_run(mainloop);
 
+    /* Close phonelog database */
+    phonelog_close_database();
+    g_debug("Phonelog database closed");
+
     free(incoming_calls);
+    free(outgoing_calls);
     exit(EXIT_SUCCESS);
 }
 
@@ -117,7 +122,7 @@ int ophonekitd_call_check(call_t *calls, int *size, int id) {
 }
 
 int ophonekitd_call_get_unique_id(call_t *calls, int *size, int id) {
-	g_debug("ophonekitd_call_get_number(%d)", id);
+	g_debug("ophonekitd_call_get_unique_id(%d)", id);
     int place = ophonekitd_call_check(calls, size, id);
     if(place >= 0) {
     	return calls[place].unique_id;
@@ -413,10 +418,6 @@ int exit_callback(void *data, int type, void *event) {
     /* called on ctrl-c, kill $pid, SIGINT, SIGTERM and SIGQIT */
     g_debug("exit_callback()");
 
-    /* Close phonelog database */
-    phonelog_close_database();
-    g_debug("Phonelog database closed");
-
     return 0;
 }
 

-- 
libframeworkd-phonegui