Remove syspopup

Tizen 3 should use a popup system that is not depends on a graphical toolkit

Bug-Tizen: TC-1476

Change-Id: I080d54d967f7e7a5f6508dfb461eaefde68f3644
Signed-off-by: Christophe Moreau <christophe.moreau@open.eurogiciel.org>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 061d6fa..2bdc82c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,6 @@ PKG_CHECK_MODULES(pkgs REQUIRED
        vconf
        wifi-direct
        tapi
-       syspopup-caller
        libsystemd-daemon)
 
 FOREACH(flag ${pkgs_CFLAGS})

diff --git a/packaging/net-config.spec b/packaging/net-config.spec
index 7f5a2ff..a3a97b9 100644 (file)
--- a/packaging/net-config.spec
+++ b/packaging/net-config.spec
@@ -14,7 +14,6 @@ BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(wifi-direct)
 BuildRequires:  pkgconfig(tapi)
-BuildRequires:  pkgconfig(syspopup-caller)
 Requires(post): /usr/bin/vconftool
 BuildRequires:    pkgconfig(libsystemd-daemon)
 %{?systemd_requires}

diff --git a/src/network-state.c b/src/network-state.c
index ff5c701..d890e1d 100644 (file)
--- a/src/network-state.c
+++ b/src/network-state.c
@@ -19,7 +19,6 @@
 
 #include <vconf.h>
 #include <vconf-keys.h>
-#include <aul.h>
 
 #include "wifi.h"
 #include "log.h"
@@ -151,23 +150,15 @@ static struct netconfig_default_connection
 static void __netconfig_pop_3g_alert_syspoppup(void)
 {
        int rv = 0;
-       bundle *b = NULL;
        int wifi_ug_state = 0;
 
        vconf_get_int(VCONFKEY_WIFI_UG_RUN_STATE, &wifi_ug_state);
        if (wifi_ug_state == VCONFKEY_WIFI_UG_RUN_STATE_ON_FOREGROUND)
                return;
 
-       b = bundle_create();
-
-       bundle_add(b, "_SYSPOPUP_TITLE_", "Cellular connection popup");
-       bundle_add(b, "_SYSPOPUP_TYPE_", "notification");
-       bundle_add(b, "_SYSPOPUP_CONTENT_", "connected");
-
        DBG("Launch 3G alert network popup");
-       rv = aul_launch_app("org.tizen.net-popup", b);
+       // TODO : display a popup
 
-       bundle_free(b);
 }
 
 static gboolean __netconfig_is_connected(const char *profile)

diff --git a/src/utils/util.c b/src/utils/util.c
index 001cdb6..02ee0c2 100644 (file)
--- a/src/utils/util.c
+++ b/src/utils/util.c
@@ -27,8 +27,6 @@
 #include <vconf.h>
 #include <vconf-keys.h>
 #include <wifi-direct.h>
-#include <syspopup_caller.h>
-#include <aul.h>
 
 #include "log.h"
 #include "util.h"
@@ -180,19 +178,15 @@ static gboolean __netconfig_test_device_picker()
 static void __netconfig_pop_device_picker(void)
 {
        int rv = 0;
-       bundle *b = NULL;
        int wifi_ug_state = 0;
 
        vconf_get_int(VCONFKEY_WIFI_UG_RUN_STATE, &wifi_ug_state);
        if (wifi_ug_state == VCONFKEY_WIFI_UG_RUN_STATE_ON_FOREGROUND)
                return;
 
-       b = bundle_create();
-
        DBG("Launch Wi-Fi device picker");
-       rv = syspopup_launch("wifi-qs", b);
+       // TODO : display a popup
 
-       bundle_free(b);
 }
 
 static gboolean __netconfig_wifi_try_device_picker(gpointer data)
@@ -361,36 +355,12 @@ gboolean netconfig_iface_wifi_launch_direct(NetconfigWifi *wifi, GError **error)
 
 void netconfig_add_wifi_found_notification(void)
 {
-       int ret;
-       bundle *b = bundle_create();
-
-       bundle_add(b, "_SYSPOPUP_TYPE_", "add_found_ap_noti");
-
-       ret = aul_launch_app("org.tizen.net-popup", b);
-
-       bundle_free(b);
-
-       if (ret >= 0)
-               DBG("Successfully added notification");
-       else
-               ERR("Unable to launch noti-popup. Err = %d", ret);
+       INFO("Add wifi found notification");
 }
 
 void netconfig_del_wifi_found_notification(void)
 {
-       int ret;
-       bundle *b = bundle_create();
-
-       bundle_add(b, "_SYSPOPUP_TYPE_", "del_found_ap_noti");
-
-       ret = aul_launch_app("org.tizen.net-popup", b);
-
-       bundle_free(b);
-
-       if (ret >= 0)
-               DBG("Successfully deleted notification");
-       else
-               ERR("Unable to launch noti-popup. Err = %d", ret);
+       INFO("Delete wifi found notification");
 }