Enlightenment CVS committal
Author : doursse
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit_image.c exhibit_main.c exhibit_menus.c
Log Message:
remove warnings and make valgrind happier
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/exhibit/src/bin/exhibit_image.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- exhibit_image.c 23 Dec 2005 01:19:34 -0000 1.11
+++ exhibit_image.c 23 Dec 2005 07:44:17 -0000 1.12
@@ -35,8 +35,8 @@
}
else if(ev->button == 3)
{
- Etk_Menu_Item *menu_item;
- Etk_Menu *submenu;
+ Etk_Widget *menu_item;
+ Etk_Widget *submenu;
if(e->menu)
{
etk_menu_popup(ETK_MENU(e->menu));
@@ -92,7 +92,7 @@
{
Etk_Event_Mouse_Move *ev;
Exhibit *e;
- Etk_Range *hs, *vs;
+ Etk_Widget *hs, *vs;
int dx, dy;
e = data;
@@ -106,8 +106,8 @@
dx = ev->prev.canvas.x - ev->cur.canvas.x;
dy = ev->prev.canvas.y - ev->cur.canvas.y;
- etk_range_value_set(hs, etk_range_value_get(hs) + dx);
- etk_range_value_set(vs, etk_range_value_get(vs) + dy);
+ etk_range_value_set(ETK_RANGE(hs), etk_range_value_get(ETK_RANGE(hs)) + dx);
+ etk_range_value_set(ETK_RANGE(vs), etk_range_value_get(ETK_RANGE(vs)) + dy);
}
void
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- exhibit_main.c 23 Dec 2005 01:19:34 -0000 1.18
+++ exhibit_main.c 23 Dec 2005 07:44:17 -0000 1.19
@@ -138,7 +138,7 @@
_ex_main_itree_item_clicked_cb(Etk_Object *object, Etk_Tree_Row *row, void
*data)
{
Etk_Tree *tree;
- Etk_Range *hs, *vs;
+ Etk_Widget *hs, *vs;
char *icol_string;
char *title;
int w, h;
@@ -183,8 +183,8 @@
hs = etk_scrolled_view_hscrollbar_get(ETK_SCROLLED_VIEW(e->scrolled_view));
vs = etk_scrolled_view_vscrollbar_get(ETK_SCROLLED_VIEW(e->scrolled_view));
- etk_range_value_set(hs, (double)w/2);
- etk_range_value_set(vs, (double)h/2);
+ etk_range_value_set(ETK_RANGE(hs), (double)w/2);
+ etk_range_value_set(ETK_RANGE(vs), (double)h/2);
}
void
@@ -431,6 +431,8 @@
etk_tree_thaw(ETK_TREE(e->itree));
etk_tree_thaw(ETK_TREE(e->dtree));
etk_tree_sort(ETK_TREE(e->dtree), _ex_main_dtree_compare_cb, TRUE, e->dcol,
NULL);
+
+ closedir(dir);
}
void
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/exhibit/src/bin/exhibit_menus.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- exhibit_menus.c 23 Dec 2005 01:19:34 -0000 1.9
+++ exhibit_menus.c 23 Dec 2005 07:44:17 -0000 1.10
@@ -120,7 +120,18 @@
void
_ex_menu_quit_cb(Etk_Object *obj, void *data)
{
+ Exhibit *e;
+
EX_MENU_ITEM_GET_RETURN(obj);
+
+ e = (Exhibit *)data;
+ if (e)
+ {
+ if (e->dir)
+ free(e->dir);
+ free(e);
+ }
+
etk_main_quit();
}
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
