summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaxerba <maiurana@gmail.com>2014-03-28 21:19:19 +0100
committermaxerba <maiurana@gmail.com>2014-03-28 21:19:19 +0100
commit622dd495a1fb0ed880e842483f2270222042758d (patch)
tree8254d85978390a6fe4c04f0590c3fed7ce2a7fa9
parent38f23531b2e77f630fd7a05d04a740e1175d1541 (diff)
Updated to build with e19. For older versions of E checkout the enlightenment-0.18 branch.
-rw-r--r--src/e_mod_configure.c5
-rw-r--r--src/e_mod_net.c4
2 files changed, 4 insertions, 5 deletions
diff --git a/src/e_mod_configure.c b/src/e_mod_configure.c
index 059b62a..abbe361 100644
--- a/src/e_mod_configure.c
+++ b/src/e_mod_configure.c
@@ -25,7 +25,7 @@ _configure_net_module(void *data)
25{ 25{
26 E_Config_Dialog *cfd; 26 E_Config_Dialog *cfd;
27 E_Config_Dialog_View *v; 27 E_Config_Dialog_View *v;
28 E_Container *con; 28 E_Comp *comp;
29 Config_Item *ci; 29 Config_Item *ci;
30 char buf[PATH_MAX]; 30 char buf[PATH_MAX];
31 31
@@ -40,8 +40,7 @@ _configure_net_module(void *data)
40 40
41 snprintf(buf, sizeof(buf), "%s/e-module-net.edj", 41 snprintf(buf, sizeof(buf), "%s/e-module-net.edj",
42 e_module_dir_get(net_cfg->mod)); 42 e_module_dir_get(net_cfg->mod));
43 con = e_container_current_get(e_manager_current_get()); 43 cfd = e_config_dialog_new(NULL, D_("Net Module Settings"), "Net",
44 cfd = e_config_dialog_new(con, D_("Net Module Settings"), "Net",
45 "_e_modules_netmod_config_dialog", buf, 0, v, ci); 44 "_e_modules_netmod_config_dialog", buf, 0, v, ci);
46 net_cfg->cfd = cfd; 45 net_cfg->cfd = cfd;
47} 46}
diff --git a/src/e_mod_net.c b/src/e_mod_net.c
index f50978a..318c996 100644
--- a/src/e_mod_net.c
+++ b/src/e_mod_net.c
@@ -185,10 +185,10 @@ _net_cb_mouse_in(void *data, Evas_Object *obj, const char *emission, const char
185 if (inst->popup) return; 185 if (inst->popup) return;
186 if (!inst->ci->show_popup) return; 186 if (!inst->ci->show_popup) return;
187 187
188 inst->popup = e_gadcon_popup_new(inst->gcc); 188 inst->popup = e_gadcon_popup_new(inst->gcc, EINA_FALSE);
189 snprintf(buf, sizeof(buf), "%s/net.edj", e_module_dir_get(net_cfg->mod)); 189 snprintf(buf, sizeof(buf), "%s/net.edj", e_module_dir_get(net_cfg->mod));
190 190
191 bg = edje_object_add(inst->popup->win->evas); 191 bg = edje_object_add(e_comp_get(inst->popup)->evas);
192 if (!e_theme_edje_object_set(bg, "base/theme/modules", 192 if (!e_theme_edje_object_set(bg, "base/theme/modules",
193 "modules/net/popup")) 193 "modules/net/popup"))
194 edje_object_file_set(bg, buf, "modules/net/popup"); 194 edje_object_file_set(bg, buf, "modules/net/popup");