Enlightenment CVS committal
Author : leviathan
Project : e17
Module : apps/exhibit
Dir : e17/apps/exhibit/src/bin
Modified Files:
exhibit_image.c exhibit_image.h exhibit_main.c exhibit_main.h
exhibit_menus.c exhibit_options.c exhibit_options.h
exhibit_slideshow.c exhibit_slideshow.h exhibit_tab.c
exhibit_tab.h exhibit_thumb.c exhibit_thumb.h
Log Message:
Brett Nash's patch (slightly modified)
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_image.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -3 -r1.58 -r1.59
--- exhibit_image.c 28 Sep 2007 22:02:58 -0000 1.58
+++ exhibit_image.c 16 Oct 2007 14:46:44 -0000 1.59
@@ -82,7 +82,7 @@
etk_toplevel_pointer_push(ETK_TOPLEVEL(e->win), ETK_POINTER_MOVE);
}
else
- _ex_main_window_fullscreen_toggle(e);
+ _ex_main_window_fullscreen_toggle();
}
else if(ev->button == 2)
{
@@ -668,7 +668,7 @@
}
Ex_Filedialog *
-_ex_image_file_dialog_new()
+_ex_image_file_dialog_new(void)
{
Ex_Filedialog *fd;
Etk_Widget *vbox;
@@ -709,7 +709,7 @@
}
void
-_ex_image_move()
+_ex_image_move(void)
{
Ex_Filedialog *fd;
Etk_Widget *btn;
@@ -734,7 +734,7 @@
}
void
-_ex_image_save_as()
+_ex_image_save_as(void)
{
Ex_Filedialog *fd;
Etk_Widget *btn;
@@ -859,7 +859,7 @@
}
void
-_ex_image_rename()
+_ex_image_rename(void)
{
Ex_Tab *tab = e->cur_tab;
Etk_Widget *dialog;
@@ -901,7 +901,7 @@
}
void
-_ex_image_refresh()
+_ex_image_refresh(void)
{
char file[PATH_MAX];
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_image.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- exhibit_image.h 28 Sep 2007 22:02:58 -0000 1.15
+++ exhibit_image.h 16 Oct 2007 14:46:44 -0000 1.16
@@ -17,15 +17,15 @@
void _ex_image_save(Etk_Image *im);
void _ex_image_save_as_entry_cb(Etk_Object *object, Etk_Event_Key_Down
*ev, void *data);
int _ex_image_save_as_cb(void *data);
-Ex_Filedialog *_ex_image_file_dialog_new();
+Ex_Filedialog *_ex_image_file_dialog_new(void);
void _ex_image_file_dialog_destroy(Ex_Filedialog *fd);
void _ex_image_move_entry_cb(Etk_Object *object, Etk_Event_Key_Down
*ev, void *data);
void _ex_image_move_cb(void *data);
-void _ex_image_save_as();
+void _ex_image_save_as(void);
void _ex_image_delete(Exhibit *e);
-void _ex_image_move();
-void _ex_image_rename();
-void _ex_image_refresh();
+void _ex_image_move(void);
+void _ex_image_rename(void);
+void _ex_image_refresh(void);
void _ex_image_run(const char *app);
void _ex_image_zoom(Etk_Image *im, int zoom);
void _ex_image_brightness(Etk_Image *im, int brightness);
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -3 -r1.132 -r1.133
--- exhibit_main.c 14 Oct 2007 20:46:44 -0000 1.132
+++ exhibit_main.c 16 Oct 2007 14:46:44 -0000 1.133
@@ -105,7 +105,7 @@
}
void
-_ex_main_image_unset()
+_ex_main_image_unset(void)
{
Ex_Tab *tab = e->cur_tab;
@@ -587,7 +587,7 @@
entry =
etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(e->combobox_entry));
- _ex_slideshow_stop(e);
+ _ex_slideshow_stop();
_ex_thumb_abort();
e->cur_tab->dir =
_ex_path_normalize((char*)etk_entry_text_get(ETK_ENTRY(entry)));
etk_tree_clear(ETK_TREE(e->cur_tab->itree));
@@ -605,7 +605,7 @@
etk_combobox_entry_item_fields_get(etk_combobox_entry_active_item_get(ETK_COMBOBOX_ENTRY(e->combobox_entry)),
&dir, NULL);
- _ex_slideshow_stop(e);
+ _ex_slideshow_stop();
_ex_thumb_abort();
e->cur_tab->dir = strdup(dir);
etk_tree_clear(ETK_TREE(e->cur_tab->itree));
@@ -680,7 +680,7 @@
}
else if(!strcmp(ev->key, "f"))
{
- _ex_main_window_fullscreen_toggle(e);
+ _ex_main_window_fullscreen_toggle();
}
}
@@ -694,7 +694,7 @@
if(etk_window_fullscreen_get(ETK_WINDOW(e->win)))
{
if(!strcmp(ev->key, "Escape") || !strcmp(ev->key, "f"))
- _ex_main_window_fullscreen_toggle(e);
+ _ex_main_window_fullscreen_toggle();
if(!strcmp(ev->key, "space"))
_ex_slideshow_next(e);
if(!strcmp(ev->key, "b"))
@@ -710,7 +710,7 @@
}
void
-_ex_main_window_slideshow_toggle()
+_ex_main_window_slideshow_toggle(void)
{
if (e->slideshow.active)
_ex_slideshow_stop();
@@ -719,7 +719,7 @@
}
void
-_ex_main_window_fullscreen_toggle(Exhibit *e)
+_ex_main_window_fullscreen_toggle()
{
if (etk_window_fullscreen_get(ETK_WINDOW(e->win)))
{
@@ -1187,7 +1187,7 @@
etk_widget_show_all(e->win);
if(fullscreen)
- _ex_main_window_fullscreen_toggle(e);
+ _ex_main_window_fullscreen_toggle();
if (slideshow)
_ex_main_window_slideshow_toggle();
}
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_main.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- exhibit_main.h 1 Jun 2007 10:19:06 -0000 1.19
+++ exhibit_main.h 16 Oct 2007 14:46:44 -0000 1.20
@@ -8,13 +8,13 @@
void _ex_main_populate_files(const char *selected_file, Ex_Tree_Update
update);
void _ex_main_itree_add(const char *file, const char *selected_file);
int _ex_main_window_slideshow_next(void *data);
-void _ex_main_window_slideshow_toggle();
-void _ex_main_window_fullscreen_toggle();
+void _ex_main_window_slideshow_toggle(void);
+void _ex_main_window_fullscreen_toggle(void);
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, int fullscreen, int slideshow);
-void _ex_main_image_unset();
+void _ex_main_image_unset(void);
void _ex_main_image_set(Exhibit *e, char *image);
void _ex_main_button_fit_to_window_cb(Etk_Object *obj, void *data);
void _ex_main_button_zoom_one_to_one_cb(Etk_Object *obj, void *data);
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_menus.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- exhibit_menus.c 2 Sep 2007 18:37:37 -0000 1.51
+++ exhibit_menus.c 16 Oct 2007 14:46:44 -0000 1.52
@@ -376,7 +376,7 @@
EX_MENU_ITEM_GET_RETURN(obj);
e = data;
- _ex_main_window_fullscreen_toggle(e);
+ _ex_main_window_fullscreen_toggle();
}
void
@@ -385,7 +385,7 @@
EX_MENU_ITEM_GET_RETURN(obj);
e = data;
- _ex_main_window_slideshow_toggle(e);
+ _ex_main_window_slideshow_toggle();
}
void
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_options.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- exhibit_options.c 12 Jul 2007 13:33:08 -0000 1.27
+++ exhibit_options.c 16 Oct 2007 14:46:44 -0000 1.28
@@ -42,15 +42,15 @@
static void _ex_options_set_apply_cb(Etk_Object *object, void *data);
static void _ex_options_set_ok_cb(Etk_Object *object, void *data);
static Etk_Bool _ex_options_window_delete_cb(void *data);
-static void _ex_options_set();
-static Etk_Widget *_ex_options_page_1_create();
-static Etk_Widget *_ex_options_page_2_create();
+static void _ex_options_set(void);
+static Etk_Widget *_ex_options_page_1_create(void);
+static Etk_Widget *_ex_options_page_2_create(void);
static void _ex_options_combobox_active_item_changed_cb(Etk_Object *object,
void *data);
-static Etk_Widget *_ex_options_page_3_create();
-static Etk_Widget *_ex_options_page_4_create();
+static Etk_Widget *_ex_options_page_3_create(void);
+static Etk_Widget *_ex_options_page_4_create(void);
int
-_ex_options_init()
+_ex_options_init(void)
{
char *home;
char buf[PATH_MAX];
@@ -131,7 +131,7 @@
}
int
-_ex_options_shutdown()
+_ex_options_shutdown(void)
{
FREED(_ex_config_options_edd);
FREED(_ex_config_version_edd);
@@ -180,7 +180,7 @@
}
Ex_Options *
-_ex_options_new()
+_ex_options_new(void)
{
Ex_Options *o;
@@ -365,7 +365,7 @@
}
static void
-_ex_options_set()
+_ex_options_set(void)
{
Ex_Options_Dialog *dialog = e->opt_dialog;
const char *string;
@@ -531,7 +531,7 @@
}
static Etk_Widget *
-_ex_options_page_1_create()
+_ex_options_page_1_create(void)
{
Etk_Widget *vbox, *hbox;
Etk_Widget *vbox2;
@@ -606,7 +606,7 @@
}
static Etk_Widget *
-_ex_options_page_2_create()
+_ex_options_page_2_create(void)
{
Etk_Widget *vbox, *vbox2;
Etk_Widget *label;
@@ -680,7 +680,7 @@
}
static Etk_Widget *
-_ex_options_page_3_create()
+_ex_options_page_3_create(void)
{
Etk_Widget *vbox, *vbox1, *hbox;
Etk_Widget *vbox2;
@@ -764,7 +764,7 @@
static Etk_Widget *
-_ex_options_page_4_create()
+_ex_options_page_4_create(void)
{
Etk_Widget *vbox, *vbox2;
Etk_Widget *frame, *table;
@@ -842,7 +842,7 @@
}
void
-_ex_options_window_show()
+_ex_options_window_show(void)
{
Etk_Widget *win;
Etk_Widget *vbox;
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_options.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- exhibit_options.h 2 Sep 2006 01:43:23 -0000 1.5
+++ exhibit_options.h 16 Oct 2007 14:46:44 -0000 1.6
@@ -4,13 +4,13 @@
#ifndef _EX_OPTIONS_H
#define _EX_OPTIONS_H
-int _ex_options_init();
-int _ex_options_shutdown();
-Ex_Options *_ex_options_new();
+int _ex_options_init(void);
+int _ex_options_shutdown(void);
+Ex_Options *_ex_options_new(void);
void _ex_options_default(Exhibit *o);
void _ex_options_free(Exhibit *e);
int _ex_options_save(Exhibit *e);
int _ex_options_load(Exhibit *e);
-void _ex_options_window_show();
+void _ex_options_window_show(void);
#endif
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_slideshow.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- exhibit_slideshow.c 6 Jul 2007 20:29:50 -0000 1.13
+++ exhibit_slideshow.c 16 Oct 2007 14:46:44 -0000 1.14
@@ -4,7 +4,7 @@
#include "exhibit.h"
void
-_ex_slideshow_stop()
+_ex_slideshow_stop(void)
{
if(e->slideshow.active)
{
@@ -15,7 +15,7 @@
}
void
-_ex_slideshow_start()
+_ex_slideshow_start(void)
{
if (e->options->slide_interval)
e->slideshow.interval = e->options->slide_interval;
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_slideshow.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- exhibit_slideshow.h 14 Dec 2006 12:07:46 -0000 1.4
+++ exhibit_slideshow.h 16 Oct 2007 14:46:44 -0000 1.5
@@ -4,8 +4,8 @@
#ifndef _EX_SLIDESHOW_H
#define _EX_SLIDESHOW_H
-void _ex_slideshow_stop();
-void _ex_slideshow_start();
+void _ex_slideshow_stop(void);
+void _ex_slideshow_start(void);
int _ex_slideshow_next(void *data);
int _ex_slideshow_prev(void *data);
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_tab.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- exhibit_tab.c 4 Oct 2007 10:35:55 -0000 1.44
+++ exhibit_tab.c 16 Oct 2007 14:46:44 -0000 1.45
@@ -94,7 +94,7 @@
}
void
-_ex_tab_delete()
+_ex_tab_delete(void)
{
if (!e->cur_tab)
{
@@ -374,7 +374,7 @@
char *path, *real_path;
e = data;
- _ex_slideshow_stop(e);
+ _ex_slideshow_stop();
_ex_thumb_abort();
tree = ETK_TREE(object);
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_tab.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- exhibit_tab.h 4 Oct 2007 10:35:55 -0000 1.8
+++ exhibit_tab.h 16 Oct 2007 14:46:44 -0000 1.9
@@ -5,7 +5,7 @@
#define _EX_TAB_H
Ex_Tab *_ex_tab_new(Exhibit *e, char *dir);
-void _ex_tab_delete();
+void _ex_tab_delete(void);
void _ex_tab_select(Ex_Tab *tab);
void _ex_tab_current_zoom_in(Exhibit *e);
void _ex_tab_current_zoom_out(Exhibit *e);
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_thumb.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- exhibit_thumb.c 2 Oct 2007 21:05:00 -0000 1.18
+++ exhibit_thumb.c 16 Oct 2007 14:46:44 -0000 1.19
@@ -42,7 +42,7 @@
}
void
-_ex_thumb_abort()
+_ex_thumb_abort(void)
{
/* TODO: reimplement */
#if 0
@@ -69,7 +69,7 @@
void
-_ex_thumb_abort_all()
+_ex_thumb_abort_all(void)
{
/* TODO: reimplement */
#if 0
@@ -94,7 +94,7 @@
_ex_thumb_update_at_row(Etk_Tree_Row *row)
{
Etk_Tree *tree;
- Epsilon *ep;
+ Epsilon *ep = NULL;
char file[PATH_MAX];
char *icol_string;
char *old_thumb;
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_thumb.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- exhibit_thumb.h 2 Oct 2007 21:05:00 -0000 1.4
+++ exhibit_thumb.h 16 Oct 2007 14:46:44 -0000 1.5
@@ -6,9 +6,9 @@
int _ex_thumb_exe_exit(void *data, int type, void *event);
int _ex_thumb_complete(void *data, int type, void *event);
-void _ex_thumb_generate();
-void _ex_thumb_abort();
-void _ex_thumb_abort_all();
+void _ex_thumb_generate(void);
+void _ex_thumb_abort(void);
+void _ex_thumb_abort_all(void);
void _ex_thumb_update_at_row(Etk_Tree_Row *row);
#endif
-------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
