Enlightenment CVS committal
Author : balony
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit_main.c exhibit_main.h exhibit_slideshow.c
exhibit_slideshow.h
Log Message:
And some more cleanups ...
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- exhibit_main.c 1 Sep 2006 21:51:38 -0000 1.71
+++ exhibit_main.c 1 Sep 2006 22:41:37 -0000 1.72
@@ -469,7 +469,7 @@
tab = _ex_tab_new(e, e->cur_tab->cur_path);
- _ex_main_window_tab_append(e, tab);
+ _ex_main_window_tab_append(tab);
_ex_main_populate_files(NULL, EX_TREE_UPDATE_ALL);
}
else if(!strcmp(ev->key, "w"))
@@ -500,7 +500,7 @@
}
else if(!strcmp(ev->key, "s"))
{
- _ex_main_window_slideshow_toggle(e);
+ _ex_main_window_slideshow_toggle();
}
}
}
@@ -514,26 +514,24 @@
}
void
-_ex_main_window_slideshow_toggle(Exhibit *e)
+_ex_main_window_slideshow_toggle()
{
if(e->slideshow.active)
{
- _ex_slideshow_stop(e);
+ _ex_slideshow_stop();
}
else
{
- _ex_slideshow_start(e);
+ _ex_slideshow_start();
}
}
static void
_ex_main_window_tab_toggled_cb(Etk_Object *object, void *data)
{
- Exhibit *e;
Ex_Tab *tab;
- e = data;
- _ex_slideshow_stop(e);
+ _ex_slideshow_stop();
tab = evas_list_nth(e->tabs,
etk_notebook_current_page_get(ETK_NOTEBOOK(object)));
@@ -547,7 +545,7 @@
}
void
-_ex_main_window_tab_append(Exhibit *e, Ex_Tab *tab)
+_ex_main_window_tab_append(Ex_Tab *tab)
{
if(evas_list_count(e->tabs) == 1)
{
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- exhibit_main.h 1 Sep 2006 20:23:50 -0000 1.13
+++ exhibit_main.h 1 Sep 2006 22:41:37 -0000 1.14
@@ -7,8 +7,8 @@
void _ex_main_statusbar_zoom_update(Exhibit *e);
void _ex_main_populate_files(const char *selected_file, Ex_Tree_Update
update);
int _ex_main_window_slideshow_next(void *data);
-void _ex_main_window_slideshow_toggle(Exhibit *e);
-void _ex_main_window_tab_append(Exhibit *e, Ex_Tab *tab);
+void _ex_main_window_slideshow_toggle();
+void _ex_main_window_tab_append(Ex_Tab *tab);
void _ex_main_window_tab_remove(Ex_Tab *tab);
void _ex_main_dialog_show(char *text, Etk_Message_Dialog_Type type);
void _ex_main_window_show(char *dir);
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_slideshow.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- exhibit_slideshow.c 15 Aug 2006 22:21:47 -0000 1.6
+++ exhibit_slideshow.c 1 Sep 2006 22:41:37 -0000 1.7
@@ -4,7 +4,7 @@
#include "exhibit.h"
void
-_ex_slideshow_stop(Exhibit *e)
+_ex_slideshow_stop()
{
if(e->slideshow.active)
{
@@ -15,7 +15,7 @@
}
void
-_ex_slideshow_start(Exhibit *e)
+_ex_slideshow_start()
{
if (e->options->slide_interval)
e->slideshow.interval = e->options->slide_interval;
@@ -23,7 +23,8 @@
if(!e->slideshow.active)
{
etk_statusbar_push(ETK_STATUSBAR(e->statusbar[3]), "Slideshow running",
0);
- e->slideshow.timer = ecore_timer_add(e->slideshow.interval,
_ex_slideshow_next, e);
+ e->slideshow.timer = ecore_timer_add(e->slideshow.interval,
+ _ex_slideshow_next, NULL);
e->slideshow.active = ETK_TRUE;
}
}
@@ -31,13 +32,11 @@
int
_ex_slideshow_next(void *data)
{
- Exhibit *e;
Etk_Tree_Row *row, *last_row;
int i = 0;
int n = 0;
char string[80];
- e = data;
row = etk_tree_selected_row_get(ETK_TREE(e->cur_tab->itree));
last_row = etk_tree_last_row_get(ETK_TREE(e->cur_tab->itree), ETK_FALSE,
ETK_FALSE);
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_slideshow.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- exhibit_slideshow.h 14 Aug 2006 16:34:52 -0000 1.2
+++ exhibit_slideshow.h 1 Sep 2006 22:41:37 -0000 1.3
@@ -4,8 +4,8 @@
#ifndef _EX_SLIDESHOW_H
#define _EX_SLIDESHOW_H
-void _ex_slideshow_stop(Exhibit *e);
-void _ex_slideshow_start(Exhibit *e);
+void _ex_slideshow_stop();
+void _ex_slideshow_start();
int _ex_slideshow_next(void *data);
#endif
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
