Enlightenment CVS committal
Author : handyande
Project : misc
Module : engage
Dir : misc/engage/src/module
Modified Files:
e_mod_main.c tray.c
Log Message:
cuple of fixes so you can enable / disable systray to your hearts content
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/module/e_mod_main.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -3 -r1.76 -r1.77
--- e_mod_main.c 6 Dec 2005 00:16:09 -0000 1.76
+++ e_mod_main.c 6 Dec 2005 00:52:26 -0000 1.77
@@ -324,7 +324,6 @@
/*add tray*/
_engage_tray_init(eb);
- edje_object_part_swallow(eb->bar_object, "tray",
eb->tray->tray);
/* Add main menu to bar menu */
mi = e_menu_item_new(e->config_menu);
@@ -2419,8 +2418,10 @@
Engage_Bar *eb;
eb = data;
+ _engage_tray_shutdown(eb);
eb->conf->tray = e_menu_item_toggle_get(mi);
- _engage_tray_active_set(eb, eb->conf->tray);
+ _engage_tray_init(eb);
+ _engage_tray_layout(eb);
_engage_bar_frame_resize(eb);
e_config_save_queue();
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/module/tray.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- tray.c 6 Dec 2005 00:16:09 -0000 1.11
+++ tray.c 6 Dec 2005 00:52:26 -0000 1.12
@@ -13,7 +13,7 @@
#define XEMBED_EMBEDDED_NOTIFY 0
static int _engage_tray_cb_msg(void *data, int type, void *event);
-void _engage_tray_active_set();
+static 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);
@@ -43,6 +43,7 @@
evas_object_intercept_move_callback_add(eb->tray->tray,
_engage_tray_cb_move, eb);
evas_object_intercept_resize_callback_add(eb->tray->tray,
_engage_tray_cb_resize, eb);
+ edje_object_part_swallow(eb->bar_object, "tray", eb->tray->tray);
_engage_tray_active_set(eb, eb->conf->tray);
}
@@ -50,6 +51,7 @@
void
_engage_tray_shutdown(Engage_Bar *eb)
{
+ edje_object_part_unswallow(eb->bar_object, eb->tray->tray);
_engage_tray_active_set(eb, 0);
evas_list_free(eb->tray->wins);
@@ -57,7 +59,7 @@
free(eb->tray);
}
-void
+static void
_engage_tray_active_set(Engage_Bar *eb, int active)
{
Ecore_X_Window win;
@@ -67,7 +69,7 @@
Atom selection_atom;
Evas_Coord x, y, w, h;
- win = 0;
+ win = NULL;
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
