[Pkg-e-commits] [SCM] Enlightenment 17 branch, upstream-vcs, updated. 3eef8cab2cb6f039b529ffc89deb21a0dcab03df

devilhorns devilhorns at alioth.debian.org
Sat May 24 15:07:34 UTC 2008


The following commit has been merged in the upstream-vcs branch:
commit e4ee017ad17a6f45009b4f0555938abe77b121b2
Author: devilhorns <devilhorns>
Date:   Mon May 12 20:40:00 2008 +0000

    Port wallpaper dialog to use the new e_widget_flist. This fixes issue where
    using keyboard to navigate the file list would not select the next item in
    list. Fix formatting & whitespace in dialog & import dialog.

diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper.c b/src/modules/conf_wallpaper/e_int_config_wallpaper.c
index 3ab6a2a..84a0bdb 100644
--- a/src/modules/conf_wallpaper/e_int_config_wallpaper.c
+++ b/src/modules/conf_wallpaper/e_int_config_wallpaper.c
@@ -38,16 +38,14 @@ struct _E_Config_Wallpaper
 struct _E_Config_Dialog_Data
 {
    E_Config_Dialog *cfd;
-   Evas_Object *o_frame;
+//   Evas_Object *o_frame;
    Evas_Object *o_fm;
    Evas_Object *o_up_button;
    Evas_Object *o_preview;
    Evas_Object *o_theme_bg;
    Evas_Object *o_personal;
    Evas_Object *o_system;
-   int fmdir;
-
-   int use_theme_bg;
+   int fmdir, use_theme_bg;
    char *bg;
 
    /* advanced */
@@ -129,11 +127,11 @@ e_int_config_wallpaper_update(E_Config_Dialog *dia, char *file)
    cfdata->use_theme_bg = 0;
    if (cfdata->o_theme_bg)
      e_widget_check_checked_set(cfdata->o_theme_bg, cfdata->use_theme_bg);
-   if (cfdata->o_fm) e_fm2_path_set(cfdata->o_fm, path, "/");
+   if (cfdata->o_fm) e_widget_flist_path_set(cfdata->o_fm, path, "/");
    if (cfdata->o_preview)
      e_widget_preview_edje_set(cfdata->o_preview, cfdata->bg, 
                                "e/desktop/background");
-   if (cfdata->o_frame) e_widget_change(cfdata->o_frame);
+   if (cfdata->o_fm) e_widget_change(cfdata->o_fm);
 }
 
 EAPI void
@@ -200,9 +198,7 @@ _cb_button_up(void *data1, void *data2)
    E_Config_Dialog_Data *cfdata;
 
    cfdata = data1;
-   if (cfdata->o_fm) e_fm2_parent_go(cfdata->o_fm);
-   if (cfdata->o_frame)
-     e_widget_scrollframe_child_pos_set(cfdata->o_frame, 0, 0);
+   if (cfdata->o_fm) e_widget_flist_parent_go(cfdata->o_fm);
 }
 
 static void
@@ -210,14 +206,11 @@ _cb_files_changed(void *data, Evas_Object *obj, void *event_info)
 {
    E_Config_Dialog_Data *cfdata;
 
-   cfdata = data;
+   if (!(cfdata = data)) return;
    if (!cfdata->o_fm) return;
    if (cfdata->o_up_button) 
      e_widget_disabled_set(cfdata->o_up_button, 
-                           !e_fm2_has_parent_get(cfdata->o_fm));
-
-   if (cfdata->o_frame)
-     e_widget_scrollframe_child_pos_set(cfdata->o_frame, 0, 0);
+                           !e_widget_flist_has_parent_get(cfdata->o_fm));
 }
 
 static void
@@ -231,10 +224,9 @@ _cb_files_selection_change(void *data, Evas_Object *obj, void *event_info)
 
    cfdata = data;
    if (!cfdata->o_fm) return;
-   selected = e_fm2_selected_list_get(cfdata->o_fm);
-   if (!selected) return;
+   if (!(selected = e_widget_flist_selected_list_get(cfdata->o_fm))) return;
    ici = selected->data;
-   realpath = e_fm2_real_path_get(cfdata->o_fm);
+   realpath = e_widget_flist_real_path_get(cfdata->o_fm);
    if (!strcmp(realpath, "/"))
      snprintf(buf, sizeof(buf), "/%s", ici->file);
    else
@@ -250,7 +242,7 @@ _cb_files_selection_change(void *data, Evas_Object *obj, void *event_info)
    if (cfdata->o_theme_bg)
      e_widget_check_checked_set(cfdata->o_theme_bg, 0);
    cfdata->use_theme_bg = 0;
-   if (cfdata->o_frame) e_widget_change(cfdata->o_frame);
+   e_widget_change(cfdata->o_fm);
 }
 
 static void
@@ -262,7 +254,7 @@ _cb_files_files_changed(void *data, Evas_Object *obj, void *event_info)
 
    cfdata = data;
    if ((!cfdata->bg) || (!cfdata->o_fm)) return;
-   p = e_fm2_real_path_get(cfdata->o_fm);
+   p = e_widget_flist_real_path_get(cfdata->o_fm);
    if (p)
      {
 	if (strncmp(p, cfdata->bg, strlen(p))) return;
@@ -281,8 +273,8 @@ _cb_files_files_changed(void *data, Evas_Object *obj, void *event_info)
 	  p = cfdata->bg;
      }
 
-   e_fm2_select_set(cfdata->o_fm, p, 1);
-   e_fm2_file_show(cfdata->o_fm, p);
+   e_widget_flist_select_set(cfdata->o_fm, p, 1);
+   e_widget_flist_file_show(cfdata->o_fm, p);
 }
 
 static void
@@ -295,10 +287,8 @@ _cb_files_files_deleted(void *data, Evas_Object *obj, void *event_info)
    cfdata = data;
    if ((!cfdata->bg) || (!cfdata->o_fm)) return;
 
-   all = e_fm2_all_list_get(cfdata->o_fm);
-   if (!all) return;
-   sel = e_fm2_selected_list_get(cfdata->o_fm);
-   if (!sel) return;
+   if (!(all = e_widget_flist_all_list_get(cfdata->o_fm))) return;
+   if (!(sel = e_widget_flist_selected_list_get(cfdata->o_fm))) return;
 
    ici = sel->data;
    all = evas_list_find_list(all, ici);
@@ -311,8 +301,8 @@ _cb_files_files_deleted(void *data, Evas_Object *obj, void *event_info)
 
    if (!(ic = n->data)) return;
 
-   e_fm2_select_set(cfdata->o_fm, ic->file, 1);
-   e_fm2_file_show(cfdata->o_fm, ic->file);
+   e_widget_flist_select_set(cfdata->o_fm, ic->file, 1);
+   e_widget_flist_file_show(cfdata->o_fm, ic->file);
 
    evas_list_free(n);
 
@@ -360,7 +350,7 @@ _cb_dir(void *data, Evas_Object *obj, void *event_info)
      snprintf(path, sizeof(path), "%s/data/backgrounds", e_prefix_data_get());
    else
      snprintf(path, sizeof(path), "%s/.e/e/backgrounds", e_user_homedir_get());
-   e_fm2_path_set(cfdata->o_fm, path, "/");
+   e_widget_flist_path_set(cfdata->o_fm, path, "/");
 }
 
 static void
@@ -410,6 +400,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
    if (cw->specific_config)
      {
 	const char *bg;
+
 	/* specific config passed in. set for that only */
 	bg = e_bg_file_get(cw->con_num, cw->zone_num, cw->desk_x, cw->desk_y);
 	if (bg) cfdata->bg = strdup(bg);
@@ -450,11 +441,10 @@ _fill_data(E_Config_Dialog_Data *cfdata)
 
 	f = e_theme_edje_file_get("base/theme/backgrounds", 
                                   "e/desktop/background");
-	if (!strcmp(cfdata->bg, f))
-	  cfdata->use_theme_bg = 1;
-	snprintf(path, sizeof(path), "%s/data/backgrounds", e_prefix_data_get());
-	if (!strncmp(cfdata->bg, path, strlen(path)))
-	  cfdata->fmdir = 1;
+	if (!strcmp(cfdata->bg, f)) cfdata->use_theme_bg = 1;
+	snprintf(path, sizeof(path), "%s/data/backgrounds", 
+                 e_prefix_data_get());
+	if (!strncmp(cfdata->bg, path, strlen(path))) cfdata->fmdir = 1;
      }
    else
      cfdata->use_theme_bg = 1;
@@ -494,7 +484,6 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    E_Zone *zone = NULL;
    E_Radio_Group *rg;
    char path[PATH_MAX];
-   E_Fm2_Config fmc;
    int mw, mh;
    const char *f;
 
@@ -526,44 +515,20 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    else
      snprintf(path, sizeof(path), "%s/.e/e/backgrounds", e_user_homedir_get());
 
-   /* add file selector */
-   ow = e_fm2_add(evas);
+   ow = e_widget_flist_add(evas);
    cfdata->o_fm = ow;
-   memset(&fmc, 0, sizeof(E_Fm2_Config));
-   fmc.view.mode = E_FM2_VIEW_MODE_LIST;
-   fmc.view.open_dirs_in_place = 1;
-   fmc.view.selector = 1;
-   fmc.view.single_click = 0;
-   fmc.view.no_subdir_jump = 0;
-   fmc.icon.list.w = 48;
-   fmc.icon.list.h = 48;
-   fmc.icon.fixed.w = 1;
-   fmc.icon.fixed.h = 1;
-   fmc.icon.extension.show = 0;
-   fmc.icon.key_hint = NULL;
-   fmc.list.sort.no_case = 1;
-   fmc.list.sort.dirs.first = 0;
-   fmc.list.sort.dirs.last = 1;
-   fmc.selection.single = 1;
-   fmc.selection.windows_modifiers = 0;
-   e_fm2_config_set(ow, &fmc);
-   e_fm2_icon_menu_flags_set(ow, E_FM2_MENU_NO_SHOW_HIDDEN);
    evas_object_smart_callback_add(ow, "dir_changed",
 				  _cb_files_changed, cfdata);
    evas_object_smart_callback_add(ow, "selection_change",
 				  _cb_files_selection_change, cfdata);
-   evas_object_smart_callback_add(ow, "changed",
-				  _cb_files_files_changed, cfdata);
+   evas_object_smart_callback_add(ow, "changed", 
+                                  _cb_files_files_changed, cfdata);
    evas_object_smart_callback_add(ow, "files_deleted",
 				  _cb_files_files_deleted, cfdata);
-   e_fm2_path_set(ow, path, "/");
-
-   of = e_widget_scrollframe_pan_add(evas, ow, e_fm2_pan_set, e_fm2_pan_get,
-				     e_fm2_pan_max_get,
-				     e_fm2_pan_child_size_get);
-   cfdata->o_frame = of;
-   e_widget_min_size_set(of, 60, 60);
-   e_widget_table_object_append(ot, of, 0, 2, 1, 1, 1, 1, 1, 1);
+   e_widget_flist_path_set(ow, path, "/");
+
+   e_widget_min_size_set(ow, 60, 60);
+   e_widget_table_object_append(ot, ow, 0, 2, 1, 1, 1, 1, 1, 1);
    e_widget_list_object_append(o, ot, 1, 1, 0.0);
 
    ot = e_widget_table_add(evas, 0);
@@ -645,7 +610,6 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    E_Zone *zone = NULL;
    E_Radio_Group *rg;
    char path[PATH_MAX];
-   E_Fm2_Config fmc;
    int mw, mh;
    const char *f;
 
@@ -677,44 +641,18 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    else
      snprintf(path, sizeof(path), "%s/.e/e/backgrounds", e_user_homedir_get());
 
-   /* add file selector */
-   ow = e_fm2_add(evas);
+   ow = e_widget_flist_add(evas);
    cfdata->o_fm = ow;
-   memset(&fmc, 0, sizeof(E_Fm2_Config));
-   fmc.view.mode = E_FM2_VIEW_MODE_LIST;
-   fmc.view.open_dirs_in_place = 1;
-   fmc.view.selector = 1;
-   fmc.view.single_click = 0;
-   fmc.view.no_subdir_jump = 0;
-   fmc.icon.list.w = 48;
-   fmc.icon.list.h = 48;
-   fmc.icon.fixed.w = 1;
-   fmc.icon.fixed.h = 1;
-   fmc.icon.extension.show = 0;
-   fmc.icon.key_hint = NULL;
-   fmc.list.sort.no_case = 1;
-   fmc.list.sort.dirs.first = 0;
-   fmc.list.sort.dirs.last = 1;
-   fmc.selection.single = 1;
-   fmc.selection.windows_modifiers = 0;
-   e_fm2_config_set(ow, &fmc);
-   e_fm2_icon_menu_flags_set(ow, E_FM2_MENU_NO_SHOW_HIDDEN);
    evas_object_smart_callback_add(ow, "dir_changed",
 				  _cb_files_changed, cfdata);
    evas_object_smart_callback_add(ow, "selection_change",
 				  _cb_files_selection_change, cfdata);
-   evas_object_smart_callback_add(ow, "changed",
-				  _cb_files_files_changed, cfdata);
-   evas_object_smart_callback_add(ow, "files_deleted",
-				  _cb_files_files_deleted, cfdata);
-   e_fm2_path_set(ow, path, "/");
-
-   of = e_widget_scrollframe_pan_add(evas, ow, e_fm2_pan_set, e_fm2_pan_get,
-				     e_fm2_pan_max_get,
-				     e_fm2_pan_child_size_get);
-   cfdata->o_frame = of;
-   e_widget_min_size_set(of, 160, 160);
-   e_widget_table_object_append(ot, of, 0, 2, 1, 1, 1, 1, 1, 1);
+   evas_object_smart_callback_add(ow, "changed", 
+                                  _cb_files_files_changed, cfdata);
+   e_widget_flist_path_set(ow, path, "/");
+
+   e_widget_min_size_set(ow, 160, 160);
+   e_widget_table_object_append(ot, ow, 0, 2, 1, 1, 1, 1, 1, 1);
    e_widget_list_object_append(o, ot, 1, 1, 0.0);
 
    ot = e_widget_table_add(evas, 0);
diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c b/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c
index ef98794..506ef5c 100644
--- a/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c
+++ b/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c
@@ -16,13 +16,13 @@ struct _Import
 {
    E_Config_Dialog *parent;
    E_Config_Dialog_Data *cfdata;
-   
+
    Evas_Object *bg_obj;
    Evas_Object *box_obj;
    Evas_Object *event_obj;
    Evas_Object *content_obj;
    Evas_Object *fsel_obj;
-   
+
    Evas_Object *ok_obj;
    Evas_Object *close_obj;
 
@@ -35,9 +35,9 @@ struct _Import
    Evas_Object *quality_obj;
    Evas_Object *frame_fill_obj;
    Evas_Object *frame_quality_obj;
-   
+
    E_Win *win;
-   
+
    Ecore_Exe *exe;
    Ecore_Event_Handler *exe_handler;
    char *tmpf;
@@ -77,7 +77,7 @@ e_int_config_wallpaper_import(E_Config_Dialog *parent)
    E_Config_Dialog_Data *cfdata;
    Evas_Modifier_Mask mask;
    const char *fdev, *fpath;
-   
+
    import = E_NEW(Import, 1);
    if (!import) return NULL;
 
@@ -88,34 +88,33 @@ e_int_config_wallpaper_import(E_Config_Dialog *parent)
 
    if (!win) 
      { 
-	free(import);
+	E_FREE(import);
 	return NULL;	
      }
-   
+
    cfdata = E_NEW(E_Config_Dialog_Data, 1);
    cfdata->method = IMPORT_STRETCH;
    cfdata->external = 0;
    cfdata->quality = 90;
    import->cfdata = cfdata;
    import->win = win;
-   
+
    evas = e_win_evas_get(win);
 
-   if (parent)
-     import->parent = parent;
+   if (parent) import->parent = parent;
 
    e_win_title_set(win, _("Select a Picture..."));
    e_win_delete_callback_set(win, _import_cb_delete);
    e_win_resize_callback_set(win, _import_cb_resize);
    e_win_dialog_set(win, 1);
    e_win_name_class_set(win, "E", "_wallpaper_import_dialog");
-   
+
    o = edje_object_add(evas);
    import->bg_obj = o;
    e_theme_edje_object_set(o, "base/theme/dialog", "e/widgets/dialog/main");
    evas_object_move(o, 0, 0);
    evas_object_show(o);
-   
+
    o = e_widget_list_add(evas, 1, 1);
    e_widget_on_focus_hook_set(o, _import_cb_wid_on_focus, import);
    import->box_obj = o;
@@ -132,8 +131,9 @@ e_int_config_wallpaper_import(E_Config_Dialog *parent)
    mask = 0;
    evas_object_key_grab(o, "KP_Enter", mask, ~mask, 0);
    mask = 0;
-   evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN, _import_cb_key_down, import);
-   
+   evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN, 
+                                  _import_cb_key_down, import);
+
    o = e_widget_list_add(evas, 0, 0);   
    import->content_obj = o;
 
@@ -152,7 +152,7 @@ e_int_config_wallpaper_import(E_Config_Dialog *parent)
    e_widget_list_object_append(o, ofm, 1, 1, 0.5);
 
    ot = e_widget_table_add(evas, 0);
-   
+
    of = e_widget_frametable_add(evas, _("Fill and Stretch Options"), 1);
    import->frame_fill_obj = of;
    rg = e_widget_radio_group_new(&cfdata->method);
@@ -182,7 +182,7 @@ e_int_config_wallpaper_import(E_Config_Dialog *parent)
    import->fill_fill_obj = ord;
    e_widget_frametable_object_append(of, ord, 4, 0, 1, 1, 1, 0, 1, 0);
    e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 1, 0);
-   
+
    of = e_widget_frametable_add(evas, _("File Quality"), 0);
    import->frame_quality_obj = of;
    ord = e_widget_check_add(evas, _("Use original file"), &(cfdata->external));
@@ -193,14 +193,14 @@ e_int_config_wallpaper_import(E_Config_Dialog *parent)
    import->quality_obj = ord;
    e_widget_frametable_object_append(of, ord, 0, 1, 1, 1, 1, 0, 1, 0);
    e_widget_table_object_append(ot, of, 0, 1, 1, 1, 1, 1, 1, 0);
-   
+
    e_widget_list_object_append(o, ot, 0, 0, 0.5);
-   
+
    e_widget_min_size_get(o, &w, &h);
    edje_extern_object_min_size_set(o, w, h);
    edje_object_part_swallow(import->bg_obj, "e.swallow.content", o);
    evas_object_show(o);
-   
+
    import->ok_obj = e_widget_button_add(evas, _("OK"), NULL, 
 					_import_cb_ok, win, cfdata);
    e_widget_list_object_append(import->box_obj, import->ok_obj, 1, 0, 0.5);
@@ -208,14 +208,14 @@ e_int_config_wallpaper_import(E_Config_Dialog *parent)
    import->close_obj = e_widget_button_add(evas, _("Cancel"), NULL, 
 					   _import_cb_close, win, NULL);
    e_widget_list_object_append(import->box_obj, import->close_obj, 1, 0, 0.5);
-   
+
    e_win_centered_set(win, 1);
-   
+
    o = import->box_obj;
    e_widget_min_size_get(o, &w, &h);
    edje_extern_object_min_size_set(o, w, h);
    edje_object_part_swallow(import->bg_obj, "e.swallow.buttons", o);
-   
+
    edje_object_size_min_calc(import->bg_obj, &w, &h);
    evas_object_resize(import->bg_obj, w, h);
    e_win_resize(win, w, h);
@@ -223,12 +223,12 @@ e_int_config_wallpaper_import(E_Config_Dialog *parent)
    e_win_size_max_set(win, 99999, 99999);
    e_win_show(win);
    e_win_border_icon_set(win, "enlightenment/background");
-   
+
    if (!e_widget_focus_get(import->bg_obj))
      e_widget_focus_set(import->box_obj, 1);
-   
+
    win->data = import;
-   
+
    _import_opt_disabled_set(import, 1);
    return win;
 }
@@ -237,7 +237,7 @@ EAPI void
 e_int_config_wallpaper_del(E_Win *win)
 {
    Import *import;
-   
+
    import = win->data;
    _import_path_save(import);
    if (import->exe_handler) ecore_event_handler_del(import->exe_handler);
@@ -272,7 +272,7 @@ static void
 _import_cb_sel_selected(void *data, Evas_Object *obj)
 {
    Import *import;
-   
+
    import = data;
    _import_cb_ok(import->win, NULL);
 }
@@ -282,7 +282,7 @@ _import_cb_sel_change(void *data, Evas_Object *obj)
 {
    Import *import;
    const char *path, *p = NULL;
-   
+
    import = data;
    path = e_widget_fsel_selection_path_get(import->fsel_obj);
    E_FREE(import->cfdata->file);
@@ -298,7 +298,7 @@ static void
 _import_path_save(Import *import)
 {
    const char *fdev = NULL, *fpath = NULL;
-   
+
    e_widget_fsel_path_get(import->fsel_obj, &fdev, &fpath);
    if ((fdev) || (fpath))
      {
@@ -328,7 +328,7 @@ _import_edj_gen(Import *import)
    char *imgdir = NULL, *fstrip;
    int cr = 255, cg = 255, cb = 255, ca = 255;
    FILE *f;
-   
+
    evas = e_win_evas_get(import->win);
    file = ecore_file_file_get(import->cfdata->file);
    homedir = e_user_homedir_get();
@@ -350,14 +350,14 @@ _import_edj_gen(Import *import)
 	return;
      }
    close(fd);
-   
+
    f = fopen(tmpn, "w");
    if (!f) 
      {
 	printf("Cannot open %s for writing\n", tmpn);
 	return;
      }
-   
+
    imgdir = ecore_file_dir_get(import->cfdata->file);
    if (!imgdir) ipart[0] = '\0';
    else
@@ -370,7 +370,7 @@ _import_edj_gen(Import *import)
    evas_object_image_file_set(img, import->cfdata->file, NULL);
    evas_object_image_size_get(img, &w, &h);
    evas_object_del(img);   
-   
+
    if (import->cfdata->external)
      {
 	fstrip = strdup(e_util_filename_escape(import->cfdata->file));
@@ -475,7 +475,7 @@ _import_edj_gen(Import *import)
 	break;
      }
    free(fstrip);
-   
+
    fclose(f);
 
    snprintf(cmd, sizeof(cmd), "edje_cc -v %s %s %s", 
@@ -494,7 +494,7 @@ _import_cb_edje_cc_exit(void *data, int type, void *event)
 {
    Import *import;
    Ecore_Exe_Event_Del *ev;
-   
+
    ev = event;
    import = data;
    if (ev->exe != import->exe) return 1;
@@ -523,9 +523,8 @@ static void
 _import_cb_resize(E_Win *win) 
 {
    Import *import;
-   
-   import = win->data;
-   if (!import) return;
+
+   if (!(import = win->data)) return;
    evas_object_resize(import->bg_obj, win->w, win->h);
 }
 
@@ -533,7 +532,7 @@ static void
 _import_cb_close(void *data, void *data2) 
 {
    E_Win *win;
-   
+
    win = data;
    e_int_config_wallpaper_del(win);
 }
@@ -548,10 +547,9 @@ _import_cb_ok(void *data, void *data2)
    const char *homedir;
    char buf[4096];
    int is_bg, is_theme;
-   
+
    win = data;
-   import = win->data;
-   if (!import) return;
+   if (!(import = win->data)) return;
    path = e_widget_fsel_selection_path_get(import->fsel_obj);
    E_FREE(import->cfdata->file);
    if (path) import->cfdata->file = strdup(path);
@@ -571,7 +569,7 @@ _import_cb_ok(void *data, void *data2)
 	     is_theme = 
 	       edje_file_group_exists(import->cfdata->file, 
 				      "e/widgets/border/default/border");
-	     
+
 	     if ((is_bg) && (!is_theme)) 
 	       {
 		  if (!ecore_file_cp(import->cfdata->file, buf)) 
@@ -602,7 +600,7 @@ _import_cb_ok(void *data, void *data2)
 		  return;		  
 	       }
 	  }
-	
+
 	e_win_hide(win);
 	return;
      }
@@ -613,7 +611,7 @@ static void
 _import_cb_wid_on_focus(void *data, Evas_Object *obj) 
 {
    Import *import;
-   
+
    import = data;
    if (obj == import->content_obj)
      e_widget_focused_object_clear(import->box_obj);
@@ -671,7 +669,7 @@ _import_cb_key_down(void *data, Evas *e, Evas_Object *obj, void *event)
 	     (!strcmp(ev->keyname, "space"))))
      {
 	Evas_Object *o = NULL;
-	
+
 	if ((import->content_obj) && (e_widget_focus_get(import->content_obj)))
 	  o = e_widget_focused_object_get(import->content_obj);
 	else

-- 
Enlightenment 17



More information about the Pkg-e-commits mailing list