Enlightenment CVS committal
Author : handyande
Project : misc
Module : engage
Dir : misc/engage/src/module
Modified Files:
e_mod_main.c tray.c
Log Message:
tidies and hide the system tray if we hide the bar
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/module/e_mod_main.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -3 -r1.84 -r1.85
--- e_mod_main.c 10 Dec 2005 15:07:56 -0000 1.84
+++ e_mod_main.c 10 Dec 2005 15:37:52 -0000 1.85
@@ -137,6 +137,7 @@
extern void _engage_tray_init(Engage_Bar *eb);
extern void _engage_tray_shutdown(Engage_Bar *eb);
+extern void _engage_tray_active_set(Engage_Bar *eb, int active);
extern void _engage_tray_layout(Engage_Bar *eb);
extern void _engage_tray_freeze(Engage_Bar *eb);
extern void _engage_tray_thaw(Engage_Bar *eb);
@@ -737,7 +738,6 @@
evas_object_del(eb->event_object);
_engage_tray_shutdown(eb);
- eb->tray = NULL;
e_gadman_client_save(eb->gmc);
e_object_del(E_OBJECT(eb->gmc));
@@ -914,7 +914,7 @@
evas_object_show(eb->bar_object);
evas_object_show(eb->box_object);
evas_object_show(eb->event_object);
- evas_object_show(eb->tray->tray);
+ _engage_tray_active_set(eb, eb->conf->tray);
e_config_save_queue();
}
@@ -922,10 +922,10 @@
_engage_bar_disable(Engage_Bar *eb)
{
eb->conf->enabled = 0;
+ _engage_tray_active_set(eb, 0);
evas_object_hide(eb->bar_object);
evas_object_hide(eb->box_object);
evas_object_hide(eb->event_object);
- evas_object_hide(eb->tray->tray);
e_config_save_queue();
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/module/tray.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- tray.c 7 Dec 2005 12:57:07 -0000 1.15
+++ tray.c 10 Dec 2005 15:37:52 -0000 1.16
@@ -13,7 +13,7 @@
#define XEMBED_EMBEDDED_NOTIFY 0
static int _engage_tray_cb_msg(void *data, int type, void *event);
-static void _engage_tray_active_set(Engage_Bar *eb, int active);
+void _engage_tray_active_set(Engage_Bar *eb, int active);
static void _engage_tray_cb_move(void *data, Evas_Object *o, Evas_Coord x,
Evas_Coord y);
static void _engage_tray_cb_resize(void *data, Evas_Object *o, Evas_Coord
w, Evas_Coord h);
@@ -37,7 +37,7 @@
eb->tray->msg_handler = NULL;
eb->tray->dst_handler = NULL;
- eb->tray->win = NULL;
+ eb->tray->win = 0;
evas_object_resize(eb->tray->tray, eb->tray->w, eb->tray->h);
evas_object_color_set(eb->tray->tray, 180, 0, 0, 255);
@@ -59,9 +59,10 @@
evas_list_free(eb->tray->wins);
evas_object_del(eb->tray->tray);
free(eb->tray);
+ eb->tray = NULL;
}
-static void
+void
_engage_tray_active_set(Engage_Bar *eb, int active)
{
Ecore_X_Window win;
@@ -71,7 +72,7 @@
Atom selection_atom;
Evas_Coord x, y, w, h;
- win = NULL;
+ win = 0;
if (active)
win = eb->con->bg_win;
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
