Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/exhibit
Dir : e17/apps/exhibit/src/bin
Modified Files:
exhibit.h exhibit_file.c exhibit_image.c exhibit_image.h
exhibit_main.c exhibit_menus.c exhibit_menus.h
exhibit_options.c exhibit_slideshow.c
Log Message:
* Added a moved to dialog (requested by Sara)
* cleanups.
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- exhibit.h 6 Jul 2007 11:11:49 -0000 1.45
+++ exhibit.h 6 Jul 2007 20:29:50 -0000 1.46
@@ -259,6 +259,7 @@
Etk_Widget *filechooser;
Etk_Widget *entry;
Etk_Image *im;
+ Etk_Widget *hbox;
Exhibit *e;
};
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_file.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- exhibit_file.c 6 Jul 2007 11:49:46 -0000 1.19
+++ exhibit_file.c 6 Jul 2007 20:29:50 -0000 1.20
@@ -26,7 +26,6 @@
static Etk_Widget *dialog;
static Etk_Widget *progressbar;
-
static void
_ex_file_download_dialog_response(Etk_Object *obj, int response_id, void *data)
{
@@ -48,7 +47,7 @@
{
char string[PATH_MAX + 16];
- sprintf(string, "Downloading %s", url);
+ snprintf(string, sizeof(string), "Downloading %s", url);
dialog = etk_message_dialog_new(ETK_MESSAGE_DIALOG_INFO,
ETK_MESSAGE_DIALOG_CANCEL,
@@ -113,7 +112,6 @@
etk_object_destroy(ETK_OBJECT(dialog));
E_FREE(data);
D(("Download of file %s is done\n", file));
-
}
int
@@ -121,7 +119,7 @@
{
char *ext;
int i = 0;
- char *mime = NULL;
+ const char *mime = NULL;
if (!(mime = efreet_mime_type_get(file)))
{
@@ -178,15 +176,15 @@
int
_ex_file_is_jpg(char *file)
{
- char *ext;
+ const char *mime;
- ext = strrchr(file, '.');
- if (!ext) return 0;
+ if (!(mime = efreet_mime_type_get(file)))
+ return 0;
- if (strcasecmp(ext, ".jpg") && strcasecmp(ext, ".jpeg"))
- return 0;
+ if (!strcasecmp(mime, "image/jpeg"))
+ return 1;
- return 1;
+ return 0;
}
char *
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_image.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- exhibit_image.c 22 Jun 2007 20:33:32 -0000 1.50
+++ exhibit_image.c 6 Jul 2007 20:29:50 -0000 1.51
@@ -599,15 +599,37 @@
}
void
-_ex_image_save_as_entry_cb(Etk_Object *object, void *event, void *data)
+_ex_image_move_entry_cb(Etk_Object *object, Etk_Event_Key_Down *ev, void *data)
{
- Etk_Event_Key_Down *ev = event;
-
if (!strcmp(ev->key, "Return") || !strcmp(ev->key, "KP_Enter"))
- _ex_image_save_as_cb(data);
+ _ex_image_move_cb(data);
+}
+
+void
+_ex_image_move_cb(void *data)
+{
+ Ex_Filedialog *fd = data;
+ char *basename;
+ int ret;
+
+ basename = strdup(etk_entry_text_get(ETK_ENTRY(fd->entry)));
+ ret = _ex_image_save_as_cb(data);
+ if (basename)
+ {
+ if (ret)
+ ecore_file_unlink(basename);
+ free(basename);
+ }
}
void
+_ex_image_save_as_entry_cb(Etk_Object *object, Etk_Event_Key_Down *ev, void
*data)
+{
+ if (!strcmp(ev->key, "Return") || !strcmp(ev->key, "KP_Enter"))
+ _ex_image_save_as_cb(data);
+}
+
+int
_ex_image_save_as_cb(void *data)
{
Ex_Filedialog *fd = data;
@@ -615,52 +637,55 @@
const char *basename;
const char *dir;
Etk_Image *im = ETK_IMAGE(fd->e->cur_tab->image);
+ int res = 0;
basename = etk_entry_text_get(ETK_ENTRY(fd->entry));
dir = etk_filechooser_widget_current_folder_get
(ETK_FILECHOOSER_WIDGET(fd->filechooser));
-
+
if (!dir || !basename)
- return;
-
- sprintf(file, "%s/%s", dir, basename);
- D(("Saving: %s\n", file));
+ goto destroy;
- /* Dont fork for the tree polulating to work */
- evas_object_image_save(etk_image_evas_object_get(im), file, NULL, NULL);
+ {
+ char *r1, *r2;
+ int ret;
+
+ r1 = ecore_file_realpath(dir);
+ r2 = ecore_file_realpath(e->cur_tab->cur_path);
+
+ ret = strcmp(r1, r2);
+ free(r1);
+ free(r2);
+
+ if (!ret)
+ goto destroy;;
+ }
+
+ snprintf(file, sizeof(file), "%s/%s", dir, basename);
+ D(("Saving: %s\n", file));
- etk_widget_hide(fd->win);
+ /* Dont fork for the tree polulating to work */
+ evas_object_image_save(etk_image_evas_object_get(im), file, NULL, NULL);
+ res = 1;
+
+destroy:
+ _ex_image_file_dialog_destroy(fd);
+ return res;
}
-void
-_ex_image_save_as(Exhibit *e)
+Ex_Filedialog *
+_ex_image_file_dialog_new()
{
- static Ex_Filedialog *fd = NULL;
+ Ex_Filedialog *fd;
Etk_Widget *vbox;
- Etk_Widget *hbox;
- Etk_Widget *btn;
Etk_Widget *label;
- if (!fd)
- {
- fd = calloc(1, sizeof(Ex_Filedialog));
- if (!fd) return;
- fd->e = e;
- fd->win = NULL;
- }
-
- /* Don't open more then one window */
- if (fd->win)
- {
- /* Update the filename when we show the window again */
- etk_entry_text_set(ETK_ENTRY(fd->entry), e->cur_tab->cur_file);
- etk_widget_show_all(ETK_WIDGET(fd->win));
- return;
- }
-
+ fd = calloc(1, sizeof(Ex_Filedialog));
+ if (!fd) return NULL;
+ fd->e = e;
+ fd->win = NULL;
fd->win = etk_window_new();
- etk_window_title_set(ETK_WINDOW(fd->win), "Exhibit - Save image as ..");
etk_signal_connect("delete-event", ETK_OBJECT(fd->win),
ETK_CALLBACK(etk_window_hide_on_delete), fd->win);
@@ -677,23 +702,71 @@
fd->entry = etk_entry_new();
etk_entry_text_set(ETK_ENTRY(fd->entry), e->cur_tab->cur_file);
- etk_box_append(ETK_BOX(vbox), fd->entry, ETK_BOX_START, ETK_BOX_EXPAND, 0);
- etk_signal_connect("key-down", ETK_OBJECT(fd->entry),
- ETK_CALLBACK(_ex_image_save_as_entry_cb), fd);
+ etk_box_append(ETK_BOX(vbox), fd->entry, ETK_BOX_START, ETK_BOX_EXPAND, 0);
- hbox = etk_hbox_new(ETK_FALSE, 0);
- etk_container_add(ETK_CONTAINER(vbox), hbox);
+ fd->hbox = etk_hbox_new(ETK_FALSE, 0);
+ etk_container_add(ETK_CONTAINER(vbox), fd->hbox);
+
+ return fd;
+}
+
+void
+_ex_image_file_dialog_destroy(Ex_Filedialog *fd)
+{
+ if (!fd)
+ return;
+
+ if (fd->win)
+ etk_object_destroy(ETK_OBJECT(fd->win));
+
+ free(fd);
+}
+
+void
+_ex_image_move()
+{
+ Ex_Filedialog *fd;
+ Etk_Widget *btn;
+
+ fd = _ex_image_file_dialog_new();
+ etk_window_title_set(ETK_WINDOW(fd->win), "Exhibit - Move image...");
+ etk_signal_connect("key-down", ETK_OBJECT(fd->entry),
+ ETK_CALLBACK(_ex_image_move_entry_cb), fd);
+
+ btn = etk_button_new_with_label("Move");
+ etk_box_append(ETK_BOX(fd->hbox), btn, ETK_BOX_START, ETK_BOX_NONE, 0);
+ etk_signal_connect_swapped("clicked", ETK_OBJECT(btn),
+ ETK_CALLBACK(_ex_image_move_cb), fd);
+ btn = etk_button_new_with_label("Cancel");
+ etk_box_append(ETK_BOX(fd->hbox), btn, ETK_BOX_START, ETK_BOX_NONE, 0);
+ etk_signal_connect_swapped("clicked", ETK_OBJECT(btn),
+ ETK_CALLBACK(_ex_image_file_dialog_destroy), fd);
+
+ etk_widget_show_all(fd->win);
+}
+
+void
+_ex_image_save_as()
+{
+ Ex_Filedialog *fd;
+ Etk_Widget *btn;
+
+ fd = _ex_image_file_dialog_new();
+ etk_window_title_set(ETK_WINDOW(fd->win), "Exhibit - Save image as...");
+ etk_signal_connect("key-down", ETK_OBJECT(fd->entry),
+ ETK_CALLBACK(_ex_image_move_entry_cb), fd);
+
btn = etk_button_new_with_label("Save");
- etk_box_append(ETK_BOX(hbox), btn, ETK_BOX_START, ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(fd->hbox), btn, ETK_BOX_START, ETK_BOX_NONE, 0);
etk_signal_connect_swapped("clicked", ETK_OBJECT(btn),
ETK_CALLBACK(_ex_image_save_as_cb), fd);
btn = etk_button_new_with_label("Cancel");
- etk_box_append(ETK_BOX(hbox), btn, ETK_BOX_START, ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(fd->hbox), btn, ETK_BOX_START, ETK_BOX_NONE, 0);
etk_signal_connect_swapped("clicked", ETK_OBJECT(btn),
- ETK_CALLBACK(etk_widget_hide), fd->win);
-
+ ETK_CALLBACK(_ex_image_file_dialog_destroy), fd);
+
etk_widget_show_all(fd->win);
}
@@ -705,7 +778,7 @@
char string[PATH_MAX];
int ret;
- sprintf(string, "%s%s", tab->set_img_path, tab->cur_file);
+ snprintf(string, sizeof(string), "%s%s", tab->set_img_path, tab->cur_file);
ret = remove(string);
if (ret == -1)
@@ -742,7 +815,8 @@
Ex_Tab *tab = e->cur_tab;
char string[PATH_MAX];
- sprintf(string, "Are you sure you want to delete this image? <br>%s%s<br>
",
+ snprintf(string, sizeof(string),
+ "Are you sure you want to delete this image? <br>%s%s<br> ",
tab->set_img_path, tab->cur_file);
tab->dialog = etk_message_dialog_new(ETK_MESSAGE_DIALOG_QUESTION,
@@ -775,8 +849,8 @@
string = etk_entry_text_get(ETK_ENTRY(data));
newpath = malloc(PATH_MAX);
oldpath = malloc(PATH_MAX);
- sprintf(newpath, "%s%s", tab->set_img_path, string);
- sprintf(oldpath, "%s%s", tab->set_img_path, tab->cur_file);
+ snprintf(newpath, PATH_MAX, "%s%s", tab->set_img_path, string);
+ snprintf(oldpath, PATH_MAX, "%s%s", tab->set_img_path, tab->cur_file);
D(("Renaming from %s -> %s\n", oldpath, newpath));
ret = rename(oldpath, newpath);
@@ -805,10 +879,10 @@
char string[PATH_MAX];
char labeltext[PATH_MAX + 100];
- sprintf(string, "%s%s", tab->set_img_path, tab->cur_file);
+ snprintf(string, sizeof(PATH_MAX), "%s%s", tab->set_img_path,
tab->cur_file);
dialog = etk_dialog_new();
- sprintf(labeltext, "Rename file '%s'", string);
+ snprintf(labeltext, sizeof(labeltext), "Rename file '%s'", string);
label = etk_label_new(labeltext);
@@ -841,7 +915,7 @@
{
char file[PATH_MAX];
- sprintf(file, "%s%s", e->cur_tab->set_img_path, e->cur_tab->cur_file);
+ snprintf(file, sizeof(file), "%s%s", e->cur_tab->set_img_path,
e->cur_tab->cur_file);
_ex_main_image_set(e, file);
}
@@ -858,8 +932,8 @@
if (!tmp)
return;
- sprintf(str, "%s%s", e->cur_tab->set_img_path, e->cur_tab->cur_file);
- sprintf(tmp, app, str);
+ snprintf(str, sizeof(str), "%s%s", e->cur_tab->set_img_path,
e->cur_tab->cur_file);
+ snprintf(tmp, PATH_MAX, app, str);
if (strlen(tmp) <= 0)
return;
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_image.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- exhibit_image.h 3 May 2007 10:30:41 -0000 1.13
+++ exhibit_image.h 6 Jul 2007 20:29:50 -0000 1.14
@@ -15,10 +15,15 @@
void _ex_image_blur(Etk_Image *im);
void _ex_image_sharpen(Etk_Image *im);
void _ex_image_save(Etk_Image *im);
-void _ex_image_save_as_entry_cb(Etk_Object *object, void *event, void
*data);
-void _ex_image_save_as_cb(void *data);
-void _ex_image_save_as(Exhibit *e);
+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();
+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_delete(Exhibit *e);
+void _ex_image_move();
void _ex_image_rename();
void _ex_image_refresh();
void _ex_image_run(const char *app);
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -3 -r1.110 -r1.111
--- exhibit_main.c 6 Jul 2007 18:58:10 -0000 1.110
+++ exhibit_main.c 6 Jul 2007 20:29:50 -0000 1.111
@@ -152,8 +152,8 @@
e->cur_tab->cur_file = malloc(PATH_MAX);
memset(e->cur_tab->cur_file, 0, PATH_MAX);
- sprintf(e->cur_tab->set_img_path, "%s", e->cur_tab->cur_path);
- sprintf(e->cur_tab->cur_file, "%s", image);
+ snprintf(e->cur_tab->set_img_path, PATH_MAX, "%s", e->cur_tab->cur_path);
+ snprintf(e->cur_tab->cur_file, PATH_MAX, "%s", image);
e->cur_tab->image_loaded = ETK_TRUE;
etk_widget_show(ETK_WIDGET(e->cur_tab->image));
@@ -934,11 +934,12 @@
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Tab"), ETK_STOCK_TAB_NEW,
ETK_MENU_SHELL(submenu), ETK_CALLBACK(_ex_menu_new_tab_cb), NULL);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Save image"),
ETK_STOCK_DOCUMENT_SAVE, ETK_MENU_SHELL(menu),
ETK_CALLBACK(_ex_menu_save_image_cb), e);
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Save image as"),
ETK_STOCK_DOCUMENT_SAVE, ETK_MENU_SHELL(menu),
ETK_CALLBACK(_ex_menu_save_image_as_cb), e);
+ _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Save image as"),
ETK_STOCK_DOCUMENT_SAVE, ETK_MENU_SHELL(menu),
ETK_CALLBACK(_ex_menu_save_image_as_cb), NULL);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Set as wallpaper"),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu),
ETK_CALLBACK(_ex_menu_set_wallpaper_cb), e);
_ex_menu_item_new(EX_MENU_ITEM_SEPARATOR, NULL, ETK_STOCK_NO_STOCK,
ETK_MENU_SHELL(menu), NULL, NULL);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Rename"), ETK_STOCK_NO_STOCK,
ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_rename_cb), e);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Delete"),
ETK_STOCK_X_DIRECTORY_TRASH, ETK_MENU_SHELL(menu),
ETK_CALLBACK(_ex_menu_delete_cb), e);
+ _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Move"),
ETK_STOCK_FORMAT_INDENT_MORE, ETK_MENU_SHELL(menu),
ETK_CALLBACK(_ex_menu_move_cb), NULL);
_ex_menu_item_new(EX_MENU_ITEM_SEPARATOR, NULL, ETK_STOCK_NO_STOCK,
ETK_MENU_SHELL(menu), NULL, NULL);
menu_item = _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Close"),
ETK_STOCK_LIST_REMOVE, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_run_in_cb),
e);
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_menus.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- exhibit_menus.c 4 Jul 2007 15:27:44 -0000 1.47
+++ exhibit_menus.c 6 Jul 2007 20:29:50 -0000 1.48
@@ -128,11 +128,9 @@
void
_ex_menu_save_image_cb(Etk_Object *obj, void *data)
{
- Exhibit *e;
Etk_Tree_Row *r;
EX_MENU_ITEM_GET_RETURN(obj);
- e = data;
r = etk_tree_selected_row_get(ETK_TREE(e->cur_tab->itree));
if(!r) return;
@@ -142,19 +140,17 @@
void
_ex_menu_save_image_as_cb(Etk_Object *obj, void *data)
{
- Exhibit *e = data;
EX_MENU_ITEM_GET_RETURN(obj);
if (!e->cur_tab->image_loaded)
return;
- _ex_image_save_as(e);
+ _ex_image_save_as();
}
void
_ex_menu_rename_cb(Etk_Object *obj, void *data)
{
- Exhibit *e = data;
EX_MENU_ITEM_GET_RETURN(obj);
if (!e->cur_tab->image_loaded)
@@ -166,7 +162,6 @@
void
_ex_menu_delete_cb(Etk_Object *obj, void *data)
{
- Exhibit *e = data;
EX_MENU_ITEM_GET_RETURN(obj);
if (!e->cur_tab->image_loaded)
@@ -176,6 +171,17 @@
}
void
+_ex_menu_move_cb(Etk_Object *obj, void *data)
+{
+ EX_MENU_ITEM_GET_RETURN(obj);
+
+ if (!e->cur_tab->image_loaded)
+ return;
+
+ _ex_image_move();
+}
+
+void
_ex_menu_options_cb(Etk_Object *obj, void *data)
{
EX_MENU_ITEM_GET_RETURN(obj);
@@ -185,7 +191,6 @@
void
_ex_menu_quit_cb(Etk_Object *obj, void *data)
{
- Exhibit *e = data;
EX_MENU_ITEM_GET_RETURN(obj);
if (e)
@@ -211,7 +216,6 @@
void
_ex_menu_undo_cb(Etk_Object *obj, void *data)
{
- Exhibit *e = data;
EX_MENU_ITEM_GET_RETURN(obj);
if (!e->cur_tab->image_loaded)
@@ -224,7 +228,6 @@
void
_ex_menu_rot_clockwise_cb(Etk_Object *obj, void *data)
{
- Exhibit *e = data;
int w, h;
char size[30];
EX_MENU_ITEM_GET_RETURN(obj);
@@ -242,7 +245,6 @@
void
_ex_menu_rot_counter_clockwise_cb(Etk_Object *obj, void *data)
{
- Exhibit *e = data;
int w, h;
char size[30];
EX_MENU_ITEM_GET_RETURN(obj);
@@ -260,7 +262,6 @@
void
_ex_menu_flip_horizontal_cb(Etk_Object *obj, void *data)
{
- Exhibit *e = data;
EX_MENU_ITEM_GET_RETURN(obj);
if (!e->cur_tab->image_loaded)
@@ -272,7 +273,6 @@
void
_ex_menu_flip_vertical_cb(Etk_Object *obj, void *data)
{
- Exhibit *e = data;
EX_MENU_ITEM_GET_RETURN(obj);
if (!e->cur_tab->image_loaded)
@@ -284,7 +284,6 @@
void
_ex_menu_blur_cb(Etk_Object *obj, void *data)
{
- Exhibit *e = data;
EX_MENU_ITEM_GET_RETURN(obj);
if (!e->cur_tab->image_loaded)
@@ -296,7 +295,6 @@
void
_ex_menu_sharpen_cb(Etk_Object *obj, void *data)
{
- Exhibit *e = data;
EX_MENU_ITEM_GET_RETURN(obj);
if (!e->cur_tab->image_loaded)
@@ -308,7 +306,6 @@
void
_ex_menu_brighten_cb(Etk_Object *obj, void *data)
{
- Exhibit *e = data;
EX_MENU_ITEM_GET_RETURN(obj);
if (!e->cur_tab->image_loaded)
@@ -329,7 +326,6 @@
void
_ex_menu_darken_cb(Etk_Object *obj, void *data)
{
- Exhibit *e = data;
EX_MENU_ITEM_GET_RETURN(obj);
if (!e->cur_tab->image_loaded)
@@ -344,7 +340,6 @@
void
_ex_menu_set_wallpaper_cb(Etk_Object *obj, void *data)
{
- Exhibit *e = data;
EX_MENU_ITEM_GET_RETURN(obj);
if (!e->cur_tab->image_loaded)
@@ -380,7 +375,6 @@
void
_ex_menu_window_fullscreen_toggle_cb(Etk_Object *obj, void *data)
{
- Exhibit *e;
EX_MENU_ITEM_GET_RETURN(obj);
e = data;
@@ -390,7 +384,6 @@
void
_ex_menu_toggle_slideshow_cb(Etk_Object *obj, void *data)
{
- Exhibit *e;
EX_MENU_ITEM_GET_RETURN(obj);
e = data;
@@ -411,7 +404,6 @@
void
_ex_menu_comments_cb(Etk_Object *obj, void *data)
{
- Exhibit *e = data;
EX_MENU_ITEM_GET_RETURN(obj);
if (!e->cur_tab->image_loaded)
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_menus.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- exhibit_menus.h 1 Jun 2007 10:19:06 -0000 1.15
+++ exhibit_menus.h 6 Jul 2007 20:29:50 -0000 1.16
@@ -21,6 +21,7 @@
void _ex_menu_save_image_as_cb(Etk_Object *obj, void *data);
void _ex_menu_rename_cb(Etk_Object *obj, void *data);
void _ex_menu_delete_cb(Etk_Object *obj, void *data);
+void _ex_menu_move_cb(Etk_Object *obj, void *data);
void _ex_menu_options_cb(Etk_Object *obj, void *data);
void _ex_menu_quit_cb(Etk_Object *obj, void *data);
void _ex_menu_run_in_cb(Etk_Object *obj, void *data);
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_options.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- exhibit_options.c 4 Jul 2007 15:27:44 -0000 1.25
+++ exhibit_options.c 6 Jul 2007 20:29:50 -0000 1.26
@@ -589,7 +589,7 @@
etk_toggle_button_toggle(ETK_TOGGLE_BUTTON(dialog->comments_visible));
- sprintf(string, "%.2f", e->options->slide_interval);
+ snprintf(string, sizeof(string), "%.2f", e->options->slide_interval);
etk_entry_text_set(ETK_ENTRY(dialog->slide_interval), string);
etk_entry_text_set(ETK_ENTRY(dialog->dl_path), e->options->dl_path);
@@ -640,11 +640,11 @@
etk_box_append(ETK_BOX(vbox2), dialog->rotate_autosave, ETK_BOX_START,
ETK_BOX_NONE, 0);
- sprintf(string, "%.2f", e->options->blur_thresh);
+ snprintf(string, sizeof(string), "%.2f", e->options->blur_thresh);
etk_entry_text_set(ETK_ENTRY(dialog->blur_thresh), string);
- sprintf(string, "%.2f", e->options->sharpen_thresh);
+ snprintf(string, sizeof(string), "%.2f", e->options->sharpen_thresh);
etk_entry_text_set(ETK_ENTRY(dialog->sharpen_thresh), string);
- sprintf(string, "%.2f", e->options->brighten_thresh);
+ snprintf(string, sizeof(string), "%.2f", e->options->brighten_thresh);
etk_entry_text_set(ETK_ENTRY(dialog->brighten_thresh), string);
if (e->options->rotate_autosave)
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_slideshow.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- exhibit_slideshow.c 6 Feb 2007 04:56:45 -0000 1.12
+++ exhibit_slideshow.c 6 Jul 2007 20:29:50 -0000 1.13
@@ -50,7 +50,7 @@
i = etk_tree_num_rows_get(ETK_TREE(e->cur_tab->itree));
n = 1 + etk_tree_row_num_get(ETK_TREE(e->cur_tab->itree), row);
- sprintf(string, "Slideshow picture %d of %d", n, i);
+ snprintf(string, sizeof(string), "Slideshow picture %d of %d", n, i);
etk_statusbar_message_push(ETK_STATUSBAR(e->statusbar[3]), string, 0);
return 1;
@@ -77,7 +77,7 @@
i = etk_tree_num_rows_get(ETK_TREE(e->cur_tab->itree));
n = 1 + etk_tree_row_num_get(ETK_TREE(e->cur_tab->itree), row);
- sprintf(string, "Slideshow picture %d of %d", n, i);
+ snprintf(string, sizeof(string), "Slideshow picture %d of %d", n, i);
etk_statusbar_message_push(ETK_STATUSBAR(e->statusbar[3]), string, 0);
return 1;
-------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
