E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_border.c e_configure.c e_eap_editor.c e_fm.c e_int_border_menu.c e_int_menus.c e_module.c e_slidecore.c e_utils.c e_utils.h Log Message: fix against efreet API breakage === RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v retrieving revision 1.654 retrieving revision 1.655 diff -u -3 -r1.654 -r1.655 --- e_border.c 11 Aug 2008 01:22:33 - 1.654 +++ e_border.c 14 Aug 2008 20:49:36 - 1.655 @@ -2798,7 +2798,7 @@ { if ((bd->desktop) && (bd->icon_preference != E_ICON_PREF_NETWM)) { -o = e_util_desktop_icon_add(bd->desktop, "24x24", evas); +o = e_util_desktop_icon_add(bd->desktop, 24, evas); if (o) return o; } === RCS file: /cvs/e/e17/apps/e/src/bin/e_configure.c,v retrieving revision 1.120 retrieving revision 1.121 diff -u -3 -r1.120 -r1.121 --- e_configure.c 19 Jun 2008 11:56:54 - 1.120 +++ e_configure.c 14 Aug 2008 20:49:36 - 1.121 @@ -103,7 +103,7 @@ cfg_cat_icon = strdup(cfg_cat_icon); else cfg_cat_icon = efreet_icon_path_find(e_config->icon_theme, -cfg_cat_icon, "64x64"); +cfg_cat_icon, 64); } } if (desktop->icon) @@ -112,7 +112,7 @@ cfg_icon = strdup(desktop->icon); else cfg_icon = efreet_icon_path_find(e_config->icon_theme, - desktop->icon, "64x64"); + desktop->icon, 64); } if (desktop->name) label = desktop->name; else if (desktop->generic_name) label = desktop->generic_name; === RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v retrieving revision 1.97 retrieving revision 1.98 diff -u -3 -r1.97 -r1.98 --- e_eap_editor.c 18 Jul 2008 10:05:25 - 1.97 +++ e_eap_editor.c 14 Aug 2008 20:49:36 - 1.98 @@ -567,7 +567,7 @@ if (ecore_file_exists(cfdata->icon)) icon_path = strdup(cfdata->icon); else - icon_path = efreet_icon_path_find(e_config->icon_theme, cfdata->icon, "scalable"); + icon_path = efreet_icon_path_find(e_config->icon_theme, cfdata->icon, 64); if (icon_path) { @@ -721,7 +721,7 @@ Evas_Object *o; if (!cfdata->editor->img_widget) return; - o = e_util_icon_theme_icon_add(cfdata->icon, "32x32", cfdata->editor->evas); + o = e_util_icon_theme_icon_add(cfdata->icon, 32, cfdata->editor->evas); /* NB this takes care of freeing any previous icon object */ e_widget_button_icon_set(cfdata->editor->img_widget, o); === RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v retrieving revision 1.247 retrieving revision 1.248 diff -u -3 -r1.247 -r1.248 --- e_fm.c 11 Aug 2008 02:13:22 - 1.247 +++ e_fm.c 14 Aug 2008 20:49:36 - 1.248 @@ -1201,7 +1201,7 @@ snprintf(buf, sizeof(buf), "%s/%s", e_fm2_real_path_get(ic->info.fm), ic->info.file); ef = efreet_desktop_new(buf); - if (ef) oic = e_util_desktop_icon_add(ef, "48x48", evas); + if (ef) oic = e_util_desktop_icon_add(ef, 48, evas); if (type_ret) *type_ret = "DESKTOP"; if (ef) efreet_desktop_free(ef); } @@ -1278,7 +1278,7 @@ oic = NULL; snprintf(buf, sizeof(buf), "%s/%s", ic->sd->realpath, ic->info.file); ef = efreet_desktop_new(buf); - if (ef) oic = e_util_desktop_icon_add(ef, "48x48", evas); + if (ef) oic = e_util_desktop_icon_add(ef, 48, evas); if (type_ret) *type_ret = "DESKTOP"; if (ef) efreet_desktop_free(ef); } @@ -1350,7 +1350,7 @@ oic = NULL; ef = efreet_desktop_new(buf); - if (ef) oic = e_util_desktop_icon_add(ef, "48x48", evas); + if (ef) oic = e_util_desktop_icon_add(ef, 48, evas); if (type_ret) *type_ret = "DESKTOP"; if (ef) efreet_desktop_free(ef); } @@ -1372,7 +1372,7 @@ Efreet_Desktop *desktop; desktop = efreet_util_desktop_exec_find(imc->e_im_setup_exec); if (desktop) -
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_icon_theme Modified Files: e_int_config_icon_themes.c Log Message: fix against efreet API breakage === RCS file: /cvs/e/e17/apps/e/src/modules/conf_icon_theme/e_int_config_icon_themes.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_int_config_icon_themes.c 23 Aug 2007 10:07:55 - 1.6 +++ e_int_config_icon_themes.c 14 Aug 2008 20:49:36 - 1.7 @@ -183,7 +183,7 @@ { char *path; -path = efreet_icon_path_find(theme->name.internal, theme->example_icon, "24x24"); +path = efreet_icon_path_find(theme->name.internal, theme->example_icon, 24); if (path) { oc = e_icon_add(evas); @@ -297,7 +297,7 @@ { char *path; -path = efreet_icon_path_find(theme->name.internal, theme->example_icon, "24x24"); +path = efreet_icon_path_find(theme->name.internal, theme->example_icon, 24); if (path) { oc = e_icon_add(evas); - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/exebuf Modified Files: e_exebuf.c Log Message: fix against efreet API breakage === RCS file: /cvs/e/e17/apps/e/src/modules/exebuf/e_exebuf.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_exebuf.c 19 Jun 2008 15:56:18 - 1.4 +++ e_exebuf.c 14 Aug 2008 20:49:37 - 1.5 @@ -419,7 +419,7 @@ if (!desktop) desktop = efreet_util_desktop_generic_name_find(cmd_buf); if (desktop) { - o = e_util_desktop_icon_add(desktop, "24x24", exebuf->evas); + o = e_util_desktop_icon_add(desktop, 24, exebuf->evas); icon_object = o; edje_object_part_swallow(bg_object, "e.swallow.icons", o); evas_object_show(o); @@ -1053,7 +1053,7 @@ evas_object_show(o); if (edje_object_part_exists(exe->bg_object, "e.swallow.icons")) { -o = e_util_desktop_icon_add(exe->desktop, "24x24", exebuf->evas); +o = e_util_desktop_icon_add(exe->desktop, 24, exebuf->evas); exe->icon_object = o; edje_object_part_swallow(exe->bg_object, "e.swallow.icons", o); evas_object_show(o); @@ -1103,7 +1103,7 @@ desktop = efreet_util_desktop_exec_find(exe->file); if (desktop) { - o = e_util_desktop_icon_add(desktop, "24x24", exebuf->evas); + o = e_util_desktop_icon_add(desktop, 24, exebuf->evas); exe->icon_object = o; edje_object_part_swallow(exe->bg_object, "e.swallow.icons", o); evas_object_show(o); @@ -1157,7 +1157,7 @@ desktop = efreet_util_desktop_exec_find(exe->file); if (desktop) { - o = e_util_desktop_icon_add(desktop, "24x24", exebuf->evas); + o = e_util_desktop_icon_add(desktop, 24, exebuf->evas); exe->icon_object = o; edje_object_part_swallow(exe->bg_object, "e.swallow.icons", o); evas_object_show(o); - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_imc Modified Files: e_int_config_imc.c Log Message: fix against efreet API breakage === RCS file: /cvs/e/e17/apps/e/src/modules/conf_imc/e_int_config_imc.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_int_config_imc.c 12 Feb 2008 06:11:22 - 1.5 +++ e_int_config_imc.c 14 Aug 2008 20:49:36 - 1.6 @@ -353,7 +353,7 @@ Efreet_Desktop *desktop; desktop = efreet_util_desktop_exec_find(imc->e_im_setup_exec); if (desktop) -icon = e_util_desktop_icon_add(desktop, "48x48", evas); +icon = e_util_desktop_icon_add(desktop, 48, evas); } e_widget_ilist_append(cfdata->gui.imc_basic_list, icon, imc->e_im_name, NULL, NULL, imc_path); - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/fileman Modified Files: e_fwin.c Log Message: fix against efreet API breakage === RCS file: /cvs/e/e17/apps/e/src/modules/fileman/e_fwin.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -3 -r1.27 -r1.28 --- e_fwin.c6 May 2008 05:05:13 - 1.27 +++ e_fwin.c14 Aug 2008 20:49:37 - 1.28 @@ -1343,7 +1343,7 @@ for (l = apps; l; l = l->next) { desk = l->data; -oi = e_util_desktop_icon_add(desk, "24x24", evas); +oi = e_util_desktop_icon_add(desk, 24, evas); e_widget_ilist_append(o, oi, desk->name, NULL, NULL, efreet_util_path_to_file_id(desk->orig_path)); } @@ -1383,7 +1383,7 @@ desk = mlist->data; if (!desk) continue; - icon = e_util_desktop_icon_add(desk, "24x24", evas); + icon = e_util_desktop_icon_add(desk, 24, evas); e_widget_ilist_append(o, icon, desk->name, NULL, NULL, efreet_util_path_to_file_id(desk->orig_path)); } - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_applications Modified Files: e_int_config_apps.c Log Message: fix against efreet API breakage === RCS file: /cvs/e/e17/apps/e/src/modules/conf_applications/e_int_config_apps.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- e_int_config_apps.c 18 Dec 2007 01:27:44 - 1.10 +++ e_int_config_apps.c 14 Aug 2008 20:49:36 - 1.11 @@ -378,7 +378,7 @@ { Evas_Object *icon = NULL; -icon = e_util_desktop_icon_add(desk, "24x24", evas); +icon = e_util_desktop_icon_add(desk, 24, evas); e_widget_ilist_append(cfdata->o_all, icon, desk->name, _all_list_cb_selected, cfdata, desk->orig_path); } @@ -413,7 +413,7 @@ { Evas_Object *icon = NULL; -icon = e_util_desktop_icon_add(desk, "24x24", evas); +icon = e_util_desktop_icon_add(desk, 24, evas); e_widget_ilist_append(cfdata->o_sel, icon, desk->name, _sel_list_cb_selected, cfdata, desk->orig_path); } @@ -525,7 +525,7 @@ if (!lbl) continue; desk = efreet_util_desktop_name_find(lbl); if (!desk) continue; - icon = e_util_desktop_icon_add(desk, "24x24", evas); + icon = e_util_desktop_icon_add(desk, 24, evas); e_widget_ilist_append(cfdata->o_sel, icon, desk->name, _sel_list_cb_selected, cfdata, desk->orig_path); } @@ -594,7 +594,7 @@ { e_widget_ilist_remove_num(cfdata->o_sel, sel); e_widget_ilist_go(cfdata->o_sel); -icon = e_util_desktop_icon_add(desk, "24x24", evas); +icon = e_util_desktop_icon_add(desk, 24, evas); e_widget_ilist_prepend_relative(cfdata->o_sel, icon, desk->name, _sel_list_cb_selected, cfdata, desk->orig_path, (sel - 1)); @@ -634,7 +634,7 @@ { e_widget_ilist_remove_num(cfdata->o_sel, sel); e_widget_ilist_go(cfdata->o_sel); -icon = e_util_desktop_icon_add(desk, "24x24", evas); +icon = e_util_desktop_icon_add(desk, 24, evas); e_widget_ilist_append_relative(cfdata->o_sel, icon, desk->name, _sel_list_cb_selected, cfdata, desk->orig_path, sel); - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/ibar Modified Files: e_mod_main.c Log Message: fix against efreet API breakage === RCS file: /cvs/e/e17/apps/e/src/modules/ibar/e_mod_main.c,v retrieving revision 1.191 retrieving revision 1.192 diff -u -3 -r1.191 -r1.192 --- e_mod_main.c13 Dec 2007 13:25:10 - 1.191 +++ e_mod_main.c14 Aug 2008 20:49:37 - 1.192 @@ -598,12 +598,12 @@ { /* TODO: Correct icon size! */ if (ic->o_icon) evas_object_del(ic->o_icon); - ic->o_icon = e_util_desktop_icon_add(ic->app, "48x48", evas_object_evas_get(ic->ibar->o_box)); + ic->o_icon = e_util_desktop_icon_add(ic->app, 48, evas_object_evas_get(ic->ibar->o_box)); edje_object_part_swallow(ic->o_holder, "e.swallow.content", ic->o_icon); evas_object_pass_events_set(ic->o_icon, 1); evas_object_show(ic->o_icon); if (ic->o_icon2) evas_object_del(ic->o_icon2); - ic->o_icon2 = e_util_desktop_icon_add(ic->app, "48x48", evas_object_evas_get(ic->ibar->o_box)); + ic->o_icon2 = e_util_desktop_icon_add(ic->app, 48, evas_object_evas_get(ic->ibar->o_box)); edje_object_part_swallow(ic->o_holder2, "e.swallow.content", ic->o_icon2); evas_object_pass_events_set(ic->o_icon2, 1); evas_object_show(ic->o_icon2); @@ -905,8 +905,8 @@ E_Drag *d; Evas_Object *o; Evas_Coord x, y, w, h; +unsigned int size; const char *drag_types[] = { "enlightenment/desktop" }; -char buf[128]; ic->drag.dnd = 1; ic->drag.start = 0; @@ -915,8 +915,8 @@ d = e_drag_new(ic->ibar->inst->gcc->gadcon->zone->container, x, y, drag_types, 1, ic->app, -1, NULL, NULL); -snprintf(buf, sizeof(buf), "%dx%d", w, h); - o = e_util_desktop_icon_add(ic->app, buf, e_drag_evas_get(d)); +size = MAX(w, h); + o = e_util_desktop_icon_add(ic->app, size, e_drag_evas_get(d)); e_drag_object_set(d, o); e_drag_resize(d, w, h); - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: configure.in Log Message: Battery does not depend on ecore-txt === RCS file: /cvs/e/e17/apps/e/configure.in,v retrieving revision 1.213 retrieving revision 1.214 diff -u -3 -r1.213 -r1.214 --- configure.in14 Aug 2008 01:16:26 - 1.213 +++ configure.in14 Aug 2008 17:58:22 - 1.214 @@ -209,7 +209,6 @@ ecore-txt ], [ have_temp="yes" - have_bat="yes" ], [ have_temp="no"]) AM_CONDITIONAL(HAVE_TEMPERATURE, test x$have_temp = "xyes") @@ -219,14 +218,12 @@ ecore-file ]) fi -AM_CONDITIONAL(HAVE_BATTERY, test x$have_bat = "xyes") -if test x$have_bat = "xyes"; then - PKG_CHECK_MODULES(BATTERY, [ -ecore -ecore-file -ecore-con - ]) -fi + +PKG_CHECK_MODULES(BATTERY, [ + ecore + ecore-file + ecore-con +]) PKG_CHECK_MODULES(E_DBUS, edbus, have_edbus=yes, have_edbus=no) PKG_CHECK_MODULES(E_HAL, ehal, have_ehal=yes, have_ehal=no) - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_dnd.c e_hints.c Log Message: remove unused variables === RCS file: /cvs/e/e17/apps/e/src/bin/e_dnd.c,v retrieving revision 1.79 retrieving revision 1.80 diff -u -3 -r1.79 -r1.80 --- e_dnd.c 11 Aug 2008 02:13:22 - 1.79 +++ e_dnd.c 14 Aug 2008 06:15:35 - 1.80 @@ -1195,7 +1195,6 @@ Ecore_X_Rectangle rect; Ecore_X_Action action; const char *id; - const char *description = NULL; Evas_List *l; int active; === RCS file: /cvs/e/e17/apps/e/src/bin/e_hints.c,v retrieving revision 1.103 retrieving revision 1.104 diff -u -3 -r1.103 -r1.104 --- e_hints.c 25 Jul 2008 02:09:27 - 1.103 +++ e_hints.c 14 Aug 2008 06:15:35 - 1.104 @@ -271,7 +271,6 @@ E_Border_List *bl; E_Border *b; Ecore_X_Window *clients = NULL; - Ecore_X_Window *clients_focus = NULL; /* Get client count by adding client lists on all containers */ for (ml = e_manager_list(); ml; ml = ml->next) - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/gadman Modified Files: e_mod_gadman.h Log Message: export public function in header === RCS file: /cvs/e/e17/apps/e/src/modules/gadman/e_mod_gadman.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_mod_gadman.h 19 May 2008 09:39:37 - 1.2 +++ e_mod_gadman.h 14 Aug 2008 06:09:37 - 1.3 @@ -45,5 +45,6 @@ E_Gadcon_Client *gadman_gadget_place(E_Config_Gadcon_Client *cf, int ontop); void gadman_gadget_edit_start(E_Gadcon_Client *gcc); void gadman_gadget_edit_end(void); +void gadman_gadgets_toggle(void); #endif - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_wallpaper Modified Files: e_int_config_wallpaper.c Log Message: Remove unused variable === RCS file: /cvs/e/e17/apps/e/src/modules/conf_wallpaper/e_int_config_wallpaper.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- e_int_config_wallpaper.c12 May 2008 20:49:44 - 1.12 +++ e_int_config_wallpaper.c14 Aug 2008 06:06:24 - 1.13 @@ -479,7 +479,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *o, *rt, *ot; - Evas_Object *ow, *of, *oa; + Evas_Object *ow, *oa; E_Zone *zone = NULL; E_Radio_Group *rg; char path[PATH_MAX]; - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/fileman Modified Files: e_mod_config.c Log Message: Add header which declares function === RCS file: /cvs/e/e17/apps/e/src/modules/fileman/e_mod_config.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- e_mod_config.c 11 Aug 2008 02:13:22 - 1.8 +++ e_mod_config.c 14 Aug 2008 06:06:01 - 1.9 @@ -1,6 +1,7 @@ #include "e.h" #include "e_mod_main.h" #include "e_mod_config.h" +#include "e_fm_hal.h" struct _E_Config_Dialog_Data { - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_theme Modified Files: e_int_config_theme.h Log Message: Declare public function in header. === RCS file: /cvs/e/e17/apps/e/src/modules/conf_theme/e_int_config_theme.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_int_config_theme.h24 Jul 2007 18:47:26 - 1.2 +++ e_int_config_theme.h14 Aug 2008 06:05:29 - 1.3 @@ -10,6 +10,7 @@ EAPI void e_int_config_theme_import_done(E_Config_Dialog *dia); EAPI void e_int_config_theme_update(E_Config_Dialog *dia, char *file); +EAPI void e_int_config_theme_web_done(E_Config_Dialog *dia); #endif #endif - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e.h e_entry.c e_main.c Log Message: - embryo is not a needed pkg - make ecore_imf optional - add pkg-config requirements to enlightenment.pc - remove battery check dependant on ecore-txt - move Ecore_Txt.h from e.h to temperature module === RCS file: /cvs/e/e17/apps/e/src/bin/e.h,v retrieving revision 1.74 retrieving revision 1.75 diff -u -3 -r1.74 -r1.75 --- e.h 5 Aug 2008 13:11:47 - 1.74 +++ e.h 13 Aug 2008 19:22:01 - 1.75 @@ -64,14 +64,13 @@ #include #include #include +#include +#include #include #include #include #include -#include #include -#include -#include #include #include #include === RCS file: /cvs/e/e17/apps/e/src/bin/e_entry.c,v retrieving revision 1.55 retrieving revision 1.56 diff -u -3 -r1.55 -r1.56 --- e_entry.c 15 May 2008 21:08:30 - 1.55 +++ e_entry.c 13 Aug 2008 19:22:01 - 1.56 @@ -3,8 +3,10 @@ */ #include "e.h" +#ifdef HAVE_ECORE_IMF #include #include +#endif typedef struct _E_Entry_Smart_Data E_Entry_Smart_Data; @@ -14,7 +16,9 @@ Evas_Object *editable_object; E_Menu *popup; Ecore_Event_Handler *selection_handler; +#ifdef HAVE_ECORE_IMF Ecore_IMF_Context *imf_context; +#endif Ecore_Event_Handler *imf_ee_commit_handler; Ecore_Event_Handler *imf_ee_delete_handler; @@ -54,9 +58,11 @@ static void _e_entry_cb_paste(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_entry_cb_select_all(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_entry_cb_delete(void *data, E_Menu *m, E_Menu_Item *mi); +#ifdef HAVE_ECORE_IMF static int _e_entry_cb_imf_retrieve_surrounding(void *data, Ecore_IMF_Context *ctx, char **text, int *cursor_pos); static int _e_entry_cb_imf_event_commit(void *data, int type, void *event); static int _e_entry_cb_imf_event_delete_surrounding(void *data, int type, void *event); +#endif /* local subsystem globals */ static Evas_Smart *_e_entry_smart = NULL; @@ -181,10 +187,12 @@ if ((!entry) || (!(sd = evas_object_smart_data_get(entry return; e_editable_password_set(sd->editable_object, password_mode); +#ifdef HAVE_ECORE_IMF if (sd->imf_context) ecore_imf_context_input_mode_set(sd->imf_context, password_mode ? ECORE_IMF_INPUT_MODE_FULL & ECORE_IMF_INPUT_MODE_INVISIBLE : ECORE_IMF_INPUT_MODE_FULL); +#endif } /** @@ -228,22 +236,26 @@ if (!sd->selection_dragging) { e_editable_cursor_move_to_end(sd->editable_object); +#ifdef HAVE_ECORE_IMF if (sd->imf_context) { ecore_imf_context_reset(sd->imf_context); ecore_imf_context_cursor_position_set(sd->imf_context, e_editable_cursor_pos_get(sd->editable_object)); } +#endif e_editable_selection_move_to_end(sd->editable_object); } if (sd->enabled) e_editable_cursor_show(sd->editable_object); e_editable_selection_show(sd->editable_object); +#ifdef HAVE_ECORE_IMF if (sd->imf_context) { ecore_imf_context_reset(sd->imf_context); ecore_imf_context_focus_in(sd->imf_context); } +#endif sd->focused = 1; } @@ -268,11 +280,13 @@ edje_object_signal_emit(sd->entry_object, "e,state,unfocused", "e"); e_editable_cursor_hide(sd->editable_object); e_editable_selection_hide(sd->editable_object); +#ifdef HAVE_ECORE_IMF if (sd->imf_context) { ecore_imf_context_reset(sd->imf_context); ecore_imf_context_focus_out(sd->imf_context); } +#endif sd->focused = 0; } @@ -332,6 +346,7 @@ if ((!obj) || (!(sd = evas_object_smart_data_get(obj return; +#ifdef HAVE_ECORE_IMF if (sd->imf_context) { Ecore_IMF_Event_Key_Down ev; @@ -342,6 +357,7 @@ (Ecore_IMF_Event *) &ev)) return; } +#endif if (_e_entry_emacs_keybindings) _e_entry_key_down_emacs(obj, event_info); @@ -358,6 +374,7 @@ if ((!obj) || (!(sd = evas_object_smart_data_get(obj return; +#ifdef HAVE_ECORE_IMF if (sd->imf_context) { Ecore_IMF_Event_Key_Up ev; @@ -368,6 +385,7 @@ (Ecore_IMF_Event *) &ev)) return; } +#endif } /* Called when the entry object is pressed by the mouse */ @@ -384,6 +402,7 @@ if (!(event = event_info)) return; +#ifdef HAVE_ECORE_IMF if (sd->imf_context) { Ecore_IMF_Event_Mouse_Down ev; @@ -394,6 +413,7 @@ (Ecore_IMF_Event *) &ev)) return; } +#endif
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: configure.in Log Message: - embryo is not a needed pkg - make ecore_imf optional - add pkg-config requirements to enlightenment.pc - remove battery check dependant on ecore-txt - move Ecore_Txt.h from e.h to temperature module === RCS file: /cvs/e/e17/apps/e/configure.in,v retrieving revision 1.211 retrieving revision 1.212 diff -u -3 -r1.211 -r1.212 --- configure.in6 Aug 2008 05:42:53 - 1.211 +++ configure.in13 Aug 2008 19:22:01 - 1.212 @@ -183,35 +183,37 @@ PKG_CHECK_MODULES(E, [ evas ecore + ecore-x ecore-evas - ecore-file - ecore-ipc ecore-con + ecore-ipc ecore-job - ecore-imf - ecore-imf-evas - edje + ecore-file eet >= 1.0.1 - embryo + edje efreet efreet-mime ]) +requirements_e="evas ecore ecore-x ecore-evas ecore-con ecore-ipc ecore-job ecore-file eet edje efreet efreet-mime" + +PKG_CHECK_MODULES(ECORE_IMF, [ + ecore-imf + ecore-imf-evas +], [ + have_ecore_imf="yes" + AC_DEFINE(HAVE_ECORE_IMF, 1, [Ecore IMF support]) +], [ have_ecore_imf="no" ] +) PKG_CHECK_MODULES(ECORE_TXT, [ ecore-txt ], [ have_temp="yes" - have_battery="yes" # This test will succeed as these modules are also checked before PKG_CHECK_MODULES(TEMPERATURE, [ ecore ecore-file ]) - PKG_CHECK_MODULES(BATTERY, [ -ecore -ecore-file -ecore-con - ]) ], [ have_temp="no"]) AM_CONDITIONAL(HAVE_TEMPERATURE, test x$have_temp = "xyes") AM_CONDITIONAL(HAVE_BATTERY, test x$have_bat = "xyes") @@ -224,6 +226,7 @@ define_e_dbus="" if test x$have_edbus = "xyes"; then define_e_dbus="-DHAVE_EDBUS" + requirements_e=$requirements_e" edbus" if test x$have_ehal = "xyes"; then AC_DEFINE(HAVE_EDBUS, 1, [E_Dbus support]) fi @@ -236,6 +239,7 @@ AC_SUBST(e_libs) AC_SUBST(e_cflags) AC_SUBST(e_configflags) +AC_SUBST(requirements_e) profile="SLOW_PC" AC_ARG_WITH(profile, - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/temperature Modified Files: e_mod_main.c Log Message: - embryo is not a needed pkg - make ecore_imf optional - add pkg-config requirements to enlightenment.pc - remove battery check dependant on ecore-txt - move Ecore_Txt.h from e.h to temperature module === RCS file: /cvs/e/e17/apps/e/src/modules/temperature/e_mod_main.c,v retrieving revision 1.94 retrieving revision 1.95 diff -u -3 -r1.94 -r1.95 --- e_mod_main.c17 Mar 2008 07:23:22 - 1.94 +++ e_mod_main.c13 Aug 2008 19:22:01 - 1.95 @@ -4,6 +4,8 @@ #include "e.h" #include "e_mod_main.h" +#include + #ifdef __FreeBSD__ #include #include - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_fm_main.c Log Message: - Add e_prefix.h for e_prefix_bin_get() - Formatting === RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_main.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -3 -r1.44 -r1.45 --- e_fm_main.c 11 Aug 2008 02:13:22 - 1.44 +++ e_fm_main.c 13 Aug 2008 18:56:09 - 1.45 @@ -36,6 +36,7 @@ #include "config.h" #include "e_fm_op.h" +#include "e_prefix.h" /* E_DBUS support */ #ifdef HAVE_EDBUS @@ -2177,7 +2178,8 @@ free(ed); } -static const char *_e_prepare_command(E_Fm_Op_Type type, const char *args) +static const char * +_e_prepare_command(E_Fm_Op_Type type, const char *args) { char *buffer; unsigned int length = 0; - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: .cvsignore Log Message: ignore++ === RCS file: /cvs/e/e17/apps/e/src/bin/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- .cvsignore 25 Sep 2007 14:26:36 - 1.8 +++ .cvsignore 13 Aug 2008 18:51:23 - 1.9 @@ -12,3 +12,4 @@ enlightenment_thumb enlightenment_fm enlightenment_init +enlightenment_fm_op - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/mixer Added Files: .cvsignore Log Message: ignore - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_theme Modified Files: e_int_config_theme.c e_int_config_theme_import.c e_int_config_theme_web.c Log Message: Web dialog returns an E_Dialog object, not E_Win. === RCS file: /cvs/e/e17/apps/e/src/modules/conf_theme/e_int_config_theme.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- e_int_config_theme.c2 Jul 2008 11:29:14 - 1.13 +++ e_int_config_theme.c13 Aug 2008 18:31:15 - 1.14 @@ -4,6 +4,7 @@ #include "e.h" #include "e_int_config_theme_import.h" +#include "e_int_config_theme_web.h" static void*_create_data (E_Config_Dialog *cfd); static void _free_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); @@ -36,8 +37,8 @@ Evas_List *parts_list; /* Dialog */ - E_Win *win_import; - E_Win *win_web; + E_Win*win_import; + E_Dialog *dia_web; }; EAPI E_Config_Dialog * @@ -78,7 +79,7 @@ E_Config_Dialog_Data *cfdata; cfdata = dia->cfdata; - cfdata->win_web = NULL; + cfdata->dia_web = NULL; } EAPI void @@ -262,10 +263,10 @@ E_Config_Dialog_Data *cfdata; cfdata = data1; - if (cfdata->win_web) - e_win_raise(cfdata->win_web); + if (cfdata->dia_web) + e_dialog_raise(cfdata->dia_web); else - cfdata->win_web = e_int_config_theme_web(cfdata->cfd); + cfdata->dia_web = e_int_config_theme_web(cfdata->cfd); } static void === RCS file: /cvs/e/e17/apps/e/src/modules/conf_theme/e_int_config_theme_import.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_int_config_theme_import.c 25 Jul 2007 17:00:51 - 1.3 +++ e_int_config_theme_import.c 13 Aug 2008 18:31:15 - 1.4 @@ -1,5 +1,6 @@ #include "e.h" #include "e_int_config_theme.h" +#include "e_int_config_theme_import.h" typedef struct _Import Import; === RCS file: /cvs/e/e17/apps/e/src/modules/conf_theme/e_int_config_theme_web.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_int_config_theme_web.c2 Jul 2008 12:43:33 - 1.1 +++ e_int_config_theme_web.c13 Aug 2008 18:31:15 - 1.2 @@ -4,6 +4,7 @@ #include "e.h" #include "e_int_config_theme.h" +#include "e_int_config_theme_web.h" #defineMAGIC_WEB 0x425581cb #define TEMPLATE "/tmp/themeXX" - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: enlightenment.pc.in Log Message: Add packages which e requires === RCS file: /cvs/e/e17/apps/e/enlightenment.pc.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- enlightenment.pc.in 6 Aug 2008 05:42:53 - 1.5 +++ enlightenment.pc.in 13 Aug 2008 16:36:20 - 1.6 @@ -5,6 +5,7 @@ Name: enlightenment Description: Enlightenmnt Window Manager +Requires: @requirements_e@ Version: @VERSION@ Libs: -L${libdir} Libs.private: - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_fm_op.c Log Message: include limits.h for PATH_MAX === RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_op.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_fm_op.c 11 Aug 2008 02:13:22 - 1.4 +++ e_fm_op.c 12 Aug 2008 19:04:01 - 1.5 @@ -12,6 +12,7 @@ #include #include #include +#include #include - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: configure.in enlightenment.pc.in Log Message: - If e is built with dbus support, pass the DBUS flag on to modules. - Only export functions which don't require dbus from e_msgbus.h === RCS file: /cvs/e/e17/apps/e/configure.in,v retrieving revision 1.209 retrieving revision 1.210 diff -u -3 -r1.209 -r1.210 --- configure.in1 Aug 2008 03:08:16 - 1.209 +++ configure.in5 Aug 2008 13:52:00 - 1.210 @@ -221,14 +221,16 @@ # this is used to conditionally build modules which depend on E_DBUS AM_CONDITIONAL(HAVE_EDBUS, test x$have_edbus = "xyes") +define_e_dbus="" if test x$have_edbus = "xyes"; then + define_e_dbus="-DHAVE_EDBUS" if test x$have_ehal = "xyes"; then AC_DEFINE(HAVE_EDBUS, 1, [E_Dbus support]) fi fi e_libs=$E_LIBS" "$LIBINTL" "$fnmatch_libs" " -e_cflags="-DUSE_E_CONFIG_H "$E_CFLAGS" "$E_DBUS_CFLAGS" " +e_cflags="-DUSE_E_CONFIG_H "$define_e_dbus" "$E_CFLAGS" "$E_DBUS_CFLAGS" " AC_SUBST(e_libs) AC_SUBST(e_cflags) === RCS file: /cvs/e/e17/apps/e/enlightenment.pc.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- enlightenment.pc.in 31 Mar 2008 14:35:23 - 1.3 +++ enlightenment.pc.in 5 Aug 2008 13:52:00 - 1.4 @@ -6,6 +6,6 @@ Name: enlightenment Description: Enlightenmnt Window Manager Version: @VERSION@ -Libs: @libdir@/@PACKAGE@/modules +Libs: -L${libdir} Libs.private: -Cflags: -I${includedir} +Cflags: -I${includedir} @e_cflags@ - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_msgbus.h Log Message: - If e is built with dbus support, pass the DBUS flag on to modules. - Only export functions which don't require dbus from e_msgbus.h === RCS file: /cvs/e/e17/apps/e/src/bin/e_msgbus.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_msgbus.h 2 Nov 2007 12:07:09 - 1.2 +++ e_msgbus.h 5 Aug 2008 13:52:01 - 1.3 @@ -3,10 +3,6 @@ */ #ifdef E_TYPEDEFS -#ifndef HAVE_EDBUS -#define E_DBus_Interface void -#endif - typedef struct _E_Msgbus_Data E_Msgbus_Data; #else @@ -15,18 +11,20 @@ /* This is the dbus subsystem, but e_dbus namespace is taken by e_dbus */ +#ifdef HAVE_EDBUS struct _E_Msgbus_Data { -#ifdef HAVE_EDBUS E_DBus_Connection *conn; E_DBus_Object *obj; -#endif }; +#endif EAPI int e_msgbus_init(void); EAPI int e_msgbus_shutdown(void); +#ifdef HAVE_EDBUS EAPI void e_msgbus_interface_attach(E_DBus_Interface *iface); EAPI void e_msgbus_interface_detach(E_DBus_Interface *iface); +#endif #endif #endif - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e.h Log Message: guard config.h === RCS file: /cvs/e/e17/apps/e/src/bin/e.h,v retrieving revision 1.73 retrieving revision 1.74 diff -u -3 -r1.73 -r1.74 --- e.h 1 Apr 2008 20:51:04 - 1.73 +++ e.h 5 Aug 2008 13:11:47 - 1.74 @@ -4,7 +4,9 @@ #ifndef E_H #define E_H +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #define USE_IPC #if 0 - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_fm.c e_fm_main.c e_fm_op.c e_int_border_menu.c Log Message: formatting === RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v retrieving revision 1.244 retrieving revision 1.245 diff -u -3 -r1.244 -r1.245 --- e_fm.c 21 Jul 2008 04:12:39 - 1.244 +++ e_fm.c 25 Jul 2008 21:32:27 - 1.245 @@ -2265,7 +2265,7 @@ { int percent, seconds; -if(!e->data || e->size != 2 * sizeof(int)) return; +if (!e->data || e->size != 2 * sizeof(int)) return; percent = *(int *)e->data; seconds = *(int *)(e->data + sizeof(int)); @@ -2522,7 +2522,7 @@ static void _e_fm_file_buffer_clear(void) { - while(_e_fm_file_buffer) + while (_e_fm_file_buffer) { evas_stringshare_del(evas_list_data(_e_fm_file_buffer)); _e_fm_file_buffer = evas_list_remove_list(_e_fm_file_buffer, _e_fm_file_buffer); === RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_main.c,v retrieving revision 1.41 retrieving revision 1.42 diff -u -3 -r1.41 -r1.42 --- e_fm_main.c 22 Jul 2008 23:32:00 - 1.41 +++ e_fm_main.c 25 Jul 2008 21:32:27 - 1.42 @@ -1371,7 +1371,7 @@ slave = malloc(sizeof(E_Fm_Slave)); - if(!slave) return 0; + if (!slave) return 0; command = evas_stringshare_add(_e_prepare_command(type, src, dst)); @@ -1391,11 +1391,11 @@ Evas_List *l = _e_fm_slaves; E_Fm_Slave *slave; - while(l) + while (l) { slave = evas_list_data(l); - if(slave->id == id) + if (slave->id == id) return slave; l = evas_list_next(l); @@ -1414,7 +1414,7 @@ ssize = 3 * sizeof(int) + size; sdata = malloc(ssize); - if(!sdata) return 0; + if (!sdata) return 0; memcpy(sdata, &magic, sizeof(int)); memcpy(sdata + sizeof(int),&type, sizeof(E_Fm_Op_Type)); @@ -1438,20 +1438,20 @@ void *sdata; int ssize; - if(!e) return 1; + if (!e) return 1; slave = ecore_exe_data_get(e->exe); sdata = e->data; ssize = e->size; - while(ssize) + while (ssize) { memcpy(&magic, sdata, sizeof(int)); memcpy(&id,sdata + sizeof(int), sizeof(int)); memcpy(&size, sdata + sizeof(int) + sizeof(int), sizeof(int)); - if(magic != E_FM_OP_MAGIC) + if (magic != E_FM_OP_MAGIC) { //DEBUG("%s:%s(%d) Wrong magic number from slave #%d. ", __FILE__, __FUNCTION__, __LINE__, slave->id); } @@ -1459,7 +1459,7 @@ sdata += 3 * sizeof(int); ssize -= 3 * sizeof(int); - if(id == E_FM_OP_OVERWRITE) + if (id == E_FM_OP_OVERWRITE) { response[0] = E_FM_OP_MAGIC; response[1] = E_FM_OP_OVERWRITE_RESPONSE_YES; @@ -1468,12 +1468,12 @@ _e_client_send_overwrite(slave->id, (const char *)sdata, size); printf("%s:%s(%d) Overwrite response sent to slave #%d.\n", __FILE__, __FUNCTION__, __LINE__, slave->id); } - else if(id == E_FM_OP_ERROR) + else if (id == E_FM_OP_ERROR) { _e_client_send_error(slave->id, (const char *)sdata, size); printf("%s:%s(%d) Error sent to client from slave #%d.\n", __FILE__, __FUNCTION__, __LINE__, slave->id); } - else if(id == E_FM_OP_PROGRESS) + else if (id == E_FM_OP_PROGRESS) { _e_client_send_progress(slave->id, (const char *)sdata, size); printf("%s:%s(%d) Progress sent to client from slave #%d.\n", __FILE__, __FUNCTION__, __LINE__, slave->id); @@ -1492,7 +1492,7 @@ Ecore_Exe_Event_Data *e = event; E_Fm_Slave *slave; - if(e == NULL) return 1; + if (e == NULL) return 1; slave = ecore_exe_data_get(e->exe); @@ -1506,11 +1506,11 @@ Ecore_Exe_Event_Del *e = event; E_Fm_Slave *slave; - if(!e) return 1; + if (!e) return 1; slave = ecore_exe_data_get(e->exe); - if(!slave) return 1; + if (!slave) return 1; _e_fm_slaves = evas_list_remove(_e_fm_slaves, (void *)slave); free(slave); @@ -2374,9 +2374,9 @@ static void _e_append_quoted(char **str, int *size, const char *src) { - while(*src) + while (*src) { - if(*src == '\'') + if (*src == '\'') { _e_append_char(str, size, '\''); _e_append_char(str, size, '\\'); @@ -2401,9 +2401,9 @@ char *buf = &buffer[0]; char command[3]; - if(type == E_FM_OP_MOVE) + if (type == E_FM_OP_MOVE) strcpy(command, "mv"); - else if(type == E_FM_OP_REMOVE) + else if (type == E_FM_OP_REMOVE) strcpy(command, "rm"); el
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_menu.c Log Message: formatting === RCS file: /cvs/e/e17/apps/e/src/bin/e_menu.c,v retrieving revision 1.77 retrieving revision 1.78 diff -u -3 -r1.77 -r1.78 --- e_menu.c22 Mar 2008 17:59:52 - 1.77 +++ e_menu.c8 Jul 2008 03:50:16 - 1.78 @@ -1433,7 +1433,7 @@ o = e_box_add(m->evas); m->container_object = o; - evas_object_intercept_move_callback_add (o, _e_menu_cb_intercept_container_move, m); + evas_object_intercept_move_callback_add(o, _e_menu_cb_intercept_container_move, m); evas_object_intercept_resize_callback_add(o, _e_menu_cb_intercept_container_resize, m); e_box_freeze(o); evas_object_show(o); - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_ipc_handlers.h Log Message: I guess this is what raster meant. === RCS file: /cvs/e/e17/apps/e/src/bin/e_ipc_handlers.h,v retrieving revision 1.152 retrieving revision 1.153 diff -u -3 -r1.152 -r1.153 --- e_ipc_handlers.h2 Jul 2008 01:05:31 - 1.152 +++ e_ipc_handlers.h2 Jul 2008 05:15:06 - 1.153 @@ -6749,7 +6749,7 @@ // #define HDL E_IPC_OP_DEFAULT_ENGINE_SET #if (TYPE == E_REMOTE_OPTIONS) - OP("-default-engine-set", 1, "Set the default rendering engine to OPT1 (SOFTWARE or XRENDER or /usr/local/bin/enlightenment_start)", 0, HDL) + OP("-default-engine-set", 1, "Set the default rendering engine to OPT1 (SOFTWARE, SOFTWARE_16 or XRENDER)", 0, HDL) #elif (TYPE == E_REMOTE_OUT) REQ_INT_START(HDL) int value = 0; - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_dnd.c e_gadcon.c e_gadcon.h e_shelf.c e_shelf.h Log Message: Fix dnd. Hopefully works in all situations now. Seems like we should consider separating internal and external dnd code. === RCS file: /cvs/e/e17/apps/e/src/bin/e_dnd.c,v retrieving revision 1.77 retrieving revision 1.78 diff -u -3 -r1.77 -r1.78 --- e_dnd.c 15 Jun 2008 12:30:26 - 1.77 +++ e_dnd.c 24 Jun 2008 20:13:34 - 1.78 @@ -19,7 +19,7 @@ static void _e_drag_hide(E_Drag *drag); static void _e_drag_move(E_Drag *drag, int x, int y); static void _e_drag_coords_update(E_Drop_Handler *h, int *dx, int *dy, int *dw, int *dh); -static int _e_drag_win_matches(E_Drop_Handler *h, Ecore_X_Window win); +static int _e_drag_win_matches(E_Drop_Handler *h, Ecore_X_Window win, int xdnd); static void _e_drag_win_show(E_Drop_Handler *h); static void _e_drag_win_hide(E_Drop_Handler *h); static void _e_drag_update(Ecore_X_Window root, int x, int y); @@ -575,7 +575,7 @@ } static int -_e_drag_win_matches(E_Drop_Handler *h, Ecore_X_Window win) +_e_drag_win_matches(E_Drop_Handler *h, Ecore_X_Window win, int xdnd) { Ecore_X_Window hwin = 0; @@ -584,10 +584,12 @@ switch (h->obj->type) { case E_GADCON_TYPE: -hwin = e_gadcon_dnd_window_get((E_Gadcon *)(h->obj)); +if (xdnd) hwin = e_gadcon_xdnd_window_get((E_Gadcon *)(h->obj)); +else hwin = e_gadcon_dnd_window_get((E_Gadcon *)(h->obj)); break; case E_GADCON_CLIENT_TYPE: -hwin = e_gadcon_dnd_window_get(((E_Gadcon_Client *)(h->obj))->gadcon); +if (xdnd) hwin = e_gadcon_xdnd_window_get(((E_Gadcon_Client *)(h->obj))->gadcon); +else hwin = e_gadcon_dnd_window_get(((E_Gadcon_Client *)(h->obj))->gadcon); break; case E_WIN_TYPE: hwin = ((E_Win *)(h->obj))->evas_win; @@ -704,7 +706,7 @@ move_ev.y = y - dy; leave_ev.x = x - dx; leave_ev.y = y - dy; -if (E_INSIDE(x, y, dx, dy, dw, dh) && _e_drag_win_matches(h, win)) +if (E_INSIDE(x, y, dx, dy, dw, dh) && _e_drag_win_matches(h, win, 0)) { if (!h->entered) { @@ -752,7 +754,7 @@ move_ev.y = y - dy; leave_ev.x = x - dx; leave_ev.y = y - dy; -if (E_INSIDE(x, y, dx, dy, dw, dh) && _e_drag_win_matches(h, win)) +if (E_INSIDE(x, y, dx, dy, dw, dh) && _e_drag_win_matches(h, win, 1)) { if (!h->entered) { @@ -837,7 +839,7 @@ _e_drag_coords_update(h, &dx, &dy, &dw, &dh); ev.x = x - dx; ev.y = y - dy; -if ((_e_drag_win_matches(h, win)) && +if ((_e_drag_win_matches(h, win, 0)) && ((h->cb.drop) && (E_INSIDE(x, y, dx, dy, dw, dh { @@ -910,7 +912,7 @@ _e_drag_coords_update(h, &dx, &dy, &dw, &dh); ev.x = x - dx; ev.y = y - dy; -if (_e_drag_win_matches(h, win) && h->cb.drop +if (_e_drag_win_matches(h, win, 1) && h->cb.drop && E_INSIDE(x, y, dx, dy, dw, dh)) { h->cb.drop(h->cb.data, h->active_type, &ev); === RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.c,v retrieving revision 1.108 retrieving revision 1.109 diff -u -3 -r1.108 -r1.109 --- e_gadcon.c 19 May 2008 09:57:48 - 1.108 +++ e_gadcon.c 24 Jun 2008 20:13:35 - 1.109 @@ -680,6 +680,22 @@ } EAPI void +e_gadcon_xdnd_window_set(E_Gadcon *gc, Ecore_X_Window win) +{ + E_OBJECT_CHECK(gc); + E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE); + gc->xdnd_win = win; +} + +EAPI Ecore_X_Window +e_gadcon_xdnd_window_get(E_Gadcon *gc) +{ + E_OBJECT_CHECK_RETURN(gc, 0); + E_OBJECT_TYPE_CHECK_RETURN(gc, E_GADCON_TYPE, 0); + return gc->xdnd_win; +} + +EAPI void e_gadcon_shelf_set(E_Gadcon *gc, E_Shelf *shelf) { E_OBJECT_CHECK(gc); === RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.h,v retrieving revision 1.47 retrieving revision 1.48 diff -u -3 -r1.47 -r1.48 --- e_gadcon.h 19 May 2008 04:37:34 - 1.47 +++ e_gadcon.h 24 Jun 2008 20:13:35 - 1.48 @@ -87,6 +87,7 @@ E_Config_Dialog*config_dialog; unsigned char editing : 1; Ecore_X_Window dnd_win; + Ecore_X_Window xdnd_win; E_Shelf*shelf; E_Toolbar *toolbar; @@ -207,6 +208,8 @@ EAPI void e_gadcon_util_menu_attach_func_set(E_Gadcon *gc, void (*func) (
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_shelf.c Log Message: Correct window for shelf on the desktop is the containers bg window. === RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v retrieving revision 1.97 retrieving revision 1.98 diff -u -3 -r1.97 -r1.98 --- e_shelf.c 23 Jun 2008 15:47:16 - 1.97 +++ e_shelf.c 24 Jun 2008 15:56:15 - 1.98 @@ -118,7 +118,7 @@ es->ee = zone->container->bg_ecore_evas; es->evas = zone->container->bg_evas; /* TODO: We should have a mouse out on the evas object if we are on the desktop */ - es->win = zone->container->event_win; + es->win = zone->container->bg_win; } es->fit_along = 1; es->layer = layer; @@ -623,7 +623,7 @@ es->ee = es->zone->container->bg_ecore_evas; es->evas = es->zone->container->bg_evas; - es->win = es->zone->container->event_win; + es->win = es->zone->container->bg_win; evas_object_move(es->o_event, es->zone->x + es->x, es->zone->y + es->y); evas_object_move(es->o_base, es->zone->x + es->x, es->zone->y + es->y); - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_shelf.c Log Message: Can't use zone directly. === RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v retrieving revision 1.96 retrieving revision 1.97 diff -u -3 -r1.96 -r1.97 --- e_shelf.c 23 Jun 2008 14:45:28 - 1.96 +++ e_shelf.c 23 Jun 2008 15:47:16 - 1.97 @@ -621,9 +621,9 @@ e_object_del(E_OBJECT(es->popup)); es->popup = NULL; - es->ee = zone->container->bg_ecore_evas; - es->evas = zone->container->bg_evas; - es->win = zone->container->event_win; + es->ee = es->zone->container->bg_ecore_evas; + es->evas = es->zone->container->bg_evas; + es->win = es->zone->container->event_win; evas_object_move(es->o_event, es->zone->x + es->x, es->zone->y + es->y); evas_object_move(es->o_base, es->zone->x + es->x, es->zone->y + es->y); - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_shelf.c Log Message: clean up dnd registering, should be no functional change. === RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v retrieving revision 1.95 retrieving revision 1.96 diff -u -3 -r1.95 -r1.96 --- e_shelf.c 19 Jun 2008 13:23:20 - 1.95 +++ e_shelf.c 23 Jun 2008 14:45:28 - 1.96 @@ -108,16 +108,17 @@ if (popup) { es->popup = e_popup_new(zone, es->x, es->y, es->w, es->h); - e_drop_xdnd_register_set(es->popup->evas_win, 1); e_popup_layer_set(es->popup, layer); es->ee = es->popup->ecore_evas; es->evas = es->popup->evas; + es->win = es->popup->evas_win; } else { - e_drop_xdnd_register_set(zone->container->event_win, 1); es->ee = zone->container->bg_ecore_evas; es->evas = zone->container->bg_evas; + /* TODO: We should have a mouse out on the evas object if we are on the desktop */ + es->win = zone->container->event_win; } es->fit_along = 1; es->layer = layer; @@ -149,7 +150,6 @@ evas_object_show(es->o_event); evas_object_show(es->o_base); e_popup_edje_bg_object_set(es->popup, es->o_base); - es->win = es->popup->evas_win; } else { @@ -157,8 +157,6 @@ evas_object_move(es->o_base, es->zone->x + es->x, es->zone->y + es->y); evas_object_layer_set(es->o_event, layer); evas_object_layer_set(es->o_base, layer); - /* TODO: We should have a mouse out on the evas object if we are on the desktop */ - es->win = zone->container->event_win; } es->gadcon = e_gadcon_swallowed_new(es->name, es->id, es->o_base, "e.swallow.content"); @@ -177,13 +175,10 @@ e_gadcon_zone_set(es->gadcon, zone); e_gadcon_ecore_evas_set(es->gadcon, es->ee); e_gadcon_shelf_set(es->gadcon, es); + e_drop_xdnd_register_set(es->win, 1); + e_gadcon_dnd_window_set(es->gadcon, es->win); if (popup) - { - e_gadcon_dnd_window_set(es->gadcon, es->popup->evas_win); - winid_shelves = evas_hash_add(winid_shelves, e_util_winid_str_get(es->popup->evas_win), es); - } - else - e_gadcon_dnd_window_set(es->gadcon, zone->container->event_win); + winid_shelves = evas_hash_add(winid_shelves, e_util_winid_str_get(es->popup->evas_win), es); e_gadcon_util_menu_attach_func_set(es->gadcon, _e_shelf_cb_menu_items_append, es); @@ -609,8 +604,6 @@ if (popup) { es->popup = e_popup_new(es->zone, es->x, es->y, es->w, es->h); - e_drop_xdnd_register_set(es->popup->evas_win, 1); - e_gadcon_dnd_window_set(es->gadcon, es->popup->evas_win); e_popup_layer_set(es->popup, es->cfg->layer); es->ee = es->popup->ecore_evas; @@ -624,19 +617,23 @@ } else { - e_drop_xdnd_register_set(es->popup->evas_win, 0); + e_drop_xdnd_register_set(es->win, 0); e_object_del(E_OBJECT(es->popup)); es->popup = NULL; + es->ee = zone->container->bg_ecore_evas; + es->evas = zone->container->bg_evas; + es->win = zone->container->event_win; + evas_object_move(es->o_event, es->zone->x + es->x, es->zone->y + es->y); evas_object_move(es->o_base, es->zone->x + es->x, es->zone->y + es->y); evas_object_layer_set(es->o_event, es->cfg->layer); evas_object_layer_set(es->o_base, es->cfg->layer); - e_drop_xdnd_register_set(es->zone->container->event_win, 1); - e_gadcon_dnd_window_set(es->gadcon, es->zone->container->event_win); _e_shelf_edge_event_register(es, 0); } + e_drop_xdnd_register_set(es->win, 1); + e_gadcon_dnd_window_set(es->gadcon, es->win); } EAPI E_Shelf * @@ -717,7 +714,7 @@ if (es->popup) { _e_shelf_edge_event_register(es, 0); - e_drop_xdnd_register_set(es->popup->evas_win, 0); + e_drop_xdnd_register_set(es->win, 0); winid_shelves = evas_hash_del(winid_shelves, e_util_winid_str_get(es->popup->evas_win), es); e_object_del(E_OBJECT(es->popup)); } - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_wallpaper Modified Files: e_int_config_wallpaper_web.c Log Message: only show progess when now != total, as curl returns some weird values at the start of a download. === RCS file: /cvs/e/e17/apps/e/src/modules/conf_wallpaper/e_int_config_wallpaper_web.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- e_int_config_wallpaper_web.c10 May 2008 08:02:27 - 1.15 +++ e_int_config_wallpaper_web.c19 Jun 2008 17:30:47 - 1.16 @@ -23,7 +23,7 @@ E_Dialog *dia; }; -struct _E_Config_Dialog_Data +struct _E_Config_Dialog_Data { Evas_Object *ofm, *o, *osfm, *ol; Ecore_List *thumbs, *names, *medias; @@ -70,7 +70,7 @@ import->magic = MAGIC_IMPORT; dia = e_dialog_new(parent->con, "E", "_wallpaper_web_dialog"); - if (!dia) + if (!dia) { E_FREE(import); return NULL; @@ -218,7 +218,7 @@ e_object_unref(E_OBJECT(dia)); } -static int +static int _feed_complete(void *data, int type, void *event) { Ecore_Con_Event_Url_Complete *euc; @@ -241,7 +241,7 @@ cfdata->hcomplete = NULL; if (euc->status == 200) { -snprintf(title, sizeof(title), _("[%s] Getting feed... DONE!"), +snprintf(title, sizeof(title), _("[%s] Getting feed... DONE!"), cfdata->source); e_dialog_title_set(import->dia, title); _parse_feed(data); @@ -249,7 +249,7 @@ } else { -snprintf(title, sizeof(title), _("[%s] Getting feed... FAILED!"), +snprintf(title, sizeof(title), _("[%s] Getting feed... FAILED!"), cfdata->source); e_dialog_title_set(import->dia, title); } @@ -290,7 +290,7 @@ cfdata->busy = 1; _get_feed(cfdata->ol_val, import); } - else + else e_widget_ilist_unselect(cfdata->ol); } @@ -372,15 +372,15 @@ if (state == 0) { -snprintf(title, sizeof(title), _("[%s] Parsing feed... DONE!"), +snprintf(title, sizeof(title), _("[%s] Parsing feed... DONE!"), cfdata->source); e_dialog_title_set(import->dia, title); e_fm2_path_set(cfdata->ofm, cfdata->tmpdir, "/"); _get_thumbs(import); - } + } else { -snprintf(title, sizeof(title), _("[%s] Parsing feed... FAILED!"), +snprintf(title, sizeof(title), _("[%s] Parsing feed... FAILED!"), cfdata->source); cfdata->busy = 0; e_dialog_title_set(import->dia, title); @@ -419,7 +419,7 @@ e_int_config_wallpaper_web_del(dia); } -static void +static void _file_double_click_cb(void *data, Evas_Object *obj, void *ev_info) { /*E_Config_Dialog_Data *cfdata; @@ -432,11 +432,11 @@ return; icon_info = sels->data; printf("[double click] %s\n", icon_info->file);*/ - + // Unused atm, interesting to simulate click on Ok button } -static void +static void _file_click_cb(void *data, Evas_Object *obj, void *ev_info) { Import *import; @@ -461,13 +461,13 @@ return strcmp(str1, ecore_file_strip_ext(str2)); } -static void -_dia_close_cb(void *data, E_Dialog *dia) +static void +_dia_close_cb(void *data, E_Dialog *dia) { e_int_config_wallpaper_web_del(dia); } -static void +static void _dia_ok_cb(void *data, E_Dialog *dia) { Import *import; @@ -483,7 +483,7 @@ e_int_config_wallpaper_web_del(dia); } -static void +static void _download_media(Import *import) { Import *i; @@ -493,12 +493,12 @@ i = import; cfdata = i->cfdata; - + cfdata->pending_downloads = 1; file = ecore_file_file_get(cfdata->edj); - snprintf(buf, sizeof(buf), "%s/.e/e/backgrounds/%s", + snprintf(buf, sizeof(buf), "%s/.e/e/backgrounds/%s", e_user_homedir_get(), file); - snprintf(title, sizeof(title), _("[%s] Downloading of edje file..."), + snprintf(title, sizeof(title), _("[%s] Downloading of edje file..."), cfdata->source); e_dialog_title_set(i->dia, title); ecore_file_download(cfdata->edj, buf, @@ -506,7 +506,7 @@ _download_media_progress_cb, i); } -static void +static void _download_media_complete_cb(void *data, const char *file, int status) { Import *import; @@ -514,7 +514,7 @@ import = data; import->cfdata->pending_downloads = 0; - snprintf(dest, sizeof(dest), "%s/.e/e/backgrounds/%s", + snprintf(dest, sizeof(dest), "%s/.e/e/backgrounds/%s", e_user_homedir_get(), ecore_file_file_get(import->cfdata->edj)); e_int_config_wallpaper_update(import->parent, dest); e_int_config_wallpaper_web_del(import->dia); @@ -532,11 +532,11 @@ cfdata = import->cfdata; if (got != ecore_list_count(cfdata->thumbs)) { -snprintf(title, sizeof(title), _("[%
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/exebuf Modified Files: e_exebuf.c Log Message: Add option to clear exebuf (from Bertrand Janin). === RCS file: /cvs/e/e17/apps/e/src/modules/exebuf/e_exebuf.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_exebuf.c 30 May 2008 22:30:56 - 1.3 +++ e_exebuf.c 19 Jun 2008 15:56:18 - 1.4 @@ -45,6 +45,7 @@ static void _e_exebuf_prev(void); static void _e_exebuf_complete(void); static void _e_exebuf_backspace(void); +static void _e_exebuf_clear(void); static void _e_exebuf_matches_update(void); static void _e_exebuf_hist_update(void); static void _e_exebuf_hist_clear(void); @@ -830,6 +831,18 @@ } } +static void +_e_exebuf_clear(void) +{ + if (cmd_buf[0] != 0) + { + cmd_buf[0] = 0; + _e_exebuf_update(); + if (!update_timer) + update_timer = ecore_timer_add(MATCH_LAG, _e_exebuf_update_timer, NULL); + } +} + static int _e_exebuf_cb_sort_eap(void *data1, void *data2) { @@ -1265,6 +1278,8 @@ _e_exebuf_exec_term(); else if (!strcmp(ev->keysymbol, "KP_Enter")) _e_exebuf_exec(); + else if (!strcmp(ev->keysymbol, "u") && (ev->modifiers & ECORE_X_MODIFIER_CTRL)) + _e_exebuf_clear(); else if (!strcmp(ev->keysymbol, "Escape")) e_exebuf_hide(); else if (!strcmp(ev->keysymbol, "BackSpace")) - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_shelf.c e_zone.c e_zone.h Log Message: Add edge move event, so a slide in on the edge will show a shelf. Fix interrupt hiding on mouse in. === RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v retrieving revision 1.94 retrieving revision 1.95 diff -u -3 -r1.94 -r1.95 --- e_shelf.c 14 Jun 2008 10:10:54 - 1.94 +++ e_shelf.c 19 Jun 2008 13:23:20 - 1.95 @@ -128,10 +128,11 @@ evas_object_resize(es->o_event, es->w, es->h); evas_object_event_callback_add(es->o_event, EVAS_CALLBACK_MOUSE_DOWN, _e_shelf_cb_mouse_down, es); - /* FIXME: Need an EDGE_MOVE handler */ es->handlers = evas_list_append(es->handlers, ecore_event_handler_add(E_EVENT_ZONE_EDGE_IN, _e_shelf_cb_mouse_in, es)); es->handlers = evas_list_append(es->handlers, +ecore_event_handler_add(E_EVENT_ZONE_EDGE_MOVE, _e_shelf_cb_mouse_in, es)); + es->handlers = evas_list_append(es->handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_IN, _e_shelf_cb_mouse_in, es)); es->handlers = evas_list_append(es->handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_OUT, _e_shelf_cb_mouse_out, es)); @@ -1238,10 +1239,10 @@ es = data; if (es->cfg->autohide_show_action) return 1; - if (type == E_EVENT_ZONE_EDGE_IN) + if ((type == E_EVENT_ZONE_EDGE_IN) || (type == E_EVENT_ZONE_EDGE_MOVE)) { - E_Event_Zone_Edge_In *ev; - int show = 0; + E_Event_Zone_Edge *ev; + intshow = 0; ev = event; if (es->zone != ev->zone) return 1; @@ -1312,7 +1313,7 @@ if (ev->win == es->win) { edje_object_signal_emit(es->o_base, "e,state,focused", "e"); -if ((es->hide_animator) || (es->instant_timer)) +if ((es->hide_animator) || (es->hide_timer) || (es->instant_timer)) e_shelf_toggle(es, 1); } } === RCS file: /cvs/e/e17/apps/e/src/bin/e_zone.c,v retrieving revision 1.135 retrieving revision 1.136 diff -u -3 -r1.135 -r1.136 --- e_zone.c7 Apr 2008 19:06:13 - 1.135 +++ e_zone.c19 Jun 2008 13:23:20 - 1.136 @@ -14,6 +14,7 @@ static void _e_zone_event_zone_desk_count_set_free(void *data, void *ev); static int _e_zone_cb_mouse_in(void *data, int type, void *event); static int _e_zone_cb_mouse_out(void *data, int type, void *event); +static int _e_zone_cb_mouse_move(void *data, int type, void *event); static int _e_zone_cb_timer(void *data); static int _e_zone_cb_desk_show(void *data, int type, void *event); static void _e_zone_update_flip(E_Zone *zone); @@ -28,9 +29,9 @@ EAPI int E_EVENT_ZONE_MOVE_RESIZE = 0; EAPI int E_EVENT_ZONE_ADD = 0; EAPI int E_EVENT_ZONE_DEL = 0; -/* FIXME: We need a EDGE_MOVE event */ EAPI int E_EVENT_ZONE_EDGE_IN = 0; EAPI int E_EVENT_ZONE_EDGE_OUT = 0; +EAPI int E_EVENT_ZONE_EDGE_MOVE = 0; #define E_ZONE_FLIP_LEFT(zone) ((e_config->desk_flip_wrap && ((zone)->desk_x_count > 1)) || ((zone)->desk_x_current > 0)) #define E_ZONE_FLIP_RIGHT(zone) ((e_config->desk_flip_wrap && ((zone)->desk_x_count > 1)) || (((zone)->desk_x_current + 1) < (zone)->desk_x_count)) @@ -47,6 +48,7 @@ E_EVENT_ZONE_DEL = ecore_event_type_new(); E_EVENT_ZONE_EDGE_IN = ecore_event_type_new(); E_EVENT_ZONE_EDGE_OUT = ecore_event_type_new(); + E_EVENT_ZONE_EDGE_MOVE = ecore_event_type_new(); return 1; } @@ -92,6 +94,9 @@ ecore_event_handler_add(ECORE_X_EVENT_MOUSE_OUT, _e_zone_cb_mouse_out, zone)); zone->handlers = evas_list_append(zone->handlers, + ecore_event_handler_add(ECORE_X_EVENT_MOUSE_MOVE, + _e_zone_cb_mouse_move, zone)); + zone->handlers = evas_list_append(zone->handlers, ecore_event_handler_add(E_EVENT_DESK_SHOW, _e_zone_cb_desk_show, zone)); @@ -827,7 +832,7 @@ _e_zone_cb_mouse_in(void *data, int type, void *event) { Ecore_X_Event_Mouse_In *ev; - E_Event_Zone_Edge_In *zev; + E_Event_Zone_Edge *zev; E_Zone *zone; ev = event; @@ -842,7 +847,7 @@ zone->flip.direction = E_DIRECTION_UP; } - zev = E_NEW(E_Event_Zone_Edge_In, 1); + zev = E_NEW(E_Event_Zone_Edge, 1); zev->zone = zone; zev->x = ev->x; zev->y = ev->y; @@ -858,7 +863,7 @@ zone->flip.direction = E_DIRECTION_RIGHT; } - zev = E_NEW(E_Event_Zone_Edge_In, 1); + zev = E_NEW(E_Event_Zone_Edge, 1); zev->zone = zone; zev-
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/gadman Modified Files: e_mod_config.c e_mod_gadman.c Log Message: Remove unused variables. === RCS file: /cvs/e/e17/apps/e/src/modules/gadman/e_mod_config.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_mod_config.c 19 May 2008 09:21:44 - 1.2 +++ e_mod_config.c 19 Jun 2008 12:56:07 - 1.3 @@ -133,7 +133,6 @@ { E_Config_Dialog_Data *cfdata; Evas_List *l = NULL; - Evas_List *selected; int i; if (!(cfdata = data)) return; @@ -141,7 +140,6 @@ for (i = 0, l = e_widget_ilist_items_get(cfdata->o_avail); l; l = l->next, i++) { E_Ilist_Item *item = NULL; -const char *name = NULL; E_Gadcon_Client_Class *cc; E_Gadcon_Client *gcc; === RCS file: /cvs/e/e17/apps/e/src/modules/gadman/e_mod_gadman.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_mod_gadman.c 12 Jun 2008 22:51:44 - 1.6 +++ e_mod_gadman.c 19 Jun 2008 12:56:07 - 1.7 @@ -42,7 +42,7 @@ void gadman_init(E_Module *m) { - Evas_List *managers, *l; + Evas_List *l; /* Create Manager */ Man = calloc(1, sizeof(Manager)); @@ -188,7 +188,6 @@ E_Config_Gadcon_Client *cf = NULL; E_Gadcon_Client *gcc; E_Gadcon *gc; - char *id; if (ontop) gc = Man->gc_top; @@ -492,9 +491,7 @@ static void _apply_widget_position(E_Gadcon_Client *gcc) { - Evas_List *l; int x, y, w, h; - int fx, fy, fw, fh; x = gcc->cf->geom.pos_x * Man->width; y = gcc->cf->geom.pos_y * Man->height; @@ -839,7 +836,7 @@ } else if (action == DRAG_MOVE) { -int w, h; +int h; evas_pointer_output_xy_get(current->gadcon->evas, &mx, &my); @@ -879,7 +876,7 @@ } else if (action == DRAG_MOVE) { -int w, h; +int w; evas_pointer_output_xy_get(current->gadcon->evas, &mx, &my); @@ -916,7 +913,7 @@ } else if (action == DRAG_MOVE) { -int w, h; +int h; evas_pointer_output_xy_get(current->gadcon->evas, &mx, &my); h = my - oy - 15; @@ -952,7 +949,7 @@ } else if (action == DRAG_MOVE) { -int w, h; +int w; evas_pointer_output_xy_get(current->gadcon->evas, &mx, &my); - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: .cvsignore Log Message: ignore === RCS file: /cvs/e/e17/apps/e/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- .cvsignore 15 Jul 2007 21:26:17 - 1.13 +++ .cvsignore 19 Jun 2008 12:23:41 - 1.14 @@ -11,6 +11,7 @@ configure depcomp enlightenment-config +enlightenment.pc install-sh libtool missing - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/battery Modified Files: batget.c e_mod_main.c Log Message: Remove unused variables. === RCS file: /cvs/e/e17/apps/e/src/modules/battery/batget.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- batget.c11 May 2008 16:21:21 - 1.12 +++ batget.c19 Jun 2008 12:18:59 - 1.13 @@ -1354,8 +1354,7 @@ dir_has_contents(const char *dir) { Ecore_List *bats; - char *name; - + bats = ecore_file_ls(dir); if (bats) { === RCS file: /cvs/e/e17/apps/e/src/modules/battery/e_mod_main.c,v retrieving revision 1.120 retrieving revision 1.121 diff -u -3 -r1.120 -r1.121 --- e_mod_main.c14 Jun 2008 06:18:30 - 1.120 +++ e_mod_main.c19 Jun 2008 12:18:59 - 1.121 @@ -510,7 +510,6 @@ int have_battery = 0; int have_power = 0; Evas_List *l; - int mins, hrs; static int debounce_popup = 0; if (debounce_popup > POPUP_DEBOUNCE_CYCLES) - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_shelf_config.c Log Message: Update flip windows in case we change outhide behaviour. === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_shelf_config.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -3 -r1.34 -r1.35 --- e_int_shelf_config.c9 Nov 2007 23:53:38 - 1.34 +++ e_int_shelf_config.c19 Jun 2008 12:12:24 - 1.35 @@ -399,6 +399,7 @@ e_shelf_toggle(cfdata->es, 0); else if (!cfdata->escfg->autohide && cfdata->es->hidden) e_shelf_toggle(cfdata->es, 1); + e_zone_update_flip_all(); cfdata->escfg->desk_show_mode = cfdata->desk_show_mode; cfdata->escfg->desk_list = NULL; - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_actions.c Log Message: Function doesn't return a value. === RCS file: /cvs/e/e17/apps/e/src/bin/e_actions.c,v retrieving revision 1.115 retrieving revision 1.116 diff -u -3 -r1.115 -r1.116 --- e_actions.c 18 Jun 2008 11:38:29 - 1.115 +++ e_actions.c 19 Jun 2008 11:59:25 - 1.116 @@ -2050,7 +2050,7 @@ } } -static int +static void _delayed_action_list_parse(Delayed_Action *da, const char *params) { double delay = 2.0; - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_border_menu.c Log Message: Remove unused variables. === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_menu.c,v retrieving revision 1.83 retrieving revision 1.84 diff -u -3 -r1.83 -r1.84 --- e_int_border_menu.c 23 May 2008 22:36:57 - 1.83 +++ e_int_border_menu.c 19 Jun 2008 11:57:59 - 1.84 @@ -332,7 +332,6 @@ E_Menu *subm; E_Menu_Item *submi; E_Border *bd; - Evas *evas; if (!(bd = data)) return; @@ -465,7 +464,6 @@ E_Menu *subm; E_Menu_Item *submi; E_Border *bd; - Evas *evas; if (!(bd = data)) return; @@ -499,7 +497,6 @@ E_Menu *subm; E_Menu_Item *submi; E_Border *bd; - Evas *evas; if (!(bd = data)) return; @@ -766,7 +763,6 @@ E_Menu *subm; E_Menu_Item *submi; E_Border *bd; - Evas *evas; if (!(bd = data)) return; - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_configure.c Log Message: Remove unused variable. === RCS file: /cvs/e/e17/apps/e/src/bin/e_configure.c,v retrieving revision 1.119 retrieving revision 1.120 diff -u -3 -r1.119 -r1.120 --- e_configure.c 23 May 2008 14:40:51 - 1.119 +++ e_configure.c 19 Jun 2008 11:56:54 - 1.120 @@ -74,7 +74,6 @@ while ((desktop = ecore_list_next(settings_desktops))) { char *s; - char *cfg_cat_item; char *cfg_cat_name; char *cfg_cat_icon; char *cfg_cat; - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_manager.c Log Message: Remove unused variables. === RCS file: /cvs/e/e17/apps/e/src/bin/e_manager.c,v retrieving revision 1.69 retrieving revision 1.70 diff -u -3 -r1.69 -r1.70 --- e_manager.c 18 Jun 2008 11:38:29 - 1.69 +++ e_manager.c 19 Jun 2008 11:56:09 - 1.70 @@ -798,8 +798,7 @@ { Evas_List *l; E_Manager *man; - int x, y; - + if (!managers) return NULL; for (l = managers; l; l = l->next) { - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_dnd.c Log Message: formatting === RCS file: /cvs/e/e17/apps/e/src/bin/e_dnd.c,v retrieving revision 1.76 retrieving revision 1.77 diff -u -3 -r1.76 -r1.77 --- e_dnd.c 15 Jun 2008 12:28:16 - 1.76 +++ e_dnd.c 15 Jun 2008 12:30:26 - 1.77 @@ -251,7 +251,7 @@ _drag_win = ecore_x_window_input_new(drag->container->win, drag->container->x, drag->container->y, drag->container->w, drag->container->h); - _drag_win_root= drag->container->manager->root; + _drag_win_root = drag->container->manager->root; ecore_x_window_show(_drag_win); if (!e_grabinput_get(_drag_win, 1, _drag_win)) { - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_dnd.c Log Message: We don't need to search for window at pointer with xdnd, xdnd handles this already. === RCS file: /cvs/e/e17/apps/e/src/bin/e_dnd.c,v retrieving revision 1.75 retrieving revision 1.76 diff -u -3 -r1.75 -r1.76 --- e_dnd.c 15 Jun 2008 12:19:40 - 1.75 +++ e_dnd.c 15 Jun 2008 12:28:16 - 1.76 @@ -680,12 +680,8 @@ // win = ecore_x_window_at_xy_with_skip_get(x, y, ignore_win, 2); } else - /* FIXME: this is nasty. every x mouse event we go back to x and do - * a whole bunch of round-trips narrowing down the toplevel window - * which contains the mouse */ - win = ecore_x_window_shadow_tree_at_xy_with_skip_get(root, x, y, NULL, 0); -// win = ecore_x_window_at_xy_with_skip_get(x, y, NULL, 0); - + win = root; + if (_drag_current) { _e_drag_show(_drag_current); @@ -890,24 +886,13 @@ } static void -_e_drag_xdnd_end(Ecore_X_Window root, int x, int y) +_e_drag_xdnd_end(Ecore_X_Window win, int x, int y) { Evas_List *l; E_Event_Dnd_Drop ev; int dx, dy, dw, dh; - Ecore_X_Window win, ignore_win[2]; if (!_xdnd) return; - if (_drag_current) - { - ignore_win[0] = _drag_current->evas_win; - ignore_win[1] = _drag_win; - win = ecore_x_window_shadow_tree_at_xy_with_skip_get(root, x, y, ignore_win, 2); -// win = ecore_x_window_at_xy_with_skip_get(x, y, ignore_win, 2); - } - else - win = ecore_x_window_shadow_tree_at_xy_with_skip_get(root, x, y, NULL, 0); -// win = ecore_x_window_at_xy_with_skip_get(x, y, NULL, 0); ev.data = _xdnd->data; - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_dnd.c Log Message: Fix typo. === RCS file: /cvs/e/e17/apps/e/src/bin/e_dnd.c,v retrieving revision 1.74 retrieving revision 1.75 diff -u -3 -r1.74 -r1.75 --- e_dnd.c 15 Jun 2008 08:44:32 - 1.74 +++ e_dnd.c 15 Jun 2008 12:19:40 - 1.75 @@ -1307,7 +1307,7 @@ l = evas_list_append(l, file); _xdnd->data = l; - _e_drag_xdnd_end(ev>win, _xdnd->x, _xdnd->y); + _e_drag_xdnd_end(ev->win, _xdnd->x, _xdnd->y); evas_list_free(l); } else - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_dnd.c Log Message: Remove printf === RCS file: /cvs/e/e17/apps/e/src/bin/e_dnd.c,v retrieving revision 1.73 retrieving revision 1.74 diff -u -3 -r1.73 -r1.74 --- e_dnd.c 15 Jun 2008 08:41:41 - 1.73 +++ e_dnd.c 15 Jun 2008 08:44:32 - 1.74 @@ -606,7 +606,6 @@ break; } } - printf("0x%x == 0x%x\n", win, hwin); if (win == hwin) return 1; return 0; } @@ -1185,7 +1184,6 @@ } else { - printf("Position over xdnd: 0x%x, 0x%x\n", ev->win, ev->source); _e_drag_update(ev->win, ev->position.x, ev->position.y); ecore_x_dnd_send_status(1, 0, rect, ECORE_X_DND_ACTION_PRIVATE); } - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_dnd.c Log Message: Use right base window for drop. === RCS file: /cvs/e/e17/apps/e/src/bin/e_dnd.c,v retrieving revision 1.72 retrieving revision 1.73 diff -u -3 -r1.72 -r1.73 --- e_dnd.c 13 Jun 2008 21:35:39 - 1.72 +++ e_dnd.c 15 Jun 2008 08:41:41 - 1.73 @@ -606,6 +606,7 @@ break; } } + printf("0x%x == 0x%x\n", win, hwin); if (win == hwin) return 1; return 0; } @@ -1184,6 +1185,7 @@ } else { + printf("Position over xdnd: 0x%x, 0x%x\n", ev->win, ev->source); _e_drag_update(ev->win, ev->position.x, ev->position.y); ecore_x_dnd_send_status(1, 0, rect, ECORE_X_DND_ACTION_PRIVATE); } @@ -1268,8 +1270,7 @@ for (i = 0; i < files->num_files; i++) l = evas_list_append(l, files->files[i]), printf("file: %s\n", files->files[i]); _xdnd->data = l; - printf("_drag_win_root = %x\n", _drag_win_root); - _e_drag_xdnd_end(_drag_win_root, _xdnd->x, _xdnd->y); + _e_drag_xdnd_end(ev->win, _xdnd->x, _xdnd->y); evas_list_free(l); } else if (!strcmp("text/x-moz-url", _xdnd->type)) @@ -1308,12 +1309,12 @@ l = evas_list_append(l, file); _xdnd->data = l; - _e_drag_xdnd_end(_drag_win_root, _xdnd->x, _xdnd->y); + _e_drag_xdnd_end(ev>win, _xdnd->x, _xdnd->y); evas_list_free(l); } else { - _e_drag_xdnd_end(_drag_win_root, _xdnd->x, _xdnd->y); + _e_drag_xdnd_end(ev->win, _xdnd->x, _xdnd->y); } /* FIXME: When to execute this? It could be executed in ecore_x after getting * the drop property... */ - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_shelf.c Log Message: pure zone isn't available. === RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v retrieving revision 1.93 retrieving revision 1.94 diff -u -3 -r1.93 -r1.94 --- e_shelf.c 14 Jun 2008 09:53:05 - 1.93 +++ e_shelf.c 14 Jun 2008 10:10:54 - 1.94 @@ -632,8 +632,8 @@ evas_object_layer_set(es->o_event, es->cfg->layer); evas_object_layer_set(es->o_base, es->cfg->layer); - e_drop_xdnd_register_set(zone->container->event_win, 1); - e_gadcon_dnd_window_set(es->gadcon, zone->container->event_win); + e_drop_xdnd_register_set(es->zone->container->event_win, 1); + e_gadcon_dnd_window_set(es->gadcon, es->zone->container->event_win); _e_shelf_edge_event_register(es, 0); } } - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_shelf.c Log Message: Add missing dnd registration for shelf. === RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v retrieving revision 1.92 retrieving revision 1.93 diff -u -3 -r1.92 -r1.93 --- e_shelf.c 19 May 2008 04:37:34 - 1.92 +++ e_shelf.c 14 Jun 2008 09:53:05 - 1.93 @@ -609,6 +609,7 @@ { es->popup = e_popup_new(es->zone, es->x, es->y, es->w, es->h); e_drop_xdnd_register_set(es->popup->evas_win, 1); + e_gadcon_dnd_window_set(es->gadcon, es->popup->evas_win); e_popup_layer_set(es->popup, es->cfg->layer); es->ee = es->popup->ecore_evas; @@ -622,6 +623,7 @@ } else { + e_drop_xdnd_register_set(es->popup->evas_win, 0); e_object_del(E_OBJECT(es->popup)); es->popup = NULL; @@ -630,6 +632,8 @@ evas_object_layer_set(es->o_event, es->cfg->layer); evas_object_layer_set(es->o_base, es->cfg->layer); + e_drop_xdnd_register_set(zone->container->event_win, 1); + e_gadcon_dnd_window_set(es->gadcon, zone->container->event_win); _e_shelf_edge_event_register(es, 0); } } - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_dnd.c Log Message: On drop from external program, use the event window to find the drop target. === RCS file: /cvs/e/e17/apps/e/src/bin/e_dnd.c,v retrieving revision 1.71 retrieving revision 1.72 diff -u -3 -r1.71 -r1.72 --- e_dnd.c 13 Jun 2008 10:57:06 - 1.71 +++ e_dnd.c 13 Jun 2008 21:35:39 - 1.72 @@ -1184,7 +1184,7 @@ } else { - _e_drag_update(_drag_win_root, ev->position.x, ev->position.y); + _e_drag_update(ev->win, ev->position.x, ev->position.y); ecore_x_dnd_send_status(1, 0, rect, ECORE_X_DND_ACTION_PRIVATE); } // double t2 = ecore_time_get() - t1; - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_dnd.c Log Message: No need to continue looping after finding active. === RCS file: /cvs/e/e17/apps/e/src/bin/e_dnd.c,v retrieving revision 1.70 retrieving revision 1.71 diff -u -3 -r1.70 -r1.71 --- e_dnd.c 13 Jun 2008 10:21:43 - 1.70 +++ e_dnd.c 13 Jun 2008 10:57:06 - 1.71 @@ -1173,7 +1173,10 @@ h = l->data; if (h->active) - active = 1; + { +active = 1; +break; + } } if (!active) { - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_dnd.c Log Message: No need to alloc === RCS file: /cvs/e/e17/apps/e/src/bin/e_dnd.c,v retrieving revision 1.69 retrieving revision 1.70 diff -u -3 -r1.69 -r1.70 --- e_dnd.c 13 Jun 2008 09:14:20 - 1.69 +++ e_dnd.c 13 Jun 2008 10:21:43 - 1.70 @@ -1102,7 +1102,7 @@ _e_dnd_cb_event_dnd_leave(void *data, int type, void *event) { Ecore_X_Event_Xdnd_Leave *ev; - E_Event_Dnd_Leave *leave_ev; + E_Event_Dnd_Leave leave_ev; const char *id; Evas_List *l; @@ -1112,10 +1112,8 @@ if (!evas_hash_find(_drop_win_hash, id)) return 1; printf("Xdnd leave\n"); - leave_ev = E_NEW(E_Event_Dnd_Leave, 1); - /* FIXME: We don't need x and y in leave */ - leave_ev->x = 0; - leave_ev->y = 0; + leave_ev.x = 0; + leave_ev.y = 0; if (_xdnd) { @@ -1131,7 +1129,7 @@ if (h->entered) { if (h->cb.leave) - h->cb.leave(h->cb.data, h->active_type, leave_ev); + h->cb.leave(h->cb.data, h->active_type, &leave_ev); h->entered = 0; } } @@ -1140,7 +1138,6 @@ free(_xdnd); _xdnd = NULL; } - free(leave_ev); return 1; } - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_dnd.c Log Message: Check whether the gadcon is on a shelf before doing shelf operation. (Thanks to Dave Andreoli). === RCS file: /cvs/e/e17/apps/e/src/bin/e_dnd.c,v retrieving revision 1.68 retrieving revision 1.69 diff -u -3 -r1.68 -r1.69 --- e_dnd.c 24 Mar 2008 12:48:33 - 1.68 +++ e_dnd.c 13 Jun 2008 09:14:20 - 1.69 @@ -637,15 +637,19 @@ static void _e_drag_win_hide(E_Drop_Handler *h) { + E_Shelf *shelf; + if (h->obj) { switch (h->obj->type) { case E_GADCON_TYPE: - e_shelf_toggle(e_gadcon_shelf_get((E_Gadcon *)(h->obj)), 0); + shelf = e_gadcon_shelf_get((E_Gadcon *)(h->obj)); + if (shelf) e_shelf_toggle(shelf, 0); break; case E_GADCON_CLIENT_TYPE: - e_shelf_toggle(e_gadcon_shelf_get(((E_Gadcon_Client *)(h->obj))->gadcon), 0); + shelf = e_gadcon_shelf_get(((E_Gadcon_Client *)(h->obj))->gadcon); + if (shelf) e_shelf_toggle(shelf, 0); break; /* FIXME: add more types as needed */ default: - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_border.c Log Message: formatting === RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v retrieving revision 1.632 retrieving revision 1.633 diff -u -3 -r1.632 -r1.633 --- e_border.c 28 Apr 2008 10:50:35 - 1.632 +++ e_border.c 28 Apr 2008 16:10:05 - 1.633 @@ -1404,7 +1404,7 @@ // printf(" accept:%i take:%i\n", bd->client.icccm.accepts_focus, bd->client.icccm.take_focus); if (!bd->client.icccm.accepts_focus) return; /* dont focus an iconified window. that's silly! */ - if ((focus) && (bd->iconic))return; + if ((focus) && (bd->iconic)) return; if ((bd->modal) && (bd->modal != bd)) { - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_fm_hal.c Log Message: formatting === RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_hal.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_fm_hal.c 13 Mar 2008 19:10:27 - 1.5 +++ e_fm_hal.c 24 Mar 2008 14:27:50 - 1.6 @@ -157,11 +157,11 @@ s->volumes = evas_list_append(s->volumes, v); } - if ((v->storage) - && (!v->mount_point - || (strcmp(v->mount_point, "/") - && strcmp(v->mount_point, "/home") - && strcmp(v->mount_point, "/tmp" + if ((v->storage) && + ((!v->mount_point) || + (strcmp(v->mount_point, "/") && +strcmp(v->mount_point, "/home") && +strcmp(v->mount_point, "/tmp" { _e_fm2_volume_write(v); } - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_dnd.c Log Message: Check if the gadcon has a shelf set. === RCS file: /cvs/e/e17/apps/e/src/bin/e_dnd.c,v retrieving revision 1.67 retrieving revision 1.68 diff -u -3 -r1.67 -r1.68 --- e_dnd.c 26 Feb 2008 09:47:50 - 1.67 +++ e_dnd.c 24 Mar 2008 12:48:33 - 1.68 @@ -613,17 +613,19 @@ static void _e_drag_win_show(E_Drop_Handler *h) { + E_Shelf *shelf; + if (h->obj) { switch (h->obj->type) { case E_GADCON_TYPE: -/* FIXME: this is wrong - it ASSUMES the holder is a shelf */ -// e_shelf_toggle(e_gadcon_shelf_get((E_Gadcon *)(h->obj)), 1); +shelf = e_gadcon_shelf_get((E_Gadcon *)(h->obj)); +if (shelf) e_shelf_toggle(shelf, 1); break; case E_GADCON_CLIENT_TYPE: -/* FIXME: this is wrong - it ASSUMES the holder is a shelf */ -// e_shelf_toggle(e_gadcon_shelf_get(((E_Gadcon_Client *)(h->obj))->gadcon), 1); +shelf = e_gadcon_shelf_get(((E_Gadcon_Client *)(h->obj))->gadcon); +if (shelf) e_shelf_toggle(shelf, 1); break; /* FIXME: add more types as needed */ default: - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_wallpaper Modified Files: e_int_config_wallpaper_web.c Log Message: Delete ecore_con_url object. === RCS file: /cvs/e/e17/apps/e/src/modules/conf_wallpaper/e_int_config_wallpaper_web.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- e_int_config_wallpaper_web.c15 Mar 2008 07:42:18 - 1.10 +++ e_int_config_wallpaper_web.c21 Mar 2008 14:23:16 - 1.11 @@ -189,6 +189,8 @@ if (cfdata->pending_downloads == 1) ecore_file_download_abort_all(); + if (cfdata->ecu) + ecore_con_url_destroy(cfdata->ecu); if (cfdata->hdata) ecore_event_handler_del(cfdata->hdata); - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/temperature Modified Files: e_mod_main.c Log Message: Remove unused variable. === RCS file: /cvs/e/e17/apps/e/src/modules/temperature/e_mod_main.c,v retrieving revision 1.93 retrieving revision 1.94 diff -u -3 -r1.93 -r1.94 --- e_mod_main.c10 Mar 2008 06:45:05 - 1.93 +++ e_mod_main.c17 Mar 2008 07:23:22 - 1.94 @@ -59,7 +59,6 @@ Evas_Object *o; E_Gadcon_Client *gcc; Config_Face *inst; - char buf[PATH_MAX]; inst = evas_hash_find(temperature_config->faces, id); if (!inst) - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_wallpaper Modified Files: e_int_config_wallpaper_web.c Log Message: Make it work again (from Massimiliano Calamelli) === RCS file: /cvs/e/e17/apps/e/src/modules/conf_wallpaper/e_int_config_wallpaper_web.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- e_int_config_wallpaper_web.c13 Mar 2008 19:19:10 - 1.8 +++ e_int_config_wallpaper_web.c13 Mar 2008 19:28:12 - 1.9 @@ -292,8 +292,8 @@ if ((cfdata->busy == 0) && (cfdata->pending_downloads == 0)) { cfdata->source = e_widget_ilist_selected_label_get(cfdata->ol); - cfdata->busy = 1; _reset(import); + cfdata->busy = 1; _get_feed(cfdata->ol_val, import); } else @@ -355,7 +355,7 @@ img = strstr(instr, "url="); img += 5; p = strchr(img, '"'); -p = 0; +*p = 0; img = strdup(img); state = 3; } - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_wallpaper Modified Files: e_int_config_wallpaper.h e_int_config_wallpaper_web.c Log Message: Fix compiler warnings. === RCS file: /cvs/e/e17/apps/e/src/modules/conf_wallpaper/e_int_config_wallpaper.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_int_config_wallpaper.h24 Oct 2007 08:37:48 - 1.3 +++ e_int_config_wallpaper.h13 Mar 2008 19:19:10 - 1.4 @@ -13,6 +13,7 @@ EAPI void e_int_config_wallpaper_update(E_Config_Dialog *dia, char *file); EAPI void e_int_config_wallpaper_import_done(E_Config_Dialog *dia); EAPI void e_int_config_wallpaper_gradient_done(E_Config_Dialog *dia); +EAPI void e_int_config_wallpaper_web_done(E_Config_Dialog *dia); EAPI void e_int_config_wallpaper_handler_set(Evas_Object *obj, const char *path, void *data); EAPI int e_int_config_wallpaper_handler_test(Evas_Object *obj, const char *path, void *data); === RCS file: /cvs/e/e17/apps/e/src/modules/conf_wallpaper/e_int_config_wallpaper_web.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_int_config_wallpaper_web.c12 Mar 2008 23:49:45 - 1.7 +++ e_int_config_wallpaper_web.c13 Mar 2008 19:19:10 - 1.8 @@ -70,7 +70,7 @@ Import *import; E_Config_Dialog_Data *cfdata; - Evas_Object *o, *ol, *of, *ofm, *osfm, *otl; + Evas_Object *o, *ol, *of, *ofm, *osfm; Evas_Coord mw, mh; E_Fm2_Config fmc; @@ -94,9 +94,6 @@ cfdata = E_NEW(E_Config_Dialog_Data, 1); - ecore_con_url_init(); - ecore_file_download_init(); - cfdata->ecu = ecore_con_url_new("http://fake.url";); cfdata->ready_for_edj = 0; @@ -210,8 +207,6 @@ ecore_event_handler_del(cfdata->hdata); if (cfdata->hcomplete) ecore_event_handler_del(cfdata->hcomplete); - ecore_file_download_shutdown(); - ecore_con_url_shutdown(); if (cfdata->tmpdir) { @@ -404,7 +399,7 @@ asprintf(&dtmp, "%s/.tmp", cfdata->tmpdir); ecore_file_mkdir(dtmp); ecore_list_first_goto(cfdata->thumbs); - while (src = ecore_list_next(cfdata->thumbs)) + while ((src = ecore_list_next(cfdata->thumbs))) { asprintf(&dest, "%s/%s", dtmp, ecore_file_file_get(src)); ecore_file_download(src, dest, _get_thumb_complete, NULL, import); @@ -488,7 +483,6 @@ { Import *i; E_Config_Dialog_Data *cfdata; - int num = 0; const char *file; char *buf; char *title; @@ -589,7 +583,6 @@ E_Config_Dialog_Data *cfdata; extern int errno; char *title; - char *tpl; import = data; cfdata = import->cfdata; - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/battery Modified Files: batget.c Log Message: Fix compiler warnings. === RCS file: /cvs/e/e17/apps/e/src/modules/battery/batget.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- batget.c4 Mar 2008 03:35:03 - 1.6 +++ batget.c13 Mar 2008 19:13:36 - 1.7 @@ -34,7 +34,6 @@ #define CHECK_SYS_CLASS_POWER_SUPPLY 4 static void init(void); -static int check(void); static int poll_cb(void *data); static int poll_interval = 512; @@ -490,7 +489,6 @@ static void linux_sys_class_power_supply_sysev_init(Sys_Class_Power_Supply_Uevent *sysev) { - char *name; char buf[4096]; sysev->basis = 0; @@ -1108,9 +1106,8 @@ linux_apm_check(void) { FILE *f; - char s[256], s1[32], s2[32], s3[32], buf[4096]; + char s[256], s1[32], s2[32], s3[32]; int apm_flags, ac_stat, bat_stat, bat_flags, bat_val, time_val; - int hours, minutes; battery_full = -1; time_left = -1; @@ -1214,8 +1211,6 @@ int flags = 0; int charge = 0; int max_charge = 0; - int current = 0; - int timeleft = 0; int voltage = 0; int seconds = 0; int curcharge = 0; - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_fm_hal.c Log Message: simpler way to set an empty string. === RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_hal.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_fm_hal.c 6 Mar 2008 16:58:38 - 1.4 +++ e_fm_hal.c 13 Mar 2008 19:10:27 - 1.5 @@ -146,7 +146,7 @@ else if (ecore_file_is_dir("/tmp")) snprintf(buf, sizeof(buf), "/tmp/%s", id); else - snprintf(buf, sizeof(buf), ""); + buf[0] = 0; v->mount_point = strdup(buf); } } - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_hints.c Log Message: Add correct sign === RCS file: /cvs/e/e17/apps/e/src/bin/e_hints.c,v retrieving revision 1.96 retrieving revision 1.97 diff -u -3 -r1.96 -r1.97 --- e_hints.c 7 Mar 2008 11:51:31 - 1.96 +++ e_hints.c 13 Mar 2008 19:09:15 - 1.97 @@ -1342,7 +1342,7 @@ EAPI void e_hints_window_qtopia_soft_menu_get(E_Border *bd) { - int val; + unsigned int val; if (ecore_x_window_prop_card32_get(bd->client.win, _QTOPIA_SOFT_MENU, &val, 1)) bd->client.qtopia.soft_menu = val; @@ -1353,7 +1353,7 @@ EAPI void e_hints_window_qtopia_soft_menus_get(E_Border *bd) { - int val; + unsigned int val; if (ecore_x_window_prop_card32_get(bd->client.win, _QTOPIA_SOFT_MENUS, &val, 1)) bd->client.qtopia.soft_menus = val; - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_wallpaper Modified Files: e_int_config_wallpaper_web.c Log Message: Clean up and remove some leaks. === RCS file: /cvs/e/e17/apps/e/src/modules/conf_wallpaper/e_int_config_wallpaper_web.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_int_config_wallpaper_web.c12 Mar 2008 20:40:24 - 1.5 +++ e_int_config_wallpaper_web.c12 Mar 2008 21:13:21 - 1.6 @@ -112,7 +112,9 @@ o = e_widget_list_add(evas, 0, 1); cfdata->o = o; cfdata->thumbs = ecore_list_new(); + ecore_list_free_cb_set(cfdata->thumbs, free); cfdata->medias = ecore_list_new(); + ecore_list_free_cb_set(cfdata->medias, free); of = e_widget_framelist_add(evas, "Sources", 1); ol = e_widget_ilist_add(evas, 24, 24, &cfdata->ol_val); cfdata->ol = ol; @@ -218,7 +220,10 @@ ecore_file_recursive_rm(cfdata->tmpdir); ecore_file_rmdir(cfdata->tmpdir); } + free(cfdata->tmpdir); } + ecore_list_destroy(cfdata->thumbs); + ecore_list_destroy(cfdata->medias); e_int_config_wallpaper_web_done(import->parent); E_FREE(import->cfdata); @@ -308,13 +313,9 @@ Import *import; E_Config_Dialog_Data *cfdata; FILE *fh; - char instr[255]; + char instr[1024]; char *edj; char *img; - char *tmpstr; - char *tinstr; - char *timg; - char *title; int state = -1; @@ -323,7 +324,7 @@ cfdata->pending_downloads = 0; fh = fopen("/tmp/feed.xml", "r"); - while (fgets(instr, 255, fh) != NULL) + while (fgets(instr, sizeof(instr), fh) != NULL) { if (strstr(instr, "") != NULL) && (state == 1)) { -tinstr = strdup(instr); -edj = strtok(tinstr, ">"); -edj = strtok(NULL, "<"); -tmpstr = strrchr(ecore_file_file_get(edj), '.'); -if (strstr(tmpstr, "edj") != NULL) - state = 2; +char *p; + +edj = strchr(instr, ">"); +edj++; +p = strchr(edj, "<"); +*p = 0; +p = strrchr(ecore_file_file_get(edj), '.'); +if (!strcmp(p, ".edj")) + { + edj = strdup(edj); + state = 2; + } } if ((strstr(instr, "") != NULL) && (state == 3)) { -timg = strdup(img); -timg[strlen(timg) - 1] = 0; -ecore_list_append(cfdata->thumbs, strdup(timg)); -ecore_list_append(cfdata->medias, strdup(edj)); +ecore_list_append(cfdata->thumbs, img); +ecore_list_append(cfdata->medias, edj); state = 0; } - } - - if (timg) - free(timg); - if (tinstr) - free(tinstr); + } fclose(fh); - if ((state != -1) && (state == 0)) + if (state == 0) { asprintf(&title, _("[%s] Parsing feed... DONE!"), cfdata->source); e_dialog_title_set(import->dia, title); @@ -454,10 +457,7 @@ static int _list_find(const char *str1, const char *str2) { - char *tmp; - - tmp = strdup(str1); - return strcmp(ecore_file_file_get(tmp), str2); + return strcmp(ecore_file_file_get(str1), str2); } static void @@ -477,9 +477,7 @@ cfdata = import->cfdata; sels = e_fm2_selected_list_get(cfdata->ofm); if (sels) - { - _download_media(import); - } + _download_media(import); else e_int_config_wallpaper_web_del(dia); } @@ -491,7 +489,6 @@ E_Config_Dialog_Data *cfdata; int num = 0; const char *file; - const char *homedir; char *buf; char *title; @@ -500,8 +497,7 @@ cfdata->pending_downloads = 1; file = ecore_file_file_get(cfdata->edj); - homedir = e_user_homedir_get(); - asprintf(&buf, "%s/.e/e/backgrounds/%s", homedir, file); + asprintf(&buf, "%s/.e/e/backgrounds/%s", e_user_homedir_get(), file); asprintf(&title, _("[%s] Downloading of edje file..."), cfdata->source); e_dialog_title_set(i->dia, title); ecore_file_download(cfdata->edj, buf, @@ -597,9 +593,7 @@ import = data; cfdata = import->cfdata; - tpl = strdup(TEMPLATE); - cfdata->tmpdir = mkdtemp(tpl); - free(tpl); + cfdata->tmpdir = mkdtemp(strdup(TEMPLATE)); ecore_con_url_url_set(cfdata->ecu, url); ecore_file_download_abort_all(); - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_wallpaper Modified Files: e_int_config_wallpaper_web.c Log Message: formatting === RCS file: /cvs/e/e17/apps/e/src/modules/conf_wallpaper/e_int_config_wallpaper_web.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_int_config_wallpaper_web.c12 Mar 2008 10:19:44 - 1.4 +++ e_int_config_wallpaper_web.c12 Mar 2008 20:40:24 - 1.5 @@ -12,8 +12,9 @@ typedef struct _Import Import; -struct _Import { - int magic; +struct _Import +{ + int magic; E_Config_Dialog *parent; E_Config_Dialog_Data *cfdata; @@ -41,7 +42,7 @@ const char *source; }; -const char tmpdir_tpl[] = "/tmp/wallpXX"; +#define TEMPLATE "/tmp/wallpXX"; static void _file_double_click_cb(void *data, Evas_Object *obj, void *ev_info); static void _file_click_cb(void *data, Evas_Object *obj, void *ev_info); @@ -74,8 +75,7 @@ E_Fm2_Config fmc; import = E_NEW(Import, 1); - if (!import) - return NULL; + if (!import) return NULL; import->magic = MAGIC_IMPORT; @@ -168,10 +168,10 @@ import); osfm = e_widget_scrollframe_pan_add(evas, ofm, - e_fm2_pan_set, - e_fm2_pan_get, - e_fm2_pan_max_get, - e_fm2_pan_child_size_get); + e_fm2_pan_set, + e_fm2_pan_get, + e_fm2_pan_max_get, + e_fm2_pan_child_size_get); cfdata->osfm = osfm; e_widget_list_object_append(cfdata->o, cfdata->osfm, 1, 1, 0.5); e_widget_min_size_set(osfm, 320, 320); @@ -202,29 +202,23 @@ cfdata = import->cfdata; if (cfdata->pending_downloads == 1) - { - ecore_file_download_abort_all(); - } + ecore_file_download_abort_all(); if (cfdata->hdata) - { - ecore_event_handler_del(cfdata->hdata); - } + ecore_event_handler_del(cfdata->hdata); if (cfdata->hcomplete) - { - ecore_event_handler_del(cfdata->hcomplete); - } + ecore_event_handler_del(cfdata->hcomplete); ecore_file_download_shutdown(); ecore_con_url_shutdown(); if (cfdata->tmpdir) - { - if (ecore_file_is_dir(cfdata->tmpdir)) - { - ecore_file_recursive_rm(cfdata->tmpdir); - ecore_file_rmdir(cfdata->tmpdir); - } - } + { + if (ecore_file_is_dir(cfdata->tmpdir)) + { +ecore_file_recursive_rm(cfdata->tmpdir); +ecore_file_rmdir(cfdata->tmpdir); + } + } e_int_config_wallpaper_web_done(import->parent); E_FREE(import->cfdata); @@ -253,17 +247,18 @@ ecore_event_handler_del(cfdata->hcomplete); cfdata->hdata = NULL; cfdata->hcomplete = NULL; - if (euc->status == 200) { - asprintf(&title, _("[%s] Getting feed... DONE!"), cfdata->source); - e_dialog_title_set(import->dia, title); - _parse_feed(data); - return 0; - } + if (euc->status == 200) + { + asprintf(&title, _("[%s] Getting feed... DONE!"), cfdata->source); + e_dialog_title_set(import->dia, title); + _parse_feed(data); + return 0; + } else - { - asprintf(&title, _("[%s] Getting feed... FAILED!"), cfdata->source); - e_dialog_title_set(import->dia, title); - } + { + asprintf(&title, _("[%s] Getting feed... FAILED!"), cfdata->source); + e_dialog_title_set(import->dia, title); + } return 0; } @@ -295,16 +290,16 @@ import = data; cfdata = import->cfdata; if ((cfdata->busy == 0) && (cfdata->pending_downloads == 0)) - { - cfdata->source = e_widget_ilist_selected_label_get(cfdata->ol); - cfdata->busy = 1; - _reset(import); - _get_feed(cfdata->ol_val, import); - } + { + cfdata->source = e_widget_ilist_selected_label_get(cfdata->ol); + cfdata->busy = 1; + _reset(import); + _get_feed(cfdata->ol_val, import); + } else - { - e_widget_ilist_unselect(cfdata->ol); - } + { + e_widget_ilist_unselect(cfdata->ol); + } } static void @@ -329,67 +324,65 @@ cfdata->pending_downloads = 0; fh = fopen("/tmp/feed.xml", "r"); while (fgets(instr, 255, fh) != NULL) - { - if (strstr(instr, "") != NULL) && (state == 0)) - { - edj = NULL; - img = NULL; - state = 1; - } - - if ((strstr(instr, "") != NULL) && (state == 1)) - { - tinstr = strdup(instr); - edj = strtok(tinstr, ">"); - edj = strtok(NULL, "<"); - tmpstr = strrchr(ecore_file_file_get(edj), '.'); - if (strs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_wallpaper Modified Files: e_int_config_wallpaper_web.c Log Message: fix leak. === RCS file: /cvs/e/e17/apps/e/src/modules/conf_wallpaper/e_int_config_wallpaper_web.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_int_config_wallpaper_web.c12 Mar 2008 10:16:01 - 1.3 +++ e_int_config_wallpaper_web.c12 Mar 2008 10:19:44 - 1.4 @@ -41,7 +41,7 @@ const char *source; }; -char tmpdir_tpl[17] = "/tmp/wallpXX"; +const char tmpdir_tpl[] = "/tmp/wallpXX"; static void _file_double_click_cb(void *data, Evas_Object *obj, void *ev_info); static void _file_click_cb(void *data, Evas_Object *obj, void *ev_info); @@ -609,11 +609,14 @@ E_Config_Dialog_Data *cfdata; extern int errno; char *title; + char *tpl; import = data; cfdata = import->cfdata; - cfdata->tmpdir = mkdtemp(strdup(tmpdir_tpl)); + tpl = strdup(tmpdir_tpl); + cfdata->tmpdir = mkdtemp(tpl); + free(tpl); ecore_con_url_url_set(cfdata->ecu, url); ecore_file_download_abort_all(); - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_wallpaper Modified Files: e_int_config_wallpaper_web.c Log Message: Formatting === RCS file: /cvs/e/e17/apps/e/src/modules/conf_wallpaper/e_int_config_wallpaper_web.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_int_config_wallpaper_web.c9 Mar 2008 16:43:58 - 1.2 +++ e_int_config_wallpaper_web.c12 Mar 2008 10:16:01 - 1.3 @@ -43,26 +43,26 @@ char tmpdir_tpl[17] = "/tmp/wallpXX"; -static void _file_double_click_cb (void *data, Evas_Object *obj, void *ev_info); -static void _file_click_cb (void *data, Evas_Object *obj, void *ev_info); -static int _feed_complete (void *data, int type, void *event); -static int _feed_data (void *data, int type, void *event); -static void _get_feed (char *url, void *data); -static void _parse_feed (void *data); -static void _get_thumbs (void *data); -void_get_thumb_complete (void *data, const char *file, int status); -static void _source_sel_cb (void *data); -static void _reset (void *data); -static int _list_find (const char *str1, const char *str2); -static void _dia_del_cb (void *obj); -static void _dia_close_cb (void *data, E_Dialog *dia); -static void _dia_ok_cb (void *data, E_Dialog *dia); -static void _download_media (Import *import); -int _download_media_progress_cb (void *data, const char *file, long int dltotal, long int dlnow, long int ultotal, long int ulnow); -void_download_media_complete_cb (void *data, const char *file, int status); +static void _file_double_click_cb(void *data, Evas_Object *obj, void *ev_info); +static void _file_click_cb(void *data, Evas_Object *obj, void *ev_info); +static int _feed_complete(void *data, int type, void *event); +static int _feed_data(void *data, int type, void *event); +static void _get_feed(char *url, void *data); +static void _parse_feed(void *data); +static void _get_thumbs(void *data); +void_get_thumb_complete(void *data, const char *file, int status); +static void _source_sel_cb(void *data); +static void _reset(void *data); +static int _list_find(const char *str1, const char *str2); +static void _dia_del_cb(void *obj); +static void _dia_close_cb(void *data, E_Dialog *dia); +static void _dia_ok_cb(void *data, E_Dialog *dia); +static void _download_media(Import *import); +int _download_media_progress_cb(void *data, const char *file, long int dltotal, long int dlnow, long int ultotal, long int ulnow); +void_download_media_complete_cb(void *data, const char *file, int status); EAPI E_Dialog * -e_int_config_wallpaper_web (E_Config_Dialog *parent) +e_int_config_wallpaper_web(E_Config_Dialog *parent) { Evas *evas; E_Dialog *dia; @@ -73,31 +73,31 @@ Evas_Coord mw, mh; E_Fm2_Config fmc; - import = E_NEW (Import, 1); + import = E_NEW(Import, 1); if (!import) return NULL; import->magic = MAGIC_IMPORT; - dia = e_dialog_new (parent->con, "E", "_wallpaper_web_dialog"); + dia = e_dialog_new(parent->con, "E", "_wallpaper_web_dialog"); if (!dia) - { - E_FREE (import); - return NULL; - } + { + E_FREE(import); + return NULL; + } dia->data = import; - e_object_del_attach_func_set (E_OBJECT(dia), _dia_del_cb); - e_win_centered_set (dia->win, 1); + e_object_del_attach_func_set(E_OBJECT(dia), _dia_del_cb); + e_win_centered_set(dia->win, 1); - evas = e_win_evas_get (dia->win); + evas = e_win_evas_get(dia->win); - cfdata = E_NEW (E_Config_Dialog_Data, 1); + cfdata = E_NEW(E_Config_Dialog_Data, 1); - ecore_con_url_init (); - ecore_file_download_init (); + ecore_con_url_init(); + ecore_file_download_init(); - cfdata->ecu = ecore_con_url_new ("http://fake.url";); + cfdata->ecu = ecore_con_url_new("http://fake.url";); cfdata->ready_for_edj = 0; cfdata->pending_downloads = 0; @@ -107,35 +107,35 @@ import->parent = parent; - e_dialog_title_set (dia, _("Choose a website from list...")); + e_dialog_title_set(dia, _("Choose a website from list...")); - o = e_widget_list_add (evas, 0, 1); + o = e_widget_list_add(evas, 0, 1); cfdata->o = o; - cfdata->thumbs = ecore_list_new (); - cfdata->medias = ecore_list_new (); - of = e_widget_framelist_add (evas, "Sources", 1); - ol = e_widget_ilist_add (evas, 24, 24, &cfdata->ol_val); + cfdata->thumbs = ecore_list_new(); + cfdata->medias = ecore_list_new(); + of = e_widget_framelist_add(evas, "Sources", 1); + ol = e_widget_ilist_add(evas, 24, 24, &cfdata->ol_val); cfdata->ol = ol; - e_widget_ilist_append (ol, NULL, _("get-e.org - Static"), + e_widget_ilist_append(ol, NULL, _("get-e.org - Static"), _source_sel_cb, import, "http://www.get-e.org/Backgrounds/St
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_profiles Modified Files: e_int_config_profiles.c Log Message: Formatting === RCS file: /cvs/e/e17/apps/e/src/modules/conf_profiles/e_int_config_profiles.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_int_config_profiles.c 13 Feb 2008 04:51:01 - 1.7 +++ e_int_config_profiles.c 12 Mar 2008 10:16:00 - 1.8 @@ -122,7 +122,7 @@ e_widget_ilist_clear(cfdata->o_list); e_widget_ilist_go(cfdata->o_list); - cur_profile = e_config_profile_get (); + cur_profile = e_config_profile_get(); for (l = e_config_profile_list(); l; l = l->next) { Evas_Object *ob; @@ -153,7 +153,7 @@ cfdata = data; if (!cfdata) return; - cur_profile = e_config_profile_get (); + cur_profile = e_config_profile_get(); if (!strcmp (cur_profile, cfdata->sel_profile)) { e_widget_disabled_set(cfdata->o_select, 1); @@ -175,7 +175,7 @@ if (!cfdata) return; if (cfdata->dia_new_profile) - e_win_raise (cfdata->dia_new_profile->win); + e_win_raise(cfdata->dia_new_profile->win); else cfdata->dia_new_profile = _dia_new_profile(cfdata); } @@ -189,10 +189,10 @@ cfdata = data; if (!cfdata) return; - e_config_save_flush (); - e_config_profile_set (cfdata->sel_profile); - e_config_profile_save (); - e_config_save_block_set (1); + e_config_save_flush(); + e_config_profile_set(cfdata->sel_profile); + e_config_profile_save(); + e_config_save_block_set(1); a = e_action_find("restart"); if ((a) && (a->func.go)) a->func.go(NULL, NULL); @@ -225,7 +225,7 @@ d = data; if (!data) return; - e_config_profile_del (d->cfdata->sel_profile); + e_config_profile_del(d->cfdata->sel_profile); e_config_save_queue(); _ilist_fill(d->cfdata); } @@ -316,17 +316,17 @@ cfdata = data; if (!cfdata) return; - snprintf (cur_profile, sizeof (cur_profile), "%s", e_config_profile_get ()); + snprintf(cur_profile, sizeof (cur_profile), "%s", e_config_profile_get()); if (cfdata->new_profile) { - e_config_profile_add(cfdata->new_profile); - if (cfdata->new_profile_type) - { - e_config_profile_set (cfdata->new_profile); - e_config_save(); - e_config_profile_set (cur_profile); - } + e_config_profile_add(cfdata->new_profile); + if (cfdata->new_profile_type) + { +e_config_profile_set(cfdata->new_profile); +e_config_save(); +e_config_profile_set(cur_profile); + } } e_object_unref(E_OBJECT(dia)); - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_actions.c Log Message: formatting === RCS file: /cvs/e/e17/apps/e/src/bin/e_actions.c,v retrieving revision 1.112 retrieving revision 1.113 diff -u -3 -r1.112 -r1.113 --- e_actions.c 12 Mar 2008 07:31:13 - 1.112 +++ e_actions.c 12 Mar 2008 10:05:19 - 1.113 @@ -304,7 +304,7 @@ if (e_config->cnfmdlg_disabled) { - _e_actions_cb_kill_dialog_ok (obj, NULL); + _e_actions_cb_kill_dialog_ok(obj, NULL); return; } @@ -1583,7 +1583,7 @@ if (e_config->cnfmdlg_disabled) { - _e_actions_cb_exit_dialog_ok (NULL, NULL); + _e_actions_cb_exit_dialog_ok(NULL, NULL); return; } @@ -1654,7 +1654,7 @@ if (e_config->cnfmdlg_disabled) { - _e_actions_cb_logout_dialog_ok (NULL, NULL); + _e_actions_cb_logout_dialog_ok(NULL, NULL); return; } @@ -1713,7 +1713,7 @@ if (e_config->cnfmdlg_disabled) { - _e_actions_cb_halt_dialog_ok (NULL, NULL); + _e_actions_cb_halt_dialog_ok(NULL, NULL); return; } @@ -1772,7 +1772,7 @@ if (e_config->cnfmdlg_disabled) { - _e_actions_cb_reboot_dialog_ok (NULL, NULL); + _e_actions_cb_reboot_dialog_ok(NULL, NULL); return; } @@ -1831,7 +1831,7 @@ if (e_config->cnfmdlg_disabled) { - _e_actions_cb_suspend_dialog_ok (NULL, NULL); + _e_actions_cb_suspend_dialog_ok(NULL, NULL); return; } @@ -1890,7 +1890,7 @@ if (e_config->cnfmdlg_disabled) { - _e_actions_cb_hibernate_dialog_ok (NULL, NULL); + _e_actions_cb_hibernate_dialog_ok(NULL, NULL); return; } - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_font.c Log Message: formatting === RCS file: /cvs/e/e17/apps/e/src/bin/e_font.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -3 -r1.25 -r1.26 --- e_font.c9 Feb 2008 22:48:28 - 1.25 +++ e_font.c12 Mar 2008 10:03:30 - 1.26 @@ -310,7 +310,7 @@ { E_Font_Fallback *eff; - e_font_fallback_remove (font); + e_font_fallback_remove(font); eff = E_NEW(E_Font_Fallback, 1); eff->name = evas_stringshare_add(font); @@ -322,7 +322,7 @@ { E_Font_Fallback *eff; - e_font_fallback_remove (font); + e_font_fallback_remove(font); eff = E_NEW(E_Font_Fallback, 1); eff->name = evas_stringshare_add(font); - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_zone.c Log Message: Need to update edge windows after updating flip. === RCS file: /cvs/e/e17/apps/e/src/bin/e_zone.c,v retrieving revision 1.133 retrieving revision 1.134 diff -u -3 -r1.133 -r1.134 --- e_zone.c19 Jan 2008 11:41:42 - 1.133 +++ e_zone.c11 Feb 2008 17:27:18 - 1.134 @@ -506,6 +506,7 @@ E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE); _e_zone_update_flip(zone); + _e_zone_update_edge(zone); } EAPI void @@ -1014,6 +1015,7 @@ if (ev->desk->zone != zone) return 1; _e_zone_update_flip(zone); + _e_zone_update_edge(zone); return 1; } - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_interaction Modified Files: e_int_config_interaction.c Log Message: Remove unused variable. === RCS file: /cvs/e/e17/apps/e/src/modules/conf_interaction/e_int_config_interaction.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_int_config_interaction.c 23 Jan 2008 09:04:56 - 1.1 +++ e_int_config_interaction.c 27 Jan 2008 19:34:28 - 1.2 @@ -78,8 +78,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *o, *ob; - E_Radio_Group *rg; - + o = e_widget_list_add(evas, 0, 0); ob = e_widget_check_add(evas, _("Enable Thumbscroll"), &(cfdata->thumbscroll_enable)); - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/ibox Modified Files: e_mod_main.c Log Message: Add const modifier. === RCS file: /cvs/e/e17/apps/e/src/modules/ibox/e_mod_main.c,v retrieving revision 1.91 retrieving revision 1.92 diff -u -3 -r1.91 -r1.92 --- e_mod_main.c21 Jan 2008 06:11:56 - 1.91 +++ e_mod_main.c27 Jan 2008 19:33:27 - 1.92 @@ -556,7 +556,7 @@ static void _ibox_icon_fill_label(IBox_Icon *ic) { - char *label = NULL; + const char *label = NULL; switch (ic->ibox->inst->ci->icon_label) { - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules Modified Files: Makefile.am Log Message: Only link tempget with needed libs. === RCS file: /cvs/e/e17/apps/e/src/modules/Makefile.am,v retrieving revision 1.41 retrieving revision 1.42 diff -u -3 -r1.41 -r1.42 --- Makefile.am 25 Sep 2007 14:26:36 - 1.41 +++ Makefile.am 20 Jan 2008 19:42:38 - 1.42 @@ -5,7 +5,6 @@ clock \ pager \ battery \ -temperature \ cpufreq \ ibox \ start \ @@ -51,3 +50,7 @@ conf_exebuf \ conf_paths \ conf_mime + +if HAVE_TEMPERATURE +SUBDIRS += temperature +endif - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: configure.in Log Message: Only link tempget with needed libs. === RCS file: /cvs/e/e17/apps/e/configure.in,v retrieving revision 1.198 retrieving revision 1.199 diff -u -3 -r1.198 -r1.199 --- configure.in11 Jan 2008 07:33:54 - 1.198 +++ configure.in20 Jan 2008 19:42:37 - 1.199 @@ -185,7 +185,6 @@ ecore-ipc ecore-con ecore-job - ecore-txt ecore-imf ecore-imf-evas edje @@ -195,11 +194,17 @@ efreet-mime ]) -# ecore-txt is really only needed by the temperature module, -# so we check for it separately. -# in a perfect world, we'd also disable the temperate module here -# if ecore-txt isn't available. -PKG_CHECK_MODULES(ECORE_TXT, ecore-txt) +PKG_CHECK_MODULES(ECORE_TXT, [ + ecore-txt +], [ + have_temp="yes" + # This test will succeed as these modules are also checked before + PKG_CHECK_MODULES(TEMPERATURE, [ +ecore +ecore-file + ]) +], [ have_temp="no"]) +AM_CONDITIONAL(HAVE_TEMPERATURE, test x$have_temp = "xyes") PKG_CHECK_MODULES(E_DBUS, edbus, have_edbus=yes, have_edbus=no) PKG_CHECK_MODULES(E_HAL, ehal, have_ehal=yes, have_ehal=no) - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/temperature Modified Files: Makefile.am Log Message: Only link tempget with needed libs. === RCS file: /cvs/e/e17/apps/e/src/modules/temperature/Makefile.am,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- Makefile.am 11 Jan 2008 07:33:56 - 1.14 +++ Makefile.am 20 Jan 2008 19:42:38 - 1.15 @@ -35,7 +35,7 @@ noinst_PROGRAMS= tempget tempget_SOURCES= tempget.c -tempget_LDFLAGS= @e_libs@ +tempget_LDFLAGS= @TEMPERATURE_LIBS@ uninstall: rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE) - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/temperature Modified Files: tempget.c Log Message: formatting === RCS file: /cvs/e/e17/apps/e/src/modules/temperature/tempget.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- tempget.c 12 Jan 2008 07:58:56 - 1.2 +++ tempget.c 20 Jan 2008 18:41:13 - 1.3 @@ -398,8 +398,8 @@ init(); if (poller) ecore_poller_del(poller); - poller= ecore_poller_add(ECORE_POLLER_CORE, cur_poll_interval, - poll_cb, NULL); + poller = ecore_poller_add(ECORE_POLLER_CORE, cur_poll_interval, +poll_cb, NULL); poll_cb(NULL); ecore_main_loop_begin(); - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_shelf.c e_shelf.h e_zone.c e_zone.h Log Message: Only show edge windows which are in use. === RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v retrieving revision 1.90 retrieving revision 1.91 diff -u -3 -r1.90 -r1.91 --- e_shelf.c 19 Jan 2008 10:08:05 - 1.90 +++ e_shelf.c 19 Jan 2008 11:41:42 - 1.91 @@ -26,6 +26,8 @@ static void _e_shelf_menu_del_hook(void *data); static void _e_shelf_menu_pre_cb(void *data, E_Menu *m); +static void _e_shelf_edge_event_register(E_Shelf *es, int reg); + static Evas_List *shelves = NULL; static Evas_Hash *winid_shelves = NULL; @@ -102,6 +104,7 @@ es->y = 0; es->w = 32; es->h = 32; + es->zone = zone; if (popup) { es->popup = e_popup_new(zone, es->x, es->y, es->w, es->h); @@ -118,7 +121,6 @@ } es->fit_along = 1; es->layer = layer; - es->zone = zone; es->style = evas_stringshare_add(style); es->o_event = evas_object_rectangle_add(es->evas); @@ -602,17 +604,21 @@ if (!es->cfg) return; if (((popup) && (es->popup)) || ((!popup) && (!es->popup))) return; + if (popup) { es->popup = e_popup_new(es->zone, es->x, es->y, es->w, es->h); e_drop_xdnd_register_set(es->popup->evas_win, 1); e_popup_layer_set(es->popup, es->cfg->layer); + es->ee = es->popup->ecore_evas; es->evas = es->popup->evas; es->win = es->popup->evas_win; evas_object_show(es->o_event); evas_object_show(es->o_base); e_popup_edje_bg_object_set(es->popup, es->o_base); + + _e_shelf_edge_event_register(es, 1); } else { @@ -623,6 +629,8 @@ evas_object_move(es->o_base, es->zone->x + es->x, es->zone->y + es->y); evas_object_layer_set(es->o_event, es->cfg->layer); evas_object_layer_set(es->o_base, es->cfg->layer); + + _e_shelf_edge_event_register(es, 0); } } @@ -666,6 +674,8 @@ else e_shelf_show(es); + if (es->popup) + _e_shelf_edge_event_register(es, 1); e_shelf_toggle(es, 0); return es; } @@ -701,6 +711,7 @@ evas_object_del(es->o_base); if (es->popup) { + _e_shelf_edge_event_register(es, 0); e_drop_xdnd_register_set(es->popup->evas_win, 0); winid_shelves = evas_hash_del(winid_shelves, e_util_winid_str_get(es->popup->evas_win), es); e_object_del(E_OBJECT(es->popup)); @@ -1638,4 +1649,52 @@ e_menu_item_label_set(mi, _("Delete this Shelf")); e_util_menu_item_edje_icon_set(mi, "enlightenment/delete"); e_menu_item_callback_set(mi, _e_shelf_cb_menu_delete, es); +} + +static void +_e_shelf_edge_event_register(E_Shelf *es, int reg) +{ + if (!es) return; + if ((!reg) && (!es->edge)) return; + if ((reg) && (es->edge)) return; + if ((reg) && ((!es->cfg->autohide) || (es->cfg->autohide_show_action) || (!es->popup))) return; + es->edge = reg; + + switch (es->gadcon->orient) + { + case E_GADCON_ORIENT_LEFT: +e_zone_edge_event_register(es->zone, E_ZONE_EDGE_LEFT, es->edge); +break; + case E_GADCON_ORIENT_RIGHT: +e_zone_edge_event_register(es->zone, E_ZONE_EDGE_RIGHT, es->edge); +break; + case E_GADCON_ORIENT_TOP: +e_zone_edge_event_register(es->zone, E_ZONE_EDGE_TOP, es->edge); +break; + case E_GADCON_ORIENT_BOTTOM: +e_zone_edge_event_register(es->zone, E_ZONE_EDGE_BOTTOM, es->edge); +break; + case E_GADCON_ORIENT_CORNER_TL: + case E_GADCON_ORIENT_CORNER_LT: +e_zone_edge_event_register(es->zone, E_ZONE_EDGE_TOP, es->edge); +e_zone_edge_event_register(es->zone, E_ZONE_EDGE_LEFT, es->edge); +break; + case E_GADCON_ORIENT_CORNER_TR: + case E_GADCON_ORIENT_CORNER_RT: +e_zone_edge_event_register(es->zone, E_ZONE_EDGE_TOP, es->edge); +e_zone_edge_event_register(es->zone, E_ZONE_EDGE_RIGHT, es->edge); +break; + case E_GADCON_ORIENT_CORNER_BL: + case E_GADCON_ORIENT_CORNER_LB: +e_zone_edge_event_register(es->zone, E_ZONE_EDGE_BOTTOM, es->edge); +e_zone_edge_event_register(es->zone, E_ZONE_EDGE_LEFT, es->edge); +break; + case E_GADCON_ORIENT_CORNER_BR: + case E_GADCON_ORIENT_CORNER_RB: +e_zone_edge_event_register(es->zone, E_ZONE_EDGE_BOTTOM, es->edge); +e_zone_edge_event_register(es->zone, E_ZONE_EDGE_RIGHT, es->edge); +break; + default: +break; + } } === RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.h,v retrieving revision 1.27 retrieving revision 1.28 diff -u -3 -r1.27 -r1.28 --- e_shelf.h 23 Nov 2007 09:18:21 - 1.27 +++ e_shelf.h 19 Jan 2008 11:41:42 - 1.28 @@ -45,6 +45,7 @@ unsigned c
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_shelf.c Log Message: No need to recreate the popup if it already exists. === RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v retrieving revision 1.89 retrieving revision 1.90 diff -u -3 -r1.89 -r1.90 --- e_shelf.c 13 Jan 2008 19:14:19 - 1.89 +++ e_shelf.c 19 Jan 2008 10:08:05 - 1.90 @@ -601,8 +601,7 @@ E_OBJECT_TYPE_CHECK(es, E_SHELF_TYPE); if (!es->cfg) return; - if (es->popup) e_object_del(E_OBJECT(es->popup)); - es->popup = NULL; + if (((popup) && (es->popup)) || ((!popup) && (!es->popup))) return; if (popup) { es->popup = e_popup_new(es->zone, es->x, es->y, es->w, es->h); @@ -617,6 +616,9 @@ } else { + e_object_del(E_OBJECT(es->popup)); + es->popup = NULL; + evas_object_move(es->o_event, es->zone->x + es->x, es->zone->y + es->y); evas_object_move(es->o_base, es->zone->x + es->x, es->zone->y + es->y); evas_object_layer_set(es->o_event, es->cfg->layer); - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_editable.c Log Message: formatting === RCS file: /cvs/e/e17/apps/e/src/bin/e_editable.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- e_editable.c19 Jan 2008 01:00:37 - 1.21 +++ e_editable.c19 Jan 2008 08:44:02 - 1.22 @@ -847,7 +847,7 @@ } EAPI void -e_editable_enable (Evas_Object *editable) +e_editable_enable(Evas_Object *editable) { E_Editable_Smart_Data *sd; @@ -858,7 +858,7 @@ } EAPI void -e_editable_disable (Evas_Object *editable) +e_editable_disable(Evas_Object *editable) { E_Editable_Smart_Data *sd; - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_shelf.c Log Message: Only trigger on edge event in the shelf's zone. === RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v retrieving revision 1.88 retrieving revision 1.89 diff -u -3 -r1.88 -r1.89 --- e_shelf.c 9 Dec 2007 15:38:03 - 1.88 +++ e_shelf.c 13 Jan 2008 19:14:19 - 1.89 @@ -1227,6 +1227,7 @@ int show = 0; ev = event; + if (es->zone != ev->zone) return 1; switch (es->gadcon->orient) { case E_GADCON_ORIENT_LEFT: - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_border.c Log Message: Clean up unmaximize. === RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v retrieving revision 1.622 retrieving revision 1.623 diff -u -3 -r1.622 -r1.623 --- e_border.c 13 Jan 2008 18:27:33 - 1.622 +++ e_border.c 13 Jan 2008 18:53:58 - 1.623 @@ -1941,26 +1941,16 @@ if (!max) return; if (bd->maximized & E_MAXIMIZE_TYPE) { -// printf("UNMAXIMIZE!!\n"); - E_Maximize dir; - int signal; - bd->pre_res_change.valid = 0; - /* Get the resulting directions */ - dir = (max & bd->maximized & E_MAXIMIZE_DIRECTION); - bd->need_maximize = 0; - signal = 1; - switch (bd->maximized & E_MAXIMIZE_TYPE) + if ((bd->maximized & E_MAXIMIZE_TYPE) == E_MAXIMIZE_FULLSCREEN) { - case E_MAXIMIZE_FULLSCREEN: if (bd->bg_object) { Evas_Coord cx, cy, cw, ch; edje_object_signal_emit(bd->bg_object, "e,action,unmaximize,fullscreen", "e"); - signal = 0; edje_object_message_signal_process(bd->bg_object); evas_object_resize(bd->bg_object, 1000, 1000); @@ -1977,20 +1967,13 @@ bd->client_inset.l, bd->client_inset.r, bd->client_inset.t, bd->client_inset.b); } -dir = 0; -break; - case E_MAXIMIZE_SMART: -/* Don't have to do anything special */ -break; - case E_MAXIMIZE_NONE: - case E_MAXIMIZE_EXPAND: - case E_MAXIMIZE_FILL: - case E_MAXIMIZE_VERTICAL: - case E_MAXIMIZE_HORIZONTAL: -/*Ignore*/ -break; + +bd->maximized = E_MAXIMIZE_NONE; +e_border_move_resize(bd, bd->zone->x + bd->saved.x, bd->zone->y + bd->saved.y, bd->saved.w, bd->saved.h); +bd->saved.x = bd->saved.y = bd->saved.w = bd->saved.h = 0; +e_hints_window_size_unset(bd); } - if (dir) + else { int w, h, x, y; @@ -1999,7 +1982,7 @@ x = bd->x; y = bd->y; -if (dir & E_MAXIMIZE_VERTICAL) +if (max & E_MAXIMIZE_VERTICAL) { /* Remove vertical */ h = bd->saved.h; @@ -2007,7 +1990,7 @@ bd->saved.h = bd->saved.y = 0; bd->maximized &= ~E_MAXIMIZE_VERTICAL; } -if (dir & E_MAXIMIZE_HORIZONTAL) +if (max & E_MAXIMIZE_HORIZONTAL) { /* Remove horizontal */ w = bd->saved.w; @@ -2022,18 +2005,13 @@ { bd->maximized = E_MAXIMIZE_NONE; e_hints_window_size_unset(bd); + edje_object_signal_emit(bd->bg_object, "e,action,unmaximize", "e"); } else - { - signal = 0; - e_hints_window_size_set(bd); - } + e_hints_window_size_set(bd); } e_hints_window_maximized_set(bd, bd->maximized & E_MAXIMIZE_HORIZONTAL, bd->maximized & E_MAXIMIZE_VERTICAL); - - if (signal) - edje_object_signal_emit(bd->bg_object, "e,action,unmaximize", "e"); } if (bd->remember) e_remember_update(bd->remember, bd); - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_border.c Log Message: Fix unmaximize (bug #176) === RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v retrieving revision 1.621 retrieving revision 1.622 diff -u -3 -r1.621 -r1.622 --- e_border.c 11 Jan 2008 07:33:54 - 1.621 +++ e_border.c 13 Jan 2008 18:27:33 - 1.622 @@ -1947,17 +1947,13 @@ bd->pre_res_change.valid = 0; /* Get the resulting directions */ - dir = (bd->maximized & E_MAXIMIZE_DIRECTION); - dir &= ~max; + dir = (max & bd->maximized & E_MAXIMIZE_DIRECTION); bd->need_maximize = 0; signal = 1; switch (bd->maximized & E_MAXIMIZE_TYPE) { - case E_MAXIMIZE_NONE: -/* Ignore */ -break; case E_MAXIMIZE_FULLSCREEN: if (bd->bg_object) { @@ -1986,66 +1982,52 @@ case E_MAXIMIZE_SMART: /* Don't have to do anything special */ break; + case E_MAXIMIZE_NONE: case E_MAXIMIZE_EXPAND: -/* Ignore */ -break; case E_MAXIMIZE_FILL: -/* Ignore */ -break; case E_MAXIMIZE_VERTICAL: -/*Ignore*/ -break; case E_MAXIMIZE_HORIZONTAL: /*Ignore*/ break; } - if (dir & E_MAXIMIZE_HORIZONTAL) + if (dir) { -/* Remove vertical */ -int w,h; +int w, h, x, y; -signal = 0; -bd->maximized &= ~E_MAXIMIZE_VERTICAL; w = bd->w; -h = bd->saved.h; -e_border_resize_limit(bd, &w, &h); -e_border_resize_limit(bd, &w, &h); -e_border_move_resize(bd, bd->x, bd->saved.y + bd->zone->y, w, h); -bd->saved.y = bd->saved.h = 0; -e_hints_window_size_set(bd); - } - else if (dir & E_MAXIMIZE_VERTICAL) - { -/* Remove horizontal */ -int w, h; - -signal = 0; -bd->maximized &= ~E_MAXIMIZE_HORIZONTAL; -w = bd->saved.w; h = bd->h; +x = bd->x; +y = bd->y; + +if (dir & E_MAXIMIZE_VERTICAL) + { + /* Remove vertical */ + h = bd->saved.h; + y = bd->saved.y; + bd->saved.h = bd->saved.y = 0; + bd->maximized &= ~E_MAXIMIZE_VERTICAL; + } +if (dir & E_MAXIMIZE_HORIZONTAL) + { + /* Remove horizontal */ + w = bd->saved.w; + x = bd->saved.x; + bd->saved.w = bd->saved.x = 0; + bd->maximized &= ~E_MAXIMIZE_HORIZONTAL; + } + e_border_resize_limit(bd, &w, &h); -e_border_move_resize(bd, bd->saved.x + bd->zone->x, bd->y, w, h); -bd->saved.x = bd->saved.w = 0; -e_hints_window_size_set(bd); - } - else - { -int x, y, w, h; -/* Maybe some of the sizes has already been set to 0 */ -if (bd->saved.x) x = bd->saved.x + bd->zone->x; -else x = bd->x; -if (bd->saved.y) y = bd->saved.y + bd->zone->y; -else y = bd->y; -if (bd->saved.w) w = bd->saved.w; -else w = bd->w; -if (bd->saved.h) h = bd->saved.h; -else h = bd->h; - -bd->maximized = E_MAXIMIZE_NONE; -e_border_resize_limit(bd, &w, &h); -e_border_move_resize(bd, x, y, w, h); -bd->saved.x = bd->saved.y = bd->saved.w = bd->saved.h = 0; -e_hints_window_size_unset(bd); +e_border_move_resize(bd, bd->zone->x + x, bd->zone->y + y, w, h); +if (!(bd->maximized & E_MAXIMIZE_DIRECTION)) + { + bd->maximized = E_MAXIMIZE_NONE; + e_hints_window_size_unset(bd); + } +else + { + signal = 0; + e_hints_window_size_set(bd); + } } e_hints_window_maximized_set(bd, bd->maximized & E_MAXIMIZE_HORIZONTAL, bd->maximized & E_MAXIMIZE_VERTICAL); - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/pager Modified Files: e_mod_main.c Log Message: Add return value. === RCS file: /cvs/e/e17/apps/e/src/modules/pager/e_mod_main.c,v retrieving revision 1.232 retrieving revision 1.233 diff -u -3 -r1.232 -r1.233 --- e_mod_main.c11 Jan 2008 07:33:55 - 1.232 +++ e_mod_main.c12 Jan 2008 08:00:13 - 1.233 @@ -1463,7 +1463,7 @@ } pp = _pager_popup_find(zone); - if (!pp) return; + if (!pp) return 1; for (l = pp->pager->desks; l; l = l->next) { Pager_Desk *pd; @@ -1515,7 +1515,7 @@ } pp = _pager_popup_find(zone); - if (!pp) return; + if (!pp) return 1; for (l = pp->pager->desks; l; l = l->next) { Pager_Desk *pd; - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/temperature Modified Files: tempget.c Log Message: Remove unused variable. === RCS file: /cvs/e/e17/apps/e/src/modules/temperature/tempget.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- tempget.c 11 Jan 2008 08:58:18 - 1.1 +++ tempget.c 12 Jan 2008 07:58:56 - 1.2 @@ -20,7 +20,6 @@ #endif static Ecore_Poller *poller = NULL; static int ptemp = 0; -static int have_temp = 0; static void init(void); static int check(void); - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_border_menu.c Log Message: Fix logical test by adding paranthesis. === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_menu.c,v retrieving revision 1.77 retrieving revision 1.78 diff -u -3 -r1.77 -r1.78 --- e_int_border_menu.c 9 Dec 2007 00:23:50 - 1.77 +++ e_int_border_menu.c 12 Jan 2008 07:58:18 - 1.78 @@ -655,7 +655,7 @@ bd = data; if (!bd) return; - if ((bd->client.icccm.accepts_focus) || (bd->client.icccm.take_focus) && + if (((bd->client.icccm.accepts_focus) || (bd->client.icccm.take_focus)) && (!bd->client.netwm.state.skip_taskbar)) bd->user_skip_winlist = e_menu_item_toggle_get(mi); else - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_gadcon_config.c Log Message: Remove unused variable. === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_gadcon_config.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -3 -r1.44 -r1.45 --- e_int_gadcon_config.c 4 Jan 2008 09:18:42 - 1.44 +++ e_int_gadcon_config.c 10 Jan 2008 17:24:02 - 1.45 @@ -355,7 +355,6 @@ E_Module *mod = NULL; Efreet_Desktop *desk = NULL; char buf[4096]; - char *tmp; if (!(cfdata = data)) return; if (!name) return; - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: configure.in Log Message: Create a define which can be used to wrap internal E stuff. This works as the define is created in config.h which isn't exported. This will break modules which still uses _() to wrap NLS strings. It is an error that they use it as modules strings wont be defined in E's domain. Modules should use D_() and define it to lock up strings in their own domain. === RCS file: /cvs/e/e17/apps/e/configure.in,v retrieving revision 1.196 retrieving revision 1.197 diff -u -3 -r1.196 -r1.197 --- configure.in9 Dec 2007 17:32:22 - 1.196 +++ configure.in10 Jan 2008 07:43:01 - 1.197 @@ -232,6 +232,8 @@ ]) AC_SUBST(edje_cc) +AC_DEFINE(E_INTERNAL, 1, "This define can be used to wrap internal E stuff, as config.h isn't exported") + AC_OUTPUT([ Makefile - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_intl.h Log Message: Create a define which can be used to wrap internal E stuff. This works as the define is created in config.h which isn't exported. This will break modules which still uses _() to wrap NLS strings. It is an error that they use it as modules strings wont be defined in E's domain. Modules should use D_() and define it to lock up strings in their own domain. === RCS file: /cvs/e/e17/apps/e/src/bin/e_intl.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- e_intl.h25 Sep 2007 14:26:36 - 1.20 +++ e_intl.h10 Jan 2008 07:43:01 - 1.21 @@ -3,8 +3,10 @@ */ #ifdef E_TYPEDEFS +#if E_INTERNAL #define _(str) gettext(str) #define d_(str, dom) dgettext(PACKAGE dom, str) +#endif /* This macro is used to just mark string for translation, this is useful * for string lists which are not dynamically allocated - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/pager Modified Files: e_mod_main.c Log Message: Fix compiler warnings. === RCS file: /cvs/e/e17/apps/e/src/modules/pager/e_mod_main.c,v retrieving revision 1.230 retrieving revision 1.231 diff -u -3 -r1.230 -r1.231 --- e_mod_main.c8 Jan 2008 16:26:14 - 1.230 +++ e_mod_main.c10 Jan 2008 07:40:25 - 1.231 @@ -165,8 +165,6 @@ /* functions for pager popup on key actions */ static int _pager_popup_show(); static void _pager_popup_hide(int switch_desk); -static void _cb_action_pager_popup_show(E_Object *obj, const char *params, Ecore_X_Event_Key_Down *ev); -static void _cb_action_pager_popup_switch(E_Object *obj, const char *params, Ecore_X_Event_Key_Down *ev); static int _pager_popup_cb_mouse_down(void *data, int type, void *event); static int _pager_popup_cb_mouse_up(void *data, int type, void *event); static int _pager_popup_cb_mouse_move(void *data, int type, void *event); @@ -842,8 +840,8 @@ static E_Config_Dialog * _pager_config_dialog(E_Container *con, const char *params) { - if (!pager_config) return; - if (pager_config->config_dialog) return; + if (!pager_config) return NULL; + if (pager_config->config_dialog) return NULL; /* FIXME: pass zone config item */ _config_pager_module(NULL); return pager_config->config_dialog; @@ -1345,7 +1343,6 @@ Pager_Popup *pp; E_Zone *zone; int urgent; - int urgent_cnt = 0; Pager *p; Pager_Desk *pd; Pager_Win *pw; @@ -1562,7 +1559,7 @@ if (pager_config->popup && !act_popup) { - if (pp = _pager_popup_find(ev->desk->zone)) + if ((pp = _pager_popup_find(ev->desk->zone))) { ecore_timer_del(pp->timer); } @@ -1720,7 +1717,6 @@ E_Drag *drag; Evas_Object *o, *oo; Evas_Coord x, y, w, h; - const char *file = NULL, *part = NULL; const char *drag_types[] = { "enlightenment/pager_win", "enlightenment/border" }; Evas_Coord dx, dy; unsigned int resist = 0; - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/pager Modified Files: e_mod_main.c Log Message: No need to subtract 1 === RCS file: /cvs/e/e17/apps/e/src/modules/pager/e_mod_main.c,v retrieving revision 1.228 retrieving revision 1.229 diff -u -3 -r1.228 -r1.229 --- e_mod_main.c8 Jan 2008 00:52:37 - 1.228 +++ e_mod_main.c8 Jan 2008 06:01:24 - 1.229 @@ -2489,7 +2489,7 @@ e_zone_desk_count_get(pp->pager->zone, &max_x, NULL); - if (current_desk->x + ev->z > max_x - 1) + if (current_desk->x + ev->z >= max_x) _pager_popup_desk_switch(1, 1); else if (current_desk->x + ev->z < 0) _pager_popup_desk_switch(-1, -1); - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/pager Modified Files: e_mod_main.c Log Message: Fix check for correct pager popup. Add return values. === RCS file: /cvs/e/e17/apps/e/src/modules/pager/e_mod_main.c,v retrieving revision 1.221 retrieving revision 1.222 diff -u -3 -r1.221 -r1.222 --- e_mod_main.c14 Dec 2007 22:30:44 - 1.221 +++ e_mod_main.c4 Jan 2008 07:40:17 - 1.222 @@ -738,11 +738,11 @@ Pager_Popup *pp; Evas_List *l; - for(l = pager_popups; l; l = l->next) + for (l = pager_popups; l; l = l->next) { pp = l->data; - pp->pager->zone == zone; - return pp; + if (pp->pager->zone == zone) + return pp; } return NULL; } @@ -818,8 +818,8 @@ static E_Config_Dialog * _pager_config_dialog(E_Container *con, const char *params) { - if (!pager_config) return; - if (pager_config->config_dialog) return; + if (!pager_config) return NULL; + if (pager_config->config_dialog) return NULL; /* FIXME: pass zone config item */ _config_pager_module(NULL); return pager_config->config_dialog; - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_border.c e_border.h e_desk.c Log Message: Fix fullscreen on desktop change (patch by Hannes Janetzek). === RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v retrieving revision 1.613 retrieving revision 1.614 diff -u -3 -r1.613 -r1.614 --- e_border.c 2 Dec 2007 20:03:29 - 1.613 +++ e_border.c 9 Dec 2007 15:40:14 - 1.614 @@ -718,8 +718,6 @@ ecore_x_window_shadow_tree_flush(); if (bd->moving) _e_border_move_end(bd); - if (bd->fullscreen) - e_border_unfullscreen(bd); if (bd->resize_mode != RESIZE_NONE) { _e_border_pointer_resize_end(bd); === RCS file: /cvs/e/e17/apps/e/src/bin/e_border.h,v retrieving revision 1.167 retrieving revision 1.168 diff -u -3 -r1.167 -r1.168 --- e_border.h 26 Nov 2007 21:33:23 - 1.167 +++ e_border.h 9 Dec 2007 15:40:14 - 1.168 @@ -352,7 +352,6 @@ unsigned intneed_shape_export : 1; unsigned intfullscreen : 1; unsigned intneed_fullscreen : 1; - unsigned intwant_fullscreen : 1; unsigned intalready_unparented : 1; unsigned intneed_reparent : 1; unsigned intbutton_grabbed : 1; === RCS file: /cvs/e/e17/apps/e/src/bin/e_desk.c,v retrieving revision 1.70 retrieving revision 1.71 diff -u -3 -r1.70 -r1.71 --- e_desk.c15 Nov 2007 20:16:25 - 1.70 +++ e_desk.c9 Dec 2007 15:40:14 - 1.71 @@ -244,17 +244,11 @@ if ((bd->desk == desk) || (bd->sticky)) { e_border_show(bd); - if (bd->want_fullscreen) -{ - e_border_fullscreen(bd, e_config->fullscreen_policy); - bd->want_fullscreen = 0; -} } else if (bd->moving) e_border_desk_set(bd, desk); else { - if (bd->fullscreen) bd->want_fullscreen = 1; e_border_hide(bd, 2); } } @@ -599,11 +593,6 @@ bd->fx.start.y += bd->zone->container->h - (bd->zone->y + bd->zone->h); e_border_fx_offset(bd, bd->fx.start.x, bd->fx.start.y); e_border_show(bd); - if (bd->want_fullscreen) - { - e_border_fullscreen(bd, e_config->fullscreen_policy); - bd->want_fullscreen = 0; - } } } } @@ -737,11 +726,6 @@ else bd->fx.start.y += bd->zone->container->h - (bd->zone->y + bd->zone->h); e_border_fx_offset(bd, 0, 0); - if (bd->want_fullscreen) - { - e_border_fullscreen(bd, e_config->fullscreen_policy); - bd->want_fullscreen = 0; - } } } } @@ -766,7 +750,6 @@ else if ((bd->desk == desk) && (!bd->sticky)) { e_border_fx_offset(bd, 0, 0); - if (bd->fullscreen) bd->want_fullscreen = 1; e_border_hide(bd, 2); } } - SF.Net email is sponsored by: Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_shelf.c Log Message: Delay assignment of es->win, as e_popup_edje_bg_object_set might change the window (patch from jeffdameth). === RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v retrieving revision 1.87 retrieving revision 1.88 diff -u -3 -r1.87 -r1.88 --- e_shelf.c 8 Dec 2007 23:40:57 - 1.87 +++ e_shelf.c 9 Dec 2007 15:38:03 - 1.88 @@ -109,15 +109,12 @@ e_popup_layer_set(es->popup, layer); es->ee = es->popup->ecore_evas; es->evas = es->popup->evas; - es->win = es->popup->evas_win; } else { e_drop_xdnd_register_set(zone->container->event_win, 1); es->ee = zone->container->bg_ecore_evas; es->evas = zone->container->bg_evas; - /* TODO: We should have a mouse out on the evas object if we are on the desktop */ - es->win = zone->container->event_win; } es->fit_along = 1; es->layer = layer; @@ -149,6 +146,7 @@ evas_object_show(es->o_event); evas_object_show(es->o_base); e_popup_edje_bg_object_set(es->popup, es->o_base); + es->win = es->popup->evas_win; } else { @@ -156,6 +154,8 @@ evas_object_move(es->o_base, es->zone->x + es->x, es->zone->y + es->y); evas_object_layer_set(es->o_event, layer); evas_object_layer_set(es->o_base, layer); + /* TODO: We should have a mouse out on the evas object if we are on the desktop */ + es->win = zone->container->event_win; } es->gadcon = e_gadcon_swallowed_new(es->name, es->id, es->o_base, "e.swallow.content"); - SF.Net email is sponsored by: Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_shelf.c e_zone.c Log Message: Something to do on a dark winter day. === RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v retrieving revision 1.85 retrieving revision 1.86 diff -u -3 -r1.85 -r1.86 --- e_shelf.c 2 Dec 2007 19:32:32 - 1.85 +++ e_shelf.c 2 Dec 2007 20:19:21 - 1.86 @@ -127,6 +127,7 @@ evas_object_resize(es->o_event, es->w, es->h); evas_object_event_callback_add(es->o_event, EVAS_CALLBACK_MOUSE_DOWN, _e_shelf_cb_mouse_down, es); + /* FIXME: Need an EDGE_MOVE handler */ es->handlers = evas_list_append(es->handlers, ecore_event_handler_add(E_EVENT_ZONE_EDGE_IN, _e_shelf_cb_mouse_in, es)); es->handlers = evas_list_append(es->handlers, === RCS file: /cvs/e/e17/apps/e/src/bin/e_zone.c,v retrieving revision 1.127 retrieving revision 1.128 diff -u -3 -r1.127 -r1.128 --- e_zone.c22 Nov 2007 20:48:15 - 1.127 +++ e_zone.c2 Dec 2007 20:19:21 - 1.128 @@ -21,6 +21,7 @@ EAPI int E_EVENT_ZONE_DESK_COUNT_SET = 0; EAPI int E_EVENT_POINTER_WARP = 0; EAPI int E_EVENT_ZONE_MOVE_RESIZE = 0; +/* FIXME: We need a EDGE_MOVE event */ EAPI int E_EVENT_ZONE_EDGE_IN = 0; EAPI int E_EVENT_ZONE_EDGE_OUT = 0; - SF.Net email is sponsored by: The Future of Linux Business White Paper from Novell. From the desktop to the data center, Linux is going mainstream. Let it simplify your IT future. http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_border.c Log Message: formatting === RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v retrieving revision 1.612 retrieving revision 1.613 diff -u -3 -r1.612 -r1.613 --- e_border.c 2 Dec 2007 19:48:09 - 1.612 +++ e_border.c 2 Dec 2007 20:03:29 - 1.613 @@ -7678,7 +7678,8 @@ ecore_x_pointer_xy_get(desk->zone->container->win, &x, &y); else if (exclude) ecore_x_pointer_xy_get(exclude->desk->zone->container->win, &x, &y); - else return NULL; + else + return NULL; for (l = e_border_raise_stack_get(); l; l = l->next) { - SF.Net email is sponsored by: The Future of Linux Business White Paper from Novell. From the desktop to the data center, Linux is going mainstream. Let it simplify your IT future. http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_border.c Log Message: Fix compile warnings. === RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v retrieving revision 1.611 retrieving revision 1.612 diff -u -3 -r1.611 -r1.612 --- e_border.c 26 Nov 2007 21:33:23 - 1.611 +++ e_border.c 2 Dec 2007 19:48:09 - 1.612 @@ -7678,7 +7678,7 @@ ecore_x_pointer_xy_get(desk->zone->container->win, &x, &y); else if (exclude) ecore_x_pointer_xy_get(exclude->desk->zone->container->win, &x, &y); - else return; + else return NULL; for (l = e_border_raise_stack_get(); l; l = l->next) { @@ -7708,7 +7708,7 @@ { if (warp_to) { - int dx, dy, x, y; + int x, y; double spd; ecore_x_pointer_xy_get(warp_to_win, &x, &y); - SF.Net email is sponsored by: The Future of Linux Business White Paper from Novell. From the desktop to the data center, Linux is going mainstream. Let it simplify your IT future. http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_shelf.c Log Message: If we don't want to show the shelf, explicitly hide it. Needed if the user moves the mouse along the shelf edge. === RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v retrieving revision 1.84 retrieving revision 1.85 diff -u -3 -r1.84 -r1.85 --- e_shelf.c 24 Nov 2007 12:35:20 - 1.84 +++ e_shelf.c 2 Dec 2007 19:32:32 - 1.85 @@ -1280,6 +1280,8 @@ edje_object_signal_emit(es->o_base, "e,state,focused", "e"); e_shelf_toggle(es, 1); } + else + e_shelf_toggle(es, 0); } else if (type == ECORE_X_EVENT_MOUSE_IN) { - SF.Net email is sponsored by: The Future of Linux Business White Paper from Novell. From the desktop to the data center, Linux is going mainstream. Let it simplify your IT future. http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_gadcon.c Log Message: Disable gadcon locking for gadcon client menu for now. Need to find the right solution. === RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.c,v retrieving revision 1.96 retrieving revision 1.97 diff -u -3 -r1.96 -r1.97 --- e_gadcon.c 25 Nov 2007 08:27:13 - 1.96 +++ e_gadcon.c 2 Dec 2007 16:01:02 - 1.97 @@ -1159,10 +1159,12 @@ E_OBJECT_CHECK(gcc); E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE); + /* if (gcc->gadcon->shelf) e_shelf_locked_set(gcc->gadcon->shelf, 1); e_menu_post_deactivate_callback_set(menu, _e_gadcon_client_cb_menu_post, gcc); gcc->menu = menu; + */ if (!gcc->gadcon->toolbar) { - SF.Net email is sponsored by: The Future of Linux Business White Paper from Novell. From the desktop to the data center, Linux is going mainstream. Let it simplify your IT future. http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs