enlightenment-cvs

E CVS: apps/e devilhorns

[Enlightenment C. <no...@cv...>]

Enlightenment CVS committal

Author  : devilhorns
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/modules/battery


Modified Files:
	e_mod_main.c 


Log Message:
little formatting fix.

===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/battery/e_mod_main.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -3 -r1.119 -r1.120
--- e_mod_main.c	3 May 2008 22:18:35 -0000	1.119
+++ e_mod_main.c	14 Jun 2008 06:18:30 -0000	1.120
@@ -209,7 +209,8 @@
    edje_object_message_send(battery, EDJE_MESSAGE_FLOAT, 1, &msg);
 }
 
-static void _battery_face_time_set(Evas_Object *battery, int time_left)
+static void 
+_battery_face_time_set(Evas_Object *battery, int time_left)
 {
    char buf[256];
    int hrs, mins;
@@ -249,8 +250,7 @@
 	ecore_exe_terminate(battery_config->batget_exe);
 	ecore_exe_free(battery_config->batget_exe);
      }
-   snprintf(buf, sizeof(buf),
-	    "%s/%s/batget %i",
+   snprintf(buf, sizeof(buf), "%s/%s/batget %i",
 	    e_module_dir_get(battery_config->module), MODULE_ARCH,
 	    battery_config->poll_interval);
 
@@ -266,9 +266,7 @@
    Instance *inst;
 
    inst = data;
-
    e_gadcon_popup_hide(inst->warning);
-
    return 0;
 }
 
@@ -279,15 +277,13 @@
 
    inst = (Instance *)data;
    if ((!inst) || (!inst->warning)) return;
-
    e_gadcon_popup_hide(inst->warning);
 }
 
 static void
 _battery_warning_popup_destroy(Instance *inst)
 {
-   if (!inst || !inst->warning) return;
-
+   if ((!inst) || (!inst->warning)) return;
    e_object_del(E_OBJECT(inst->warning));
    inst->warning = NULL;
    inst->popup_battery = NULL;
@@ -312,7 +308,8 @@
 
    if ((!inst) || (inst->warning)) return;
 
-   inst->warning = e_gadcon_popup_new(inst->gcc, _battery_warning_popup_resize);
+   inst->warning = 
+     e_gadcon_popup_new(inst->gcc, _battery_warning_popup_resize);
    if (!inst->warning) return;
 
    e = inst->warning->win->evas;

E CVS: apps/e devilhorns

[Enlightenment C. <no...@cv...>]

Enlightenment CVS committal

Author  : devilhorns
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
	e_zone.c 


Log Message:
Formatting/Whitespace fixes.

===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_zone.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -3 -r1.136 -r1.137
--- e_zone.c	19 Jun 2008 13:23:20 -0000	1.136
+++ e_zone.c	7 Jul 2008 00:53:52 -0000	1.137
@@ -87,24 +87,28 @@
    zone->edge.bottom = ecore_x_window_input_new(con->win, zone->x + 1, zone->y + zone->h - 1, zone->w - 2, 1);
    e_container_window_raise(zone->container, zone->edge.bottom, 999);
 
-   zone->handlers = evas_list_append(zone->handlers,
-				     ecore_event_handler_add(ECORE_X_EVENT_MOUSE_IN,
-							     _e_zone_cb_mouse_in, zone));
-   zone->handlers = evas_list_append(zone->handlers,
-				     ecore_event_handler_add(ECORE_X_EVENT_MOUSE_OUT,
-							     _e_zone_cb_mouse_out, zone));
-   zone->handlers = evas_list_append(zone->handlers,
-				     ecore_event_handler_add(ECORE_X_EVENT_MOUSE_MOVE,
-							     _e_zone_cb_mouse_move, zone));
-   zone->handlers = evas_list_append(zone->handlers,
-				     ecore_event_handler_add(E_EVENT_DESK_SHOW,
-							     _e_zone_cb_desk_show, zone));
+   zone->handlers = 
+     evas_list_append(zone->handlers,
+                      ecore_event_handler_add(ECORE_X_EVENT_MOUSE_IN,
+                                              _e_zone_cb_mouse_in, zone));
+   zone->handlers = 
+     evas_list_append(zone->handlers,
+                      ecore_event_handler_add(ECORE_X_EVENT_MOUSE_OUT,
+                                              _e_zone_cb_mouse_out, zone));
+   zone->handlers = 
+     evas_list_append(zone->handlers,
+                      ecore_event_handler_add(ECORE_X_EVENT_MOUSE_MOVE,
+                                              _e_zone_cb_mouse_move, zone));
+   zone->handlers = 
+     evas_list_append(zone->handlers,
+                      ecore_event_handler_add(E_EVENT_DESK_SHOW,
+                                              _e_zone_cb_desk_show, zone));
 
    snprintf(name, sizeof(name), "Zone %d", zone->num);
    zone->name = evas_stringshare_add(name);
 
    con->zones = evas_list_append(con->zones, zone);
-   
+
    o = evas_object_rectangle_add(con->bg_evas);
    zone->bg_clip_object = o;
    evas_object_move(o, x, y);
@@ -125,9 +129,9 @@
    evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_MOVE, _e_zone_cb_bg_mouse_move, zone);
 
    /* TODO: config the ecore_evas type. */
-   zone->black_ecore_evas = e_canvas_new(e_config->evas_engine_zone, zone->container->win,
-					 0, 0, zone->w, zone->h, 1, 1,
-					 &(zone->black_win), NULL);
+   zone->black_ecore_evas = 
+     e_canvas_new(e_config->evas_engine_zone, zone->container->win,
+                  0, 0, zone->w, zone->h, 1, 1, &(zone->black_win), NULL);
    e_canvas_add(zone->black_ecore_evas);
    ecore_evas_layer_set(zone->black_ecore_evas, 6);
    zone->black_evas = ecore_evas_get(zone->black_ecore_evas);
@@ -146,20 +150,19 @@
    zone->desk_y_count = 0;
    zone->desk_x_current = 0;
    zone->desk_y_current = 0;
-   e_zone_desk_count_set(zone,
-			 e_config->zone_desks_x_count,
+   e_zone_desk_count_set(zone, e_config->zone_desks_x_count,
 			 e_config->zone_desks_y_count);
 
    _e_zone_update_flip(zone);
    _e_zone_update_edge(zone);
 
    e_object_del_attach_func_set(E_OBJECT(zone), _e_zone_object_del_attach);
-   
+
    ev = E_NEW(E_Event_Zone_Add, 1);
    ev->zone = zone;
    e_object_ref(E_OBJECT(ev->zone));
    ecore_event_add(E_EVENT_ZONE_ADD, ev, _e_zone_event_add_free, NULL);
-   
+
    return zone;
 }
 
@@ -168,6 +171,7 @@
 {
    E_OBJECT_CHECK(zone);
    E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
+
    if (zone->name) evas_stringshare_del(zone->name);
    zone->name = evas_stringshare_add(name);
 }
@@ -176,10 +180,10 @@
 e_zone_move(E_Zone *zone, int x, int y)
 {
    E_Event_Zone_Move_Resize *ev;
-   
+
    E_OBJECT_CHECK(zone);
    E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
-   
+
    if ((x == zone->x) && (y == zone->y)) return;
    zone->x = x;
    zone->y = y;
@@ -202,10 +206,10 @@
 e_zone_resize(E_Zone *zone, int w, int h)
 {
    E_Event_Zone_Move_Resize *ev;
-   
+
    E_OBJECT_CHECK(zone);
    E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
-   
+
    if ((w == zone->w) && (h == zone->h)) return;
    zone->w = w;
    zone->h = h;
@@ -216,19 +220,23 @@
    ev = E_NEW(E_Event_Zone_Move_Resize, 1);
    ev->zone = zone;
    e_object_ref(E_OBJECT(ev->zone));
-   ecore_event_add(E_EVENT_ZONE_MOVE_RESIZE, ev, _e_zone_event_move_resize_free, NULL);
+   ecore_event_add(E_EVENT_ZONE_MOVE_RESIZE, ev, 
+                   _e_zone_event_move_resize_free, NULL);
 
    ecore_x_window_move_resize(zone->edge.left, zone->x, zone->y, 1, zone->h);
-   ecore_x_window_move_resize(zone->edge.right, zone->x + zone->w - 1, zone->y, 1, zone->h);
-   ecore_x_window_move_resize(zone->edge.top, zone->x + 1, zone->y, zone->w - 2, 1);
-   ecore_x_window_move_resize(zone->edge.bottom, zone->x + 1, zone->y + zone->h - 1, zone->w - 2, 1);
+   ecore_x_window_move_resize(zone->edge.right, zone->x + zone->w - 1, 
+                              zone->y, 1, zone->h);
+   ecore_x_window_move_resize(zone->edge.top, zone->x + 1, zone->y, 
+                              zone->w - 2, 1);
+   ecore_x_window_move_resize(zone->edge.bottom, zone->x + 1, 
+                              zone->y + zone->h - 1, zone->w - 2, 1);
 }
 
 EAPI void
 e_zone_move_resize(E_Zone *zone, int x, int y, int w, int h)
 {
    E_Event_Zone_Move_Resize *ev;
-   
+
    E_OBJECT_CHECK(zone);
    E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
 
@@ -239,23 +247,27 @@
    zone->y = y;
    zone->w = w;
    zone->h = h;
-   
+
    evas_object_move(zone->bg_object, x, y);
    evas_object_move(zone->bg_event_object, x, y);
    evas_object_move(zone->bg_clip_object, x, y);
    evas_object_resize(zone->bg_object, w, h);
    evas_object_resize(zone->bg_event_object, w, h);
    evas_object_resize(zone->bg_clip_object, w, h);
-   
+
    ev = E_NEW(E_Event_Zone_Move_Resize, 1);
    ev->zone = zone;
    e_object_ref(E_OBJECT(ev->zone));
-   ecore_event_add(E_EVENT_ZONE_MOVE_RESIZE, ev, _e_zone_event_move_resize_free, NULL);
+   ecore_event_add(E_EVENT_ZONE_MOVE_RESIZE, ev, 
+                   _e_zone_event_move_resize_free, NULL);
 
    ecore_x_window_move_resize(zone->edge.left, zone->x, zone->y, 1, zone->h);
-   ecore_x_window_move_resize(zone->edge.right, zone->x + zone->w - 1, zone->y, 1, zone->h);
-   ecore_x_window_move_resize(zone->edge.top, zone->x + 1, zone->y, zone->w - 2, 1);
-   ecore_x_window_move_resize(zone->edge.bottom, zone->x + 1, zone->y + zone->h - 1, zone->w - 2, 1);
+   ecore_x_window_move_resize(zone->edge.right, zone->x + zone->w - 1, 
+                              zone->y, 1, zone->h);
+   ecore_x_window_move_resize(zone->edge.top, zone->x + 1, zone->y, 
+                              zone->w - 2, 1);
+   ecore_x_window_move_resize(zone->edge.bottom, zone->x + 1, 
+                              zone->y + zone->h - 1, zone->w - 2, 1);
 } 
 
 EAPI void
@@ -263,7 +275,7 @@
 {
    E_OBJECT_CHECK(zone);
    E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
-   
+
    if ((!zone->fullscreen) && (on))
      {
 	ecore_evas_show(zone->black_ecore_evas);
@@ -280,8 +292,8 @@
 EAPI E_Zone *
 e_zone_current_get(E_Container *con)
 {
-   Evas_List *l;
- 
+   Evas_List *l = NULL;
+
    E_OBJECT_CHECK_RETURN(con, NULL);
    E_OBJECT_TYPE_CHECK_RETURN(con, E_CONTAINER_TYPE, NULL);
    if (!starting)
@@ -292,7 +304,7 @@
 	for (l = con->zones; l; l = l->next)
 	  {
 	     E_Zone *zone;
-	     
+
 	     zone = l->data;
 	     if (E_INSIDE(x, y, zone->x, zone->y, zone->w, zone->h))
 	       return zone;
@@ -308,17 +320,19 @@
 {
    E_OBJECT_CHECK(zone);
    E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
+
    e_bg_zone_update(zone, E_BG_TRANSITION_CHANGE);
 }
 
 EAPI void
 e_zone_flip_coords_handle(E_Zone *zone, int x, int y)
 {
-   E_OBJECT_CHECK(zone);
-   E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
    int one_row = 1;
    int one_col = 1;
-   
+
+   E_OBJECT_CHECK(zone);
+   E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
+
    if (!e_config->edge_flip_dragging) return;
    /* if we have only 1 row we can flip up/down even if we have xinerama */
    if (evas_list_count(zone->container->zones) > 1)
@@ -326,9 +340,9 @@
 	Evas_List *zones;
 	E_Zone *next_zone;
 	int cx, cy;
-	
+
 	zones = zone->container->zones;
-	next_zone = (E_Zone *) evas_list_data(zones);
+	next_zone = (E_Zone *)evas_list_data(zones);
 	cx = next_zone->x;
 	cy = next_zone->y;
 	zones = evas_list_next(zones);
@@ -348,36 +362,39 @@
      {
 	/* top */
 	if (!zone->flip.timer)
-	  zone->flip.timer = ecore_timer_add(e_config->edge_flip_timeout, _e_zone_cb_timer, zone);
+	  zone->flip.timer = ecore_timer_add(e_config->edge_flip_timeout, 
+                                             _e_zone_cb_timer, zone);
 	zone->flip.direction = E_DIRECTION_UP;
      }
    else if ((one_col) && (x == (zone->w - 1)) && E_ZONE_FLIP_RIGHT(zone))
      {
 	/* right */
 	if (!zone->flip.timer)
-	  zone->flip.timer = ecore_timer_add(e_config->edge_flip_timeout, _e_zone_cb_timer, zone);
+	  zone->flip.timer = ecore_timer_add(e_config->edge_flip_timeout, 
+                                             _e_zone_cb_timer, zone);
 	zone->flip.direction = E_DIRECTION_RIGHT;
      }
    else if ((one_row) && (y == (zone->h - 1)) && E_ZONE_FLIP_DOWN(zone))
      {
 	/* bottom */
 	if (!zone->flip.timer)
-	  zone->flip.timer = ecore_timer_add(e_config->edge_flip_timeout, _e_zone_cb_timer, zone);
+	  zone->flip.timer = ecore_timer_add(e_config->edge_flip_timeout, 
+                                             _e_zone_cb_timer, zone);
 	zone->flip.direction = E_DIRECTION_DOWN;
      }
    else if ((one_col) && (x == 0) && E_ZONE_FLIP_LEFT(zone))
      {
 	/* left */
 	if (!zone->flip.timer)
-	  zone->flip.timer = ecore_timer_add(e_config->edge_flip_timeout, _e_zone_cb_timer, zone);
+	  zone->flip.timer = ecore_timer_add(e_config->edge_flip_timeout, 
+                                             _e_zone_cb_timer, zone);
 	zone->flip.direction = E_DIRECTION_LEFT;
      }
    else
      {
 	noflip:
 	/* in zone */
-	if (zone->flip.timer)
-	  ecore_timer_del(zone->flip.timer);
+	if (zone->flip.timer) ecore_timer_del(zone->flip.timer);
 	zone->flip.timer = NULL;
      }
 }
@@ -385,16 +402,16 @@
 EAPI void
 e_zone_desk_count_set(E_Zone *zone, int x_count, int y_count)
 {
-   E_Desk   **new_desks;
-   E_Desk    *desk, *new_desk;
-   int        x, y, xx, yy, moved, nx, ny;
+   E_Desk **new_desks;
+   E_Desk *desk, *new_desk;
    E_Border  *bd;
    E_Event_Zone_Desk_Count_Set *ev;
    E_Border_List *bl;
-   
+   int x, y, xx, yy, moved, nx, ny;
+
    E_OBJECT_CHECK(zone);
    E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
-   
+
    xx = x_count;
    if (xx < 1) xx = 1;
    yy = y_count;
@@ -412,7 +429,7 @@
 	if (zone->desk_y_current >= yy) ny = yy - 1;
 	e_desk_show(e_desk_at_xy_get(zone, nx, ny));
      }
-   
+
    new_desks = malloc(xx * yy * sizeof(E_Desk *));
    for (x = 0; x < xx; x++)
      {
@@ -435,7 +452,7 @@
 	     for (x = xx; x < zone->desk_x_count; x++)
 	       {
 		  desk = zone->desks[x + (y * zone->desk_x_count)];
-		  
+
 		  bl = e_container_border_list_first(zone->container);
 		  while ((bd = e_container_border_list_next(bl)))
 		    {
@@ -455,7 +472,7 @@
 	     for (y = yy; y < zone->desk_y_count; y++)
 	       {
 		  desk = zone->desks[x + (y * zone->desk_x_count)];
-		  
+
 		  bl = e_container_border_list_first(zone->container);
 		  while ((bd = e_container_border_list_next(bl)))
 		    {
@@ -465,11 +482,11 @@
 		  e_container_border_list_free(bl);
 		  e_object_del(E_OBJECT(desk));
 	       }
-	  }	
+	  }
      }
    if (zone->desks) free(zone->desks);
    zone->desks = new_desks;
-   
+
    zone->desk_x_count = xx;
    zone->desk_y_count = yy;
    e_config->zone_desks_x_count = xx;
@@ -491,7 +508,8 @@
    if (!ev) return;
    ev->zone = zone;
    e_object_ref(E_OBJECT(ev->zone));
-   ecore_event_add(E_EVENT_ZONE_DESK_COUNT_SET, ev, _e_zone_event_zone_desk_count_set_free, NULL);
+   ecore_event_add(E_EVENT_ZONE_DESK_COUNT_SET, ev, 
+                   _e_zone_event_zone_desk_count_set_free, NULL);
 }
 
 EAPI void
@@ -499,7 +517,7 @@
 {
    E_OBJECT_CHECK(zone);
    E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
-   
+
    if (x_count) *x_count = zone->desk_x_count;
    if (y_count) *y_count = zone->desk_y_count;
 }
@@ -509,7 +527,7 @@
 {
    E_OBJECT_CHECK(zone);
    E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
-   
+
    _e_zone_update_flip(zone);
    _e_zone_update_edge(zone);
 }
@@ -521,7 +539,7 @@
    E_Manager *man;
    E_Container *con;
    E_Zone *zone;
-   
+
    for (l = e_manager_list(); l; l = l->next)
      {
 	man = l->data;
@@ -539,7 +557,7 @@
 {
    E_OBJECT_CHECK(zone);
    E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
-   
+
    dx = zone->desk_x_current + dx;
    dy = zone->desk_y_current + dy;
    e_zone_desk_flip_to(zone, dx, dy);
@@ -549,7 +567,7 @@
 e_zone_desk_flip_to(E_Zone *zone, int x, int y)
 {
    E_Desk *desk;
-   
+
    E_OBJECT_CHECK(zone);
    E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
 
@@ -576,7 +594,7 @@
 {
    E_OBJECT_CHECK(zone);
    E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
-   
+
    dx = zone->desk_x_current + 
      (zone->desk_y_current * zone->desk_x_count) + dx;
    dx = dx % (zone->desk_x_count * zone->desk_y_count);
@@ -592,7 +610,7 @@
 
    E_OBJECT_CHECK(zone);
    E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
-   
+
    y = x / zone->desk_x_count;
    x = x - (y * zone->desk_x_count);
    e_zone_desk_flip_to(zone, x, y);
@@ -604,7 +622,7 @@
    Evas_List *l, *ll, *lll;
    E_Manager *man;
    E_Container *con;
-   
+
    for (l = e_manager_list(); l; l = l->next)
      {
 	man = l->data;
@@ -614,7 +632,7 @@
 	     for (lll = con->zones; lll; lll = lll->next)
 	       {
 		  E_Zone *zone;
-		  
+
 		  zone = lll->data;
 		  ecore_x_window_hide(zone->edge.left);
 		  ecore_x_window_hide(zone->edge.right);
@@ -631,7 +649,7 @@
    Evas_List *l, *ll, *lll;
    E_Manager *man;
    E_Container *con;
-   
+
    for (l = e_manager_list(); l; l = l->next)
      {
 	man = l->data;
@@ -641,7 +659,7 @@
 	     for (lll = con->zones; lll; lll = lll->next)
 	       {
 		  E_Zone *zone;
-		  
+
 		  zone = lll->data;
 		  _e_zone_update_edge(zone);
 	       }
@@ -745,17 +763,17 @@
 {
    E_Zone *zone;
    Evas_Event_Mouse_Down *ev;
-   
+
    ev = (Evas_Event_Mouse_Down *)event_info;
    zone = data;
    if (e_menu_grab_window_get()) return;
-   
+
    if (!zone->cur_mouse_action)
      {
 	if (ecore_event_current_type_get() == ECORE_X_EVENT_MOUSE_BUTTON_DOWN)
 	  {
 	     Ecore_X_Event_Mouse_Button_Down *ev2;
-	     
+
 	     ev2 = ecore_event_current_event_get();
 	     zone->cur_mouse_action =
 	       e_bindings_mouse_down_event_handle(E_BINDING_CONTEXT_ZONE,
@@ -777,7 +795,7 @@
 {
    E_Zone *zone;
    Evas_Event_Mouse_Up *ev;
-   
+
    ev = (Evas_Event_Mouse_Up *)event_info;      
    zone = data;
    if (zone->cur_mouse_action)
@@ -785,7 +803,7 @@
 	if (ecore_event_current_type_get() == ECORE_X_EVENT_MOUSE_BUTTON_UP)
 	  {
 	     Ecore_X_Event_Mouse_Button_Up *ev2;
-	     
+
 	     ev2 = ecore_event_current_event_get();
 	     if (zone->cur_mouse_action->func.end_mouse)
 	       zone->cur_mouse_action->func.end_mouse(E_OBJECT(zone), "", ev2);
@@ -800,7 +818,7 @@
 	if (ecore_event_current_type_get() == ECORE_X_EVENT_MOUSE_BUTTON_UP)
 	  {
 	     Ecore_X_Event_Mouse_Button_Up *ev2;
-	     
+
 	     ev2 = ecore_event_current_event_get();
 	     e_bindings_mouse_up_event_handle(E_BINDING_CONTEXT_ZONE,
 					      E_OBJECT(zone), ev2);
@@ -813,7 +831,7 @@
 {
    E_Zone *zone;
    Evas_Event_Mouse_Move *ev;
-   
+
    ev = (Evas_Event_Mouse_Move *)event_info;   
    zone = data;
 }
@@ -832,7 +850,7 @@
 _e_zone_cb_mouse_in(void *data, int type, void *event)
 {
    Ecore_X_Event_Mouse_In *ev;
-   E_Event_Zone_Edge      *zev;
+   E_Event_Zone_Edge *zev;
    E_Zone *zone;
 
    ev = event;
@@ -859,7 +877,8 @@
 	if (zone->flip.right)
 	  {
 	     if (!zone->flip.timer)
-	       zone->flip.timer = ecore_timer_add(e_config->edge_flip_timeout, _e_zone_cb_timer, zone);
+	       zone->flip.timer = ecore_timer_add(e_config->edge_flip_timeout, 
+                                                  _e_zone_cb_timer, zone);
 	     zone->flip.direction = E_DIRECTION_RIGHT;
 	  }
 
@@ -875,7 +894,8 @@
 	if (zone->flip.bottom)
 	  {
 	     if (!zone->flip.timer)
-	       zone->flip.timer = ecore_timer_add(e_config->edge_flip_timeout, _e_zone_cb_timer, zone);
+	       zone->flip.timer = ecore_timer_add(e_config->edge_flip_timeout, 
+                                                  _e_zone_cb_timer, zone);
 	     zone->flip.direction = E_DIRECTION_DOWN;
 	  }
 
@@ -891,7 +911,8 @@
 	if (zone->flip.left)
 	  {
 	     if (!zone->flip.timer)
-	       zone->flip.timer = ecore_timer_add(e_config->edge_flip_timeout, _e_zone_cb_timer, zone);
+	       zone->flip.timer = ecore_timer_add(e_config->edge_flip_timeout, 
+                                                  _e_zone_cb_timer, zone);
 	     zone->flip.direction = E_DIRECTION_LEFT;
 	  }
 
@@ -909,7 +930,7 @@
 _e_zone_cb_mouse_out(void *data, int type, void *event)
 {
    Ecore_X_Event_Mouse_Out *ev;
-   E_Event_Zone_Edge       *zev;
+   E_Event_Zone_Edge *zev;
    E_Zone *zone;
 
    ev = event;
@@ -940,7 +961,7 @@
 _e_zone_cb_mouse_move(void *data, int type, void *event)
 {
    Ecore_X_Event_Mouse_Move *ev;
-   E_Event_Zone_Edge        *zev;
+   E_Event_Zone_Edge *zev;
    E_Zone *zone;
 
    ev = event;
@@ -1026,16 +1047,15 @@
 	  }
 	break;
      }
-   
+
    zone->flip.timer = NULL;
-   
+
    current = e_desk_current_get(zone);
-   
    if (current)
      ecore_event_add(E_EVENT_POINTER_WARP, ev, NULL, NULL);
    else
      free(ev);
-   
+
    return 0;
 }
 
@@ -1043,7 +1063,7 @@
 _e_zone_cb_desk_show(void *data, int type, void *event)
 {
    E_Event_Desk_Show *ev;
-   E_Zone            *zone;
+   E_Zone *zone;
 
    ev = event;
    zone = data;
@@ -1079,7 +1099,7 @@
 	     int x, y;
 
 	     zones = zone->container->zones;
-	     next_zone = (E_Zone *) evas_list_data(zones);
+	     next_zone = (E_Zone *)evas_list_data(zones);
 	     x = next_zone->x;
 	     y = next_zone->y;
 	     zones = evas_list_next(zones);
@@ -1102,19 +1122,19 @@
 	     zone->flip.left = 1;
 	     zone->show.left++;
 	  }
-	
+
 	if (one_col && E_ZONE_FLIP_RIGHT(zone))
 	  {
 	     zone->flip.right = 1;
 	     zone->show.right++;
 	  }
-	
+
 	if (one_row && E_ZONE_FLIP_UP(zone))
 	  {
 	     zone->flip.top = 1;
 	     zone->show.top++;
 	  }
-	
+
 	if (one_row && E_ZONE_FLIP_DOWN(zone))
 	  {
 	     zone->flip.bottom = 1;
@@ -1182,4 +1202,3 @@
    e_object_ref(E_OBJECT(ev->zone));
    ecore_event_add(E_EVENT_ZONE_DEL, ev, _e_zone_event_del_free, NULL);
 }
-

E CVS: apps/e devilhorns

[Enlightenment C. <no...@cv...>]

Enlightenment CVS committal

Author  : devilhorns
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
	e_desk.c 


Log Message:
Formatting/Whitespace fixes.

===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_desk.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- e_desk.c	5 Jun 2008 10:52:13 -0000	1.72
+++ e_desk.c	7 Jul 2008 01:03:33 -0000	1.73
@@ -13,7 +13,6 @@
 static void _e_border_event_desk_before_show_free(void *data, void *ev);
 static void _e_border_event_desk_deskshow_free(void *data, void *ev);
 static void _e_border_event_desk_name_change_free(void *data, void *ev);
-
 static void _e_desk_show_begin(E_Desk *desk, int mode, int dx, int dy);
 static void _e_desk_show_end(E_Desk *desk);
 static int _e_desk_show_animator(void *data);
@@ -49,10 +48,10 @@
    Evas_List *l;
    char name[40];
    int ok;
-   
+
    E_OBJECT_CHECK_RETURN(zone, NULL);
    E_OBJECT_TYPE_CHECK_RETURN(zone, E_ZONE_TYPE, NULL);
-   
+
    desk = E_OBJECT_ALLOC(E_Desk, E_DESK_TYPE, _e_desk_free);
    if (!desk) return NULL;
 
@@ -71,7 +70,8 @@
 	    (zone->container->num != cfname->container)) continue;
 	if ((cfname->zone >= 0) &&
 	    (zone->num != cfname->zone)) continue;
-	if ((cfname->desk_x != desk->x) || (cfname->desk_y != desk->y)) continue;
+	if ((cfname->desk_x != desk->x) || (cfname->desk_y != desk->y)) 
+          continue;
 	desk->name = evas_stringshare_add(cfname->name);
 	ok = 1;
 	break;
@@ -82,7 +82,7 @@
    	snprintf(name, sizeof(name), _(e_config->desktop_default_name), x, y);
    	desk->name = evas_stringshare_add(name);
      }
-   
+
    return desk;
 }
 
@@ -107,7 +107,7 @@
 e_desk_name_add(int container, int zone, int desk_x, int desk_y, const char *name)
 {
    E_Config_Desktop_Name *cfname;
-   
+
    e_desk_name_del(container, zone, desk_x, desk_y);
    cfname = E_NEW(E_Config_Desktop_Name, 1);
    cfname->container = container;
@@ -121,12 +121,12 @@
 EAPI void
 e_desk_name_del(int container, int zone, int desk_x, int desk_y)
 {
-   Evas_List *l;
-   
+   Evas_List *l = NULL;
+
    for (l = e_config->desktop_names; l; l = l->next)
      {
 	E_Config_Desktop_Name *cfname;
-	
+
 	cfname = l->data;
 	if ((cfname->container == container) && (cfname->zone == zone) &&
 	    (cfname->desk_x == desk_x) && (cfname->desk_y == desk_y))
@@ -150,7 +150,7 @@
    E_Desk *desk;
    int d_x, d_y, ok;
    char	name[40];
-   
+
    for (m = e_manager_list(); m; m = m->next)
      {
 	man = m->data;
@@ -200,13 +200,12 @@
 EAPI void
 e_desk_show(E_Desk *desk)
 {
-   E_Border_List     *bl;
-   E_Border          *bd;
+   E_Border_List *bl;
+   E_Border *bd;
    E_Event_Desk_Show *ev;
    E_Event_Desk_Before_Show *eev;
    Evas_List *l;
-   int                was_zone = 0;
-   int                x, y, dx = 0, dy = 0;
+   int was_zone = 0, x, y, dx = 0, dy = 0;
 
    E_OBJECT_CHECK(desk);
    E_OBJECT_TYPE_CHECK(desk, E_DESK_TYPE);
@@ -215,7 +214,8 @@
    eev = E_NEW(E_Event_Desk_Before_Show, 1);
    eev->desk = e_desk_current_get(desk->zone);
    e_object_ref(E_OBJECT(eev->desk));
-   ecore_event_add(E_EVENT_DESK_BEFORE_SHOW, eev, _e_border_event_desk_before_show_free, NULL);
+   ecore_event_add(E_EVENT_DESK_BEFORE_SHOW, eev, 
+                   _e_border_event_desk_before_show_free, NULL);
 
    ecore_x_window_shadow_tree_flush();
    for (x = 0; x < desk->zone->desk_x_count; x++)
@@ -237,7 +237,7 @@
 	       }
 	  }
      }
-   
+
    desk->zone->desk_x_current = desk->x;
    desk->zone->desk_y_current = desk->y;
    desk->visible = 1;
@@ -251,15 +251,11 @@
 	     if ((bd->desk->zone == desk->zone) && (!bd->iconic))
 	       {
 		  if ((bd->desk == desk) || (bd->sticky))
-		    {
-		       e_border_show(bd);
-		    }
+                    e_border_show(bd);
 		  else if (bd->moving)
 		    e_border_desk_set(bd, desk);
 		  else
-		    {
-		       e_border_hide(bd, 2);
-		    }
+                    e_border_hide(bd, 2);
 	       }
 	  }
 	e_container_border_list_free(bl);
@@ -267,15 +263,15 @@
 
    if (e_config->desk_flip_animate_mode > 0)
      _e_desk_show_begin(desk, e_config->desk_flip_animate_mode, dx, dy);
-   
+
    if (e_config->focus_last_focused_per_desktop)
      e_desk_last_focused_focus(desk);
-	
+
    if (was_zone)
      e_bg_zone_update(desk->zone, E_BG_TRANSITION_DESK);
    else
      e_bg_zone_update(desk->zone, E_BG_TRANSITION_START);
-   
+
    ev = E_NEW(E_Event_Desk_Show, 1);
    ev->desk = desk;
    e_object_ref(E_OBJECT(desk));
@@ -295,7 +291,7 @@
 	cf_es = es->cfg;
 	if (!cf_es) continue;
 
-	zone = e_zone_current_get(e_container_current_get(e_manager_current_get()));
+	zone = e_util_zone_current_get(e_manager_current_get());
 	if (cf_es->zone != zone->num) continue;
 
 	for (ll = es->cfg->desk_list; ll; ll = ll->next)
@@ -306,7 +302,7 @@
 	     if (!sd) continue;
 	     if ((desk->x == sd->x) && (desk->y == sd->y))
 	       {
-		  show_shelf=1;
+		  show_shelf = 1;
 		  break;
 	       }
 	  }
@@ -362,9 +358,9 @@
 EAPI void
 e_desk_last_focused_focus(E_Desk *desk)
 {
-   Evas_List *l;
+   Evas_List *l = NULL;
    E_Border *bd;
-   
+
    for (l = e_border_focus_stack_get(); l; l = l->next)
      {
 	bd = l->data;
@@ -406,6 +402,7 @@
 {
    E_OBJECT_CHECK_RETURN(zone, NULL);
    E_OBJECT_TYPE_CHECK_RETURN(zone, E_ZONE_TYPE, NULL);
+
    return e_desk_at_xy_get(zone, zone->desk_x_current, zone->desk_y_current);
 }
 
@@ -419,7 +416,7 @@
      return NULL;
    else if ((x < 0) || (y < 0))
      return NULL;
-   
+
    return zone->desks[x + (y * zone->desk_x_count)];
 }
 
@@ -457,13 +454,13 @@
 
    E_OBJECT_CHECK(zone);
    E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
-   
+
    if ((zone->desk_x_count < 2) && (zone->desk_y_count < 2))
      return;
-   
+
    x = zone->desk_x_current;
    y = zone->desk_y_current;
-   
+
    x++;
    if (x >= zone->desk_x_count)
      {
@@ -471,7 +468,7 @@
 	y++;
 	if (y >= zone->desk_y_count) y = 0;
      }
-   
+
    e_desk_show(e_desk_at_xy_get(zone, x, y));
 }
 
@@ -527,7 +524,6 @@
    free(ev);
 }
 
-
 static void
 _e_border_event_desk_deskshow_free(void *data, void *event)
 {
@@ -581,10 +577,10 @@
 		    {
 		       int mx, my, bx, by;
 		       double fx, fy, ang, rad, len, lmax;
-		       
+
 		       mx = bd->zone->x + (bd->zone->w / 2);
 		       my = bd->zone->y + (bd->zone->h / 2);
-		       
+
 		       bx = bd->x + (bd->w / 2) - mx;
 		       by = bd->y + (bd->h / 2) - my;
 		       if (bx == 0) bx = 1;
@@ -645,10 +641,10 @@
 static int
 _e_desk_show_animator(void *data)
 {
-   E_Desk        *desk;
+   E_Desk *desk;
    E_Border_List *bl;
-   E_Border      *bd;
-   double         t, dt, spd;
+   E_Border *bd;
+   double t, dt, spd;
 
    desk = data;
    t = ecore_time_get();
@@ -715,10 +711,10 @@
 		    {
 		       int mx, my, bx, by;
 		       double fx, fy, ang, rad, len, lmax;
-		       
+
 		       mx = bd->zone->x + (bd->zone->w / 2);
 		       my = bd->zone->y + (bd->zone->h / 2);
-		       
+
 		       bx = bd->x + (bd->w / 2) - mx;
 		       by = bd->y + (bd->h / 2) - my;
 		       if (bx == 0) bx = 1;
@@ -758,7 +754,7 @@
 _e_desk_hide_end(E_Desk *desk)
 {
    E_Border_List *bl;
-   E_Border      *bd;
+   E_Border *bd;
 
    bl = e_container_border_list_first(desk->zone->container);
    while ((bd = e_container_border_list_next(bl)))
@@ -781,10 +777,10 @@
 static int
 _e_desk_hide_animator(void *data)
 {
-   E_Desk        *desk;
+   E_Desk *desk;
    E_Border_List *bl;
-   E_Border      *bd;
-   double         t, dt, spd;
+   E_Border *bd;
+   double t, dt, spd;
 
    desk = data;
    t = ecore_time_get();

E CVS: apps/e devilhorns

[Enlightenment C. <no...@cv...>]

Enlightenment CVS committal

Author  : devilhorns
Project : e17
Module  : apps/e

Dir     : e17/apps/e/data/themes


Modified Files:
	default_sys.edc 


Log Message:
Small patch from Toma to fix Logout dialog not having a fixed: 1 1; for
certain parts.

===================================================================
RCS file: /cvs/e/e17/apps/e/data/themes/default_sys.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- default_sys.edc	10 Sep 2006 04:51:07 -0000	1.1
+++ default_sys.edc	7 Jul 2008 09:53:09 -0000	1.2
@@ -128,6 +128,7 @@
 	    aspect_preference: BOTH;
 	    min: 128 128;
 	    max: 128 128;
+	    fixed: 1 1;
 	    align: 0.5 0.0;
 	    rel1 {
                relative: 0.0 0.0;
@@ -363,6 +364,7 @@
 	    aspect_preference: BOTH;
 	    min: 128 128;
 	    max: 128 128;
+	    fixed: 1 1;
 	    align: 0.5 0.0;
 	    rel1 {
                relative: 0.0 0.0;
@@ -598,6 +600,7 @@
 	    aspect_preference: BOTH;
 	    min: 128 128;
 	    max: 128 128;
+	    fixed: 1 1;
 	    align: 0.5 0.0;
 	    rel1 {
                relative: 0.0 0.0;
@@ -833,6 +836,7 @@
 	    aspect_preference: BOTH;
 	    min: 128 128;
 	    max: 128 128;
+	    fixed: 1 1;
 	    align: 0.5 0.0;
 	    rel1 {
                relative: 0.0 0.0;
@@ -1068,6 +1072,7 @@
 	    aspect_preference: BOTH;
 	    min: 128 128;
 	    max: 128 128;
+	    fixed: 1 1;
 	    align: 0.5 0.0;
 	    rel1 {
                relative: 0.0 0.0;

E CVS: apps/e devilhorns

[Enlightenment C. <no...@cv...>]

Enlightenment CVS committal

Author  : devilhorns
Project : e17
Module  : apps/e

Dir     : e17/apps/e/data/themes


Modified Files:
	default_desklock.edc 


Log Message:
Patch from Toma to remove duplicate color: entries for some parts.

===================================================================
RCS file: /cvs/e/e17/apps/e/data/themes/default_desklock.edc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- default_desklock.edc	17 Sep 2007 12:03:47 -0000	1.11
+++ default_desklock.edc	10 Jul 2008 15:19:50 -0000	1.12
@@ -63,7 +63,6 @@
 	    effect: SHADOW;
 	    description {
 	       state: "default" 0.0;
-	       color: 0 0 0 255;
 	       fixed: 0 1;
 	       align: 0.0 0.5;
 	       rel1 {
@@ -162,7 +161,6 @@
 	       clip_to: "passwd_entry_clip";
 	       description {
 		  state: "default" 0.0;
-		  color: 0 0 0 255;
 		  fixed: 0 1;
 		  align: 0.0 0.5;
 		  

E CVS: apps/e devilhorns

[Enlightenment C. <no...@cv...>]

Enlightenment CVS committal

Author  : devilhorns
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
	e_about.c 


Log Message:
Formatting/Whitespace Fixes.
Update Copyright year.

===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_about.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- e_about.c	8 Jul 2008 19:41:42 -0000	1.20
+++ e_about.c	11 Jul 2008 03:01:02 -0000	1.21
@@ -21,11 +21,11 @@
    E_Manager *man;
    Evas_Object *o;
    E_About *about;
-   
+
    if (_e_about) 
      {
 	E_Zone *z, *z2;
-	
+
 	about = _e_about;
 	z = e_util_zone_current_get(e_manager_current_get());
 	z2 = about->win->border->zone;
@@ -43,7 +43,7 @@
 	e_border_unshade(about->win->border, E_DIRECTION_DOWN);
 	return NULL;
      }
-   
+
    if (!con)
      {
 	man = e_manager_current_get();
@@ -66,19 +66,19 @@
    e_win_dialog_set(about->win, 1);
    e_win_name_class_set(about->win, "E", "_about");
    e_win_title_set(about->win, _("About Enlightenment"));
-   
+
    o = edje_object_add(e_win_evas_get(about->win));
    about->bg_object = o;
    e_theme_edje_object_set(o, "base/theme/about", "e/widgets/about/main");
    evas_object_move(o, 0, 0);
    evas_object_show(o);
-   
+
    edje_object_part_text_set(about->bg_object, "e.text.title", _("Enlightenment"));
    edje_object_part_text_set(about->bg_object, "e.text.version", VERSION);
    edje_object_part_text_set
      (about->bg_object, "e.textblock.about",
       _(
-	"Copyright &copy; 1999-2007, by the Enlightenment Development Team.<br>"
+	"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br>"
 	"<br>"
 	"We hope you enjoy using this software as much as we enjoyed "
 	"writing it.<br>"
@@ -98,7 +98,7 @@
      {
 	FILE *f;
 	char buf[4096], buf2[4096], *tbuf;
-	
+
 	snprintf(buf, sizeof(buf), "%s/AUTHORS", e_prefix_data_get());
 	f = fopen(buf, "r");
 	if (f)
@@ -107,7 +107,7 @@
 	     while (fgets(buf, sizeof(buf), f))
 	       {
 		  int len;
-		  
+
 		  len = strlen(buf);
 		  if (len > 0)
 		    {  
@@ -119,7 +119,7 @@
 		       if (len > 0)
 			 {
 			    char *p;
-			    
+
 			    do
 			      {
 				 p = strchr(buf, '<');
@@ -141,7 +141,8 @@
 	     fclose(f);
 	     if (tbuf)
 	       {
-		  edje_object_part_text_set(about->bg_object, "e.textblock.authors", tbuf);
+		  edje_object_part_text_set(about->bg_object, 
+                                            "e.textblock.authors", tbuf);
 		  free(tbuf);
 	       }
 	  }
@@ -155,7 +156,7 @@
 e_about_show(E_About *about)
 {
    Evas_Coord w, h, mw, mh;
-   
+
    edje_object_size_min_get(about->bg_object, &w, &h);
    edje_object_size_min_calc(about->bg_object, &mw, &mh);
    if (w > mw) mw = w;
@@ -163,7 +164,7 @@
    evas_object_resize(about->bg_object, mw, mh);
    e_win_resize(about->win, mw, mh);
    e_win_size_min_set(about->win, mw, mh);
-   
+
    edje_object_size_max_get(about->bg_object, &w, &h);
    if ((w > 0) && (h > 0))
      {
@@ -188,9 +189,8 @@
 _e_about_cb_delete(E_Win *win)
 {
    E_About *about;
-   
-   about = win->data;
-   if (!about) return;
+
+   if (!(about = win->data)) return;
    e_object_del(E_OBJECT(about));
 }
 
@@ -198,9 +198,8 @@
 _e_about_cb_close(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
    E_About *about;
-   
-   about = data;
-   if (!about) return;
+
+   if (!(about = data)) return;
    e_util_defer_object_del(E_OBJECT(about));
 }
 
@@ -208,7 +207,7 @@
 _e_about_cb_resize(E_Win *win)
 {
    E_About *about;
-   
+
    about = win->data;
    evas_object_resize(about->bg_object, about->win->w, about->win->h);
 }

E CVS: apps/e devilhorns

[Enlightenment C. <no...@cv...>]

Enlightenment CVS committal

Author  : devilhorns
Project : e17
Module  : apps/e

Dir     : e17/apps/e/data/themes


Modified Files:
	default_configure.edc 


Log Message:
Theme patch from Toma. Remove unused glints.

===================================================================
RCS file: /cvs/e/e17/apps/e/data/themes/default_configure.edc,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- default_configure.edc	5 Mar 2008 05:39:55 -0000	1.24
+++ default_configure.edc	12 Jul 2008 06:25:32 -0000	1.25
@@ -3,9 +3,6 @@
    image: "e17_dialog_watermark.png" COMP;
    image: "e17_logo.png" COMP;
    image: "e17_menu_bg.png" COMP;
-   image: "e17_titlebar_glint1.png" COMP;
-   image: "e17_titlebar_glint2.png" COMP;
-   image: "e17_titlebar_glint3.png" COMP;
 }
 
 group {
@@ -156,209 +153,5 @@
 	    }	       	    
 	 }
       }
-      part {
-	 name: "glint_clip";
-	 type: RECT;
-	 mouse_events: 0;
-	 description {
-	    state: "default" 0.0;
-	    color: 255 255 255 255;
-	    rel1 {
-	       relative: 0.0 0.0;
-	       offset: 3 3;
-	    }
-	    rel2 {
-	       relative: 1.0 1.0;
-	       offset: -4 -4;
-	    }
-	 }
-      }
-      part {
-	 name: "glint1";
-	 mouse_events: 0;
-	 description {
-	    state: "default" 0.0;
-	    visible: 0;
-	    color: 255 255 255 0;
-	    align: 0.0 0.0;
-	    max: 34 13;
-	    rel1 {
-	       relative: 0.0 0.0;
-	       offset: 2 2;
-	    }
-	    rel2 {
-	       relative: 1.0 1.0;
-	       offset: -3 -3;
-	    }
-	    image {
-	       normal: "e17_titlebar_glint1.png";
-	       border: 5 0 5 0;
-	    }
-	    fill {
-	       smooth: 0;
-	    }
-	 }
-	 description {
-	    state: "active" 0.0;
-	    inherit: "default" 0.0;
-	    visible: 1;
-	    color: 255 255 255 255;
-	 }
-      }
-      part {
-	 name: "glint2";
-	 mouse_events: 0;
-	 clip_to: "glint_clip";
-	 description {
-	    state: "default" 0.0;
-	    visible: 0;
-	    color: 255 255 255 0;
-	    align: 1.0 0.5;
-	    max: 0 0;
-	    rel1 {
-	       relative: 0.0 0.0;
-	       offset: 3 3;
-	    }
-	    rel2 {
-	       relative: 0.0 1.0;
-	       offset: 3 -4;
-	    }
-	    image {
-	       normal: "e17_titlebar_glint2.png";
-	       border: 0 0 5 5;
-	    }
-	    fill {
-	       smooth: 0;
-	    }
-	 }
-	 description {
-	    state: "active" 0.0;
-	    inherit: "default" 0.0;
-	    visible: 1;
-	    color: 255 255 255 255;
-	    max: 169 9999;
-	    min: 169 8;
-	    align: 0.5 0.5;
-	 }
-	 description {
-	    state: "active2" 0.0;
-	    inherit: "default" 0.0;
-	    visible: 1;
-	    color: 255 255 255 128;
-	    max: 169 9999;
-	    min: 169 8;
-	    align: 0.5 0.5;
-	    rel1 {
-	       relative: 1.0 0.0;
-	       offset: -4 3;
-	    }
-	    rel2 {
-	       relative: 1.0 1.0;
-	       offset: -4 -4;
-	    }
-	 }
-	 description {
-	    state: "active3" 0.0;
-	    inherit: "default" 0.0;
-	    visible: 0;
-	    color: 255 255 255 0;
-	    max: 169 9999;
-	    min: 169 8;
-	    align: 0.0 0.5;
-	    rel1 {
-	       relative: 1.0 0.0;
-	       offset: -4 3;
-	    }
-	    rel2 {
-	       relative: 1.0 1.0;
-	       offset: -4 -4;
-	    }
-	 }
-      }
-      part {
-	 name: "glint3";
-	 mouse_events: 0;
-	 description {
-	    state: "default" 0.0;
-	    visible: 0;
-	    color: 255 255 255 0;
-	    align: 1.0 1.0;
-	    max: 34 13;
-	    rel1 {
-	       relative: 0.0 0.0;
-	       offset: 2 2;
-	    }
-	    rel2 {
-	       relative: 1.0 1.0;
-	       offset: -3 -3;
-	    }
-	    image {
-	       normal: "e17_titlebar_glint3.png";
-	       border: 0 5 0 5;
-	    }
-	    fill {
-	       smooth: 0;
-	    }
-	 }
-	 description {
-	    state: "active" 0.0;
-	    inherit: "default" 0.0;
-	    visible: 1;
-	    color: 255 255 255 255;
-	 }
-      }
-   }
-   programs {
-      program {
-	 name: "button_in";
-	 signal: "mouse,in";
-	 source: "e.swallow.button";
-	 script {
-	    run_program(PROGRAM:"go_active");
-	 }
-      }
-      program {
-	 name: "go_active";
-	 action: STATE_SET "active" 0.0;
-	 target: "glint1";
-	 target: "glint2";
-	 transition: LINEAR 0.05;
-	 after: "go_active2";
-	 after: "go_active2b";
-      }
-      program {
-	 name: "go_active2";
-	 action: STATE_SET "active2" 0.0;
-	 target: "glint2";
-	 transition: LINEAR 0.2;
-	 after: "go_active3";
-	 after: "go_active3b";
-      }
-      program {
-	 name: "go_active2b";
-	 action: STATE_SET "active" 0.0;
-	 target: "glint3";
-	 transition: LINEAR 0.2;
-      }
-      program {
-	 name: "go_active3";
-	 action: STATE_SET "active3" 0.0;
-	 target: "glint2";
-	 transition: LINEAR 0.05;
-      }
-      program {
-	 name: "go_active3b";
-	 action: STATE_SET "default" 0.0;
-	 target: "glint3";
-	 transition: LINEAR 0.1;
-	 after: "go_active4";
-      }
-      program {
-	 name: "go_active4";
-	 action: STATE_SET "default" 0.0;
-	 target: "glint1";
-	 target: "glint2";
-	 target: "glint3";
-      }      
    }
 }

E CVS: apps/e devilhorns

[Enlightenment C. <no...@cv...>]

Enlightenment CVS committal

Author  : devilhorns
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
	e_msgbus.c 


Log Message:
Patch from lok to fix E compiling without e_dbus. Makes cvs build again.
Thanks lok :)

===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_msgbus.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_msgbus.c	11 Jun 2008 07:02:05 -0000	1.5
+++ e_msgbus.c	6 Aug 2008 22:52:04 -0000	1.6
@@ -110,25 +110,21 @@
    return 1;
 }
 
+#ifdef HAVE_EDBUS
 EAPI void
 e_msgbus_interface_attach(E_DBus_Interface *iface)
 {
-#ifdef HAVE_EDBUS
    if (!_e_msgbus_data->obj) return;
    e_dbus_object_interface_attach(_e_msgbus_data->obj, iface);
-#endif
 }
 
 EAPI void
 e_msgbus_interface_detach(E_DBus_Interface *iface)
 {
-#ifdef HAVE_EDBUS
    if (!_e_msgbus_data->obj) return;
    e_dbus_object_interface_detach(_e_msgbus_data->obj, iface);
-#endif
 }
 
-#ifdef HAVE_EDBUS
 static void
 _e_msgbus_request_name_cb(void *data, DBusMessage *msg, DBusError *err)
 {