discomfitor pushed a commit to branch master.
commit 4b8a73b1d9500b55d42a45cd8d978bc88f11e8e8
Author: Mike Blumenkrantz <[email protected]>
Date: Tue May 28 11:01:50 2013 +0100
systray is effectively the same whether it's in a shelf or on the desktop
now, make it work for both
---
src/modules/systray/e_mod_main.c | 8 ++------
src/modules/systray/e_mod_xembed.c | 5 +++--
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/modules/systray/e_mod_main.c b/src/modules/systray/e_mod_main.c
index 614ed11..e496da5 100644
--- a/src/modules/systray/e_mod_main.c
+++ b/src/modules/systray/e_mod_main.c
@@ -47,12 +47,8 @@ _systray_site_is_safe(E_Gadcon_Site site)
/* NB: filter out sites we know are not safe for a systray to sit.
* This was done so that systray could be put into illume indicator
* (or anywhere else really) that is 'safe' for systray to be.
- * Pretty much, this is anywhere but Desktop and toolbars at the moment */
- if (e_gadcon_site_is_desktop(site))
- return EINA_FALSE;
- else if (e_gadcon_site_is_any_toolbar(site))
- return EINA_FALSE;
- return EINA_TRUE;
+ * Pretty much, this is anywhere but toolbars at the moment */
+ return !e_gadcon_site_is_any_toolbar(site);
}
static const char *
diff --git a/src/modules/systray/e_mod_xembed.c
b/src/modules/systray/e_mod_xembed.c
index 10a09e9..0652a06 100644
--- a/src/modules/systray/e_mod_xembed.c
+++ b/src/modules/systray/e_mod_xembed.c
@@ -221,7 +221,7 @@ _systray_xembed_icon_add(Instance_Xembed *xembed, const
Ecore_X_Window win)
{
Ecore_X_Gravity gravity;
Evas_Object *o;
- Evas_Coord w, h, sz;
+ Evas_Coord w, h, sz = 48;
Icon *icon;
edje_object_part_geometry_get(systray_edje_get(xembed->inst), _part_size,
@@ -251,8 +251,9 @@ _systray_xembed_icon_add(Instance_Xembed *xembed, const
Ecore_X_Window win)
case E_GADCON_ORIENT_CORNER_RT:
case E_GADCON_ORIENT_CORNER_LB:
case E_GADCON_ORIENT_CORNER_RB:
- default:
sz = systray_gadcon_get(xembed->inst)->shelf->w;
+ default:
+ break;
}
if ((w < 16) && (sz > 16))
w = h = sz - 5;
--
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
