From 25b368d774245216c2efac9a6e639b12c0d0b7ef Mon Sep 17 00:00:00 2001
From: Jinkun Jang <jinkun.jang@samsung.com>
Date: Sat, 16 Mar 2013 01:04:24 +0900
Subject: [PATCH] merge with master

---
 CMakeLists.txt              |  4 ++--
 NOTICE                      |  0
 include/notification.h      |  2 +-
 packaging/notification.spec | 12 ++++--------
 src/notification.c          |  2 +-
 src/notification_noti.c     | 34 +++++++++++++++++++++++-----------
 6 files changed, 31 insertions(+), 23 deletions(-)
 mode change 100644 => 100755 NOTICE

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1d2f11..5ceb429 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,8 +61,8 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS})
 
 CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
 
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 FOREACH(hfile ${HEADERS})
 	INSTALL(FILES ${CMAKE_SOURCE_DIR}/${hfile} DESTINATION include/${PROJECT_NAME})
 ENDFOREACH(hfile)
diff --git a/NOTICE b/NOTICE
old mode 100644
new mode 100755
diff --git a/include/notification.h b/include/notification.h
index 5b6ac4c..399d084 100755
--- a/include/notification.h
+++ b/include/notification.h
@@ -1771,7 +1771,7 @@ notification_register_detailed_changed_cb(
  */
 notification_error_e
 notification_unregister_detailed_changed_cb(
-		void (*detailed_changed_cb)(void *data, notification_type_e type, notification_op_type_e op_type, int *list_priv_id, int num_priv_id),
+		void (*detailed_changed_cb)(void *data, notification_type_e type, notification_op *op_list, int num_op),
 		void *user_data);
 
 /**
diff --git a/packaging/notification.spec b/packaging/notification.spec
index 035e30b..0346947 100755
--- a/packaging/notification.spec
+++ b/packaging/notification.spec
@@ -1,6 +1,6 @@
 Name:       notification
 Summary:    notification library
-Version:    0.1.6
+Version:    0.1.8
 Release:    1
 Group:      TBD
 License:    Apache-2.0
@@ -20,7 +20,7 @@ BuildRequires: pkgconfig(dbus-glib-1)
 BuildRequires: cmake
 Requires(post): /sbin/ldconfig
 Requires(post): /usr/bin/sqlite3
-requires(postun): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 %description
 Notificaiton library.
@@ -37,20 +37,16 @@ Requires:   %{name} = %{version}-%{release}
 Notificaiton library (devel).
 
 %build
-export LDFLAGS+="-Wl,--rpath=%{_prefix}/lib -Wl,--as-needed"
-LDFLAGS="$LDFLAGS" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+export LDFLAGS+="-Wl,--rpath=%{_libdir} -Wl,--as-needed"
+%cmake .
 make %{?jobs:-j%jobs}
 
 %install
-rm -rf %{buildroot}
 %make_install
 
 mkdir -p %{buildroot}/usr/share/license
 cp -f LICENSE.APLv2.0 %{buildroot}/usr/share/license/%{name}
 
-%clean
-rm -rf %{buildroot}
-
 %post
 /sbin/ldconfig
 
diff --git a/src/notification.c b/src/notification.c
index d435218..827b515 100755
--- a/src/notification.c
+++ b/src/notification.c
@@ -3072,7 +3072,7 @@ notification_register_detailed_changed_cb(
 
 EXPORT_API notification_error_e
 notification_unregister_detailed_changed_cb(
-		void (*detailed_changed_cb)(void *data, notification_type_e type, notification_op_type_e op_type, int *list_priv_id, int num_priv_id),
+		void (*detailed_changed_cb)(void *data, notification_type_e type, notification_op *op_list, int num_op),
 		void *user_data)
 {
 	notification_cb_list_s *noti_cb_list = NULL;
diff --git a/src/notification_noti.c b/src/notification_noti.c
index 5d2c218..395f82a 100755
--- a/src/notification_noti.c
+++ b/src/notification_noti.c
@@ -1434,18 +1434,30 @@ notification_error_e notification_noti_get_detail_list(const char *pkgname,
 		 "flags_for_property, display_applist, progress_size, progress_percentage "
 		 "from noti_list ");
 
-	internal_group_id =
-	    _notification_noti_get_internal_group_id_by_priv_id(pkgname,
-								priv_id, db);
-
-	if (status == VCONFKEY_TELEPHONY_SIM_INSERTED) {
-		snprintf(query_where, sizeof(query_where),
-			 "where  caller_pkgname = '%s' and internal_group_id = %d ",
-			 pkgname, internal_group_id);
+	if (priv_id == NOTIFICATION_PRIV_ID_NONE && group_id == NOTIFICATION_GROUP_ID_NONE) {
+		if (status == VCONFKEY_TELEPHONY_SIM_INSERTED) {
+			snprintf(query_where, sizeof(query_where),
+				 "where  caller_pkgname = '%s' ",
+				 pkgname, internal_group_id);
+		} else {
+			snprintf(query_where, sizeof(query_where),
+				 "where  caller_pkgname = '%s' and flag_simmode = 0 ",
+				 pkgname, internal_group_id);
+		}
 	} else {
-		snprintf(query_where, sizeof(query_where),
-			 "where  caller_pkgname = '%s' and internal_group_id = %d and flag_simmode = 0 ",
-			 pkgname, internal_group_id);
+		internal_group_id =
+		    _notification_noti_get_internal_group_id_by_priv_id(pkgname,
+									priv_id, db);
+
+		if (status == VCONFKEY_TELEPHONY_SIM_INSERTED) {
+			snprintf(query_where, sizeof(query_where),
+				 "where  caller_pkgname = '%s' and internal_group_id = %d ",
+				 pkgname, internal_group_id);
+		} else {
+			snprintf(query_where, sizeof(query_where),
+				 "where  caller_pkgname = '%s' and internal_group_id = %d and flag_simmode = 0 ",
+				 pkgname, internal_group_id);
+		}
 	}
 
 	snprintf(query, sizeof(query),
-- 
2.7.4