summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt6
-rwxr-xr-xdata/syspopup_db.sql17
-rwxr-xr-x[-rw-r--r--]debian/changelog594
-rw-r--r--debian/control6
-rw-r--r--debian/syspopup-0.install.in1
-rw-r--r--debian/syspopup-0.postinst3
-rwxr-xr-xinclude/simple_util.h8
-rwxr-xr-xinclude/syspopup_caller.h1
-rwxr-xr-x[-rw-r--r--]packaging/syspopup.spec30
-rwxr-xr-xsrc/syspopup_core.c72
-rw-r--r--syspopup-app/CMakeLists.txt6
-rwxr-xr-xsyspopup-app/org.tizen.syspopup-app.xml.in10
-rwxr-xr-xsyspopup-app/syspopup-app.c49
-rw-r--r--syspopup-caller.manifest5
-rw-r--r--syspopup-caller/CMakeLists.txt2
-rwxr-xr-xsyspopup-caller/syspopup_caller.c35
-rw-r--r--syspopup.manifest15
-rw-r--r--syspopup/CMakeLists.txt2
-rw-r--r--syspopup/syspopup.pc.in2
-rwxr-xr-xtest/test.c9
20 files changed, 798 insertions, 75 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 95bd4f9..b67f39c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ MESSAGE("Build type: ${CMAKE_BUILD_TYPE}")
# Set required packages
INCLUDE(FindPkgConfig)
-pkg_check_modules(libpkgs REQUIRED aul dlog bundle sqlite3 glib-2.0 heynoti)
+pkg_check_modules(libpkgs REQUIRED aul dlog bundle sqlite3 glib-2.0 dbus-glib-1)
FOREACH(flag ${libpkgs_CFLAGS})
SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
@@ -30,7 +30,7 @@ ENDFOREACH(flag)
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -Wl,-zdefs" )
SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden")
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -g")
SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
SET(CMAKE_C_FLAGS_RELEASE "-O2")
@@ -59,7 +59,7 @@ add_library(syspopup_mods STATIC
)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/SLP_SYSPOPUP_PG.h DESTINATION include)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/syspopup_db.sql DESTINATION /opt/share/)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/syspopup_db.sql DESTINATION /usr/share/syspopup/)
add_subdirectory(syspopup)
add_subdirectory(syspopup-caller)
diff --git a/data/syspopup_db.sql b/data/syspopup_db.sql
index d5ffc61..f85d4c9 100755
--- a/data/syspopup_db.sql
+++ b/data/syspopup_db.sql
@@ -26,19 +26,24 @@ INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"timer", 1,0,5,0,2,"org.tiz
INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"schedule_alarm", 1,0,-1,0,2,"org.tizen.schedule_alarm");
INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"bt-syspopup", 0,0,-1,0,0,"org.tizen.bt-syspopup");
INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"change_select_network", 0,0,-1,0,0,"org.tizen.change_select_network");
-INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"wifi-qs", 0,0,-1,0,0,"org.tizen.wifi-qs");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"wifi-qs", 0,0,-1,0,0,"net.wifi-qs");
INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"privacy_lock", 0,0,-1,0,2,"org.tizen.privacy_lock");
-INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"poweroff-syspopup", 0,1,-1,0,0,"org.tizen.poweroff-syspopup");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"poweroff-syspopup", 1,1,-1,0,0,"org.tizen.poweroff-syspopup");
INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"drm", 0,0,5,0,0,"org.tizen.drm-popup");
INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"active_sync_policy", 0,0,-1,0,0,"org.tizen.active_sync_policy");
INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"memory_full", 0,1,5,0,0,"org.tizen.memory_full");
-INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"lowmem-syspopup", 0,1,5,0,0,"org.tizen.lowmem-syspopup");
-INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"lowbat-syspopup", 0,1,5,0,0,"org.tizen.lowbat-syspopup");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"lowmem-syspopup", 1,1,5,0,0,"org.tizen.lowmem-syspopup");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"lowbat-syspopup", 1,1,5,0,0,"org.tizen.lowbat-syspopup");
INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"charger_conn", 0,1,5,0,0,"org.tizen.charger_conn");
INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"sim_extraction", 0,1,5,0,0,"org.tizen.sim_extraction");
INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"time_zone_update", 0,1,5,0,0,"org.tizen.time_zone_update");
-INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"dnet-popup", 0,0,5,0,0,"org.tizen.dnet-popup");
INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"nfc-syspopup", 0,1,3,0,0,"org.tizen.nfc-sys-popup");
INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"push-syspopup", 2,0,5,0,0,"org.tizen.push-syspopup");
-INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"alert-3g-syspopup", 0,0,-1,0,0,"org.tizen.alert-3g-syspopup");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"net-popup", 0,0,-1,0,0,"org.tizen.net-popup");
INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"usb-syspopup", 1,1,-1,2,2,"org.tizen.usb-syspopup");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"ims-syspopup", 1,1,-1,2,2,"org.tizen.ims-syspopup");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"mdm-syspopup", 1,1,5,0,0,"org.tizen.mdm-syspopup");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"tickernoti-syspopup", 1,1,-1,2,2,"org.tizen.tickernoti-syspopup");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"usbotg-syspopup", 0,1,-1,0,0,"org.tizen.usbotg-syspopup");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"allshare-popup", 0,0,-1,0,0,"org.tizen.allshare-popup");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"mmc-syspopup", 0,1,-1,0,0,"org.tizen.mmc-syspopup");
diff --git a/debian/changelog b/debian/changelog
index 2c4d0ca..5fde526 100644..100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,591 @@
-syspopup (0.0.67-1) unstable; urgency=low
+syspopup (0.0.75ubuntu1) precise; urgency=low
- * Initial Release.
- * Git: pkgs/s/syspopup
- * Tag: syspopup_0.0.67-1
+ * Update for net.netpopup
+ * Git: slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.76
- -- Sewook Park <sewook7.park@samsung.com> Wed, 07 Dec 2011 12:55:49 +0900
+ -- sunil85.kim <isurit@sunil85.kim> Wed, 16 Jan 2013 10:32:39 +0900
+
+syspopup (0.0.75) unstable; urgency=low
+
+ * Added OTG syspopup info
+ * Git: slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.75
+
+ -- Sewook Park <sewook7.park@samsung.com> Mon, 21 May 2012 21:07:17 +0900
+
+syspopup (0.0.74) unstable; urgency=low
+
+ * Fixed compile warnings
+ * Git: slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.74
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com> Tue, 20 Mar 2012 14:45:42 +0900
+
+syspopup (0.0.73) unstable; urgency=low
+
+ * Changed network syspopup name, Fixed desktop field
+ * Git: slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.73
+
+ -- Sewook Park <sewook7.park@samsung.com> Thu, 15 Mar 2012 16:07:54 +0900
+
+syspopup (0.0.72) unstable; urgency=low
+
+ * Added ticker popup info
+ * Git: slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.72
+
+ -- Sewook Park <sewook7.park@samsung.com> Wed, 14 Mar 2012 16:22:20 +0900
+
+syspopup (0.0.71) unstable; urgency=low
+
+ * API Changes in elementary
+ * Git: slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.71
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com> Tue, 13 Mar 2012 17:59:18 +0900
+
+syspopup (0.0.70) unstable; urgency=low
+
+ * Fixed to use dbus instead of heynoti
+ * Git: slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.70
+
+ -- Sewook Park <sewook7.park@samsung.com> Wed, 22 Feb 2012 10:41:10 +0900
+
+syspopup (0.0.69) unstable; urgency=low
+
+ * Added ims-syspopup info
+ * Git: slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.69
+
+ -- Sewook Park <sewook7.park@samsung.com> Wed, 15 Feb 2012 16:25:22 +0900
+
+syspopup (0.0.68) unstable; urgency=low
+
+ * remove quickpanel dependency
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.68
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com> Fri, 16 Dec 2011 09:51:11 +0900
+
+syspopup (0.0.67) unstable; urgency=low
+
+ * Updated changelog
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.67
+
+ -- Sewook Park <sewook7.park@samsung.com> Mon, 05 Dec 2011 15:55:09 +0900
+
+syspopup (0.0.66) unstable; urgency=low
+
+ * Fix desktop not to be removed
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.66
+
+ -- Sewook Park <sewook7.park@samsung.com> Mon, 21 Nov 2011 12:51:51 +0900
+
+syspopup (0.0.65) unstable; urgency=low
+
+ * Changed Boilerplate as per the guideline
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.65
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com> Mon, 07 Nov 2011 18:38:10 +0900
+
+syspopup (0.0.64) unstable; urgency=low
+
+ * Fix syspopup focus concept
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.64
+
+ -- Sewook Park <sewook7.park@samsung.com> Thu, 27 Oct 2011 16:40:49 +0900
+
+syspopup (0.0.63) unstable; urgency=low
+
+ * Change active window angle to root angle
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.63
+
+ -- Sewook Park <sewook7.park@samsung.com> Wed, 19 Oct 2011 19:14:24 +0900
+
+syspopup (0.0.62) unstable; urgency=low
+
+ * Fix syspopup-app layout
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.62
+
+ -- Sewook Park <sewook7.park@samsung.com> Tue, 11 Oct 2011 11:11:31 +0900
+
+syspopup (0.0.61) unstable; urgency=low
+
+ * add usb-syspopup
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.61
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com> Wed, 05 Oct 2011 16:02:45 +0900
+
+syspopup (0.0.60) unstable; urgency=low
+
+ * Fix prevent issue
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.60
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com> Mon, 05 Sep 2011 13:42:51 +0900
+
+syspopup (0.0.59) unstable; urgency=low
+
+ * Add alert-3g-syspopup
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.59
+
+ -- Sewook Park <sewook7.park@samsung.com> Tue, 23 Aug 2011 16:08:24 +0900
+
+syspopup (0.0.58) unstable; urgency=low
+
+ * Apply code cleanup
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.58
+
+ -- Sewook Park <sewook7.park@samsung.com> Mon, 01 Aug 2011 19:59:37 +0900
+
+syspopup (0.0.57) unstable; urgency=low
+
+ * Fix Boilerplate module name
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.57
+
+ -- Sewook Park <sewook7.park@samsung.com> Sat, 16 Jul 2011 13:38:40 +0900
+
+syspopup (0.0.56) unstable; urgency=low
+
+ * Apply Boilerplate
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.56
+
+ -- Sewook Park <sewook7.park@samsung.com> Wed, 13 Jul 2011 17:31:28 +0900
+
+syspopup (0.0.55) unstable; urgency=low
+
+ * Modify bt-syspopup to be unfocused
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.55
+
+ -- Sewook Park <sewook7.park@samsung.com> Fri, 01 Jul 2011 14:37:08 +0900
+
+syspopup (0.0.54) unstable; urgency=low
+
+ * Modify push popup
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.54
+
+ -- Noha Park <noha.park@samsung.com> Tue, 17 May 2011 20:53:53 +0900
+
+syspopup (0.0.53) unstable; urgency=low
+
+ * Modify push popup
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.53
+
+ -- Noha Park <noha.park@samsung.com> Tue, 17 May 2011 20:43:19 +0900
+
+syspopup (0.0.52) unstable; urgency=low
+
+ * Modify push popup
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.52
+
+ -- Noha Park <noha.park@samsung.com> Tue, 17 May 2011 20:29:23 +0900
+
+syspopup (0.0.51) unstable; urgency=low
+
+ * Modify push popup
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.51
+
+ -- Noha Park <noha.park@samsung.com> Tue, 17 May 2011 20:02:11 +0900
+
+syspopup (0.0.50) unstable; urgency=low
+
+ * Add push popup
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.50
+
+ -- Noha Park <noha.park@samsung.com> Wed, 11 May 2011 09:55:52 +0900
+
+syspopup (0.0.49) unstable; urgency=low
+
+ * Remove deb. from package name
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.49
+
+ -- Noha Park <noha.park@samsung.com> Tue, 12 Apr 2011 11:47:30 +0900
+
+syspopup (0.0.48) unstable; urgency=low
+
+ * Remove quickpanel insert option
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.48
+
+ -- Noha Park <noha.park@samsung.com> Wed, 16 Mar 2011 19:02:23 +0900
+
+syspopup (0.0.47) unstable; urgency=low
+
+ * Remove quickpanel insert option
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.47
+
+ -- Noha Park <noha.park@samsung.com> Wed, 16 Mar 2011 18:55:50 +0900
+
+syspopup (0.0.46) unstable; urgency=low
+
+ * Call term act callback when the option is hide
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.46
+
+ -- Noha Park <noha.park@samsung.com> Tue, 22 Feb 2011 15:47:35 +0900
+
+syspopup (0.0.45) unstable; urgency=low
+
+ * Image optimization
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.45
+
+ -- Noha Park <noha.park@samsung.com> Mon, 21 Feb 2011 11:37:26 +0900
+
+syspopup (0.0.44) unstable; urgency=low
+
+ * Image optimization
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.44
+
+ -- Noha Park <noha.park@samsung.com> Mon, 21 Feb 2011 11:37:26 +0900
+
+syspopup (0.0.43) unstable; urgency=low
+
+ * Rebuild for quickpanel structure
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.43
+
+ -- Noha Park <noha.park@samsung.com> Fri, 18 Feb 2011 09:13:42 +0900
+
+syspopup (0.0.42) unstable; urgency=low
+
+ * Move desktop file destination
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.42
+
+ -- Noha Park <noha.park@samsung.com> Mon, 14 Feb 2011 17:03:56 +0900
+
+syspopup (0.0.41) unstable; urgency=low
+
+ * Add NFC syspopup
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.41
+
+ -- Noha Park <noha.park@samsung.com> Thu, 27 Jan 2011 14:20:40 +0900
+
+syspopup (0.0.40) unstable; urgency=low
+
+ * Add extern C to syspopup_caller header
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.40
+
+ -- Noha Park <noha.park@samsung.com> Thu, 27 Jan 2011 10:35:47 +0900
+
+syspopup (0.0.39) unstable; urgency=low
+
+ * Add extern C to syspopup_caller header
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.39
+
+ -- Noha Park <noha.park@samsung.com> Thu, 27 Jan 2011 10:30:18 +0900
+
+syspopup (0.0.38) unstable; urgency=low
+
+ * Modify wifi qs timeout
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.38
+
+ -- Noha Park <noha.park@samsung.com> Wed, 12 Jan 2011 16:45:21 +0900
+
+syspopup (0.0.37) unstable; urgency=low
+
+ * Modify syspopup app
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.37
+
+ -- Noha Park <noha.park@samsung.com> Wed, 05 Jan 2011 08:59:54 +0900
+
+syspopup (0.0.36) unstable; urgency=low
+
+ * Modify bt syspopup name
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.36
+
+ -- Noha Park <noha.park@samsung.com> Tue, 04 Jan 2011 08:47:34 +0900
+
+syspopup (0.0.35) unstable; urgency=low
+
+ * Modify drm popup
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.35
+
+ -- Noha Park <noha.park@samsung.com> Tue, 21 Dec 2010 10:02:26 +0900
+
+syspopup (0.0.34) unstable; urgency=low
+
+ * Add dnet popup
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.34
+
+ -- Noha Park <noha.park@samsung.com> Mon, 20 Dec 2010 17:25:43 +0900
+
+syspopup (0.0.33) unstable; urgency=low
+
+ * Modify ap_con_wifi to wifi-qs
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.33
+
+ -- Noha Park <noha.park@samsung.com> Mon, 20 Dec 2010 17:12:50 +0900
+
+syspopup (0.0.32) unstable; urgency=low
+
+ * Modify ap_con_wifi to wifi-qs
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.32
+
+ -- Noha Park <noha.park@samsung.com> Wed, 15 Dec 2010 16:39:25 +0900
+
+syspopup (0.0.31) unstable; urgency=low
+
+ * Modify ap_con_wifi to wifi-qs
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.31
+
+ -- Noha Park <noha.park@samsung.com> Wed, 15 Dec 2010 14:57:17 +0900
+
+syspopup (0.0.30) unstable; urgency=low
+
+ * Modify wifi-qs to ap_con_wifi
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.30
+
+ -- Noha Park <noha.park@samsung.com> Wed, 15 Dec 2010 11:37:51 +0900
+
+syspopup (0.0.29) unstable; urgency=low
+
+ * Update bash shell script (== to =)
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.29
+
+ -- Noha Park <noha.park@samsung.com> Wed, 15 Dec 2010 09:54:41 +0900
+
+syspopup (0.0.28) unstable; urgency=low
+
+ * Add wifi-qs
+ * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup
+ * Tag: syspopup_0.0.28
+
+ -- Noha Park <noha.park@samsung.com> Mon, 13 Dec 2010 14:53:03 +0900
+
+syspopup (0.0.27) unstable; urgency=low
+
+ * Modify Sample code (syspopup-app)
+ * Git: 165.213.180.234:/git/slp/pkgs/syspopup
+ * Tag: syspopup_0.0.27
+
+ -- Noha Park <noha.park@samsung.com> Thu, 02 Dec 2010 10:56:57 +0900
+
+syspopup (0.0.26) unstable; urgency=low
+
+ * Modify power off popup
+ * Git: 165.213.180.234:/git/slp/pkgs/syspopup
+ * Tag: syspopup_0.0.26
+
+ -- Noha Park <noha.park@samsung.com> Fri, 26 Nov 2010 21:41:14 +0900
+
+syspopup (0.0.25) unstable; urgency=low
+
+ * Modify default rotation angle
+ * Git: 165.213.180.234:/git/slp/pkgs/syspopup
+ * Tag: syspopup_0.0.25
+
+ -- Noha Park <noha.park@samsung.com> Mon, 22 Nov 2010 20:33:07 +0900
+
+syspopup (0.0.24) unstable; urgency=low
+
+ * Modified desktop file
+ * Git: 165.213.180.234:/git/slp/pkgs/syspopup
+ * Tag: syspopup_0.0.24
+
+ -- Noha Park <noha.park@samsung.com> Mon, 22 Nov 2010 15:59:26 +0900
+
+syspopup (0.0.23) unstable; urgency=low
+
+ * Modified desktop file
+ * Git: 165.213.180.234:/git/slp/pkgs/syspopup
+ * Tag: syspopup_0.0.23
+
+ -- Noha Park <noha.park@samsung.com> Mon, 22 Nov 2010 13:57:09 +0900
+
+syspopup (0.0.22) unstable; urgency=low
+
+ * Code regeneration
+ * Git: 165.213.180.234:/git/slp/pkgs/syspopup
+ * Tag: syspopup_0.0.22
+
+ -- Noha Park <noha.park@samsung.com> Mon, 15 Nov 2010 18:14:36 +0900
+
+syspopup (0.0.21) unstable; urgency=low
+
+ * Modify rotation cb in syspopup-app
+ * Git: 165.213.180.234:/git/slp/pkgs/syspopup
+ * Tag: syspopup_0.0.21
+
+ -- Noha Park <noha.park@samsung.com> Fri, 12 Nov 2010 21:49:34 +0900
+
+syspopup (0.0.20) unstable; urgency=low
+
+ * Modify rotation cb in syspopup-app
+ * Git: 165.213.180.234:/git/slp/pkgs/syspopup
+ * Tag: syspopup_0.0.20
+
+ -- Noha Park <noha.park@samsung.com> Fri, 12 Nov 2010 14:17:49 +0900
+
+syspopup (0.0.19) unstable; urgency=low
+
+ * Modify DB create procedure(updated)
+ * Git: 165.213.180.234:/git/slp/pkgs/syspopup
+ * Tag: syspopup_0.0.19
+
+ -- Noha Park <noha.park@samsung.com> Thu, 11 Nov 2010 11:44:26 +0900
+
+syspopup (0.0.18) unstable; urgency=low
+
+ * Modify DB create procedure(updated)
+ * Git: 165.213.180.234:/git/slp/pkgs/syspopup
+ * Tag: syspopup_0.0.18
+
+ -- Noha Park <noha.park@samsung.com> Thu, 11 Nov 2010 09:37:41 +0900
+
+syspopup (0.0.17) unstable; urgency=low
+
+ * Modify DB create procedure(updated)
+ * Git: 165.213.180.234:/git/slp/pkgs/syspopup
+ * Tag: syspopup_0.0.17
+
+ -- Noha Park <noha.park@samsung.com> Wed, 10 Nov 2010 15:23:36 +0900
+
+syspopup (0.0.16) unstable; urgency=low
+
+ * Modify DB create procedure(updated)
+ * Git: 165.213.180.234:/git/slp/pkgs/syspopup
+ * Tag: syspopup_0.0.16
+
+ -- Noha Park <noha.park@samsung.com> Wed, 10 Nov 2010 14:32:11 +0900
+
+syspopup (0.0.15) unstable; urgency=low
+
+ * Modify DB create procedure
+ * Git: 165.213.180.234:/git/slp/pkgs/syspopup
+ * Tag: syspopup_0.0.15
+
+ -- Noha Park <noha.park@samsung.com> Wed, 10 Nov 2010 11:31:47 +0900
+
+syspopup (0.0.14) unstable; urgency=low
+
+ * Modify Syspopup API name
+ * Git: 165.213.180.234:/git/slp/pkgs/syspopup
+ * Tag: syspopup_0.0.14
+
+ -- Noha Park <noha.park@samsung.com> Tue, 09 Nov 2010 10:18:47 +0900
+
+syspopup (0.0.13) unstable; urgency=low
+
+ * Modify Syspopup create procedure
+ * Git: 165.213.180.234:/git/slp/pkgs/syspopup
+ * Tag: syspopup_0.0.13
+
+ -- Noha Park <noha.park@samsung.com> Mon, 08 Nov 2010 12:18:06 +0900
+
+syspopup (0.0.12) unstable; urgency=low
+
+ * Modify Syspopup create procedure
+ * Git: 165.213.180.234:/git/slp/pkgs/syspopup
+ * Tag: syspopup_0.0.12
+
+ -- Noha Park <noha.park@samsung.com> Mon, 08 Nov 2010 11:16:33 +0900
+
+syspopup (0.0.11) unstable; urgency=low
+
+ * Modify Syspopup Caller
+ * Git: 165.213.180.234:/git/slp/pkgs/syspopup
+ * Tag: syspopup_0.0.11
+
+ -- Noha Park <noha.park@samsung.com> Thu, 04 Nov 2010 11:54:31 +0900
+
+syspopup (0.0.10) unstable; urgency=low
+
+ * Modify e17
+ * Git: 165.213.180.234:/git/slp/pkgs/syspopup
+ * Tag: syspopup_0.0.10
+
+ -- Noha Park <noha.park@samsung.com> Thu, 04 Nov 2010 10:18:19 +0900
+
+syspopup (0.0.9) unstable; urgency=low
+
+ * add endkey handler
+ * Git: 165.213.180.234:/git/slp/pkgs/syspopup
+ * Tag: syspopup_0.0.9
+
+ -- Noha Park <noha.park@samsung.com> Tue, 02 Nov 2010 16:07:30 +0900
+
+syspopup (0.0.8) unstable; urgency=low
+
+ * modify syspopup parent window
+ * Git: 165.213.180.234:/git/slp/pkgs/syspopup
+ * Tag: syspopup_0.0.8
+
+ -- Noha Park <noha.park@samsung.com> Fri, 15 Oct 2010 11:01:33 +0900
+
+syspopup (0.0.7) unstable; urgency=low
+
+ * modify quickpanel insert procedure
+ * Git: 165.213.180.234:/git/slp/pkgs/syspopup
+ * Tag: syspopup_0.0.7
+
+ -- Noha Park <noha.park@samsung.com> Thu, 14 Oct 2010 19:14:33 +0900
+
+syspopup (0.0.6) unstable; urgency=low
+
+ * modify user callback function
+ * Git: 165.213.180.234:/git/slp/pkgs/syspopup
+ * Tag: syspopup_0.0.6
+
+ -- Kunhoon Baik <knhoon.baik@samsung.com> Thu, 14 Oct 2010 17:48:52 +0900
+
+syspopup (0.0.5) unstable; urgency=low
+
+ * build fail fix
+
+ -- Kunhoon Baik <knhoon.baik@samsung.com> Wed, 13 Oct 2010 17:49:08 +0900
+
+syspopup (0.0.3) unstable; urgency=low
+
+ * add doxygen and change maintainer
+
+ -- Kunhoon Baik <knhoon.baik@samsung.com> Wed, 13 Oct 2010 16:35:43 +0900
+
+syspopup (0.0.2) unstable; urgency=low
+
+ * modify dpkg
+
+ -- Kunhoon Baik <knhoon.baik@samsung.com> Tue, 12 Oct 2010 13:14:35 +0900
+
+syspopup (0.0.1) unstable; urgency=low
+
+ * initial update
+
+ -- Kunhoon Baik <knhoon.baik@samsung.com> Tue, 27 Jul 2010 15:51:31 +0900
diff --git a/debian/control b/debian/control
index f262cdd..db77e9c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: syspopup
Section: devel
Priority: extra
Maintainer: Jayoun Lee <airjany@samsung.com>, Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
-Build-Depends: debhelper (>= 5), libdbus-glib-1-dev, libsqlite3-dev, libx11-dev, libecore-dev, libbundle-dev, dlog-dev, libslp-utilx-dev, libheynoti-dev, sqlite3, libaul-1-dev, libevas-dev, libappcore-efl-dev
+Build-Depends: debhelper (>= 5), libdbus-glib-1-dev, libsqlite3-dev, libx11-dev, libecore-dev, libbundle-dev, dlog-dev, libslp-utilx-dev, sqlite3, libaul-1-dev, libevas-dev, libappcore-efl-dev, libdbus-glib-1-dev
Standards-Version: 0.1.0
Package: syspopup-caller-0
@@ -14,7 +14,7 @@ Description: syspopup-caller package
Package: syspopup-caller-dev
Section: libs
Architecture: any
-Depends: syspopup-caller-0 (= ${Source-Version}), libdbus-glib-1-dev, libsqlite3-dev, libbundle-dev, dlog-dev, libheynoti-dev, libaul-1-dev
+Depends: syspopup-caller-0 (= ${Source-Version}), libdbus-glib-1-dev, libsqlite3-dev, libbundle-dev, dlog-dev, libaul-1-dev
Description: syspopup-caller dev package
Package: syspopup-caller-dbg
@@ -32,7 +32,7 @@ Description: syspopup package
Package: syspopup-dev
Section: libs
Architecture: any
-Depends: syspopup-0 (= ${Source-Version}), libdbus-glib-1-dev, libsqlite3-dev, libbundle-dev, dlog-dev, libheynoti-dev, sqlite3, libslp-utilx-dev, libx11-dev, libecore-dev, libevas-dev, libappcore-efl-dev
+Depends: syspopup-0 (= ${Source-Version}), libdbus-glib-1-dev, libsqlite3-dev, libbundle-dev, dlog-dev, sqlite3, libslp-utilx-dev, libx11-dev, libecore-dev, libevas-dev, libappcore-efl-dev
Description: syspopup dev package
Package: syspopup-dbg
diff --git a/debian/syspopup-0.install.in b/debian/syspopup-0.install.in
index 300e948..8f8964b 100644
--- a/debian/syspopup-0.install.in
+++ b/debian/syspopup-0.install.in
@@ -2,4 +2,3 @@
@PREFIX@/bin/*
usr/share/popup_noti_term
@PREFIX@/share/*
-/opt/share/*
diff --git a/debian/syspopup-0.postinst b/debian/syspopup-0.postinst
index ac719d7..ccece2d 100644
--- a/debian/syspopup-0.postinst
+++ b/debian/syspopup-0.postinst
@@ -1,7 +1,6 @@
#!/bin/sh
mkdir -p /opt/dbspace/
-sqlite3 /opt/dbspace/.syspopup.db < /opt/share/syspopup_db.sql
-rm -rf /opt/share/syspopup_db.sql
+sqlite3 /opt/dbspace/.syspopup.db < /usr/share/syspopup/syspopup_db.sql
if [ ${USER} = "root" ]
then
diff --git a/include/simple_util.h b/include/simple_util.h
index 0c24ee0..684a56d 100755
--- a/include/simple_util.h
+++ b/include/simple_util.h
@@ -33,8 +33,12 @@
#define MAX_LOCAL_BUFSZ 128
-#define _E(fmt, arg...) LOGE("[%s,%d] "fmt , __FUNCTION__, __LINE__, ##arg)
-#define _D(fmt, arg...) LOGD("[%s,%d] "fmt , __FUNCTION__, __LINE__, ##arg)
+#define _E(fmt, arg...) LOGE(fmt,##arg)
+#define _D(fmt, arg...) LOGD(fmt,##arg)
+
+#define SYSPOPUP_DBUS_PATH "/syspopup/dbus_handler"
+#define SYSPOPUP_DBUS_SIGNAL_INTERFACE "org.tizen.syspopup.signal"
+#define SYSPOPUP_DBUS_SP_TERM_SIGNAL "syspopup_term"
#endif
diff --git a/include/syspopup_caller.h b/include/syspopup_caller.h
index c534707..e00d5d2 100755
--- a/include/syspopup_caller.h
+++ b/include/syspopup_caller.h
@@ -25,7 +25,6 @@
#define __SYSPOPUP_CALLER_H__
#include <bundle.h>
-#include <aul.h>
#ifdef __cplusplus
extern "C" {
diff --git a/packaging/syspopup.spec b/packaging/syspopup.spec
index f3f3460..1ffa57c 100644..100755
--- a/packaging/syspopup.spec
+++ b/packaging/syspopup.spec
@@ -1,10 +1,10 @@
Name: syspopup
Summary: syspopup package
-Version: 0.0.58
+Version: 0.0.86
Release: 1
-Group: TO_BE/FILLED_IN
-License: TO_BE/FILLED_IN
+Group: System/Libraries
+License: Apache License, Version 2.0
Source0: syspopup-%{version}.tar.gz
Requires(post): /sbin/ldconfig
Requires(post): /bin/touch
@@ -16,10 +16,8 @@ BuildRequires: pkgconfig(dlog)
BuildRequires: pkgconfig(utilX)
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(x11)
-BuildRequires: pkgconfig(heynoti)
BuildRequires: pkgconfig(aul)
BuildRequires: pkgconfig(evas)
-BuildRequires: pkgconfig(quickpanel)
BuildRequires: pkgconfig(appcore-efl)
@@ -57,10 +55,8 @@ syspopup-caller development package for popup
%prep
%setup -q -n %{name}-%{version}
-CFLAGS=${_cflags} cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DEXTRA_CFLAGS=-fPIC
-
%build
-
+CFLAGS=${_cflags} cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DEXTRA_CFLAGS=-fPIC
make %{?jobs:-j%jobs}
@@ -72,38 +68,29 @@ mkdir -p %{buildroot}/opt/dbspace
#sqlite3 $(CURDIR)/debian/tmp/opt/dbspace/.syspopup.db < $(CURDIR)/data/syspopup_db.sql
touch %{buildroot}%{_datadir}/popup_noti_term
-
-
%post
/sbin/ldconfig
mkdir -p /opt/dbspace/
-sqlite3 /opt/dbspace/.syspopup.db < /opt/share/syspopup_db.sql
-rm -rf /opt/share/syspopup_db.sql
+sqlite3 /opt/dbspace/.syspopup.db < /usr/share/syspopup/syspopup_db.sql
%postun -p /sbin/ldconfig
-
-
-
%post caller -p /sbin/ldconfig
%postun caller -p /sbin/ldconfig
-
-
-
%files
+%manifest syspopup.manifest
%defattr(-,root,root,-)
%{_datadir}/icons/default/small/org.tizen.syspopup-app.png
%{_bindir}/sp_test
%{_bindir}/syspopup-app
%{_libdir}/libsyspopup.so.0.1.0
-/opt/share/syspopup_db.sql
-/opt/share/applications/org.tizen.syspopup-app.desktop
+/usr/share/syspopup/syspopup_db.sql
+/usr/share/packages/org.tizen.syspopup-app.xml
%{_datadir}/popup_noti_term
-
%files devel
%defattr(-,root,root,-)
%{_includedir}/SLP_SYSPOPUP_PG.h
@@ -112,6 +99,7 @@ rm -rf /opt/share/syspopup_db.sql
%{_libdir}/pkgconfig/syspopup.pc
%files caller
+%manifest syspopup-caller.manifest
%defattr(-,root,root,-)
%{_libdir}/libsyspopup_caller.so.0.1.0
diff --git a/src/syspopup_core.c b/src/syspopup_core.c
index 2e05e3c..262bc95 100755
--- a/src/syspopup_core.c
+++ b/src/syspopup_core.c
@@ -20,11 +20,12 @@
*
*/
-
+#include <stdio.h>
#include <glib.h>
-#include <heynoti.h>
#include <stdlib.h>
#include <string.h>
+#include <dbus/dbus.h>
+#include <dbus/dbus-glib-lowlevel.h>
#include "syspopup_core.h"
#include "simple_util.h"
@@ -33,6 +34,7 @@
static syspopup *syspopup_head = NULL;
static int initialized = 0;
+static DBusConnection *bus;
static int noti_fd = -1;
static int sp_id = 0;
@@ -118,31 +120,75 @@ void _syspopup_del(int id)
}
}
+
+static DBusHandlerResult
+__sys_popup_dbus_signal_filter(DBusConnection *conn, DBusMessage *message,
+ void *user_data)
+{
+ const char *sender;
+ const char *interface;
+ int dead_pid;
+
+ DBusError error;
+ dbus_error_init(&error);
+
+ interface = dbus_message_get_interface(message);
+ if (interface == NULL) {
+ _E("reject by security issue - no interface\n");
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ }
+
+ if (dbus_message_is_signal(message, interface,
+ SYSPOPUP_DBUS_SP_TERM_SIGNAL)) {
+ if (_term_handler)
+ _term_handler(NULL);
+
+ _D("term handler has been called");
+ }
+
+ return DBUS_HANDLER_RESULT_HANDLED;
+}
+
+
+
int _syspopup_init(void (*term_handler) (void *),
gboolean(*timeout_handler) (void *))
{
+ DBusError error;
+ char rule[MAX_LOCAL_BUFSZ];
+
if (initialized)
return 0;
_term_handler = term_handler;
_timeout_handler = timeout_handler;
- noti_fd = heynoti_init();
- if (noti_fd < 0) {
- _E("heynoti add failed\n");
+ dbus_error_init(&error);
+ bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error);
+ if (!bus) {
+ _E("Failed to connect to the D-BUS daemon: %s", error.message);
+ dbus_error_free(&error);
return -1;
}
-
- if (heynoti_subscribe_file(noti_fd, SYSPOPUP_TERM_NOTI_PATH,
- _term_handler, NULL,
- IN_CLOSE_WRITE | IN_DELETE_SELF) < 0) {
- _E("heynoti subscribe file failed");
+ dbus_connection_setup_with_g_main(bus, NULL);
+
+ snprintf(rule, MAX_LOCAL_BUFSZ,
+ "path='%s',type='signal',interface='%s'", SYSPOPUP_DBUS_PATH,
+ SYSPOPUP_DBUS_SIGNAL_INTERFACE);
+ /* listening to messages */
+ dbus_bus_add_match(bus, rule, &error);
+ if (dbus_error_is_set(&error)) {
+ _E("Fail to rule set: %s", error.message);
+ dbus_error_free(&error);
return -1;
- } else {
- if (heynoti_attach_handler(noti_fd) < 0)
- _E("heynoti attach failed");
}
+ if (dbus_connection_add_filter(bus,
+ __sys_popup_dbus_signal_filter, NULL, NULL) == FALSE)
+ return -1;
+
+ _D("syspopup signal initialized");
+
initialized = 1;
return 0;
}
diff --git a/syspopup-app/CMakeLists.txt b/syspopup-app/CMakeLists.txt
index c2ca450..821aeaa 100644
--- a/syspopup-app/CMakeLists.txt
+++ b/syspopup-app/CMakeLists.txt
@@ -54,9 +54,9 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} syspopup ${syspopup_app_pkgs_LDFLAGS})
INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
-# install desktop file & icon
-CONFIGURE_FILE(${PKGNAME}.desktop.in ${CMAKE_BINARY_DIR}/${PKGNAME}.desktop)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/${PKGNAME}.desktop DESTINATION /opt/share/applications)
+# install manifest file & icon
+CONFIGURE_FILE(${PKGNAME}.xml.in ${CMAKE_BINARY_DIR}/${PKGNAME}.xml)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/${PKGNAME}.xml DESTINATION /usr/share/packages)
INSTALL(FILES ${CMAKE_SOURCE_DIR}/syspopup-app/${PKGNAME}.png DESTINATION share/icons/default/small)
# i18n
diff --git a/syspopup-app/org.tizen.syspopup-app.xml.in b/syspopup-app/org.tizen.syspopup-app.xml.in
new file mode 100755
index 0000000..c248501
--- /dev/null
+++ b/syspopup-app/org.tizen.syspopup-app.xml.in
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns="http://tizen.org/ns/packages" package="org.tizen.syspopup-app" version="0.1.0-0" install-location="internal-only">
+ <label>syspopup-app</label>
+ <author email="sewook7.park@samsung.com" href="www.samsung.com">Sewook Park</author>
+ <description>syspopup-app</description>
+ <ui-application appid="org.tizen.syspopup-app" exec="/usr/bin/syspopup-app" nodisplay="true" multiple="false" type="capp" taskmanage="false">
+ <label>syspopup-app</label>
+ <icon> </icon>
+ </ui-application>
+</manifest>
diff --git a/syspopup-app/syspopup-app.c b/syspopup-app/syspopup-app.c
index 8c6d143..d8e434f 100755
--- a/syspopup-app/syspopup-app.c
+++ b/syspopup-app/syspopup-app.c
@@ -119,6 +119,39 @@ static void __win_del(void *data, Evas_Object * obj, void *event)
elm_exit();
}
+/*
+static int rotate(enum appcore_rm m, void *data)
+{
+ struct appdata *ad = data;
+ int r;
+
+ if (ad == NULL || ad->win == NULL)
+ return 0;
+
+ switch(m) {
+ case APPCORE_RM_PORTRAIT_NORMAL:
+ r = 0;
+ break;
+ case APPCORE_RM_PORTRAIT_REVERSE:
+ r = 180;
+ break;
+ case APPCORE_RM_LANDSCAPE_NORMAL:
+ r = 270;
+ break;
+ case APPCORE_RM_LANDSCAPE_REVERSE:
+ r = 90;
+ break;
+ default:
+ r = -1;
+ break;
+ }
+
+ if (r >= 0)
+ elm_win_rotation_with_resize_set(ad->win, r);
+
+ return 0;
+}
+*/
static Evas_Object *__create_win(const char *name)
{
@@ -161,6 +194,8 @@ static int __app_create(void *data)
if (r)
return -1;
+ /* appcore_set_rotation_cb(rotate, ad);*/
+
appcore_measure_start();
return 0;
}
@@ -203,6 +238,11 @@ static void __response_cb(void *data, Evas_Object * obj, void *event_info)
elm_exit();
}
+static void _block_clicked_cb(void *data, Evas_Object *obj, void *event_info)
+{
+ evas_object_del(obj);
+}
+
static int __app_reset(bundle *b, void *data)
{
struct appdata *ad = data;
@@ -223,9 +263,6 @@ static int __app_reset(bundle *b, void *data)
evas_object_show(ad->win);
if (ret == 0) {
- val = bundle_get_val(b,
- "_INTERNAL_SYSPOPUP_NAME_");
-
val = bundle_get_val(b, "_SYSPOPUP_TITLE_");
if (val) {
snprintf(ad->title, TITLE_BUF_LEN, "%s",
@@ -248,9 +285,9 @@ static int __app_reset(bundle *b, void *data)
evas_object_size_hint_weight_set(popup,
EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
- elm_popup_mode_set(popup, ELM_POPUP_TYPE_ALERT);
- elm_popup_title_label_set(popup, ad->title);
- elm_popup_desc_set(popup, ad->content);
+ evas_object_smart_callback_add(popup, "block,clicked", _block_clicked_cb, NULL);
+ elm_object_part_text_set(popup, "title,text", ad->title);
+ elm_object_text_set(popup, ad->content);
evas_object_smart_callback_add(popup,
"response",
__response_cb,
diff --git a/syspopup-caller.manifest b/syspopup-caller.manifest
new file mode 100644
index 0000000..97e8c31
--- /dev/null
+++ b/syspopup-caller.manifest
@@ -0,0 +1,5 @@
+<manifest>
+ <request>
+ <domain name="_"/>
+ </request>
+</manifest>
diff --git a/syspopup-caller/CMakeLists.txt b/syspopup-caller/CMakeLists.txt
index 81dee16..47ffb1d 100644
--- a/syspopup-caller/CMakeLists.txt
+++ b/syspopup-caller/CMakeLists.txt
@@ -20,7 +20,7 @@ MESSAGE("Build type: ${CMAKE_BUILD_TYPE}")
# Set required packages
INCLUDE(FindPkgConfig)
-pkg_check_modules(spcpkgs REQUIRED dlog bundle sqlite3 glib-2.0 heynoti aul)
+pkg_check_modules(spcpkgs REQUIRED dlog bundle sqlite3 glib-2.0 aul dbus-glib-1)
FOREACH(flag ${spcpkgs_CFLAGS})
SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
diff --git a/syspopup-caller/syspopup_caller.c b/syspopup-caller/syspopup_caller.c
index 56c6d13..c5eca62 100755
--- a/syspopup-caller/syspopup_caller.c
+++ b/syspopup-caller/syspopup_caller.c
@@ -24,6 +24,8 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
+#include <glib.h>
+#include <dbus/dbus.h>
#include <aul.h>
#include "syspopup_core.h"
@@ -45,7 +47,7 @@ API int syspopup_launch(char *popup_name, bundle *b)
info = _syspopup_info_get(popup_name);
if (info == NULL || info->pkgname == NULL) {
_E("info or info->pkgname is NULL");
- if(info)
+ if (info)
_syspopup_info_free(info);
return -1;
}
@@ -81,9 +83,34 @@ API int syspopup_launch(char *popup_name, bundle *b)
API int syspopup_destroy_all()
{
- int fd;
- fd = open(SYSPOPUP_TERM_NOTI_PATH, O_CREAT | O_TRUNC | O_RDWR, 0644);
- close(fd);
+ DBusMessage *message;
+ DBusError error;
+ DBusConnection *bus = NULL;
+
+ dbus_error_init(&error);
+ bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error);
+ if (bus == NULL) {
+ _E("Failed to connect to the D-BUS daemon: %s", error.message);
+ dbus_error_free(&error);
+ return -1;
+ }
+
+ message = dbus_message_new_signal(SYSPOPUP_DBUS_PATH,
+ SYSPOPUP_DBUS_SIGNAL_INTERFACE,
+ SYSPOPUP_DBUS_SP_TERM_SIGNAL);
+
+ if (dbus_connection_send(bus, message, NULL) == FALSE) {
+ _E("dbus send error");
+ return -1;
+ }
+
+ dbus_connection_flush(bus);
+ dbus_message_unref(message);
+
+ dbus_connection_close(bus);
+
+ _D("send signal done\n");
+
return 0;
}
diff --git a/syspopup.manifest b/syspopup.manifest
new file mode 100644
index 0000000..de64036
--- /dev/null
+++ b/syspopup.manifest
@@ -0,0 +1,15 @@
+<manifest>
+ <define>
+ <domain name="syspopup"/>
+ <provide>
+ <label name="syspopup::db"/>
+ </provide>
+ </define>
+ <request>
+ <domain name="syspopup"/>
+ </request>
+ <assign>
+ <filesystem path="/usr/lib/libsyspopup.so.0" label="_"/>
+ <filesystem path="/usr/lib/libsyspopup.so.0.1.0" label="_"/>
+ </assign>
+</manifest>
diff --git a/syspopup/CMakeLists.txt b/syspopup/CMakeLists.txt
index f2fe86c..72a0929 100644
--- a/syspopup/CMakeLists.txt
+++ b/syspopup/CMakeLists.txt
@@ -20,7 +20,7 @@ MESSAGE("Build type: ${CMAKE_BUILD_TYPE}")
# Set required packages
INCLUDE(FindPkgConfig)
-pkg_check_modules(sppkgs REQUIRED dlog bundle sqlite3 glib-2.0 heynoti evas elementary utilX ecore-x x11 ecore ecore-input)
+pkg_check_modules(sppkgs REQUIRED dlog bundle sqlite3 glib-2.0 evas elementary utilX ecore-x x11 ecore ecore-input dbus-glib-1)
FOREACH(flag ${sppkgs_CFLAGS})
SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
diff --git a/syspopup/syspopup.pc.in b/syspopup/syspopup.pc.in
index 47a35ef..8d5f38a 100644
--- a/syspopup/syspopup.pc.in
+++ b/syspopup/syspopup.pc.in
@@ -8,6 +8,6 @@ includedir=@INCLUDEDIR@
Name: libsyspopup
Description: system popup library for ui
Version: @VERSION@
-Requires: dlog bundle sqlite3 glib-2.0 heynoti elementary utilX ecore-x
+Requires: dlog bundle sqlite3 glib-2.0 elementary utilX ecore-x dbus-glib-1
Libs: -L${libdir} -lsyspopup
Cflags: -I${includedir}
diff --git a/test/test.c b/test/test.c
index b41704a..ea23627 100755
--- a/test/test.c
+++ b/test/test.c
@@ -20,6 +20,7 @@
*
*/
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "syspopup_caller.h"
@@ -34,6 +35,7 @@ int main(int argc, char **argv)
{
bundle *b;
int i;
+ int ret = 0;
if (argc < 2) {
usage();
@@ -49,10 +51,13 @@ int main(int argc, char **argv)
b = bundle_create();
for (i = 3; i < argc; i = i + 2)
bundle_add(b, argv[i], argv[i + 1]);
- syspopup_launch(argv[2], b);
+ ret = syspopup_launch(argv[2], b);
bundle_free(b);
+ if(ret < 0) return -1;
+
} else if (strcmp(argv[1], "destroy") == 0) {
- syspopup_destroy_all();
+ ret = syspopup_destroy_all();
+ if(ret < 0) return -1;
} else {
usage();
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-13 01:14:57 +0000