E CVS: libs/eet raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/eet
Dir : e17/libs/eet/src/lib
Modified Files:
eet_lib.c
Log Message:
usless if's
===
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_lib.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -3 -r1.74 -r1.75
--- eet_lib.c 20 Jan 2007 15:20:23 - 1.74
+++ eet_lib.c 2 May 2007 11:08:41 - 1.75
@@ -309,11 +309,8 @@
{
for (efn = ef-header-directory-nodes[i]; efn; efn = efn-next)
{
-if (efn-compression = 0)
- {
- size += 20 + strlen(efn-name) + 1;
- count++;
- }
+size += 20 + strlen(efn-name) + 1;
+count++;
}
}
@@ -323,11 +320,8 @@
{
for (efn = ef-header-directory-nodes[i]; efn; efn = efn-next)
{
-if (efn-compression = 0)
- {
- efn-offset = 12 + size + offset;
- offset += efn-size;
- }
+efn-offset = 12 + size + offset;
+offset += efn-size;
}
}
@@ -344,25 +338,22 @@
{
for (efn = ef-header-directory-nodes[i]; efn; efn = efn-next)
{
-if (efn-compression = 0)
- {
- uint32_t ibuf[5];
- int name_size;
-
- name_size = strlen(efn-name) + 1;
-
- ibuf[0] = (int) htonl ((uint32_t) efn-offset);
- ibuf[1] = (int) htonl ((uint32_t) efn-compression);
- ibuf[2] = (int) htonl ((uint32_t) efn-size);
- ibuf[3] = (int) htonl ((uint32_t) efn-data_size);
- ibuf[4] = (int) htonl ((uint32_t) name_size);
-
-
- if (fwrite(ibuf, sizeof(ibuf), 1, ef-fp) != 1)
- goto write_error;
- if (fwrite(efn-name, name_size, 1, ef-fp) != 1)
- goto write_error;
- }
+uint32_t ibuf[5];
+intname_size;
+
+name_size = strlen(efn-name) + 1;
+
+ibuf[0] = (int) htonl ((uint32_t) efn-offset);
+ibuf[1] = (int) htonl ((uint32_t) efn-compression);
+ibuf[2] = (int) htonl ((uint32_t) efn-size);
+ibuf[3] = (int) htonl ((uint32_t) efn-data_size);
+ibuf[4] = (int) htonl ((uint32_t) name_size);
+
+
+if (fwrite(ibuf, sizeof(ibuf), 1, ef-fp) != 1)
+ goto write_error;
+if (fwrite(efn-name, name_size, 1, ef-fp) != 1)
+ goto write_error;
}
}
@@ -371,11 +362,8 @@
{
for (efn = ef-header-directory-nodes[i]; efn; efn = efn-next)
{
-if (efn-compression = 0)
- {
- if (fwrite(efn-data, efn-size, 1, ef-fp) != 1)
- goto write_error;
- }
+if (fwrite(efn-data, efn-size, 1, ef-fp) != 1)
+ goto write_error;
}
}
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fm.c e_int_config_transitions.c
Log Message:
fix transitions segv due to preview widget being inserted
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -3 -r1.149 -r1.150
--- e_fm.c 22 Apr 2007 15:30:00 - 1.149
+++ e_fm.c 2 May 2007 11:21:18 - 1.150
@@ -5,8 +5,6 @@
#define OVERCLIP 128
-/* FIXME: use edje messages embryo for scrolling of bg's */
-
/* FIXME: this is NOT complete. dnd not complete (started). only list view
* works. in icon view it needs to be much better about placement of icons and
* being able to save/load icon placement. it doesn't support backgrounds or
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_transitions.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_int_config_transitions.c 2 May 2007 02:30:54 - 1.14
+++ e_int_config_transitions.c 2 May 2007 11:21:18 - 1.15
@@ -1,6 +1,6 @@
#include e.h
-static Evas_Object *_trans_preview_add(E_Config_Dialog_Data *cfdata, Evas
*evas, int minw, int minh);
+static Evas_Object *_trans_preview_add(E_Config_Dialog_Data *cfdata, Evas
*evas, int minw, int minh, Evas_Object **tp);
static void _e_wid_done(void *data, Evas_Object *obj, const char
*emission, const char *source);
static void _trans_preview_trans_set(E_Config_Dialog_Data *cfdata,
const char *trans);
@@ -165,8 +165,7 @@
e_widget_list_object_append(o, of, 1, 1, 0.5);
of = e_widget_framelist_add(evas, _(Preview), 0);
- il = _trans_preview_add(cfdata, evas, 300, ((300 * zone-h) / zone-w));
- cfdata-tp = il;
+ il = _trans_preview_add(cfdata, evas, 300, ((300 * zone-h) / zone-w),
(cfdata-tp));
e_widget_framelist_object_append(of, il);
e_widget_list_object_append(o, of, 1, 1, 0.5);
@@ -257,7 +256,7 @@
}
Evas_Object *
-_trans_preview_add(E_Config_Dialog_Data *cfdata, Evas *evas, int minw, int
minh)
+_trans_preview_add(E_Config_Dialog_Data *cfdata, Evas *evas, int minw, int
minh, Evas_Object **tp)
{
Evas_Object *obj, *o, *oa;
@@ -270,7 +269,8 @@
e_theme_edje_object_set(o, base/theme/widgets, e/transpreview/1);
evas_object_show(o);
e_widget_preview_extern_object_set(obj, o);
-
+
+ *tp = obj;
return oa;
}
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_transitions.c
Log Message:
no need for extra param.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_transitions.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- e_int_config_transitions.c 2 May 2007 11:21:18 - 1.15
+++ e_int_config_transitions.c 2 May 2007 12:26:53 - 1.16
@@ -1,6 +1,6 @@
#include e.h
-static Evas_Object *_trans_preview_add(E_Config_Dialog_Data *cfdata, Evas
*evas, int minw, int minh, Evas_Object **tp);
+static Evas_Object *_trans_preview_add(E_Config_Dialog_Data *cfdata, Evas
*evas, int minw, int minh);
static void _e_wid_done(void *data, Evas_Object *obj, const char
*emission, const char *source);
static void _trans_preview_trans_set(E_Config_Dialog_Data *cfdata,
const char *trans);
@@ -165,7 +165,7 @@
e_widget_list_object_append(o, of, 1, 1, 0.5);
of = e_widget_framelist_add(evas, _(Preview), 0);
- il = _trans_preview_add(cfdata, evas, 300, ((300 * zone-h) / zone-w),
(cfdata-tp));
+ il = _trans_preview_add(cfdata, evas, 300, ((300 * zone-h) / zone-w));
e_widget_framelist_object_append(of, il);
e_widget_list_object_append(o, of, 1, 1, 0.5);
@@ -256,7 +256,7 @@
}
Evas_Object *
-_trans_preview_add(E_Config_Dialog_Data *cfdata, Evas *evas, int minw, int
minh, Evas_Object **tp)
+_trans_preview_add(E_Config_Dialog_Data *cfdata, Evas *evas, int minw, int
minh)
{
Evas_Object *obj, *o, *oa;
@@ -269,8 +269,8 @@
e_theme_edje_object_set(o, base/theme/widgets, e/transpreview/1);
evas_object_show(o);
e_widget_preview_extern_object_set(obj, o);
-
- *tp = obj;
+
+ cfdata-tp = obj;
return oa;
}
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
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_widget_aspect.c
Log Message:
Remove unneeded printf.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_aspect.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_widget_aspect.c 2 May 2007 02:18:40 - 1.4
+++ e_widget_aspect.c 2 May 2007 15:37:02 - 1.5
@@ -16,7 +16,6 @@
double align_x, align_y;
};
-
static void
_e_wid_del_hook(Evas_Object *obj)
{
@@ -55,7 +54,6 @@
cx = px + (wd-align_x * (pw - cw));
cy = py + (wd-align_y * (ph - ch));
- printf(ASPECT RECONF - p: %d,%d %dx%d c: %d,%d %dx%d\n, px, py, pw, ph,
cx, cy, cw, ch);
evas_object_resize(wd-child, cw, ch);
evas_object_move(wd-child, cx, cy);
}
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
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_widget_ilist.c
Log Message:
Minor formatting fix with parens.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_ilist.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- e_widget_ilist.c1 May 2007 02:02:59 - 1.30
+++ e_widget_ilist.c2 May 2007 17:16:08 - 1.31
@@ -115,7 +115,7 @@
E_Widget_Data *wd;
wd = e_widget_data_get(obj);
- if (wd-value *(wd-value))
+ if ((wd-value) *(wd-value))
{
free(*(wd-value));
*(wd-value) = NULL;
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
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_config_theme.c
Log Message:
Remove useless variable.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_theme.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- e_int_config_theme.c2 May 2007 02:18:39 - 1.49
+++ e_int_config_theme.c2 May 2007 18:38:23 - 1.50
@@ -339,7 +339,7 @@
{
Evas_Object *o, *ot, *of, *il, *ol;
char path[4096];
- const char *f, *homedir;
+ const char *homedir;
E_Fm2_Config fmc;
E_Zone *z;
E_Radio_Group *rg;
@@ -436,10 +436,7 @@
o = e_widget_preview_add(evas, mw, mh);
cfdata-o_preview = o;
if (cfdata-theme)
- {
- f = cfdata-theme;
- e_widget_preview_edje_set(o, f, e/desktop/background);
- }
+ e_widget_preview_edje_set(o, cfdata-theme, e/desktop/background);
e_widget_aspect_child_set(oa, o);
e_widget_list_object_append(of, oa, 1, 1, 0);
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/efreet englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/efreet
Dir : e17/libs/efreet/src/lib
Modified Files:
efreet_menu.c
Log Message:
implement more of fdo menu layout.
===
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_menu.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- efreet_menu.c 15 Apr 2007 04:54:45 - 1.14
+++ efreet_menu.c 2 May 2007 19:35:43 - 1.15
@@ -3690,47 +3690,50 @@
sub_entry = efreet_menu_layout_menu(sub);
if (!show_empty !sub_entry-entries)
efreet_menu_free(sub_entry);
-#if 0
else if (in_line
((inline_limit == 0) ||
- (!sub-entries || (ecore_list_nodes(sub-entries) =
inline_limit
+ (!sub_entry-entries ||
(ecore_list_nodes(sub_entry-entries) = inline_limit
{
-/* We don't delete the submenu when inlining, as we use
information
- * from it. */
/* Inline */
-if (!sub-entries)
+if (!sub_entry-entries)
{
/* Can't inline an empty submenu */
-entry = efreet_menu_entry_new();
-entry-type = EFREET_MENU_ENTRY_MENU;
-entry-name = sub-name.name;
-if (sub-directory) entry-icon = sub-directory-icon;
-entry-content.menu = sub;
-ecore_list_append(internal-entries, entry);
+ecore_list_append(entry-entries, sub_entry);
}
-else if (inline_alias (ecore_list_nodes(sub-entries)
== 1))
+else if (inline_alias
(ecore_list_nodes(sub_entry-entries) == 1))
{
-entry = ecore_list_remove_first(sub-entries);
-entry-name = sub-name.name;
-if (sub-directory) entry-icon = sub-directory-icon;
-ecore_list_append(internal-entries, entry);
+Efreet_Menu *tmp;
+
+tmp = ecore_list_remove_first(sub_entry-entries);
+IF_RELEASE(tmp-name);
+tmp-name = sub_entry-name;
+sub_entry-name = NULL;
+IF_RELEASE(tmp-icon);
+tmp-icon = sub_entry-icon;
+sub_entry-icon = NULL;
+ecore_list_append(entry-entries, tmp);
+efreet_menu_free(sub_entry);
}
else
{
+Efreet_Menu *tmp;
+
if (inline_header)
{
-entry = efreet_menu_entry_new();
-entry-type = EFREET_MENU_ENTRY_HEADER;
-entry-name = sub-name.name;
-if (sub-directory) entry-icon =
sub-directory-icon;
-ecore_list_append(internal-entries, entry);
+tmp = efreet_menu_entry_new();
+tmp-type = EFREET_MENU_ENTRY_HEADER;
+tmp-name = sub_entry-name;
+sub_entry-name = NULL;
+tmp-icon = sub_entry-icon;
+sub_entry-icon = NULL;
+ecore_list_append(entry-entries, tmp);
}
-ecore_list_goto_first(sub-entries);
-while ((entry = ecore_list_remove_first(sub-entries)))
-ecore_list_append(internal-entries, entry);
+ecore_list_goto_first(sub_entry-entries);
+while ((tmp =
ecore_list_remove_first(sub_entry-entries)))
+ecore_list_append(entry-entries, tmp);
+efreet_menu_free(sub_entry);
}
}
-#endif
else
ecore_list_append(entry-entries, sub_entry);
}
@@ -3790,47 +3793,53 @@
sub_entry = efreet_menu_layout_menu(sub);
if (!internal-show_empty !sub_entry-entries)
efreet_menu_free(sub_entry);
-#if 0
else if (internal-in_line
((internal-inline_limit == 0) ||
- (!sub-entries || (ecore_list_nodes(sub-entries)
= internal-inline_limit
+ (!sub_entry-entries ||
(ecore_list_nodes(sub_entry-entries) = internal-inline_limit
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/ruby-efl/src/etk/examples
Modified Files:
etk_test_button.rb etk_test_tree.rb
Log Message:
- add Ecore_Job to list of requirements
- update Etk bindings (examples work - need to do more thorough testing)
===
RCS file: /cvs/e/e17/proto/ruby-efl/src/etk/examples/etk_test_button.rb,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_test_button.rb 31 Aug 2006 22:02:48 - 1.2
+++ etk_test_button.rb 2 May 2007 21:10:50 - 1.3
@@ -3,7 +3,7 @@
super()
self.title = Etk Button Test
self.border_width = 5
-EtkBase.signal_connect(delete_event, self,
Window.function(:hide_on_delete), nil)
+EtkBase.signal_connect(delete-event, self,
Window.function(:hide_on_delete), nil)
end
def create_widgets
@@ -16,7 +16,7 @@
button_normal.tooltip = This is a normal button
box.append(button_normal, Etk::BOX_START, Etk::BOX_NONE, 0)
-image = Image.new_from_file(PACKAGE_DATA_DIR + /images/e_icon.png)
+image = Image.new_from_file(PACKAGE_DATA_DIR + /images/e_icon.png,
nil)
button_normal = Button.new_with_label(Button with an image)
button_normal.tooltip = This is a normal button with an image
button_normal.image = image
@@ -57,4 +57,5 @@
create_widgets
self.show_all
end
-end
\ No newline at end of file
+end
+
===
RCS file: /cvs/e/e17/proto/ruby-efl/src/etk/examples/etk_test_tree.rb,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_test_tree.rb31 Aug 2006 22:02:48 - 1.2
+++ etk_test_tree.rb2 May 2007 21:10:50 - 1.3
@@ -9,7 +9,7 @@
def initialize
super()
self.title = Etk Tree Test
-EtkBase.signal_connect(delete_event, self,
Window.function(:hide_on_delete), nil)
+EtkBase.signal_connect(delete-event, self,
Window.function(:hide_on_delete), nil)
end
def create_widgets
@@ -27,10 +27,20 @@
tree.mode = Etk::TREE_MODE_TREE
tree.multiple_select = true
-col1 = TreeCol.wrap(tree.col_new(Column 1,
tree.model_icon_text_new(Etk::TREE_FROM_EDJE), 90))
-col2 = TreeCol.wrap(tree.col_new(Column 2, tree.model_double_new(),
60))
-col3 = TreeCol.wrap(tree.col_new(Column 3,
tree.model_image_new(Etk::TREE_FROM_FILE), 60))
-col4 = TreeCol.wrap(tree.col_new(Column 4,
tree.model_checkbox_new(), 40))
+
+ col1 = TreeCol.wrap(tree.col_new(Column 1, 90, 0.0))
+ col1.model_add(Tree.model_image_new())
+col1.model_add(Tree.model_text_new())
+
+ col2 = TreeCol.wrap(tree.col_new(Column 2, 60, 0.0))
+ col2.model_add(Tree.model_double_new())
+
+ col3 = TreeCol.wrap(tree.col_new(Column 3, 60, 0.0))
+ col3.model_add(Tree.model_image_new())
+
+ col4 = TreeCol.wrap(tree.col_new(Column 4, 40, 0.0))
+ col4.model_add(Tree.model_checkbox_new())
+
#col4 = etk_tree_col_new(ETK_TREE(tree), Column 4,
etk_tree_model_checkbox_new(ETK_TREE(tree)), 40);
tree.build
@@ -38,25 +48,26 @@
tree.freeze
0.upto(1) { |i|
-row = TreeRow.wrap(tree.va_call(:append, 'P',
- col1, Theme.icon_theme, places/user-home_16,
Row1,
- col2, 10.0,
- col3, PACKAGE_DATA_DIR + /images/1star.png,
- col4, false, nil))
-
-# notice that we are calling Tree.va_call and not tree.va_call (in
other words,
+row = Tree.wrap(tree.va_call(:row_append, 'P',
+nil,
+col1, Theme.icon_path,
places/user-home_16, Row1,
+col2, 10.0,
+col3, PACKAGE_DATA_DIR +
/images/1star.png, nil,
+col4, false, nil))
+
+# notice that we are calling Tree.va_call and not tree.va_call (in
other words,
# we're NOT calling an instance method)
-row = TreeRow.wrap(Tree.va_call(:append_to_row, 'P', row,
- col1, Theme.icon_theme, places/folder_16,
Row2,
- col2, 20.0,
- col3, PACKAGE_DATA_DIR + /images/2stars.png,
- col4, false, nil))
-Tree.va_call(:append_to_row, 'P', row,
- col1, Theme.icon_theme,
mimetypes/text-x-generic_16, Row3,
- col2, 30.0,
- col3,
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/ruby-efl/src/etk Modified Files: config.rb Log Message: - add Ecore_Job to list of requirements - update Etk bindings (examples work - need to do more thorough testing) === RCS file: /cvs/e/e17/proto/ruby-efl/src/etk/config.rb,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- config.rb 31 Aug 2006 22:00:41 - 1.3 +++ config.rb 2 May 2007 21:10:50 - 1.4 @@ -10,7 +10,7 @@ :external_types = [ 'Evas', 'Evas_Object', 'Evas_Hash', 'Evas_List', 'Evas_Modifier', 'Evas_Lock', 'Evas_Button_Flags', -'Ecore_Timer', 'Ecore_Evas', 'Ecore_X_Window', +'Ecore_Timer', 'Ecore_Job', 'Ecore_Evas', 'Ecore_X_Window', 'va_list', 'Evas_Event_Mouse_In', 'Evas_Event_Mouse_Out', 'Evas_Event_Mouse_Move', 'Evas_Event_Mouse_Up', 'Evas_Event_Mouse_Down', 'Evas_Event_Mouse_Wheel', - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
