E CVS: apps/e englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/conf_keybindings
Modified Files:
e_int_config_keybindings.c
Log Message:
Formatting.
===
RCS file:
/cvs/e/e17/apps/e/src/modules/conf_keybindings/e_int_config_keybindings.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_int_config_keybindings.c 29 Oct 2007 06:20:36 - 1.7
+++ e_int_config_keybindings.c 29 Oct 2007 06:26:12 - 1.8
@@ -1,3 +1,6 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
#include "e.h"
#define TEXT_NONE_ACTION_KEY _("")
@@ -9,8 +12,8 @@
static void*_create_data(E_Config_Dialog *cfd);
static void_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data
*cfdata);
static int _basic_apply_data(E_Config_Dialog *cfd,
E_Config_Dialog_Data *cfdata);
-static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas,
- E_Config_Dialog_Data *cfdata);
+static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas,
+ E_Config_Dialog_Data *cfdata);
/* private functions ***/
static void _fill_actions_list(E_Config_Dialog_Data *cfdata);
@@ -979,7 +982,7 @@
cfdata = data;
if (ev->win != cfdata->locals.bind_win) return 1;
-
+
if (!strcmp(ev->keyname, "Escape") &&
!(ev->modifiers & ECORE_X_MODIFIER_SHIFT) &&
!(ev->modifiers & ECORE_X_MODIFIER_CTRL) &&
@@ -1000,14 +1003,16 @@
!strcmp(ev->keyname, "Shift_L") || !strcmp(ev->keyname, "Shift_R")
||
!strcmp(ev->keyname, "Alt_L") || !strcmp(ev->keyname, "Alt_R") ||
!strcmp(ev->keyname, "Super_L") || !strcmp(ev->keyname, "Super_R"))
- ;
+ {
+/* Do nothing */
+ }
else
{
E_Config_Binding_Key *bi = NULL, *bi2 = NULL;
Evas_List *l = NULL;
int mod = E_BINDING_MODIFIER_NONE;
int found = 0, n;
-
+
if (ev->modifiers & ECORE_X_MODIFIER_SHIFT)
mod |= E_BINDING_MODIFIER_SHIFT;
if (ev->modifiers & ECORE_X_MODIFIER_CTRL)
@@ -1088,22 +1093,22 @@
e_widget_ilist_unselect(cfdata->gui.o_action_list);
if (cfdata->locals.action) free(cfdata->locals.action);
cfdata->locals.action = strdup("");
- if (cfdata->params[0])
- {
-int j, g = -1;
-_find_key_binding_action("exec", NULL, &g, NULL,
&j);
-if (j >= 0)
- {
-
e_widget_ilist_unselect(cfdata->gui.o_action_list);
-
e_widget_ilist_selected_set(cfdata->gui.o_action_list, (j + g + 1));
- e_widget_entry_clear(cfdata->gui.o_params);
- e_widget_entry_text_set(cfdata->gui.o_params,
cfdata->params);
- }
- }
- else
-{
- e_widget_entry_clear(cfdata->gui.o_params);
- e_widget_disabled_set(cfdata->gui.o_params, 1);
+ if (cfdata->params[0])
+{
+ int j, g = -1;
+ _find_key_binding_action("exec", NULL, &g, NULL,
&j);
+ if (j >= 0)
+ {
+
e_widget_ilist_unselect(cfdata->gui.o_action_list);
+
e_widget_ilist_selected_set(cfdata->gui.o_action_list, (j + g + 1));
+e_widget_entry_clear(cfdata->gui.o_params);
+e_widget_entry_text_set(cfdata->gui.o_params,
cfdata->params);
+ }
+}
+ else
+{
+ e_widget_entry_clear(cfdata->gui.o_params);
+ e_widget_disabled_set(cfdata->gui.o_params, 1);
}
}
else
@@ -1138,7 +1143,7 @@
" is already used by "
"%s action."
"Please choose another binding key sequence."),
-label ? label : _("Unknown"));
+ label ? label : _("Unknown"));
e_util_dialog_show(_("Binding Key Error"), buf);
}
_grab_wnd_hide(cfdata);
-
This SF.net email is sponsored by:
E CVS: apps/e englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/conf_keybindings
Modified Files:
e_int_config_keybindings.c
Log Message:
Don't use strlen to check for empty string.
Fix formatting.
===
RCS file:
/cvs/e/e17/apps/e/src/modules/conf_keybindings/e_int_config_keybindings.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_int_config_keybindings.c 29 Oct 2007 06:17:18 - 1.6
+++ e_int_config_keybindings.c 29 Oct 2007 06:20:36 - 1.7
@@ -1088,16 +1088,16 @@
e_widget_ilist_unselect(cfdata->gui.o_action_list);
if (cfdata->locals.action) free(cfdata->locals.action);
cfdata->locals.action = strdup("");
- if(strlen(cfdata->params) > 0)
+ if (cfdata->params[0])
{
-int j,g = -1;
-_find_key_binding_action("exec",NULL,&g,NULL,&j);
-if(j >=0 )
+int j, g = -1;
+_find_key_binding_action("exec", NULL, &g, NULL,
&j);
+if (j >= 0)
{
e_widget_ilist_unselect(cfdata->gui.o_action_list);
-
e_widget_ilist_selected_set(cfdata->gui.o_action_list, (j+g+1));
+
e_widget_ilist_selected_set(cfdata->gui.o_action_list, (j + g + 1));
e_widget_entry_clear(cfdata->gui.o_params);
-
e_widget_entry_text_set(cfdata->gui.o_params,cfdata->params);
+ e_widget_entry_text_set(cfdata->gui.o_params,
cfdata->params);
}
}
else
-
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 englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/conf_keybindings
Modified Files:
e_int_config_keybindings.c
Log Message:
Don't use strlen to check for empty string.
===
RCS file:
/cvs/e/e17/apps/e/src/modules/conf_keybindings/e_int_config_keybindings.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_int_config_keybindings.c 29 Oct 2007 03:55:18 - 1.5
+++ e_int_config_keybindings.c 29 Oct 2007 06:17:18 - 1.6
@@ -88,7 +88,7 @@
cfd = e_config_dialog_new(con, _("Key Binding Settings"), "E",
"_config_keybindings_dialog",
"enlightenment/keys", 0, v, NULL);
- if ((params) && (strlen(params) > 0))
+ if ((params) && (params[0]))
{
cfd->cfdata->params = params;
_add_key_binding_cb(cfd->cfdata, NULL);
-
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 ravenlock
Enlightenment CVS committal
Author : ravenlock
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/conf_keybindings
Modified Files:
e_int_config_keybindings.c
Log Message:
Make sure we are not null before checking strlen
===
RCS file:
/cvs/e/e17/apps/e/src/modules/conf_keybindings/e_int_config_keybindings.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_int_config_keybindings.c 28 Oct 2007 19:06:48 - 1.4
+++ e_int_config_keybindings.c 29 Oct 2007 03:55:18 - 1.5
@@ -88,7 +88,7 @@
cfd = e_config_dialog_new(con, _("Key Binding Settings"), "E",
"_config_keybindings_dialog",
"enlightenment/keys", 0, v, NULL);
- if (strlen(params) > 0)
+ if ((params) && (strlen(params) > 0))
{
cfd->cfdata->params = params;
_add_key_binding_cb(cfd->cfdata, NULL);
-
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: monkeyiq monkeyiq
Enlightenment CVS committal Author : monkeyiq Project : devs Module : monkeyiq Dir : devs/monkeyiq Modified Files: info.txt Log Message: change of address from the defunct === RCS file: /cvs/e/devs/monkeyiq/info.txt,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -3 -r1.1.1.1 -r1.2 --- info.txt25 Mar 2006 06:37:29 - 1.1.1.1 +++ info.txt29 Oct 2007 03:07:27 - 1.2 @@ -3,5 +3,5 @@ Name: Ben Martin Location: Qld, Australia E-Mail: [EMAIL PROTECTED] -WWW: http://www.advogato.org/person/monkeyiq/ +WWW: http://monkeyiq.blogspot.com/ Managing: gevas - 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: proto/e_dbus raster
Enlightenment CVS committal Author : raster Project : e17 Module : proto/e_dbus Dir : e17/proto/e_dbus/src/lib/nm Removed Files: .cvsignore E_Nm.h Makefile.am README e_nm.c e_nm_device.c e_nm_manager.c e_nm_network.c e_nm_private.h e_nm_util.c Log Message: e_dbus bye bye (over to libs) - 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: proto/e_dbus raster
Enlightenment CVS committal Author : raster Project : e17 Module : proto/e_dbus Dir : e17/proto/e_dbus/src/lib/notification Removed Files: .cvsignore E_Notification_Daemon.h E_Notify.h Makefile.am client.c daemon.c e_notify_private.h marshal.c notification-spec-0.9.txt notification.c Log Message: e_dbus bye bye (over to libs) - 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: proto/e_dbus raster
Enlightenment CVS committal Author : raster Project : e17 Module : proto/e_dbus Dir : e17/proto/e_dbus/src/lib/hal Removed Files: .cvsignore E_Hal.h Makefile.am e_hal_device.c e_hal_device.h e_hal_manager.c e_hal_manager.h e_hal_util.c e_hal_util.h Log Message: e_dbus bye bye (over to libs) - 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: proto/e_dbus raster
Enlightenment CVS committal Author : raster Project : e17 Module : proto/e_dbus Dir : e17/proto/e_dbus/src/lib/dbus Removed Files: .cvsignore E_DBus.h Makefile.am e_dbus.c e_dbus_interfaces.c e_dbus_message.c e_dbus_methods.c e_dbus_object.c e_dbus_private.h e_dbus_signal.c e_dbus_util.c Log Message: e_dbus bye bye (over to libs) - 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: proto/e_dbus raster
Enlightenment CVS committal Author : raster Project : e17 Module : proto/e_dbus Dir : e17/proto/e_dbus/src/lib Removed Files: .cvsignore Makefile.am Log Message: e_dbus bye bye (over to libs) - 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: proto/e_dbus raster
Enlightenment CVS committal Author : raster Project : e17 Module : proto/e_dbus Dir : e17/proto/e_dbus/debian Removed Files: .cvsignore changelog.in control copyright libe-dbus0-bin.install libe-dbus0-dev.install libe-dbus0.install rules Log Message: e_dbus bye bye (over to libs) - 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: proto/e_dbus raster
Enlightenment CVS committal Author : raster Project : e17 Module : proto/e_dbus Dir : e17/proto/e_dbus/src/bin Removed Files: .cvsignore Makefile.am hal.c nm.c notification_daemon.c notify.c test.c test_client.c Log Message: e_dbus bye bye (over to libs) - 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: proto/e_dbus raster
Enlightenment CVS committal Author : raster Project : e17 Module : proto/e_dbus Dir : e17/proto/e_dbus/src Removed Files: .cvsignore Makefile.am Log Message: e_dbus bye bye (over to libs) - 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: proto/e_dbus raster
Enlightenment CVS committal Author : raster Project : e17 Module : proto/e_dbus Dir : e17/proto/e_dbus Removed Files: .cvsignore AUTHORS COPYING ChangeLog INSTALL Makefile.am NEWS README autogen.sh configure.in edbus.pc.in ehal.pc.in Log Message: e_dbus bye bye (over to libs) - 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: libs/e_dbus raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/e_dbus Dir : e17/libs/e_dbus/src/lib/dbus Added Files: .cvsignore E_DBus.h Makefile.am e_dbus.c e_dbus_interfaces.c e_dbus_message.c e_dbus_methods.c e_dbus_object.c e_dbus_private.h e_dbus_signal.c e_dbus_util.c Log Message: move e_dbus into libs - about time. it's a hard dep of e17 anyway now. - 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: libs/e_dbus raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/e_dbus Dir : e17/libs/e_dbus/src/lib/nm Added Files: .cvsignore E_Nm.h Makefile.am README e_nm.c e_nm_device.c e_nm_manager.c e_nm_network.c e_nm_private.h e_nm_util.c Log Message: move e_dbus into libs - about time. it's a hard dep of e17 anyway now. - 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: libs/e_dbus raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/e_dbus Dir : e17/libs/e_dbus/src/lib/hal Added Files: .cvsignore E_Hal.h Makefile.am e_hal_device.c e_hal_device.h e_hal_manager.c e_hal_manager.h e_hal_util.c e_hal_util.h Log Message: move e_dbus into libs - about time. it's a hard dep of e17 anyway now. - 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: libs/e_dbus raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/e_dbus Dir : e17/libs/e_dbus/src/lib Added Files: .cvsignore Makefile.am Log Message: move e_dbus into libs - about time. it's a hard dep of e17 anyway now. - 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: libs/e_dbus raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/e_dbus Dir : e17/libs/e_dbus/src/lib/notification Added Files: .cvsignore E_Notification_Daemon.h E_Notify.h Makefile.am client.c daemon.c e_notify_private.h marshal.c notification-spec-0.9.txt notification.c Log Message: move e_dbus into libs - about time. it's a hard dep of e17 anyway now. - 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: libs/e_dbus raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/e_dbus Dir : e17/libs/e_dbus/src Added Files: .cvsignore Makefile.am Log Message: move e_dbus into libs - about time. it's a hard dep of e17 anyway now. - 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: libs/e_dbus raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/e_dbus Dir : e17/libs/e_dbus/debian Added Files: .cvsignore changelog.in control copyright libe-dbus0-bin.install libe-dbus0-dev.install libe-dbus0.install rules Log Message: move e_dbus into libs - about time. it's a hard dep of e17 anyway now. - 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: libs/e_dbus raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/e_dbus Dir : e17/libs/e_dbus Added Files: .cvsignore AUTHORS COPYING ChangeLog INSTALL Makefile.am NEWS README autogen.sh configure.in edbus.pc.in ehal.pc.in Log Message: move e_dbus into libs - about time. it's a hard dep of e17 anyway now. - 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: libs/e_dbus raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/e_dbus Dir : e17/libs/e_dbus/src/bin Added Files: .cvsignore Makefile.am hal.c nm.c notification_daemon.c notify.c test.c test_client.c Log Message: move e_dbus into libs - about time. it's a hard dep of e17 anyway now. - 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: libs/e_dbus raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/e_dbus Dir : e17/libs/e_dbus/debian Log Message: Directory /cvs/e/e17/libs/e_dbus/debian added to the repository - 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: libs/e_dbus raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/e_dbus Dir : e17/libs/e_dbus/src/lib/nm Log Message: Directory /cvs/e/e17/libs/e_dbus/src/lib/nm added to the repository - 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: libs/e_dbus raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/e_dbus Dir : e17/libs/e_dbus/src/lib/hal Log Message: Directory /cvs/e/e17/libs/e_dbus/src/lib/hal added to the repository - 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: libs/e_dbus raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/e_dbus Dir : e17/libs/e_dbus/src/lib/notification Log Message: Directory /cvs/e/e17/libs/e_dbus/src/lib/notification added to the repository - 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: libs/e_dbus raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/e_dbus Dir : e17/libs/e_dbus/src/lib/dbus Log Message: Directory /cvs/e/e17/libs/e_dbus/src/lib/dbus added to the repository - 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: libs/e_dbus raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/e_dbus Dir : e17/libs/e_dbus/src/lib Log Message: Directory /cvs/e/e17/libs/e_dbus/src/lib added to the repository - 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: libs/e_dbus raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/e_dbus Dir : e17/libs/e_dbus/src/bin Log Message: Directory /cvs/e/e17/libs/e_dbus/src/bin added to the repository - 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: libs/e_dbus raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/e_dbus Dir : e17/libs/e_dbus/src Log Message: Directory /cvs/e/e17/libs/e_dbus/src added to the repository - 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: libs/e_dbus raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/e_dbus Dir : e17/libs/e_dbus Log Message: Directory /cvs/e/e17/libs/e_dbus added to the repository - 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: jethomas dj2
Enlightenment CVS committal Author : dj2 Project : devs Module : jethomas Dir : devs/jethomas Added Files: id_dsa.pub Log Message: - lets try this key - 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: jethomas dj2
Enlightenment CVS committal Author : dj2 Project : devs Module : jethomas Dir : devs/jethomas Added Files: id_rsa.pub info.txt Log Message: - give Jamie Thomas CVS access - 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: jethomas dj2
Enlightenment CVS committal Author : dj2 Project : devs Module : jethomas Dir : devs/jethomas Log Message: Directory /cvs/e/devs/jethomas added to the repository - 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 devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: TODO Log Message: Remove TODO item for 'Add Keyboard Shortcut'. Completed with ZGold's patch. === RCS file: /cvs/e/e17/apps/e/TODO,v retrieving revision 1.557 retrieving revision 1.558 diff -u -3 -r1.557 -r1.558 --- TODO14 Oct 2007 17:54:15 - 1.557 +++ TODO28 Oct 2007 19:08:06 - 1.558 @@ -136,8 +136,6 @@ * option for svg icon render resolution size * for startup - apps that say "wait for me befofe running the next app" have a timeout so if they never complete - complain and continue anyway. -* nice to have a menu item for a window for "add keyboard shortcut to run this - app" would be nice usability * emit signal to submenu entries if they have a submenu shown for them or not * setup configs for gnome and kde (as options) if they are installed (eg run gnome-settings-daemon). - 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 devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_border_menu.c
Log Message:
ZGold's patch for adding 'Add Keyboard Shortcut' to border menu.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_menu.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -3 -r1.73 -r1.74
--- e_int_border_menu.c 3 Aug 2007 06:11:55 - 1.73
+++ e_int_border_menu.c 28 Oct 2007 19:07:25 - 1.74
@@ -33,6 +33,7 @@
static void _e_border_menu_cb_state_pre(void *data, E_Menu *m, E_Menu_Item
*mi);
static void _e_border_menu_cb_skip(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_border_menu_cb_fav_add(void *data, E_Menu *m, E_Menu_Item *mi);
+static void _e_border_menu_cb_kbdshrtct_add(void *data, E_Menu *m, E_Menu_Item
*mi);
static void _e_border_menu_cb_ibar_add_pre(void *data, E_Menu *m, E_Menu_Item
*mi);
static void _e_border_menu_cb_ibar_add(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_border_menu_cb_border_pre(void *data, E_Menu *m, E_Menu_Item
*mi);
@@ -96,56 +97,56 @@
/* Only allow to change layer for windows in "normal" layers */
if ((!bd->lock_user_maximize) && (!bd->shaded) &&
((bd->layer == 50) || (bd->layer == 100) || (bd->layer == 150)))
- {
- m = e_menu_new();
- e_menu_category_set(m,"border/maximize");
- e_menu_category_data_set("border/maximize",bd);
- bd->border_maximize_menu = m;
-
- mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, _("Maximize"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 3);
- e_menu_item_toggle_set(mi, (bd->maximized & E_MAXIMIZE_DIRECTION) ==
E_MAXIMIZE_BOTH);
- e_menu_item_callback_set(mi, _e_border_menu_cb_maximize, bd);
- e_menu_item_icon_edje_set(mi,
- e_theme_edje_file_get("base/theme/borders",
-
"e/widgets/border/default/maximize"),
- "e/widgets/border/default/maximize");
-
- mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, _("Maximize vertically"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 3);
- e_menu_item_toggle_set(mi, (bd->maximized & E_MAXIMIZE_DIRECTION) ==
E_MAXIMIZE_VERTICAL);
- e_menu_item_callback_set(mi, _e_border_menu_cb_maximize_vertically, bd);
- e_menu_item_icon_edje_set(mi,
- e_theme_edje_file_get("base/theme/borders",
-
"e/widgets/border/default/maximize"),
- "e/widgets/border/default/maximize");
-
- mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, _("Maximize horizontally"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 3);
- e_menu_item_toggle_set(mi, (bd->maximized & E_MAXIMIZE_DIRECTION) ==
E_MAXIMIZE_HORIZONTAL);
- e_menu_item_callback_set(mi, _e_border_menu_cb_maximize_horizontally, bd);
- e_menu_item_icon_edje_set(mi,
- e_theme_edje_file_get("base/theme/borders",
-
"e/widgets/border/default/maximize"),
- "e/widgets/border/default/maximize");
-
- mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, _("Unmaximize"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 3);
- e_menu_item_toggle_set(mi, (bd->maximized & E_MAXIMIZE_DIRECTION) ==
E_MAXIMIZE_NONE);
- e_menu_item_callback_set(mi, _e_border_menu_cb_unmaximize, bd);
- e_menu_item_icon_edje_set(mi,
- e_theme_edje_file_get("base/theme/borders",
-
"e/widgets/border/default/maximize"),
- "e/widgets/border/default/maximize");
- }
+ {
+ m = e_menu_new();
+ e_menu_category_set(m,"border/maximize");
+ e_menu_category_data_set("border/maximize",bd);
+ bd->border_maximize_menu = m;
+
+ mi = e_menu_item_new(m);
+ e_menu_item_label_set(mi, _("Maximize"));
+ e_menu_item_radio_set(mi, 1);
+ e_menu_item_radio_group_set(mi, 3);
+ e_menu_item_toggle_set(mi, (bd->maximized & E_MAXIMIZE_DIRECTION) ==
E_MAXIMIZE_BOTH);
+ e_menu_item_callback_set(mi, _e_border_menu_cb_maximize, bd);
+ e_menu_item_icon_edje_set(mi,
+ e_theme_edje_file_get("base/theme/borders",
+
"e/widgets/border/default/maximize"),
+ "e/widgets/border/default/maximize");
+
+ mi = e_menu_item_new(m);
+ e_menu_item_label_set(mi, _("Maximize vertically"));
+ e_menu_item_radio_set(mi, 1);
+ e_menu_item_radio_group_set(mi, 3);
+ e_menu_item_toggle_set
E CVS: apps/e devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/conf_keybindings
Modified Files:
e_int_config_keybindings.c
Log Message:
ZGold's patch for adding 'Add Keyboard Shortcut' to border menu.
===
RCS file:
/cvs/e/e17/apps/e/src/modules/conf_keybindings/e_int_config_keybindings.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_int_config_keybindings.c 7 Oct 2007 21:22:41 - 1.3
+++ e_int_config_keybindings.c 28 Oct 2007 19:06:48 - 1.4
@@ -52,19 +52,13 @@
} binding;
struct
{
- char *binding;
- char *action;
- char *params;
-
- char *cur;
- int cur_act;
- int add;
+ char *binding, *action, *params, *cur;
+ int cur_act, add;
E_Dialog *dia;
Ecore_X_Window bind_win;
Evas_List *handlers;
} locals;
-
struct
{
Evas_Object *o_add, *o_mod, *o_del, *o_del_all;
@@ -72,11 +66,12 @@
Evas_Object *o_params;
} gui;
+ char *params;
E_Config_Dialog *cfd;
};
EAPI E_Config_Dialog *
-e_int_config_keybindings(E_Container *con, const char *params __UNUSED__)
+e_int_config_keybindings(E_Container *con, const char *params)
{
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
@@ -93,13 +88,19 @@
cfd = e_config_dialog_new(con, _("Key Binding Settings"), "E",
"_config_keybindings_dialog",
"enlightenment/keys", 0, v, NULL);
+ if (strlen(params) > 0)
+ {
+ cfd->cfdata->params = params;
+ _add_key_binding_cb(cfd->cfdata, NULL);
+ }
+
return cfd;
}
static void
_fill_data(E_Config_Dialog_Data *cfdata)
{
- Evas_List *l;
+ Evas_List *l = NULL;
E_Config_Binding_Key *bi, *bi2;
cfdata->locals.binding = strdup("");
@@ -159,14 +160,14 @@
if (cfdata->locals.binding) free(cfdata->locals.binding);
if (cfdata->locals.action) free(cfdata->locals.action);
if (cfdata->locals.params) free(cfdata->locals.params);
-
+ if (cfdata->params) free(cfdata->params);
E_FREE(cfdata);
}
static int
_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
- Evas_List *l;
+ Evas_List *l = NULL;
E_Config_Binding_Key *bi, *bi2;
_auto_apply_changes(cfdata);
@@ -392,10 +393,11 @@
_update_buttons(cfdata);
}
+
static void
_delete_key_binding_cb(void *data, void *data2)
{
- Evas_List *l;
+ Evas_List *l = NULL;
char *n;
int sel;
E_Config_Dialog_Data *cfdata;
@@ -621,6 +623,7 @@
e_widget_entry_clear(cfdata->gui.o_params);
e_widget_disabled_set(cfdata->gui.o_params, 1);
}
+
/ Updates ***/
static void
_update_action_list(E_Config_Dialog_Data *cfdata)
@@ -712,6 +715,7 @@
}
}*/
}
+
static void
_update_action_params(E_Config_Dialog_Data *cfdata)
{
@@ -785,22 +789,17 @@
if (!strcmp(action, actd->act_cmd))
{
if ((!params) || (!params[0]))
- {
- KB_EXAMPLE_PARAMS;
- }
+ KB_EXAMPLE_PARAMS;
else
e_widget_entry_text_set(cfdata->gui.o_params, params);
}
else
- {
-KB_EXAMPLE_PARAMS;
- }
+ KB_EXAMPLE_PARAMS;
}
else
- {
- KB_EXAMPLE_PARAMS;
- }
+ KB_EXAMPLE_PARAMS;
}
+
static void
_update_key_binding_list(E_Config_Dialog_Data *cfdata)
{
@@ -892,7 +891,6 @@
if (i < j) return -1;
else if (i > j) return 1;
-
if (bi->modifiers < bi2->modifiers) return -1;
else if (bi->modifiers > bi2->modifiers) return 1;
@@ -902,7 +900,6 @@
if (i < j) return -1;
else if (i > j) return 1;
-
i = strcmp(bi->key, bi2->key);
if (i < 0) return -1;
@@ -1091,8 +1088,23 @@
e_widget_ilist_unselect(cfdata->gui.o_action_list);
if (cfdata->locals.action) free(cfdata->locals.action);
cfdata->locals.action = strdup("");
- e_widget_entry_clear(cfdata->gui.o_params);
- e_widget_disabled_set(cfdata->gui.o_params, 1);
+ if(strlen(cfdata->params) > 0)
+ {
+int j,g = -1;
+_find_key_binding_action("exec",NULL,&g,NULL,&j);
+if(j >=0 )
+ {
+
e_widget_ilist_unselect(cfdata->gui.o_action_list);
+
e_widget_ilist_selected_set(cfdata->gui.o_action_list, (j+g+1));
+ e_widget_entry_clear(cfdata->gui.o_params);
+
e_widget_entry_text_set(cfdata->gui.o_params,cfdata->params);
+ }
+ }
+
E CVS: apps/e devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fm.c
Log Message:
Don't evas_list_free the returned mime handlers list. This fixes bug #255
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -3 -r1.224 -r1.225
--- e_fm.c 27 Oct 2007 15:55:27 - 1.224
+++ e_fm.c 28 Oct 2007 18:44:24 - 1.225
@@ -6447,18 +6447,23 @@
{
/* see if we have any mime handlers registered for this file */
l = e_fm2_mime_handler_mime_handlers_get(ic->info.mime);
-snprintf(buf, sizeof(buf), "%s/%s", sd->realpath, ic->info.file);
-_e_fm2_context_menu_append(obj, buf, l, mn, ic);
-if (l) evas_list_free(l);
+if (l)
+ {
+ snprintf(buf, sizeof(buf), "%s/%s", sd->realpath,
ic->info.file);
+ _e_fm2_context_menu_append(obj, buf, l, mn, ic);
+ }
}
/* see if we have any glob handlers registered for this file */
snprintf(buf, sizeof(buf), "*%s", strrchr(ic->info.file, '.'));
l = e_fm2_mime_handler_glob_handlers_get(buf);
- snprintf(buf, sizeof(buf), "%s/%s", sd->realpath, ic->info.file);
- _e_fm2_context_menu_append(obj, buf, l, mn, ic);
- if (l) evas_list_free(l);
-
+ if (l)
+ {
+snprintf(buf, sizeof(buf), "%s/%s", sd->realpath, ic->info.file);
+_e_fm2_context_menu_append(obj, buf, l, mn, ic);
+evas_list_free(l);
+ }
+
if (sd->icon_menu.end.func)
sd->icon_menu.end.func(sd->icon_menu.end.data, sd->obj, mn,
&(ic->info));
}
@@ -6493,20 +6498,20 @@
_e_fm2_context_menu_append(Evas_Object *obj, const char *path, Evas_List *l,
E_Menu *mn, E_Fm2_Icon *ic)
{
Evas_List *ll = NULL;
- E_Menu_Item *mi;
if (!l) return;
-
+
l = evas_list_sort(l, -1, _e_fm2_context_list_sort);
-
+
for (ll = l; ll; ll = ll->next)
{
E_Fm2_Mime_Handler *handler = NULL;
E_Fm2_Context_Menu_Data *md = NULL;
-
- handler = ll->data;
- if ((!handler) || (!e_fm2_mime_handler_test(handler, obj, path)))
continue;
+ E_Menu_Item *mi;
+ handler = ll->data;
+ if ((!handler) || (!e_fm2_mime_handler_test(handler, obj, path)) ||
+ (!handler->label)) continue;
if (ll == l)
{
/* only append the separator if this is the first item */
@@ -6518,10 +6523,9 @@
md = E_NEW(E_Fm2_Context_Menu_Data, 1);
if (!md) continue;
- _e_fm2_menu_contexts = evas_list_append(_e_fm2_menu_contexts, md);
-
md->icon = ic;
md->handler = handler;
+ _e_fm2_menu_contexts = evas_list_append(_e_fm2_menu_contexts, md);
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, handler->label);
-
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: libs/ewl pfritz
Enlightenment CVS committal
Author : pfritz
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_freebox.c
Log Message:
use the preferred size for now in the freebox
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_freebox.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- ewl_freebox.c 23 Aug 2007 05:26:51 - 1.23
+++ ewl_freebox.c 28 Oct 2007 17:02:47 - 1.24
@@ -394,7 +394,7 @@
while ((child = ecore_dlist_next(c->children)))
{
if (!VISIBLE(child)) continue;
- ewl_object_minimum_size_get(EWL_OBJECT(child),
+ ewl_object_preferred_size_get(EWL_OBJECT(child),
&child_w, &child_h);
/* past end of widget, wrap */
@@ -419,7 +419,7 @@
while ((child = ecore_dlist_next(c->children)))
{
if (!VISIBLE(child)) continue;
- ewl_object_minimum_size_get(EWL_OBJECT(child),
+ ewl_object_preferred_size_get(EWL_OBJECT(child),
&child_w, &child_h);
/* past end of widget, wrap */
-
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: libs/ewl doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/engines/evas_gl_x11 Modified Files: Makefile.am Log Message: i've forgotten that one === RCS file: /cvs/e/e17/libs/ewl/src/engines/evas_gl_x11/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- Makefile.am 29 Mar 2007 19:35:05 - 1.5 +++ Makefile.am 28 Oct 2007 16:02:39 - 1.6 @@ -10,7 +10,7 @@ pkgdir = $(libdir)/ewl/engines -if EWL_ENABLE_EVAS_GL_X11 +if EWL_ENABLE_EVAS_OPENGL_X11 pkg_LTLIBRARIES = evas_gl_x11.la - 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: libs/ewl doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/ewl Dir : e17/libs/ewl Modified Files: configure.in Log Message: oups, missing variable... === RCS file: /cvs/e/e17/libs/ewl/configure.in,v retrieving revision 1.115 retrieving revision 1.116 diff -u -3 -r1.115 -r1.116 --- configure.in28 Oct 2007 14:24:44 - 1.115 +++ configure.in28 Oct 2007 14:30:35 - 1.116 @@ -56,7 +56,8 @@ PCFLAGS=$CFLAGS -PKG_CHECK_MODULES(EVAS, [evas >= 0.9.9]) +have_evas="no" +PKG_CHECK_MODULES(EVAS, [evas >= 0.9.9], [have_evas="yes"]) CFLAGS=$EVAS_CFLAGS" "$CFLAGS AM_CONDITIONAL(EWL_ENABLE_EVAS, test "x$have_evas" = "xyes") - 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: libs/ewl doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/ewl Dir : e17/libs/ewl Modified Files: configure.in Log Message: small configure.in update: * build the evas engine if evas is found (and not if the software-x11 engine is found) * use pkg-config stuff to detect the engines * if the xrender engine is found, enable ecore-x engine * small fixes in descriptions === RCS file: /cvs/e/e17/libs/ewl/configure.in,v retrieving revision 1.114 retrieving revision 1.115 diff -u -3 -r1.114 -r1.115 --- configure.in17 Oct 2007 02:00:55 - 1.114 +++ configure.in28 Oct 2007 14:24:44 - 1.115 @@ -58,6 +58,7 @@ PKG_CHECK_MODULES(EVAS, [evas >= 0.9.9]) CFLAGS=$EVAS_CFLAGS" "$CFLAGS +AM_CONDITIONAL(EWL_ENABLE_EVAS, test "x$have_evas" = "xyes") PKG_CHECK_MODULES(EFREET, [ efreet >= 0.0.3 @@ -71,142 +72,196 @@ ]) CFLAGS=$ECORE_CFLAGS" "$CFLAGS +dnl software X11 AC_ARG_ENABLE(software-x11, - [AC_HELP_STRING([--enable-software-x11],[enable software X11 support])], - [enable_software_x11=$enableval], [enable_software_x11="auto"]) -have_software_x11=no + [ +AC_HELP_STRING( + [--enable-software-x11], + [enable software X11 support]) + ], + [enable_software_x11=$enableval], + [enable_software_x11="auto"]) + if test "x$enable_software_x11" != "xno" ; then - AC_CHECK_HEADER(Evas_Engine_Software_X11.h, - [AC_CHECK_HEADER(Ecore_X.h, - [have_software_x11=yes], - [], [#include ])], - [], [#include ]) - if test "x$have_software_x11" = "xyes" ; then - AC_DEFINE(ENABLE_EWL_SOFTWARE_X11, 1, [Enable X11 Software]) - elif test "x$enable_software_x11" = "xyes" ; then - AC_MSG_ERROR(software X11 requested but no evas/ecore support found) - fi + PKG_CHECK_MODULES(EVAS_SOFTWARE_X11, +[evas-software-x11 >= 0.9.9], +[ + PKG_CHECK_MODULES(ECORE_X, +[ecore-x >= 0.9.9], +[have_software_x11="yes"], +[have_software_x11="no"]) +], +[have_software_x11="no"]) + if test "x$have_software_x11" = "xyes" ; then +AC_DEFINE(ENABLE_EWL_SOFTWARE_X11, 1, [Enable X11 Software]) + elif test "x$enable_software_x11" = "xyes" ; then +AC_MSG_ERROR(software X11 requested but no evas/ecore support found) + fi fi AM_CONDITIONAL(EWL_ENABLE_EVAS_SOFTWARE_X11, test "x$have_software_x11" = xyes) -AC_ARG_ENABLE(software-sdl, - [AC_HELP_STRING([--enable-software-sdl],[enable software SDL support])], - [enable_software_sdl=$enableval], [enable_software_sdl="auto"]) -have_software_sdl=no -if test "x$enable_software_sdl" != "xno" ; then - AC_CHECK_HEADER(Evas_Engine_SDL.h, - [AC_CHECK_HEADER(Ecore_Sdl.h, - [have_software_sdl=yes], - [], [#include ])], - [], [#include ]) - if test "x$have_software_sdl" = "xyes" ; then - AC_DEFINE(ENABLE_EWL_SOFTWARE_SDL, 1, [Enable SDL Software]) - elif test "x$enable_software_sdl" = "xyes" ; then - AC_MSG_ERROR(software SDL requested but no evas/ecore support found) - fi -fi -AM_CONDITIONAL(EWL_ENABLE_EVAS_SOFTWARE_SDL, test "x$have_software_sdl" = xyes) - +dnl software X11 16 bpp AC_ARG_ENABLE(software-16-x11, - [AC_HELP_STRING([--enable-software-16-x11],[enable software X11 support])], - [enable_software_16_x11=$enableval], [enable_software_16_x11="auto"]) -have_software_16_x11=no + [ +AC_HELP_STRING( + [--enable-software-16-x11], + [enable software 16 bpp X11 support]) + ], + [enable_software_16_x11=$enableval], + [enable_software_16_x11="auto"]) + if test "x$enable_software_16_x11" != "xno" ; then - AC_CHECK_HEADER(Evas_Engine_Software_16_X11.h, - [AC_CHECK_HEADER(Ecore_X.h, - [have_software_16_x11=yes], - [], [#include ])], - [], [#include ]) - if test "x$have_software_16_x11" = "xyes" ; then - AC_DEFINE(ENABLE_EWL_SOFTWARE_16_X11, 1, [Enable X11 Software]) - elif test "x$enable_software_16_x11" = "xyes" ; then - AC_MSG_ERROR(software X11 requested but no evas/ecore support found) - fi + PKG_CHECK_MODULES(EVAS_SOFTWARE_16_X11, +[evas-software-16-x11 >= 0.9.9], +[ + PKG_CHECK_MODULES(ECORE_X, +[ecore-x >= 0.9.9], +[have_software_16_x11="yes"], +[have_software_16_x11="no"]) +], +[have_software_16_x11="no"]) + if test "x$have_software_16_x11" = "xyes" ; then +AC_DEFINE(ENABLE_EWL_SOFTWARE_16_X11, 1, [Enable X11 16 bpp Software]) + elif test "x$enable_software_16_x11" = "xyes" ; then +AC_MSG_ERROR(software 16 bpp X11 requested but no evas/ecore support found) + fi fi AM_CONDITIONAL(EWL_ENABLE_EVAS_SOFTWARE_16_X11, test "x$have_software_16
E CVS: libs/ewl doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/engines/evas Modified Files: Makefile.am Log Message: small configure.in update: * build the evas engine if evas is found (and not if the software-x11 engine is found) * use pkg-config stuff to detect the engines * if the xrender engine is found, enable ecore-x engine * small fixes in descriptions === RCS file: /cvs/e/e17/libs/ewl/src/engines/evas/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- Makefile.am 29 Mar 2007 19:35:04 - 1.4 +++ Makefile.am 28 Oct 2007 14:24:44 - 1.5 @@ -10,7 +10,7 @@ pkgdir = $(libdir)/ewl/engines -if EWL_ENABLE_EVAS_SOFTWARE_X11 +if EWL_ENABLE_EVAS pkg_LTLIBRARIES = evas.la - 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: libs/evas doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/evas Dir : e17/libs/evas Modified Files: configure.in Makefile.am Added Files: evas-software-sdl.pc.in Removed Files: evas-sdl.pc.in Log Message: evas-sdl.pc -> evas-software-sdl.pc === RCS file: /cvs/e/e17/libs/evas/configure.in,v retrieving revision 1.232 retrieving revision 1.233 diff -u -3 -r1.232 -r1.233 --- configure.in9 Oct 2007 06:53:45 - 1.232 +++ configure.in28 Oct 2007 14:11:56 - 1.233 @@ -2223,7 +2223,7 @@ evas-software-ddraw.pc evas-software-16-ddraw.pc evas-direct3d.pc -evas-sdl.pc +evas-software-sdl.pc evas.pc src/Makefile src/lib/Makefile @@ -2306,7 +2306,7 @@ echo " Software Qtopia: $have_evas_qtopia" echo " Software Memory Buffer.: $have_evas_buffer" echo " DirectFB...: $have_evas_directfb" -echo " SDL: $have_evas_sdl" +echo " Software SDL...: $have_evas_sdl" echo " OpenGL Glew: $have_evas_gl_glew" echo " OpenGL X11.: $have_evas_gl_x11" echo " Cairo X11..: $have_evas_cairo_x11" === RCS file: /cvs/e/e17/libs/evas/Makefile.am,v retrieving revision 1.46 retrieving revision 1.47 diff -u -3 -r1.46 -r1.47 --- Makefile.am 17 Oct 2007 16:24:15 - 1.46 +++ Makefile.am 28 Oct 2007 14:11:56 - 1.47 @@ -24,7 +24,7 @@ evas-software-ddraw.pc \ evas-software-16-ddraw.pc \ evas-direct3d.pc \ - evas-sdl.pc \ + evas-software-sdl.pc \ evas.pc \ evas.spec \ debian/changelog @@ -51,7 +51,7 @@ evas-software-ddraw.pc \ evas-software-16-ddraw.pc \ evas-direct3d.pc \ -evas-sdl.pc \ +evas-software-sdl.pc \ evas.pc \ evas.spec.in evas.spec \ debian/changelog \ @@ -147,12 +147,12 @@ endif if BUILD_ENGINE_SDL -psdl = evas-sdl.pc +psoftwaresdl = evas-software-sdl.pc endif pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = \ evas.pc $(psoftwarex11) $(psoftwarexcb) $(pdirectfb) $(pframebuffer) \ $(psoftwarebuffer) $(psoftwareqtopia) $(popenglx11) $(pcairox11) \ - $(pxrenderx11) $(pxrenderxcb) $(pglitzx11) $(psoftwareddraw) $(psdl) \ + $(pxrenderx11) $(pxrenderxcb) $(pglitzx11) $(psoftwareddraw) $(psoftwaresdl) \ $(psoftware16x11) $(pdirect3d) $(psoftwared16draw) $(popenglglew) - 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 morlenxus
Enlightenment CVS committal
Author : morlenxus
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/winlist
Modified Files:
e_winlist.c
Log Message:
Fixing bug #251: e_winlist.c corrupts the focus stack when switching to another
window which is NOT the nearest one
===
RCS file: /cvs/e/e17/apps/e/src/modules/winlist/e_winlist.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_winlist.c 12 Oct 2007 11:48:43 - 1.2
+++ e_winlist.c 28 Oct 2007 13:17:41 - 1.3
@@ -602,6 +602,7 @@
if (e_config->winlist_warp_while_selecting)
{
ecore_x_pointer_xy_get(winlist->zone->container->win, &warp_x,
&warp_y);
+e_border_focus_latest_set(ww->border);
warp_to = 1;
if (!warp_timer)
warp_timer = ecore_timer_add(0.01, _e_winlist_warp_timer, NULL);
-
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: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/modules/loaders/png
Modified Files:
evas_image_load_png.c
Log Message:
oops - wrong order.
===
RCS file: /cvs/e/e17/libs/evas/src/modules/loaders/png/evas_image_load_png.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- evas_image_load_png.c 28 Oct 2007 10:08:32 - 1.7
+++ evas_image_load_png.c 28 Oct 2007 10:35:13 - 1.8
@@ -39,7 +39,7 @@
if (!f) return 0;
/* if we havent read the header before, set the header data */
- if (fread(buf, 1, PNG_BYTES_TO_CHECK, f) != 1)
+ if (fread(buf, PNG_BYTES_TO_CHECK, 1, f) != 1)
{
fclose(f);
return 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: libs/emotion raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion/src/lib
Modified Files:
emotion_smart.c
Log Message:
fix odd sized videos
===
RCS file: /cvs/e/e17/libs/emotion/src/lib/emotion_smart.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- emotion_smart.c 26 Oct 2007 10:49:16 - 1.33
+++ emotion_smart.c 28 Oct 2007 10:19:09 - 1.34
@@ -1027,6 +1027,8 @@
sd = data;
evas_object_image_size_get(obj, &iw, &ih);
sd->module->video_data_size_get(sd->video, &w, &h);
+ w = (w >> 1) << 1;
+ h = (h >> 1) << 1;
if ((w != iw) || (h != ih))
{
evas_object_image_colorspace_set(obj, EVAS_COLORSPACE_YCBCR422P601_PL);
-
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: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/modules/loaders/png
Modified Files:
evas_image_load_png.c
Log Message:
fix unknown buffer content chekc problems
===
RCS file: /cvs/e/e17/libs/evas/src/modules/loaders/png/evas_image_load_png.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- evas_image_load_png.c 25 Aug 2007 02:36:18 - 1.6
+++ evas_image_load_png.c 28 Oct 2007 10:08:32 - 1.7
@@ -39,7 +39,11 @@
if (!f) return 0;
/* if we havent read the header before, set the header data */
- fread(buf, 1, PNG_BYTES_TO_CHECK, f);
+ if (fread(buf, 1, PNG_BYTES_TO_CHECK, f) != 1)
+ {
+ fclose(f);
+ return 0;
+ }
if (!png_check_sig(buf, PNG_BYTES_TO_CHECK))
{
fclose(f);
-
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: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/modules/loaders/tiff
Modified Files:
evas_image_load_tiff.c
Log Message:
fix unknown buffer content chekc problems
===
RCS file: /cvs/e/e17/libs/evas/src/modules/loaders/tiff/evas_image_load_tiff.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- evas_image_load_tiff.c 5 Nov 2006 05:07:53 - 1.7
+++ evas_image_load_tiff.c 28 Oct 2007 10:08:32 - 1.8
@@ -126,7 +126,11 @@
if (!ffile)
return 0;
- fread(&magic_number, sizeof(uint16), 1, ffile);
+ if (fread(&magic_number, sizeof(uint16), 1, ffile) != 1)
+ {
+fclose(ffile);
+return 0;
+ }
/* Apparently rewind(f) isn't sufficient */
fseek(ffile, (long)0, SEEK_SET);
-
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: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/modules/loaders/xpm
Modified Files:
evas_image_load_xpm.c
Log Message:
fix unknown buffer content chekc problems
===
RCS file: /cvs/e/e17/libs/evas/src/modules/loaders/xpm/evas_image_load_xpm.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- evas_image_load_xpm.c 25 Aug 2007 02:07:16 - 1.12
+++ evas_image_load_xpm.c 28 Oct 2007 10:08:32 - 1.13
@@ -128,7 +128,12 @@
xpm_parse_done();
return 0;
}
- fread(s, 1, 9, f);
+ if (fread(s, 9, 1, f) != 1)
+ {
+fclose(f);
+ xpm_parse_done();
+ return 0;
+ }
rewind(f);
s[9] = 0;
if (strcmp("/* XPM */", s))
-
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 devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_modules.c
Log Message:
Init some vars to NULL before use.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_modules.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -3 -r1.73 -r1.74
--- e_int_config_modules.c 28 Oct 2007 07:37:25 - 1.73
+++ e_int_config_modules.c 28 Oct 2007 07:43:46 - 1.74
@@ -564,8 +564,8 @@
_modules_hash_cb_free(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
void *data, void *fdata __UNUSED__)
{
- CFModule *module;
-
+ CFModule *module = NULL;
+
module = data;
if (!module) return 1;
if (module->short_name) evas_stringshare_del(module->short_name);
@@ -581,8 +581,8 @@
_modules_hash_cb_unsel(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
void *data, void *fdata __UNUSED__)
{
- CFModule *module;
-
+ CFModule *module = NULL;
+
module = data;
if (!module) return 1;
module->selected = 0;
@@ -593,9 +593,9 @@
_modules_hash_cb_load(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
void *data, void *fdata __UNUSED__)
{
- CFModule *module;
- E_Module *mod;
-
+ CFModule *module = NULL;
+ E_Module *mod = NULL;
+
module = data;
if ((!module) || (!module->selected)) return 1;
mod = e_module_find(module->short_name);
@@ -609,9 +609,9 @@
_modules_hash_cb_unload(Evas_Hash *hash __UNUSED__, const char *key
__UNUSED__,
void *data, void *fdata __UNUSED__)
{
- CFModule *module;
- E_Module *mod;
-
+ CFModule *module = NULL;
+ E_Module *mod = NULL;
+
module = data;
if ((!module) || (!module->selected)) return 1;
mod = e_module_find(module->short_name);
-
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 devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_modules.c
Log Message:
Comment out the efreet_icon_path_find call as this function is slowing down
the modules dialog badly & the module(s) icon is defined in it's edj anyway.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_modules.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- e_int_config_modules.c 9 Oct 2007 17:57:50 - 1.72
+++ e_int_config_modules.c 28 Oct 2007 07:37:25 - 1.73
@@ -1,7 +1,6 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
-
#include "e.h"
typedef struct _CFModule
@@ -284,6 +283,7 @@
if (!name) continue;
module = evas_hash_find(modules, name);
if ((!module) || (module->enabled) || (!module->icon)) continue;
+ /*
icon = efreet_icon_path_find(e_config->icon_theme,
module->icon, "24x24");
if ((!icon) && (module->orig_path))
@@ -293,6 +293,14 @@
icon = strdup(buf);
free(path);
}
+*/
+ if (module->orig_path)
+ {
+path = ecore_file_dir_get(module->orig_path);
+snprintf(buf, sizeof(buf), "%s/%s.edj", path, module->icon);
+icon = strdup(buf);
+free(path);
+ }
if (icon)
{
ic = e_util_icon_add(icon, evas);
@@ -339,9 +347,18 @@
if (!name) continue;
module = evas_hash_find(modules, name);
if ((!module) || (!module->enabled) || (!module->icon)) continue;
+ /*
icon = efreet_icon_path_find(e_config->icon_theme,
module->icon, "24x24");
if ((!icon) && (module->orig_path))
+ {
+path = ecore_file_dir_get(module->orig_path);
+snprintf(buf, sizeof(buf), "%s/%s.edj", path, module->icon);
+icon = strdup(buf);
+free(path);
+ }
+*/
+ if (module->orig_path)
{
path = ecore_file_dir_get(module->orig_path);
snprintf(buf, sizeof(buf), "%s/%s.edj", path, module->icon);
-
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
