From: Kyeongchul Kim <kyeongchul.kim@samsung.com>
Date: Tue, 21 Aug 2012 13:24:16 +0000 (+0900)
Subject: release tizen_2.0 beta
X-Git-Tag: 2.0_alpha^0
X-Git-Url: http://review.tizen.org/git/?p=framework%2Ftelephony%2Ftelephony-daemon.git;a=commitdiff_plain;h=6965d8d54ab0acbf877dde4d6ee4e2c7d07fce3a

release tizen_2.0 beta
---

diff --git a/debian/changelog b/debian/changelog
index dcf7e86..2c7856a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,15 @@
+telephony-daemon (0.1.4) unstable; urgency=low
+
+  * version up for code sync with public binary
+  * Git: slp/pkgs/t/telephony-daemon
+  * Tag: telephony-daemon_0.1.4
+
+ -- Kyeongchul Kim <kyeongchul.kim@samsung.com>  Mon, 02 Apr 2012 14:27:25 +0900
+
 telephony-daemon (0.1.3) unstable; urgency=low
 
   * Fix prefix (TAPI_ to TCORE_)
-  * Git: pkgs/t/telephony-daemon
+  * Git: slp/pkgs/t/telephony-daemon
   * Tag: telephony-daemon_0.1.3
 
  -- Inho Oh <inho48.oh@samsung.com>  Tue, 27 Mar 2012 22:25:04 +0900
@@ -9,15 +17,15 @@ telephony-daemon (0.1.3) unstable; urgency=low
 telephony-daemon (0.1.2) unstable; urgency=low
 
   * Add debug feature (kill -USR1 <telephony-daemon pid>)
-  * Git: pkgs/t/telephony-daemon
+  * Git: slp/pkgs/t/telephony-daemon
   * Tag: telephony-daemon_0.1.2
 
- -- Kyeongchul Kim <kyeongchul.kim@samsung.com>  Tue, 20 Mar 2012 16:10:02 +0900
+ -- Inho Oh <inho48.oh@samsung.com>  Mon, 19 Mar 2012 21:08:42 +0900
 
 telephony-daemon (0.1.1) unstable; urgency=low
 
   * Add autorun script (/etc/...)
-  * Git: pkgs/t/telephony-daemon
+  * Git: slp/pkgs/t/telephony-daemon
   * Tag: telephony-daemon_0.1.1
 
  -- Inho Oh <inho48.oh@samsung.com>  Fri, 16 Mar 2012 03:19:19 +0900
@@ -25,7 +33,7 @@ telephony-daemon (0.1.1) unstable; urgency=low
 telephony-daemon (0.1.0) unstable; urgency=low
 
   * Initial
-  * Git: pkgs/t/telephony-daemon
+  * Git: slp/pkgs/t/telephony-daemon
   * Tag: telephony-daemon_0.1.0
 
  -- Inho Oh <inho48.oh@samsung.com>  Thu, 15 Mar 2012 23:40:55 +0900
diff --git a/packaging/telephony-daemon.spec b/packaging/telephony-daemon.spec
index 4305848..6b1b3e2 100644
--- a/packaging/telephony-daemon.spec
+++ b/packaging/telephony-daemon.spec
@@ -1,6 +1,6 @@
 Name:       telephony-daemon
 Summary:    Telephony daemon
-Version:    0.1.3
+Version:    0.1.6
 Release:    1
 Group:      System/Telephony
 License:    Apache
@@ -25,6 +25,7 @@ make %{?jobs:-j%jobs}
 %make_install
 
 %files
+%manifest telephony-daemon.manifest
 %defattr(-,root,root,-)
 %{_bindir}/telephony-daemon
 %{_initrddir}/telephony-daemon
diff --git a/src/main.c b/src/main.c
index df91a48..f26894e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -195,7 +195,9 @@ int main(int argc, char *argv[])
 	dbg("flag[test_load]: %d", flag_test_load);
 
 	g_type_init();
+#if !GLIB_CHECK_VERSION (2, 31, 0)
 	g_thread_init(NULL);
+#endif
 
 	s = tcore_server_new();
 	if (!s) {
diff --git a/src/monitor.c b/src/monitor.c
index cd32615..6453e15 100644
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -35,6 +35,8 @@
 #include <server.h>
 #include <hal.h>
 #include <queue.h>
+#include <storage.h>
+#include <communicator.h>
 
 #include "monitor.h"
 
@@ -67,13 +69,6 @@ static void _monitor_plugin(Server *s)
 			free(str);
 
 		msg(" - addr: %p", p);
-		msg(" - ref_hal: %p", tcore_plugin_ref_hal(p));
-		if (tcore_plugin_ref_hal(p)) {
-			str = tcore_hal_get_name(tcore_plugin_ref_hal(p));
-			msg(" - ref_hal_name: %s", str);
-			if (str)
-				free(str);
-		}
 		msg(" - userdata: %p", tcore_plugin_ref_user_data(p));
 		msg("");
 
diff --git a/telephony-daemon.manifest b/telephony-daemon.manifest
new file mode 100644
index 0000000..28035dd
--- /dev/null
+++ b/telephony-daemon.manifest
@@ -0,0 +1,13 @@
+<manifest>
+	<define>
+		<domain name="telephony_framework" policy="restricted" plist="tel-plugin-atmodem, tel-plugin-database, tel-plugin-dbus_tapi, tel-plugin-dpram, tel-plugin-factory, tel-plugin-indicator, tel-plugin-nitz, tel-plugin-packetservice, tel-plugin-samsung, tel-plugin-samsung_indicator, tel-plugin-svcmode, tel-plugin-svnet, tel-plugin-svnet2, tel-plugin-vconf, tel-plugin-vmodem"/>
+	</define>
+	<assign>
+		<filesystem path="/usr/bin/telephony-daemon" label="telephony_framework"/>
+		<filesystem path="/usr/bin/telephony-daemon" exec_label="telephony_framework"/>
+		<filesystem path="/etc/init.d/telephony-daemon" label="telephony_framework"/>
+	</assign>
+	<request>
+		<domain name="telephony_framework"/>
+	</request>
+</manifest>