Fix daemon crash issue during server free

- in case dbus-daemon is killed, telephony-daemon is crashed during server free
because of notification hook remained in ps-plugin

Change-Id: Id3e2dc117acbad498b059ddb903c0643090a127e

diff --git a/packaging/tel-plugin-packetservice.spec b/packaging/tel-plugin-packetservice.spec
index 966f491..5aca165 100644 (file)
--- a/packaging/tel-plugin-packetservice.spec
+++ b/packaging/tel-plugin-packetservice.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 3
-%define patchlevel 33
+%define patchlevel 34
 
 Name:           tel-plugin-packetservice
 Version:        %{major}.%{minor}.%{patchlevel}

diff --git a/src/ps_master.c b/src/ps_master.c
index c8ccdf3..21f41dc 100644 (file)
--- a/src/ps_master.c
+++ b/src/ps_master.c
@@ -103,6 +103,10 @@ void __remove_master(gpointer data, gpointer user_data)
        /*Deinit alarm*/
        alarmmgr_fini();
 
+       /* Remove notification hooks */
+       tcore_server_remove_notification_hook(tcore_plugin_ref_server(master->plg), __on_hook_modem_added);
+       tcore_server_remove_notification_hook(tcore_plugin_ref_server(master->plg), __on_hook_modem_removed);
+
        /*Need to remove the compelete hash table*/
        g_hash_table_remove_all(master->modems);