Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit.h exhibit_comment_jpeg.c exhibit_favorites.c
exhibit_favorites.h exhibit_image.c exhibit_image.h
exhibit_main.c exhibit_menus.c exhibit_options.c exhibit_tab.c
Log Message:
- more code from balony, dialog fixed + general goodiness
- add debug calls (-DEX_DEBUG)
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- exhibit.h 2 Aug 2006 03:10:43 -0000 1.21
+++ exhibit.h 2 Aug 2006 17:31:03 -0000 1.22
@@ -36,6 +36,11 @@
#define EX_DEFAULT_SLIDE_INTERVAL 5.0
#define EX_DEFAULT_COMMENTS_VISIBLE 0
+#ifdef EX_DEBUG
+# define D(x) do {printf(__FILE__ ":%d: ", __LINE__); printf x;
fflush(stdout);} while (0)
+#else
+# define D(x) ((void) 0)
+#endif
typedef struct _Exhibit Exhibit;
typedef struct _Ex_Options Ex_Options;
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_comment_jpeg.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- exhibit_comment_jpeg.c 16 Mar 2006 12:42:39 -0000 1.4
+++ exhibit_comment_jpeg.c 2 Aug 2006 17:31:03 -0000 1.5
@@ -1,5 +1,4 @@
/*
- * common.c
* Updated by HandyAndE
*
* based on:
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_favorites.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- exhibit_favorites.c 3 Jan 2006 15:02:15 -0000 1.1
+++ exhibit_favorites.c 2 Aug 2006 17:31:03 -0000 1.2
@@ -1,3 +1,6 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
#include "exhibit.h"
void
@@ -19,7 +22,7 @@
ecore_file_symlink(realpath, new_path);
if(realpath)
- free(realpath);
+ E_FREE(realpath);
}
void
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_favorites.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- exhibit_favorites.h 3 Jan 2006 15:02:15 -0000 1.1
+++ exhibit_favorites.h 2 Aug 2006 17:31:03 -0000 1.2
@@ -1,3 +1,6 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
#ifndef _EX_FAVORITES_H
#define _EX_FAVORITES_H
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_image.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- exhibit_image.c 2 Aug 2006 03:10:43 -0000 1.25
+++ exhibit_image.c 2 Aug 2006 17:31:03 -0000 1.26
@@ -18,6 +18,11 @@
#define G_VAL(p) ((DATA8 *)(p))[1]
#define B_VAL(p) ((DATA8 *)(p))[0]
+static void _ex_image_delete_dialog_response(Etk_Object *obj, int response_id,
void *data);
+static void _ex_image_delete_cb(void *data);
+
+
+
void
_ex_image_mouse_wheel(Etk_Object *object, void *event, void *data)
{
@@ -171,13 +176,13 @@
data2 = etk_object_data_get(ETK_OBJECT(im), "undo");
if(data2)
- free(data2);
+ E_FREE(data2);
data2 = malloc(w * h * sizeof(unsigned int));
memcpy(data2, data, w * h * sizeof(unsigned int));
etk_object_data_set(ETK_OBJECT(im), "undo", data2);
- printf("Undo: setting data %p size %d, image %p\n", data,
- w * h * sizeof(unsigned int), im);
+ D(("Undo: setting data %p size %d, image %p\n", data,
+ w * h * sizeof(unsigned int), im));
return data2;
}
@@ -197,7 +202,7 @@
if (data)
{
- printf("Undo: getting data %p, image %p\n", data, im);
+ D(("Undo: getting data %p, image %p\n", data, im));
evas_object_image_data_set(im->image_object, data);
evas_object_image_data_update_add(im->image_object, 0, 0, w, h);
etk_object_data_set(ETK_OBJECT(im), "undo", NULL);
@@ -555,12 +560,14 @@
return;
sprintf(file, "%s/%s", dir, basename);
- printf("Saving: %s\n", file);
+ D(("Saving: %s\n", file));
/* Dont fork for the tree polulating to work */
evas_object_image_save(im->image_object, file, NULL, NULL);
/* Refresh list if the file is saved in our dir */
+ D(("Image path: %s <-> Cur path: %s\n", fd->e->cur_tab->set_img_path,
+ fd->e->cur_tab->cur_path));
if (!strcmp(fd->e->cur_tab->set_img_path, fd->e->cur_tab->cur_path))
{
etk_tree_clear(ETK_TREE(fd->e->cur_tab->itree));
@@ -612,7 +619,7 @@
label = etk_label_new("Filename:");
etk_box_pack_start(ETK_BOX(vbox), label, ETK_FALSE, ETK_FALSE, 0);
- printf ("Selected original filename: %s\n", e->cur_tab->cur_file);
+ D(("Selected original filename: %s\n", e->cur_tab->cur_file));
fd->entry = etk_entry_new();
etk_entry_text_set(ETK_ENTRY(fd->entry), e->cur_tab->cur_file);
@@ -636,7 +643,7 @@
etk_widget_show_all(fd->win);
}
-void
+static void
_ex_image_delete_cb(void *data)
{
Exhibit *e = data;
@@ -660,38 +667,71 @@
etk_tree_clear(ETK_TREE(tab->dtree));
_ex_main_populate_files(e, NULL);
- printf ("Ex_Tab pointer in _ex_image_delete_cb %p\n", tab);
+ D(("Ex_Tab pointer in _ex_image_delete_cb %p\n", tab));
etk_object_destroy(ETK_OBJECT(tab->dialog));
- printf("Deleted for %s\n", string);
+ D(("Deleted for %s\n", string));
+}
+
+static void
+_ex_image_delete_dialog_response(Etk_Object *obj, int response_id, void *data)
+{
+ Exhibit *e = data;
+
+ switch(response_id)
+ {
+ case ETK_RESPONSE_OK:
+ _ex_image_delete_cb(e);
+ break;
+ case ETK_RESPONSE_CANCEL:
+ etk_object_destroy(ETK_OBJECT(obj));
+ break;
+ default:
+ break;
+ }
}
void
_ex_image_delete(Exhibit *e)
{
Etk_Widget *label;
- Etk_Widget *button, *button2;
Ex_Tab *tab = e->cur_tab;
+ char string[PATH_MAX];
+
+ sprintf(string, "%s%s", tab->set_img_path, tab->cur_file);
- printf ("Ex_Tab pointer in _ex_image_delete %p\n", e->cur_tab);
+ D(("Ex_Tab pointer in _ex_image_delete %p\n", e->cur_tab));
tab->dialog = etk_dialog_new();
+
etk_signal_connect("delete_event", ETK_OBJECT(tab->dialog),
ETK_CALLBACK(etk_object_destroy), tab->dialog);
- label = etk_label_new("Are you sure you want to delete the picture?");
- etk_dialog_pack_widget_in_action_area(ETK_DIALOG(tab->dialog), label,
ETK_TRUE,
- ETK_TRUE, 5, ETK_FALSE);
-
- button = etk_dialog_button_add(ETK_DIALOG(tab->dialog), "Cancel",
ETK_RESPONSE_CANCEL);
- etk_signal_connect_swapped("clicked", ETK_OBJECT(button),
- ETK_CALLBACK(etk_object_destroy), ETK_OBJECT(tab->dialog));
-
- button2 = etk_dialog_button_add(ETK_DIALOG(tab->dialog), "Delete",
ETK_RESPONSE_OK);
- etk_signal_connect_swapped("clicked", ETK_OBJECT(button2),
- ETK_CALLBACK(_ex_image_delete_cb), e);
+ label = etk_label_new("Are you sure you want to delete picture?");
+ etk_dialog_pack_in_main_area(ETK_DIALOG(tab->dialog), label,
+ ETK_TRUE, ETK_TRUE, 3, ETK_FALSE);
+ label = etk_label_new(string);
+ etk_dialog_pack_in_main_area(ETK_DIALOG(tab->dialog), label,
+ ETK_TRUE, ETK_TRUE, 3, ETK_FALSE);
+
+ etk_dialog_button_add_from_stock(ETK_DIALOG(tab->dialog),
+ ETK_STOCK_DIALOG_OK, ETK_RESPONSE_OK);
+ etk_dialog_button_add_from_stock(ETK_DIALOG(tab->dialog),
+ ETK_STOCK_DIALOG_CANCEL, ETK_RESPONSE_CANCEL);
+
+ etk_signal_connect("response", ETK_OBJECT(tab->dialog),
+ ETK_CALLBACK(_ex_image_delete_dialog_response), e);
+
+ etk_container_border_width_set(ETK_CONTAINER(tab->dialog), 4);
+ etk_window_title_set(ETK_WINDOW(tab->dialog),
+ _("Exhibit, confirm delete"));
etk_widget_show_all(tab->dialog);
+
+ /* TODO
+ * Center the dialog on top of the app.
+ etk_window_center_on_window(ETK_WINDOW(tab->dialog), ETK_WINDOW(e->win));
+ */
}
@@ -806,7 +846,7 @@
if(im->use_edje)
return;
- printf("brightness = %d\n", brightness);
+ D(("brightness = %d\n", brightness));
for(i=0; i<256; i++){
light_transform[i] = i + brightness;
if(light_transform[i] > 255)
@@ -879,6 +919,16 @@
filenoext = _ex_file_strip_extention(im->filename);
filenoext = ecore_file_get_file(filenoext);
+
+ D(("Setting bg: dir: %s \tfile: %s\n", dir, file));
+
+ /*
+ * FIXME
+ *
+ * This doesnt set the bg if we choose another dir
+ * after having choosen the picture itself
+ *
+ */
if (strcmp(im->filename + strlen(im->filename) - 4, ".edj") == 0) {
int w, h, num;
@@ -887,6 +937,8 @@
char e_bg_set[PATH_MAX*2];
char filename_s[PATH_MAX];
Ecore_X_Window *roots = NULL;
+
+ D(("Entered the foo\n"));
if (!ecore_x_init(NULL))
exit(0);
@@ -897,7 +949,9 @@
snprintf(filename_s, PATH_MAX, "/tmp/%s.png", filenoext);
snprintf(static_bg, PATH_MAX, "edje_thumb %s desktop/background %s
-g %dx%d -og %dx%d", im->filename, filename_s, w, h, w, h);
snprintf(e_bg_set, PATH_MAX, "enlightenment_remote -default-bg-set
%s", im->filename);
- snprintf(esetroot_s, PATH_MAX, "Esetroot %s %s ", esetroot_opt,
filename_s);
+ snprintf(esetroot_s, PATH_MAX, "Esetroot %s %s ", esetroot_opt,
+ filename_s);
+ D(("Filename_s: %s\n", filename_s));
system(static_bg);
system(e_bg_set);
system(esetroot_s);
@@ -912,6 +966,8 @@
strcat(edj_file, "/.e/e/backgrounds/");
strcat(edj_file, filenoext);
strcat(edj_file, ".edj");
+
+ D(("Edje file: %s FILENOEXT: %s\n", edj_file, filenoext));
/* Determine image width / height */
{
@@ -985,6 +1041,8 @@
char e_bg_set[PATH_MAX*2];
snprintf(e_bg_set, PATH_MAX, "enlightenment_remote -default-bg-set
%s", edj_file);
+
+ D(("FOO: %s\n", e_bg_set));
system(e_bg_set);
}
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_image.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- exhibit_image.h 2 Aug 2006 03:10:43 -0000 1.8
+++ exhibit_image.h 2 Aug 2006 17:31:03 -0000 1.9
@@ -18,7 +18,6 @@
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_delete_cb(void *data);
void _ex_image_delete(Exhibit *e);
void _ex_image_zoom(Etk_Image *im, int zoom);
void _ex_image_brightness(Etk_Image *im, int brightness);
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -3 -r1.57 -r1.58
--- exhibit_main.c 2 Aug 2006 05:54:00 -0000 1.57
+++ exhibit_main.c 2 Aug 2006 17:31:03 -0000 1.58
@@ -242,8 +242,8 @@
etk_window_title_set(ETK_WINDOW(e->win),
WINDOW_TITLE " - Image Viewing the Kewl Way!");
- free(tab->set_img_path);
- free(tab->cur_file);
+ E_FREE(tab->set_img_path);
+ E_FREE(tab->cur_file);
tab->image_loaded = ETK_FALSE;
etk_statusbar_pop(ETK_STATUSBAR(e->statusbar[0]), 0);
@@ -321,10 +321,10 @@
etk_range_value_set(vs, (double)h/2);
/* Reset undo data every time we change image */
- printf("Resetting undo data on image %p\n", e->cur_tab->image);
+ D(("Resetting undo data on image %p\n", e->cur_tab->image));
data2 = etk_object_data_get(ETK_OBJECT(e->cur_tab->image), "undo");
if (data2)
- free(data2);
+ E_FREE(data2);
etk_object_data_set(ETK_OBJECT(e->cur_tab->image), "undo", NULL);
@@ -508,7 +508,7 @@
chdir(e->cur_tab->dir);
- printf ("Changing to dir: %s\n", e->cur_tab->dir);
+ D(("Changing to dir: %s\n", e->cur_tab->dir));
if ((dir = opendir(".")) == NULL)
return ;
@@ -596,6 +596,11 @@
etk_tree_row_select(selected_row);
etk_tree_row_scroll_to(selected_row, ETK_TRUE);
}
+
+ /* Set the dir to the current dir at the end so we avoid
+ stepdown like ".." if we just call the refresh on
+ the listing like after a delete */
+ e->cur_tab->dir = strdup(".");
closedir(dir);
}
@@ -647,7 +652,7 @@
if(!file || !strcmp(file, path))
return;
- printf("dir='%s' file='%s'\n", dir, file);
+ D(("dir='%s' file='%s'\n", dir, file));
//if(strcmp(dir, e->cur_path))
{
@@ -1183,8 +1188,8 @@
ecore_file_init();
if(!_ex_options_init())
- printf("WARNING: Exhibit could not set up its options files!\n"
- " You will not be able to save your preferences.\n");
+ fprintf(stderr, "WARNING: Exhibit could not set up its options files!\n"
+ " You will not be able to save your
preferences.\n");
event_handlers = evas_list_append(event_handlers,
ecore_event_handler_add(ECORE_EXE_EVENT_DEL,
_ex_thumb_exe_exit,
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_menus.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- exhibit_menus.c 2 Aug 2006 03:10:43 -0000 1.21
+++ exhibit_menus.c 2 Aug 2006 17:31:04 -0000 1.22
@@ -70,7 +70,7 @@
_ex_menu_new_window_cb(Etk_Object *obj, void *data)
{
EX_MENU_ITEM_GET_RETURN(obj);
- printf("new window\n");
+ D(("new window\n"));
}
void
@@ -103,14 +103,14 @@
_ex_menu_search_cb(Etk_Object *obj, void *data)
{
EX_MENU_ITEM_GET_RETURN(obj);
- printf("search\n");
+ D(("search\n"));
}
void
_ex_menu_rename_cb(Etk_Object *obj, void *data)
{
EX_MENU_ITEM_GET_RETURN(obj);
- printf("rename\n");
+ D(("rename\n"));
}
void
@@ -159,19 +159,18 @@
_ex_menu_run_in_cb(Etk_Object *obj, void *data)
{
EX_MENU_ITEM_GET_RETURN(obj);
- printf("run in\n");
+ D(("run in\n"));
}
void
_ex_menu_undo_cb(Etk_Object *obj, void *data)
{
- Exhibit *e;
- Etk_Tree_Row *r;
+ Exhibit *e = data;
EX_MENU_ITEM_GET_RETURN(obj);
- e = data;
- r = etk_tree_selected_row_get(ETK_TREE(e->cur_tab->itree));
- if(!r) return;
+ if (!e->cur_tab->image_loaded)
+ return;
+
_ex_image_undo(ETK_IMAGE(e->cur_tab->image));
}
@@ -179,15 +178,14 @@
void
_ex_menu_rot_clockwise_cb(Etk_Object *obj, void *data)
{
- Exhibit *e;
- Etk_Tree_Row *r;
+ Exhibit *e = data;
int w, h;
char size[30];
EX_MENU_ITEM_GET_RETURN(obj);
- e = data;
- r = etk_tree_selected_row_get(ETK_TREE(e->cur_tab->itree));
- if(!r) return;
+ if (!e->cur_tab->image_loaded)
+ return;
+
_ex_image_flip_diagonal(ETK_IMAGE(e->cur_tab->image), 1);
etk_image_size_get(ETK_IMAGE(e->cur_tab->image), &w, &h);
snprintf(size, sizeof(size), "( %d x %d )", w, h);
@@ -198,15 +196,14 @@
void
_ex_menu_rot_counter_clockwise_cb(Etk_Object *obj, void *data)
{
- Exhibit *e;
- Etk_Tree_Row *r;
+ Exhibit *e = data;
int w, h;
char size[30];
EX_MENU_ITEM_GET_RETURN(obj);
- e = data;
- r = etk_tree_selected_row_get(ETK_TREE(e->cur_tab->itree));
- if(!r) return;
+ if (!e->cur_tab->image_loaded)
+ return;
+
_ex_image_flip_diagonal(ETK_IMAGE(e->cur_tab->image), 2);
etk_image_size_get(ETK_IMAGE(e->cur_tab->image), &w, &h);
snprintf(size, sizeof(size), "( %d x %d )", w, h);
@@ -217,65 +214,59 @@
void
_ex_menu_flip_horizontal_cb(Etk_Object *obj, void *data)
{
- Exhibit *e;
- Etk_Tree_Row *r;
+ Exhibit *e = data;
EX_MENU_ITEM_GET_RETURN(obj);
- e = data;
- r = etk_tree_selected_row_get(ETK_TREE(e->cur_tab->itree));
- if(!r) return;
+ if (!e->cur_tab->image_loaded)
+ return;
+
_ex_image_flip_horizontal(ETK_IMAGE(e->cur_tab->image));
}
void
_ex_menu_flip_vertical_cb(Etk_Object *obj, void *data)
{
- Exhibit *e;
- Etk_Tree_Row *r;
+ Exhibit *e = data;
EX_MENU_ITEM_GET_RETURN(obj);
- e = data;
- r = etk_tree_selected_row_get(ETK_TREE(e->cur_tab->itree));
- if(!r) return;
+ if (!e->cur_tab->image_loaded)
+ return;
+
_ex_image_flip_vertical(ETK_IMAGE(e->cur_tab->image));
}
void
_ex_menu_blur_cb(Etk_Object *obj, void *data)
{
- Exhibit *e;
- Etk_Tree_Row *r;
+ Exhibit *e = data;
EX_MENU_ITEM_GET_RETURN(obj);
- e = data;
- r = etk_tree_selected_row_get(ETK_TREE(e->cur_tab->itree));
- if(!r) return;
+ if (!e->cur_tab->image_loaded)
+ return;
+
_ex_image_blur(ETK_IMAGE(e->cur_tab->image));
}
void
_ex_menu_sharpen_cb(Etk_Object *obj, void *data)
{
- Exhibit *e;
- Etk_Tree_Row *r;
+ Exhibit *e = data;
EX_MENU_ITEM_GET_RETURN(obj);
- e = data;
- r = etk_tree_selected_row_get(ETK_TREE(e->cur_tab->itree));
- if(!r) return;
+ if (!e->cur_tab->image_loaded)
+ return;
+
_ex_image_sharpen(ETK_IMAGE(e->cur_tab->image));
}
void
_ex_menu_brighten_cb(Etk_Object *obj, void *data)
{
- Exhibit *e;
- Etk_Tree_Row *r;
+ Exhibit *e = data;
EX_MENU_ITEM_GET_RETURN(obj);
- e = data;
- r = etk_tree_selected_row_get(ETK_TREE(e->cur_tab->itree));
- if(!r) return;
+ if (!e->cur_tab->image_loaded)
+ return;
e->brightness += 10;
if(e->brightness > 255)
@@ -286,13 +277,11 @@
void
_ex_menu_darken_cb(Etk_Object *obj, void *data)
{
- Exhibit *e;
- Etk_Tree_Row *r;
+ Exhibit *e = data;
EX_MENU_ITEM_GET_RETURN(obj);
- e = data;
- r = etk_tree_selected_row_get(ETK_TREE(e->cur_tab->itree));
- if(!r) return;
+ if (!e->cur_tab->image_loaded)
+ return;
e->brightness -= 10;
if(e->brightness < 0)
@@ -303,13 +292,12 @@
void
_ex_menu_set_wallpaper_cb(Etk_Object *obj, void *data)
{
- Exhibit *e;
- Etk_Tree_Row *r;
+ Exhibit *e = data;
EX_MENU_ITEM_GET_RETURN(obj);
+
+ if (!e->cur_tab->image_loaded)
+ return;
- e = data;
- r = etk_tree_selected_row_get(ETK_TREE(e->cur_tab->itree));
- if(!r) return;
_ex_image_wallpaper_set(ETK_IMAGE(e->cur_tab->image));
}
@@ -351,7 +339,7 @@
_ex_menu_refresh_cb(Etk_Object *obj, void *data)
{
EX_MENU_ITEM_GET_RETURN(obj);
- printf("refresh\n");
+ D(("refresh\n"));
}
void
@@ -431,12 +419,12 @@
_ex_menu_release_notes_cb(Etk_Object *obj, void *data)
{
EX_MENU_ITEM_GET_RETURN(obj);
- printf("release notes\n");
+ D(("release notes\n"));
}
void
_ex_menu_about_cb(Etk_Object *obj, void *data)
{
EX_MENU_ITEM_GET_RETURN(obj);
- printf("about\n");
+ D(("about\n"));
}
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_options.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- exhibit_options.c 29 Jul 2006 19:50:04 -0000 1.4
+++ exhibit_options.c 2 Aug 2006 17:31:04 -0000 1.5
@@ -34,7 +34,7 @@
home = getenv("HOME");
if(!home)
{
- printf("Cant find home directory!\n");
+ fprintf(stderr, "Cant find home directory!\n");
return 0;
}
@@ -44,13 +44,13 @@
{
if(ecore_file_exists(buf))
{
- printf("Cant create config path!\n");
+ fprintf(stderr, "Cant create config path!\n");
return 0;
}
if(!ecore_file_mkdir(buf))
{
- printf("Cant create config path!");
+ fprintf(stderr, "Cant create config path!");
return 0;
}
}
@@ -61,13 +61,13 @@
{
if(ecore_file_exists(buf))
{
- printf("Cant create config path!");
+ fprintf(stderr, "Cant create config path!");
return 0;
}
if(!ecore_file_mkdir(buf))
{
- printf("Cant create config path!");
+ fprintf(stderr, "Cant create config path!");
return 0;
}
}
@@ -206,11 +206,11 @@
ret = eet_data_write(ef, _ex_config_version_edd, "config/version",
e->version, 1);
if(!ret)
- printf("Problem saving config!\n");
+ fprintf(stderr, "Problem saving config!\n");
ret = eet_data_write(ef, _ex_config_options_edd, "config/options",
e->options, 1);
if(!ret)
- printf("Problem saving config/options!");
+ fprintf(stderr, "Problem saving config/options!");
eet_close(ef);
return ret;
@@ -242,7 +242,7 @@
ef = eet_open(buf, EET_FILE_MODE_READ);
if(!ef)
{
- printf("Cant open configuration file! Using program defaults.\n");
+ fprintf(stderr, "Cant open configuration file! Using program
defaults.\n");
return 0;
}
@@ -250,7 +250,7 @@
e->version = eet_data_read(ef, _ex_config_version_edd, "config/version");
if(!e->version)
{
- printf("Incompatible configuration file! Creating new one.\n");
+ fprintf(stderr, "Incompatible configuration file! Creating new one.\n");
eet_close(ef);
_ex_options_default(e);
return 0;
@@ -262,7 +262,7 @@
v = _ex_options_version_parse(VERSION);
if(_ex_options_version_compare(v, e->version) != 0)
{
- printf("Your version / configuration of E-Stickies is not
valid!\n");
+ fprintf(stderr, "Your version / configuration of Exhibit is not
valid!\n");
_ex_options_default(e);
return 0;
}
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_tab.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- exhibit_tab.c 2 Aug 2006 03:10:43 -0000 1.18
+++ exhibit_tab.c 2 Aug 2006 17:31:04 -0000 1.19
@@ -90,8 +90,10 @@
void
_ex_tab_select(Ex_Tab *tab)
-{
+{
chdir(tab->cur_path);
+
+ D(("_ex_tab_select: changed dir to %s\n", tab->cur_path));
if(tab->comment.visible)
etk_notebook_page_child_set(ETK_NOTEBOOK(tab->e->notebook), tab->num,
tab->comment.vbox);
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
