Enlightenment CVS committal
Author : titan
Project : e17
Module : apps/ephoto
Dir : e17/apps/ephoto/src/bin
Modified Files:
ephoto.h ephoto_gui.c ephoto_main.c
Log Message:
Cleanup
===================================================================
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- ephoto.h 11 May 2007 22:49:31 -0000 1.20
+++ ephoto.h 19 May 2007 16:59:09 -0000 1.21
@@ -66,17 +66,17 @@
/* Ephoto Gui */
Ewl_Widget *add_box(Ewl_Widget *c, Ewl_Orientation orientation, int spacing);
-Ewl_Widget *add_button(Ewl_Widget *c, const char *txt, const char *img, void
*cb, void *data);
-Ewl_Widget *add_entry(Ewl_Widget *c, const char *txt, void *cb, void *data);
-Ewl_Widget *add_icon(Ewl_Widget *c, const char *lbl, const char *img, int
thumbnail, void *cb, void *data);
+Ewl_Widget *add_button(Ewl_Widget *c, char *lbl, const char *img, void *cb,
void *data);
+Ewl_Widget *add_entry(Ewl_Widget *c, char *txt, void *cb, void *data);
+Ewl_Widget *add_icon(Ewl_Widget *c, char *lbl, const char *img, int thumbnail,
void *cb, void *data);
Ewl_Widget *add_image(Ewl_Widget *c, const char *img, int thumbnail, void *cb,
void *data);
-Ewl_Widget *add_label(Ewl_Widget *c, const char *lbl);
+Ewl_Widget *add_label(Ewl_Widget *c, char *lbl);
Ewl_Widget *add_menubar(Ewl_Widget *c);
-Ewl_Widget *add_menu(Ewl_Widget *c, const char *lbl);
-Ewl_Widget *add_menu_item(Ewl_Widget *c, const char *lbl, const char *img,
void *cb, void *data);
-Ewl_Widget *add_text(Ewl_Widget *c, const char *text);
+Ewl_Widget *add_menu(Ewl_Widget *c, char *lbl);
+Ewl_Widget *add_menu_item(Ewl_Widget *c, char *lbl, const char *img, void *cb,
void *data);
+Ewl_Widget *add_text(Ewl_Widget *c, char *text);
Ewl_Widget *add_shadow(Ewl_Widget *c);
-Ewl_Widget *add_window(const char *name, int width, int height, void *cb, void
*data);
+Ewl_Widget *add_window(char *name, int width, int height, void *cb, void
*data);
/* Ephoto Imaging */
unsigned int *flip_horizontal(Ewl_Widget *image);
===================================================================
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_gui.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ephoto_gui.c 15 May 2007 17:09:26 -0000 1.10
+++ ephoto_gui.c 19 May 2007 16:59:09 -0000 1.11
@@ -15,13 +15,13 @@
}
/*Create and Add a Button to the Container c*/
-Ewl_Widget *add_button(Ewl_Widget *c, const char *txt, const char *img, void
*cb, void *data)
+Ewl_Widget *add_button(Ewl_Widget *c, char *lbl, const char *img, void *cb,
void *data)
{
Ewl_Widget *button;
button = ewl_button_new();
if(img) ewl_button_image_set(EWL_BUTTON(button), img, NULL);
- if(txt) ewl_button_label_set(EWL_BUTTON(button), _(txt));
+ if(lbl) ewl_button_label_set(EWL_BUTTON(button), _(lbl));
ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_CENTER);
ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_SHRINK);
if(c) ewl_container_child_append(EWL_CONTAINER(c), button);
@@ -32,7 +32,7 @@
}
/*Create and Add an Entry to Container c With Text txt and the Callback cb*/
-Ewl_Widget *add_entry(Ewl_Widget *c, const char *txt, void *cb, void *data)
+Ewl_Widget *add_entry(Ewl_Widget *c, char *txt, void *cb, void *data)
{
Ewl_Widget *entry;
@@ -46,7 +46,7 @@
}
/*Create and add an icon to the container c*/
-Ewl_Widget *add_icon(Ewl_Widget *c, const char *lbl, const char *img, int
thumbnail, void *cb, void *data)
+Ewl_Widget *add_icon(Ewl_Widget *c, char *lbl, const char *img, int thumbnail,
void *cb, void *data)
{
Ewl_Widget *icon;
@@ -99,7 +99,7 @@
}
/*Create and Add a Label to the Container c, With the Text lbl*/
-Ewl_Widget *add_label(Ewl_Widget *c, const char *lbl)
+Ewl_Widget *add_label(Ewl_Widget *c, char *lbl)
{
Ewl_Widget *label;
@@ -127,7 +127,7 @@
}
/*Create and Add a Menu to the Container c*/
-Ewl_Widget *add_menu(Ewl_Widget *c, const char *lbl)
+Ewl_Widget *add_menu(Ewl_Widget *c, char *lbl)
{
Ewl_Widget *menu;
@@ -141,7 +141,7 @@
}
/*Create and Add a Menu Item to the Container c*/
-Ewl_Widget *add_menu_item(Ewl_Widget *c, const char *lbl, const char *img,
void *cb, void *data)
+Ewl_Widget *add_menu_item(Ewl_Widget *c, char *lbl, const char *img, void *cb,
void *data)
{
Ewl_Widget *mi;
@@ -170,7 +170,7 @@
}
/*Create and Add a Text Widget to the Container c*/
-Ewl_Widget *add_text(Ewl_Widget *c, const char *txt)
+Ewl_Widget *add_text(Ewl_Widget *c, char *txt)
{
Ewl_Widget *text;
@@ -185,7 +185,7 @@
}
/*Create and Add a Window*/
-Ewl_Widget *add_window(const char *name, int width, int height, void *cb, void
*data)
+Ewl_Widget *add_window(char *name, int width, int height, void *cb, void *data)
{
Ewl_Widget *win;
===================================================================
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_main.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- ephoto_main.c 15 May 2007 17:09:26 -0000 1.34
+++ ephoto_main.c 19 May 2007 16:59:09 -0000 1.35
@@ -507,7 +507,7 @@
/* The view of the users albums */
static Ewl_Widget *album_view_new(void *data, unsigned int row, unsigned int
column)
{
- const char *album;
+ char *album;
Ewl_Widget *icon;
album = data;
@@ -527,8 +527,7 @@
/* The view of the users directories */
static Ewl_Widget *directory_view_new(void *data, unsigned int row, unsigned
int column)
{
- char *current_directory;
- const char *directory;
+ char *current_directory, *directory;
int len;
Ewl_Widget *icon;
@@ -537,7 +536,7 @@
strcpy(current_directory, em->current_directory);
directory = data;
- icon = add_icon(NULL, basename((char *)directory),
+ icon = add_icon(NULL, basename(directory),
PACKAGE_DATA_DIR "/images/folder.png", 0,
populate_directories, 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
