Fix more nasty formatting.

Please, please, please do not run 'indent' on E's code. It really makes a
mess of things :)


SVN revision: 33696

src/bin/e_tlist.c

@@ -30,8 +30,7 @@ struct _E_Smart_Item
    Evas_Object *base_obj;
    void (*func) (void *data, void *data2);
    void (*func_hilight) (void *data, void *data2);
-   void               *data;
+   void *data, *data2;
-   void               *data2;
    unsigned char markup:1;
 };
 
@@ -100,15 +99,12 @@ e_tlist_selected_set(Evas_Object * obj, int n)
    E_Smart_Item *si;
 
    API_ENTRY return;
-
+   if (!sd->items) return;
-   if (!sd->items)
-      return;
    if (n >= evas_list_count(sd->items))
      n = evas_list_count(sd->items) - 1;
    else if (n < 0)
      n = 0;
-   if (sd->selected == n)
+   if (sd->selected == n) return;
-      return;
    si = evas_list_nth(sd->items, sd->selected);
    if (si)
      edje_object_signal_emit(si->base_obj, "e,state,unselected", "e");
@@ -118,14 +114,12 @@ e_tlist_selected_set(Evas_Object * obj, int n)
      {
 	evas_object_raise(si->base_obj);
 	edje_object_signal_emit(si->base_obj, "e,state,selected", "e");
-	if (si->func_hilight)
+	if (si->func_hilight) si->func_hilight(si->data, si->data2);
-	   si->func_hilight(si->data, si->data2);
 	if (!sd->selector)
 	  {
 	     if (!sd->on_hold)
 	       {
-		  if (si->func)
+		  if (si->func) si->func(si->data, si->data2);
-		    si->func(si->data, si->data2);
 	       }
 	  }
      }
@@ -135,9 +129,7 @@ EAPI int
 e_tlist_selected_get(Evas_Object *obj)
 {
    API_ENTRY return -1;
-
+   if (!sd->items) return -1;
-   if (!sd->items)
-      return -1;
    return sd->selected;
 }
 
@@ -147,9 +139,7 @@ e_tlist_selected_label_get(Evas_Object * obj)
    E_Smart_Item *si;
 
    API_ENTRY return NULL;
-
+   if (!sd->items) return NULL;
-   if (!sd->items)
-      return NULL;
    si = evas_list_nth(sd->items, sd->selected);
    if (si)
      {
@@ -167,12 +157,9 @@ e_tlist_selected_data_get(Evas_Object * obj)
    E_Smart_Item *si;
 
    API_ENTRY return NULL;
-
+   if (!sd->items) return NULL;
-   if (!sd->items)
-      return NULL;
    si = evas_list_nth(sd->items, sd->selected);
-   if (si)
+   if (si) return si->data;
-      return si->data;
    return NULL;
 }
 
@@ -182,12 +169,9 @@ e_tlist_selected_data2_get(Evas_Object * obj)
    E_Smart_Item *si;
 
    API_ENTRY return NULL;
-
+   if (!sd->items) return NULL;
-   if (!sd->items)
-      return NULL;
    si = evas_list_nth(sd->items, sd->selected);
-   if (si)
+   if (si) return si->data2;
-      return si->data2;
    return NULL;
 }
 
@@ -198,7 +182,6 @@ e_tlist_selected_geometry_get(Evas_Object * obj, Evas_Coord * x, Evas_Coord * y,
    E_Smart_Item *si;
 
    API_ENTRY return;
-
    si = evas_list_nth(sd->items, sd->selected);
    if (si)
      {
@@ -212,7 +195,6 @@ EAPI void
 e_tlist_min_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
 {
    API_ENTRY return;
-
    e_box_min_size_get(sd->box_obj, w, h);
 }
 
@@ -220,7 +202,6 @@ EAPI void
 e_tlist_selector_set(Evas_Object *obj, int selector)
 {
    API_ENTRY return;
-
    sd->selector = selector;
 }
 
@@ -228,7 +209,6 @@ EAPI int
 e_tlist_selector_get(Evas_Object *obj)
 {
    API_ENTRY return 0;
-
    return sd->selector;
 }
 
@@ -238,15 +218,12 @@ e_tlist_remove_num(Evas_Object * obj, int n)
    E_Smart_Item *si;
 
    API_ENTRY return;
-
+   if (!sd->items) return;
-   if (!sd->items)
-      return;
    si = evas_list_nth(sd->items, n);
    if (si)
      {
 	sd->items = evas_list_remove(sd->items, si);
-	if (e_tlist_selected_get(obj) == n)
+	if (e_tlist_selected_get(obj) == n) sd->selected = -1;
-	   sd->selected = -1;
 	evas_object_del(si->base_obj);
 	free(si);
      }
@@ -260,11 +237,8 @@ e_tlist_remove_label(Evas_Object * obj, const char *label)
    int i;
 
    API_ENTRY return;
-
+   if (!sd->items) return;
-   if (!sd->items)
+   if (!label) return;
-      return;
-   if (!label)
-      return;
    for (i = 0, l = sd->items; l; l = l->next, i++)
      {
 	si = l->data;
@@ -276,7 +250,8 @@ e_tlist_remove_label(Evas_Object * obj, const char *label)
                t = strdup(edje_object_part_text_get
                           (si->base_obj, "e.textblock.label"));
 	     else
-		t = strdup(edje_object_part_text_get(si->base_obj, "e.text.label"));
+               t = strdup(edje_object_part_text_get(si->base_obj, 
+                                                    "e.text.label"));
 	     if (!strcmp(t, label))
 	       {
 		  evas_object_del(si->base_obj);
@@ -293,7 +268,6 @@ EAPI int
 e_tlist_count(Evas_Object *obj)
 {
    API_ENTRY return 0;
-
    return evas_list_count(sd->items);
 }
 
@@ -324,7 +298,6 @@ _e_tlist_append(Evas_Object * obj, const char *label,
    Evas_Coord mw = 0, mh = 0;
 
    API_ENTRY return;
-
    si = E_NEW(E_Smart_Item, 1);
    si->sd = sd;
    si->markup = markup;
@@ -373,7 +346,6 @@ _e_smart_event_mouse_down(void *data, Evas * e, Evas_Object * obj,
 
    si = data;
    ev = event_info;
-   
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) si->sd->on_hold = 1;
    else si->sd->on_hold = 0;
 
@@ -406,8 +378,7 @@ _e_smart_event_mouse_up(void *data, Evas * e, Evas_Object * obj,
 	  {
 	     if (!si->sd->on_hold)
 	       {
-		  if (si->func)
+		  if (si->func) si->func(si->data, si->data2);
-		    si->func(si->data, si->data2);
 	       }
 	  }
      }
@@ -420,24 +391,22 @@ _e_smart_event_key_down(void *data, Evas * e, Evas_Object * obj,
 {
    Evas_Event_Key_Down *ev;
    E_Smart_Data *sd;
+   int n;
 
    sd = data;
    ev = event_info;
    if (!strcmp(ev->keyname, "Up"))
      {
-	int                 n;
-
 	n = e_tlist_selected_get(sd->smart_obj);
 	e_tlist_selected_set(sd->smart_obj, n - 1);
      }
    else if (!strcmp(ev->keyname, "Down"))
      {
-	int                 n;
-
 	n = e_tlist_selected_get(sd->smart_obj);
 	e_tlist_selected_set(sd->smart_obj, n + 1);
      }
-   else if ((!strcmp(ev->keyname, "Return")) || (!strcmp(ev->keyname, "space")))
+   else if ((!strcmp(ev->keyname, "Return")) || 
+            (!strcmp(ev->keyname, "space")))
      {
         if (!sd->on_hold)
 	  {
@@ -446,8 +415,7 @@ _e_smart_event_key_down(void *data, Evas * e, Evas_Object * obj,
 	     si = evas_list_nth(sd->items, sd->selected);
 	     if (si)
 	       {
-		  if (si->func)
+		  if (si->func) si->func(si->data, si->data2);
-		    si->func(si->data, si->data2);
 	       }
 	  }
      }
@@ -466,8 +434,7 @@ _e_smart_add(Evas_Object * obj)
    E_Smart_Data *sd;
 
    sd = calloc(1, sizeof(E_Smart_Data));
-   if (!sd)
+   if (!sd) return;
-      return;
    evas_object_smart_data_set(obj, sd);
 
    sd->smart_obj = obj;
@@ -475,7 +442,6 @@ _e_smart_add(Evas_Object * obj)
    sd->y = 0;
    sd->w = 0;
    sd->h = 0;
-
    sd->selected = -1;
 
    sd->box_obj = e_box_add(evas_object_evas_get(obj));
@@ -509,8 +475,7 @@ static void
 _e_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
 {
    INTERNAL_ENTRY;
-   if ((sd->x == x) && (sd->y == y))
+   if ((sd->x == x) && (sd->y == y)) return;
-      return;
    sd->x = x;
    sd->y = y;
    _e_smart_reconfigure(sd);
@@ -520,8 +485,7 @@ static void
 _e_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
 {
    INTERNAL_ENTRY;
-   if ((sd->w == w) && (sd->h == h))
+   if ((sd->w == w) && (sd->h == h)) return;
-      return;
    sd->w = w;
    sd->h = h;
    _e_smart_reconfigure(sd);
@@ -563,27 +527,17 @@ _e_smart_clip_unset(Evas_Object * obj)
 }
 
 /* never need to touch this */
-
 static void
 _e_smart_init(void)
 {
    if (_e_smart) return;
-     {
    static const Evas_Smart_Class sc =
      {
         SMART_NAME,
           EVAS_SMART_CLASS_VERSION,
-	       _e_smart_add,
+          _e_smart_add, _e_smart_del, _e_smart_move, _e_smart_resize,
-	       _e_smart_del,
+          _e_smart_show, _e_smart_hide, _e_smart_color_set,
-	       _e_smart_move,
+          _e_smart_clip_set, _e_smart_clip_unset, NULL
-	       _e_smart_resize,
-	       _e_smart_show,
-	       _e_smart_hide,
-	       _e_smart_color_set,
-	       _e_smart_clip_set,
-	       _e_smart_clip_unset,
-	       NULL
      };
    _e_smart = evas_smart_class_new(&sc);
 }
-}