E CVS: apps/e lok
Enlightenment CVS committal
Author : lok
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_eap_editor.c
Log Message:
Oops bad me. Handle both icons in the icon theme or with the path
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -3 -r1.91 -r1.92
--- e_eap_editor.c 27 Oct 2007 15:55:27 - 1.91
+++ e_eap_editor.c 28 Oct 2007 01:54:24 - 1.92
@@ -587,9 +587,16 @@
* files from a dir, or icons in the current theme */
if (cfdata->icon)
{
- icon_path = efreet_icon_path_find(e_config->icon_theme,
- cfdata->icon, "scalable");
- path = ecore_file_dir_get(icon_path);
+ 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");
+
+ if (icon_path)
+ {
+path = ecore_file_dir_get(icon_path);
+free(icon_path);
+ }
}
if (path)
@@ -606,7 +613,6 @@
NULL, cfdata, 1);
}
- if (icon_path) free(icon_path);
evas_object_show(o);
editor->icon_fsel = o;
e_widget_min_size_get(o, &mw, &mh);
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e lok
Enlightenment CVS committal
Author : lok
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_eap_editor.c e_fm.c
Log Message:
Fix the fileselector when choosing an icon.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -3 -r1.90 -r1.91
--- e_eap_editor.c 7 Oct 2007 21:22:40 - 1.90
+++ e_eap_editor.c 27 Oct 2007 15:55:27 - 1.91
@@ -568,7 +568,7 @@
Evas_Object *o;
Evas_Coord mw, mh;
E_Desktop_Edit *editor;
- char *dir = NULL;
+ char *path = NULL, *icon_path = NULL;
editor = data2;
cfdata = data1;
@@ -586,22 +586,27 @@
/* XXX change this to a generic icon selector (that can do either
* files from a dir, or icons in the current theme */
if (cfdata->icon)
- dir = ecore_file_dir_get(cfdata->icon);
+ {
+ icon_path = efreet_icon_path_find(e_config->icon_theme,
+ cfdata->icon, "scalable");
+ path = ecore_file_dir_get(icon_path);
+ }
- if (dir)
+ if (path)
{
- o = e_widget_fsel_add(dia->win->evas, dir, "/", NULL, NULL,
+ o = e_widget_fsel_add(dia->win->evas, "/", path, NULL, NULL,
_e_desktop_edit_select_cb, cfdata,
NULL, cfdata, 1);
- free(dir);
+ free(path);
}
else
{
- o = e_widget_fsel_add(dia->win->evas, "~/", "/", NULL, NULL,
+ o = e_widget_fsel_add(dia->win->evas, "/", "~/", NULL, NULL,
_e_desktop_edit_select_cb, cfdata,
NULL, cfdata, 1);
}
+ if (icon_path) free(icon_path);
evas_object_show(o);
editor->icon_fsel = o;
e_widget_min_size_get(o, &mw, &mh);
@@ -626,7 +631,7 @@
Evas_Object *o;
Evas_Coord mw, mh;
E_Desktop_Edit *editor;
- char *dir = NULL;
+ char *path = NULL;
editor = data2;
cfdata = data1;
@@ -642,18 +647,25 @@
/* absolute path to exe */
if (cfdata->exec)
- dir = ecore_file_dir_get(cfdata->exec);
+ {
+ path = ecore_file_dir_get(cfdata->exec);
+ if (path && !ecore_file_exists(path))
+ {
+free(path);
+path = NULL;
+ }
+ }
- if (dir)
+ if (path)
{
- o = e_widget_fsel_add(dia->win->evas, dir, "/", NULL, NULL,
+ o = e_widget_fsel_add(dia->win->evas, "/", path, NULL, NULL,
_e_desktop_edit_select_cb, cfdata,
NULL, cfdata, 1);
- free(dir);
+ free(path);
}
else
{
- o = e_widget_fsel_add(dia->win->evas, "~/", "/", NULL, NULL,
+ o = e_widget_fsel_add(dia->win->evas, "/", "~/", NULL, NULL,
_e_desktop_edit_select_cb, cfdata,
NULL, cfdata, 1);
}
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -3 -r1.223 -r1.224
--- e_fm.c 24 Oct 2007 18:25:44 - 1.223
+++ e_fm.c 27 Oct 2007 15:55:27 - 1.224
@@ -451,7 +451,7 @@
{
E_Fm2_Smart_Data *sd;
Evas_List *l;
- const char *realpath;
+ const char *realpath, *extended_path;
sd = evas_object_smart_data_get(obj);
if (!sd || !path) return; // safety
@@ -489,7 +489,12 @@
sd->config->theme.fixed = 0;
}
- realpath = _e_fm2_dev_path_map(dev, path);
+ if (!strcmp(path, "~/"))
+ extended_path = e_user_homedir_get();
+ else
+ extended_path = path;
+
+ realpath = _e_fm2_dev_path_map(dev, extended_path);
/* If the path doesn't exist, popup a dialog */
if (dev && strncmp(dev, "removable:", 10)
&& !ecore_file_exists(realpath))
@@ -530,7 +535,7 @@
sd->order_file = 0;
if (dev) sd->dev = evas_stringshare_add(dev);
- if (path) sd->path = evas_stringshare_add(path);
+ if (path) sd->path = evas_stringshare_add(extended_path);
sd->realpath = realpath;
_e_fm2_queue_free(obj);
_e_fm2_regions_free(obj);
@@ -739,9 +744,11 @@
if (!sd->path) return;
path = strdup(sd->path);
if (sd->dev) dev = strdup(sd->dev);
- p = strrchr(path, '/');
- if (p) *p = 0;
- e_fm2_path_set(obj, dev, path);
+ if ((p = strrchr(path, '/'))) *p = 0;
+ if (*path == 0)
+ e_fm2_path_set(obj, dev, "/");
+ else
+ e_fm2_path_set(obj, dev, path);
E_FREE(dev);
E_FREE(path);
}
@@ -3888,7 +3895,7 @@
ic->info.icon = NULL;
ic->info.link = NULL;
//Hack
- if (!strncmp(ic->info.file, "|storage_serial_", 16)) ecore_file_unlink(buf);
+ if (!strncmp(ic->info.file, "|storage_", 9)) ecore_file_unlink(buf);
return 0;
}
-
This SF.net email is sponsored by: Splunk Inc.
St
E CVS: apps/e lok
Enlightenment CVS committal
Author : lok
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/conf_window_display
Modified Files:
e_int_config_window_display.c
Log Message:
Don't tick both move and resize "display information" if only one is really
used.
===
RCS file:
/cvs/e/e17/apps/e/src/modules/conf_window_display/e_int_config_window_display.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_int_config_window_display.c 29 Jul 2007 02:12:51 - 1.1
+++ e_int_config_window_display.c 13 Oct 2007 12:14:51 - 1.2
@@ -69,7 +69,7 @@
cfdata->border_shade_animate = e_config->border_shade_animate;
cfdata->border_shade_transition = e_config->border_shade_transition;
cfdata->border_shade_speed = e_config->border_shade_speed;
- if (cfdata->move_info_visible ||
+ if (cfdata->move_info_visible &&
cfdata->resize_info_visible) cfdata->move_resize_info = 1;
if (cfdata->border_shade_animate) cfdata->animate_shading = 1;
cfdata->use_app_icon = e_config->use_app_icon;
@@ -151,6 +151,11 @@
Evas_Object *o, *of, *ob;
E_Radio_Group *rg;
+ if (cfdata->move_info_visible && cfdata->resize_info_visible)
+ cfdata->move_resize_info = 1;
+ else
+ cfdata->move_resize_info = 0;
+
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("Display"), 0);
@@ -183,17 +188,6 @@
/* generate the core widget layout for an advanced dialog */
Evas_Object *o, *ob, *of, *ot;
E_Radio_Group *rg;
-
- if (cfdata->move_resize_info)
- {
- cfdata->move_info_visible = 1;
- cfdata->resize_info_visible = 1;
- }
- else
- {
- cfdata->move_info_visible = 0;
- cfdata->resize_info_visible = 0;
- }
o = e_widget_list_add(evas, 0, 0);
ot = e_widget_table_add(evas, 0);
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e lok
Enlightenment CVS committal
Author : lok
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/conf_wallpaper
Modified Files:
e_int_config_wallpaper.c
Log Message:
Reset the preview on the selected bg when unticking the "use theme wallpaper"
checkbox.
===
RCS file:
/cvs/e/e17/apps/e/src/modules/conf_wallpaper/e_int_config_wallpaper.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_int_config_wallpaper.c24 Jul 2007 18:47:26 - 1.2
+++ e_int_config_wallpaper.c7 Oct 2007 13:33:28 - 1.3
@@ -306,6 +306,7 @@
}
else
{
+ evas_object_smart_callback_call(cfdata->o_fm, "selection_change",
cfdata);
if (cfdata->bg)
{
if (cfdata->o_preview)
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e lok
Enlightenment CVS committal
Author : lok
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fm.c
Log Message:
BSD compatibility.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -3 -r1.197 -r1.198
--- e_fm.c 18 Aug 2007 11:50:08 - 1.197
+++ e_fm.c 18 Aug 2007 12:15:31 - 1.198
@@ -3494,7 +3494,7 @@
{
E_Fm2_Uri *uri;
const char *p;
- char hostname[HOST_NAME_MAX], path[PATH_MAX];
+ char hostname[_POSIX_HOST_NAME_MAX], path[PATH_MAX];
int i = 0;
/* The shortest possible path is file:///
@@ -3507,7 +3507,7 @@
p = val + 7;
if (*p != '/')
{
- for (i = 0; *p != '/' && *p != '\0' && i < HOST_NAME_MAX; p++, i++)
+ for (i = 0; *p != '/' && *p != '\0' && i < _POSIX_HOST_NAME_MAX; p++,
i++)
hostname[i] = *p;
}
hostname[i] = '\0';
@@ -3540,9 +3540,9 @@
{
E_Fm2_Uri *uri;
Evas_List *l, *path_list = NULL;
- char current_hostname[HOST_NAME_MAX];
+ char current_hostname[_POSIX_HOST_NAME_MAX];
- if (gethostname(current_hostname, HOST_NAME_MAX) == -1)
+ if (gethostname(current_hostname, _POSIX_HOST_NAME_MAX) == -1)
current_hostname[0] = '\0';
for (l = uri_list; l; l = l->next)
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e lok
Enlightenment CVS committal Author : lok Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_menus.c Log Message: Fix the segv at restart. === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_menus.c,v retrieving revision 1.227 retrieving revision 1.228 diff -u -3 -r1.227 -r1.228 --- e_int_menus.c 5 Aug 2007 10:15:37 - 1.227 +++ e_int_menus.c 7 Aug 2007 11:46:19 - 1.228 @@ -375,6 +375,9 @@ maug->del.data = data_del; l = evas_hash_find(_e_int_menus_augmentation, menu); + if (l) + _e_int_menus_augmentation = evas_hash_del(_e_int_menus_augmentation, menu, l); + l = evas_list_append(l, maug); _e_int_menus_augmentation = evas_hash_add(_e_int_menus_augmentation, menu, l); - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e lok
Enlightenment CVS committal
Author : lok
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_moveresize.c
Log Message:
Fixed an issue when Display information is enabled when moving windows but not
when resizing.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_moveresize.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- e_moveresize.c 25 Mar 2007 22:45:00 - 1.17
+++ e_moveresize.c 22 Jul 2007 01:27:43 - 1.18
@@ -166,6 +166,7 @@
EAPI void
e_move_resize_object_coords_set(int x, int y, int w, int h)
{
+ if (!_disp_pop) return;
obj_x = x;
obj_y = y;
obj_w = w;
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e lok
Enlightenment CVS committal Author : lok Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/pager Modified Files: e_mod_config.c Log Message: Hide the grab window when Delete is pressed. === RCS file: /cvs/e/e17/apps/e/src/modules/pager/e_mod_config.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -3 -r1.25 -r1.26 --- e_mod_config.c 26 Nov 2006 04:19:25 - 1.25 +++ e_mod_config.c 17 Dec 2006 18:48:19 - 1.26 @@ -297,6 +297,7 @@ cfdata->btn_drag = 0; else cfdata->btn_noplace = 0; + _grab_wnd_hide(cfdata); } return 1; } - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
