Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_shelf.c
Log Message:
Formatting
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -3 -r1.57 -r1.58
--- e_shelf.c 23 Apr 2007 17:21:38 -0000 1.57
+++ e_shelf.c 24 Apr 2007 05:04:15 -0000 1.58
@@ -272,43 +272,43 @@
E_OBJECT_CHECK(es);
E_OBJECT_TYPE_CHECK(es, E_SHELF_TYPE);
- if(!es->cfg->autohide && !es->hidden) return;
-
+ if ((!es->cfg->autohide) && (!es->hidden)) return;
+
if (show)
{
- if(!es->hide_timer) es->hide_timer = ecore_timer_add(0.1,
_e_shelf_cb_hide_timer, es);
+ if (!es->hide_timer) es->hide_timer = ecore_timer_add(0.1,
_e_shelf_cb_hide_timer, es);
- if (es->hidden && !es->instant_timer)
- {
- es->hidden = 0;
- edje_object_signal_emit(es->o_base, "e,state,visible", "e");
- if (es->instant_delay >= 0.0)
- {
- if (!es->instant_timer)
- _e_shelf_cb_instant_hide_timer(es);
- }
- else
- {
- if(!es->hide_animator)
- es->hide_animator =
ecore_animator_add(_e_shelf_cb_hide_animator, es);
- }
- }
+ if ((es->hidden) && (!es->instant_timer))
+ {
+ es->hidden = 0;
+ edje_object_signal_emit(es->o_base, "e,state,visible", "e");
+ if (es->instant_delay >= 0.0)
+ {
+ if (!es->instant_timer)
+ _e_shelf_cb_instant_hide_timer(es);
+ }
+ else
+ {
+ if (!es->hide_animator)
+ es->hide_animator =
ecore_animator_add(_e_shelf_cb_hide_animator, es);
+ }
+ }
}
- else if (!show && es->cfg->autohide && !es->hidden)
+ else if ((!show) && (es->cfg->autohide) && (!es->hidden))
{
- es->hidden = 1;
- edje_object_signal_emit(es->o_base, "e,state,hidden", "e");
- if (es->instant_delay >= 0.0)
- {
- if (!es->instant_timer)
- es->instant_timer = ecore_timer_add(es->instant_delay,
_e_shelf_cb_instant_hide_timer, es);
- }
- else
- {
- if (!es->hide_animator)
- es->hide_animator = ecore_animator_add(_e_shelf_cb_hide_animator,
es);
- }
+ es->hidden = 1;
+ edje_object_signal_emit(es->o_base, "e,state,hidden", "e");
+ if (es->instant_delay >= 0.0)
+ {
+ if (!es->instant_timer)
+ es->instant_timer = ecore_timer_add(es->instant_delay,
_e_shelf_cb_instant_hide_timer, es);
+ }
+ else
+ {
+ if (!es->hide_animator)
+ es->hide_animator = ecore_animator_add(_e_shelf_cb_hide_animator,
es);
+ }
}
}
@@ -1086,7 +1086,10 @@
static void
_e_shelf_cb_menu_delete(void *data, E_Menu *m, E_Menu_Item *mi)
{
- E_Shelf * es = data;
+ E_Shelf *es;
+
+ es = data;
+
e_object_ref(E_OBJECT(es));
e_confirm_dialog_show(_("Are you sure you want to delete this shelf?"),
"enlightenment/e",
_("You requested to delete this shelf.<br>"
@@ -1188,18 +1191,18 @@
}
else
{
- if(es->last_in + es->cfg->hide_timeout < ecore_time_get())
- {
- e_shelf_toggle(es, 0);
- if(es->hide_timer)
- {
- ecore_timer_del(es->hide_timer);
- es->hide_timer = NULL;
- }
- return 0;
- }
- else
- return 1;
+ if ((es->last_in) + (es->cfg->hide_timeout < ecore_time_get()))
+ {
+ e_shelf_toggle(es, 0);
+ if (es->hide_timer)
+ {
+ ecore_timer_del(es->hide_timer);
+ es->hide_timer = NULL;
+ }
+ return 0;
+ }
+ else
+ 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
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
