Enlightenment CVS committal
Author : jeffdameth
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/pager
Modified Files:
e_mod_main.c
Log Message:
remove duplicated code
change text to e.text.label
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/pager/e_mod_main.c,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -3 -r1.233 -r1.234
--- e_mod_main.c 12 Jan 2008 08:00:13 -0000 1.233
+++ e_mod_main.c 13 Jan 2008 20:15:22 -0000 1.234
@@ -1354,36 +1354,6 @@
zone = ev->border->zone;
urgent = ev->border->client.icccm.urgent;
- for (l = pagers; l; l = l->next)
- {
- p = l->data;
- if (p->zone != zone) continue;
- for (l2 = p->desks; l2; l2 = l2->next)
- {
- pd = l2->data;
- pw = _pager_desk_window_find(pd, ev->border);
- if (pw)
- {
- if (urgent)
- {
- if (!(ev->border->iconic))
- edje_object_signal_emit(pd->o_desk,
- "e,state,urgent", "e");
- edje_object_signal_emit(pw->o_window,
- "e,state,urgent", "e");
- }
- else
- {
- if (!(ev->border->iconic))
- edje_object_signal_emit(pd->o_desk,
- "e,state,not_urgent", "e");
- edje_object_signal_emit(pw->o_window,
- "e,state,not_urgent", "e");
- }
- }
- }
- }
-
if (pager_config->popup_urgent)
{
pp = _pager_popup_find(zone);
@@ -1397,27 +1367,29 @@
_pager_popup_cb_timeout, pp);
pp->urgent = 1;
}
- if (pp)
+ }
+
+ for (l = pagers; l; l = l->next)
+ {
+ p = l->data;
+ if (p->zone != zone) continue;
+ for (l2 = p->desks; l2; l2 = l2->next)
{
- for (l = pp->pager->desks; l; l = l->next)
+ pd = l2->data;
+ pw = _pager_desk_window_find(pd, ev->border);
+ if (pw)
{
- Pager_Desk *pd;
- Pager_Win *pw;
-
- pd = l->data;
- pw = _pager_desk_window_find(pd, ev->border);
- if (!pw) continue;
-
if (urgent)
{
- edje_object_signal_emit(pd->o_desk,
- "e,state,urgent", "e");
+ if (!(ev->border->iconic))
+ edje_object_signal_emit(pd->o_desk,
+ "e,state,urgent", "e");
edje_object_signal_emit(pw->o_window,
"e,state,urgent", "e");
}
else
{
- if (!(pd->urgent))
+ if (!(ev->border->iconic))
edje_object_signal_emit(pd->o_desk,
"e,state,not_urgent", "e");
edje_object_signal_emit(pw->o_window,
@@ -1426,6 +1398,7 @@
}
}
}
+
return 1;
}
@@ -1776,6 +1749,7 @@
if (!pw) return;
if (pw->desk->pager->popup && !act_popup) return;
+ if (!pw->desk->pager->popup && ev->button == 3) return;
if (pw->border->lock_user_location) return;
if (ev->button == pager_config->btn_desk) return;
if ((ev->button == pager_config->btn_drag) ||
@@ -2182,6 +2156,7 @@
ev = event_info;
pd = data;
if (!pd) return;
+ if (!pd->pager->popup && ev->button == 3) return;
if (ev->button == pager_config->btn_desk)
{
evas_object_geometry_get(pd->o_desk, &ox, &oy, NULL, NULL);
@@ -2509,7 +2484,7 @@
pd = _pager_desk_find(pp->pager, current_desk);
if (pd) _pager_desk_select(pd);
- edje_object_part_text_set(pp->o_bg, "text", current_desk->name);
+ edje_object_part_text_set(pp->o_bg, "e.text.label", current_desk->name);
}
static void
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
