styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

connman wizard page now always shows, but changes text and disables default conf connman gadget if connman support disabled 

SVN revision: 79697
This commit is contained in:
Mike Blumenkrantz 2012-11-26 11:30:16 +00:00
parent ec20c1f9c5
commit 4c10701ee3
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/Makefile_wizard.am
View File

@ -30,6 +30,7 @@ wizardpkg_LTLIBRARIES = wizard/module.la \
wizard/page_080.la \
wizard/page_090.la \
wizard/page_100.la \
wizard/page_110.la \
wizard/page_120.la \
wizard/page_130.la \
wizard/page_140.la \
@ -38,10 +39,6 @@ wizardpkg_LTLIBRARIES = wizard/module.la \
wizard/page_170.la \
wizard/page_200.la
if USE_MODULE_CONNMAN
wizardpkg_LTLIBRARIES += wizard/page_110.la
endif
wizard_module_la_SOURCES = wizard/e_mod_main.h \
wizard/e_mod_main.c \
wizard/e_wizard.c \
@ -71,8 +68,8 @@ wizard_page_090_la_SOURCES = wizard/page_090.c
wizard_page_100_la_SOURCES = wizard/page_100.c
if USE_MODULE_CONNMAN
wizard_page_110_la_SOURCES = wizard/page_110.c
if USE_MODULE_CONNMAN
wizard_page_110_la_LIBADD = @ECONNMAN_LIBS@
endif

12
src/modules/wizard/page_110.c
View File

@ -13,11 +13,19 @@ _recommend_connman(E_Wizard_Page *pg)
o = e_widget_list_add(pg->evas, 1, 0);
e_wizard_title_set(_("Network Management"));
#ifdef HAVE_ECONNMAN
of = e_widget_framelist_add(pg->evas,
_("Connman network service not found"), 0);
ob = e_widget_label_add
(pg->evas, _("Install Connman for network management support"));
#else
of = e_widget_framelist_add(pg->evas,
_("Connman support disabled"), 0);
ob = e_widget_label_add
(pg->evas, _("Install/Enable Connman for network management support"));
#endif
e_widget_framelist_object_append(of, ob);
evas_object_show(ob);
@ -105,12 +113,12 @@ EAPI int
wizard_page_show(E_Wizard_Page *pg)
{
int have_connman = 0;
#ifdef HAVE_ECONNMAN
E_DBus_Connection *c;
c = e_dbus_bus_get(DBUS_BUS_SYSTEM);
if (c)
{
#ifdef HAVE_ECONNMAN
if (pending_connman)
dbus_pending_call_cancel(pending_connman);
@ -124,8 +132,8 @@ wizard_page_show(E_Wizard_Page *pg)
have_connman = 1;
e_wizard_button_next_enable_set(0);
}
#endif
}
#endif
if (!have_connman)
{
E_Config_Module *em;