Enlightenment CVS committal
Author : atmosphere
Project : e17
Module : apps/entice
Dir : e17/apps/entice/src/bin
Modified Files:
entice.c prefs.c
Log Message:
Deletion/Removal fixup,
Removing from file list via the d key made a default
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/entice.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- entice.c 19 Oct 2003 18:02:22 -0000 1.11
+++ entice.c 19 Oct 2003 20:58:03 -0000 1.12
@@ -194,10 +194,11 @@
&& !strcmp(e_thumb_file_get(o),
entice_image_file_get(entice->current)))
return;
- if((thumb_edje = evas_hash_find(entice->thumb.hash,
- entice_image_file_get(entice->current))))
- edje_object_signal_emit(thumb_edje, "EnticeThumbUnLoaded",
- "");
+ if (entice_image_file_get(entice->current)
+ && (thumb_edje =
+ evas_hash_find(entice->thumb.hash,
+ entice_image_file_get(entice->current))))
+ edje_object_signal_emit(thumb_edje, "EnticeThumbUnLoaded", "");
tmp = e_thumb_evas_object_get(o);
new_current = entice_image_new(tmp);
@@ -247,9 +248,10 @@
}
}
entice->current = new_current;
- if((thumb_edje = evas_hash_find(entice->thumb.hash,
- entice_image_file_get(entice->current))))
- edje_object_signal_emit(thumb_edje, "EnticeThumbLoaded", "");
+ if ((thumb_edje =
+ evas_hash_find(entice->thumb.hash,
+ entice_image_file_get(entice->current))))
+ edje_object_signal_emit(thumb_edje, "EnticeThumbLoaded", "");
if (entice->scroller)
evas_object_del(entice->scroller);
@@ -418,12 +420,13 @@
entice->thumb.hash = evas_hash_del(entice->thumb.hash, buf, o);
if (entice->thumb.current && entice->thumb.current->prev)
entice->thumb.current = entice->thumb.current->prev;
- else if (entice->thumb.list)
+ else
entice->thumb.current = entice->thumb.list;
if ((obj = edje_object_part_swallow_get(o, "EnticeThumb")))
{
- entice->thumb.list = evas_list_remove(entice->thumb.list, obj);
+ entice->thumb.current = entice->thumb.list =
+ evas_list_remove(entice->thumb.list, obj);
evas_object_del(obj);
}
e_container_element_remove(entice->container, o);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/prefs.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- prefs.c 18 Oct 2003 20:38:55 -0000 1.7
+++ prefs.c 19 Oct 2003 20:58:03 -0000 1.8
@@ -258,11 +258,12 @@
char *signals[] = { "EnticeZoomIn", "EnticeZoomOut", "EnticeFullScreen",
"EnticeImageNext", "EnticeImagePrev", "EnticeZoomDefault",
"EnticeZoomFit", "EnticeQuit", "EnticeRotateLeft",
- "EnticeRotateRight", "EnticeFlipH", "EnticeFlipV"
+ "EnticeRotateRight", "EnticeFlipH", "EnticeFlipV",
+ "EnticeImageRemove"
};
char *keys[] =
{ "equal", "minus", "f", "space", "BackSpace", "n", "w", "q", "Left",
- "Right", "Up", "Down"
+ "Right", "Up", "Down", "d"
};
count = sizeof(signals) / sizeof(char *);
-------------------------------------------------------
This SF.net email sponsored by: Enterprise Linux Forum Conference & Expo
The Event For Linux Datacenter Solutions & Strategies in The Enterprise
Linux in the Boardroom; in the Front Office; & in the Server Room
http://www.enterpriselinuxforum.com
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
