Use Eina_Bool for multi-select of ilist.

Fix formatting issues in some other files.



SVN revision: 47573

src/bin/e_ilist.c

@@ -107,6 +107,7 @@ e_ilist_append(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char
    if (si->o_end)
      {
 	Evas_Coord ew = 0, eh = 0;
+
 	evas_object_size_hint_min_get(si->o_end, &ew, &eh);
 	if ((ew <= 0) || (eh <= 0))
 	  {
@@ -338,6 +339,7 @@ e_ilist_prepend_relative(Evas_Object *obj, Evas_Object *icon, Evas_Object *end,
    if (si->o_end)
      {
 	Evas_Coord ew = 0, eh = 0;
+
 	evas_object_size_hint_min_get(si->o_end, &ew, &eh);
 	if ((ew <= 0) || (eh <= 0))
 	  {
@@ -433,7 +435,7 @@ e_ilist_selector_set(Evas_Object *obj, int selector)
    sd->selector = selector;
 }
 
-EAPI int 
+EAPI Eina_Bool 
 e_ilist_multi_select_get(Evas_Object *obj) 
 {
    API_ENTRY return 0;
@@ -441,7 +443,7 @@ e_ilist_multi_select_get(Evas_Object *obj)
 }
 
 EAPI void 
-e_ilist_multi_select_set(Evas_Object *obj, int multi) 
+e_ilist_multi_select_set(Evas_Object *obj, Eina_Bool multi) 
 {
    API_ENTRY return;
    sd->multi_select = multi;

src/bin/e_ilist.h

@@ -33,8 +33,8 @@ EAPI void         e_ilist_thaw                  (Evas_Object *obj);
 EAPI int          e_ilist_count                 (Evas_Object *obj);
 EAPI int          e_ilist_selector_get          (Evas_Object *obj);
 EAPI void         e_ilist_selector_set          (Evas_Object *obj, int selector);
-EAPI int          e_ilist_multi_select_get      (Evas_Object *obj);
-EAPI void         e_ilist_multi_select_set      (Evas_Object *obj, int multi);
+EAPI Eina_Bool    e_ilist_multi_select_get      (Evas_Object *obj);
+EAPI void         e_ilist_multi_select_set      (Evas_Object *obj, Eina_Bool multi);
 EAPI void         e_ilist_size_min_get          (Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
 EAPI void         e_ilist_unselect              (Evas_Object *obj);
 EAPI void         e_ilist_selected_set          (Evas_Object *obj, int n);

src/bin/e_int_config_modules.c

@@ -104,8 +104,8 @@ static void *
 _create_data(E_Config_Dialog *cfd __UNUSED__)
 {
    E_Config_Dialog_Data *cfdata = E_NEW(E_Config_Dialog_Data, 1);
-   if (!cfdata) return NULL;
 
+   if (!cfdata) return NULL;
    if (!_fill_data(cfdata))
      {
 	E_FREE(cfdata);
@@ -154,7 +154,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    if (w < 200 * e_scale) w = 200 * e_scale;
    e_widget_size_min_set(cfdata->l_modules, w, 150 * e_scale);
 
-   e_widget_ilist_multi_select_set(ol, 1);
+   e_widget_ilist_multi_select_set(ol, EINA_TRUE);
    e_widget_on_change_hook_set(ol, _widget_list_selection_changed, cfdata);
    e_widget_table_object_append(of, ol, 0, 0, 2, 1, 1, 1, 1, 1);
 
@@ -185,6 +185,7 @@ static CFModule *
 _module_new(const char *short_name, const Efreet_Desktop *desk)
 {
    CFModule *cfm = E_NEW(CFModule, 1);
+
    if (!cfm) return NULL;
    cfm->short_name = eina_stringshare_add(short_name);
 
@@ -214,6 +215,7 @@ static void
 _module_end_state_apply(CFModule *cfm)
 {
    const char *sig;
+
    if (!cfm->end) return;
    sig = cfm->enabled ? "e,state,checked" : "e,state,unchecked";
    edje_object_signal_emit(cfm->end, sig, "e");
@@ -223,6 +225,7 @@ static CFType *
 _cftype_new(const char *key, const char *name, const char *icon)
 {
    CFType * cft = E_NEW(CFType, 1);
+
    if (!cft) return NULL;
    cft->key = eina_stringshare_add(key);
    cft->name = eina_stringshare_add(name);
@@ -426,6 +429,7 @@ static int
 _fill_data_delayed(void *data)
 {
    E_Config_Dialog_Data *cfdata = data;
+
    cfdata->data_loader = ecore_idler_add(_fill_data_loader_iterate, cfdata);
    cfdata->data_delay = NULL;
    return 0;
@@ -453,6 +457,7 @@ static void
 _list_header_append(E_Config_Dialog_Data *cfdata, CFType *cft)
 {
    Evas_Object *icon = e_icon_add(cfdata->evas);
+
    if (icon)
      {
 	if (!e_util_icon_theme_set(icon, cft->icon))
@@ -482,6 +487,7 @@ _list_item_append(E_Config_Dialog_Data *cfdata, CFModule *cfm)
 		    {
 		       char *dir = ecore_file_dir_get(cfm->orig_path);
 		       char buf[PATH_MAX];
+
 		       snprintf(buf, sizeof(buf), "%s/%s.edj", dir, cfm->icon);
 		       free(dir);
 

src/bin/e_widget_ilist.c

@@ -195,18 +195,9 @@ _queue_queue(Evas_Object *obj)
 }
 
 static void
-_queue_append(Evas_Object *obj,
-              int command,
-              Evas_Object *icon,
-	      Evas_Object *end,
-              const char *label,
-              int header,
-              void (*func) (void *data),
-              void *data,
-              const char *val,
-              int relative,
-              int use_relative,
-              int item)
+_queue_append(Evas_Object *obj, int command, Evas_Object *icon, Evas_Object *end,
+              const char *label, int header, void (*func) (void *data), void *data,
+              const char *val, int relative, int use_relative, int item)
 {
    E_Widget_Data *wd;
    E_Widget_Queue_Item *qi;
@@ -281,12 +272,14 @@ e_widget_ilist_add(Evas *evas, int icon_w, int icon_h, const char **value)
    evas_object_show(o);
    e_widget_sub_object_add(obj, o);
    e_widget_resize_object_set(obj, o);
-   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _e_wid_focus_steal, obj);
+   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, 
+                                  _e_wid_focus_steal, obj);
 
    o = e_ilist_add(evas);
    wd->o_ilist = o;
    e_ilist_icon_size_set(o, icon_w, icon_h);
-   evas_object_event_callback_add(wd->o_scrollframe, EVAS_CALLBACK_RESIZE, _e_wid_cb_scrollframe_resize, o);
+   evas_object_event_callback_add(wd->o_scrollframe, EVAS_CALLBACK_RESIZE, 
+                                  _e_wid_cb_scrollframe_resize, o);
    e_scrollframe_child_set(wd->o_scrollframe, o);
    e_widget_sub_object_add(obj, o);
    evas_object_show(o);
@@ -803,7 +796,7 @@ e_widget_ilist_remove_num(Evas_Object *obj, int n)
 }
 
 EAPI void
-e_widget_ilist_multi_select_set(Evas_Object *obj, int multi)
+e_widget_ilist_multi_select_set(Evas_Object *obj, Eina_Bool multi)
 {
    E_Widget_Data *wd;
 
@@ -811,7 +804,7 @@ e_widget_ilist_multi_select_set(Evas_Object *obj, int multi)
    e_ilist_multi_select_set(wd->o_ilist, multi);
 }
 
-EAPI int
+EAPI Eina_Bool 
 e_widget_ilist_multi_select_get(Evas_Object *obj)
 {
    E_Widget_Data *wd;

src/bin/e_widget_ilist.h

@@ -50,8 +50,8 @@ EAPI Evas_Object *e_widget_ilist_selected_end_get(Evas_Object *obj);
 EAPI int          e_widget_ilist_selected_count_get(Evas_Object *obj);
 EAPI void         e_widget_ilist_unselect(Evas_Object *obj);
 EAPI void         e_widget_ilist_remove_num(Evas_Object *obj, int n);
-EAPI void         e_widget_ilist_multi_select_set(Evas_Object *obj, int multi);
-EAPI int          e_widget_ilist_multi_select_get(Evas_Object *obj);
+EAPI void         e_widget_ilist_multi_select_set(Evas_Object *obj, Eina_Bool multi);
+EAPI Eina_Bool    e_widget_ilist_multi_select_get(Evas_Object *obj);
 EAPI void         e_widget_ilist_multi_select(Evas_Object *obj, int n);
 EAPI void         e_widget_ilist_range_select(Evas_Object *obj, int n);
 EAPI void         e_widget_ilist_preferred_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);

src/bin/e_widget_toolbar.c

@@ -91,8 +91,8 @@ e_widget_toolbar_add(Evas *evas, int icon_w, int icon_h)
    e_widget_sub_object_add(obj, o);
    evas_object_show(o);
 
-   edje_object_size_min_calc
-     (e_scrollframe_edje_object_get(wd->o_base), &mw, &mh);
+   edje_object_size_min_calc(e_scrollframe_edje_object_get(wd->o_base), 
+                             &mw, &mh);
    e_widget_size_min_set(obj, mw, mh);
 
    return obj;