bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/apps/extra.git/commit/?id=64b30b3a1fe785acb1da364d6a431fd1e12d5f87
commit 64b30b3a1fe785acb1da364d6a431fd1e12d5f87 Author: Simon Tischer <[email protected]> Date: Wed Mar 25 11:35:14 2020 +0100 background is now wallpaper this is done in order to unify the terminology in e and extra. --- po/POTFILES.in | 2 +- po/da.po | 16 +-- po/de.po | 16 +-- po/extra.pot | 16 +-- po/it.po | 16 +-- src/bin/extra_main.c | 10 +- src/bin/extra_private.h | 4 +- ...round_selector.c => extra_wallpaper_selector.c} | 50 ++++----- src/bin/meson.build | 2 +- src/lib/extra.c | 124 ++++++++++----------- src/lib/extra.h | 18 +-- 11 files changed, 137 insertions(+), 137 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index fcaf4f0..48900ac 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,5 +1,5 @@ src/bin/extra_main.c src/bin/extra_private.h -src/bin/extra_background_selector.c +src/bin/extra_wallpaper_selector.c src/bin/extra_theme_selector.c src/bin/extra_util.c diff --git a/po/da.po b/po/da.po index 71612f7..0b12f97 100644 --- a/po/da.po +++ b/po/da.po @@ -21,30 +21,30 @@ msgid "Themes" msgstr "Temaer" #: src/bin/extra_main.c:71 -msgid "Backgrounds" +msgid "Wallpapers" msgstr "Baggrunde" #: src/bin/extra_main.c:85 -msgid "Updating themes and backgrounds" +msgid "Updating themes and wallpapers" msgstr "Opdaterer temaer og baggrunde" -#: src/bin/extra_background_selector.c:25 -msgid "Installing background" +#: src/bin/extra_wallpaper_selector.c:25 +msgid "Installing wallpaper" msgstr "Installerer baggrund" -#: src/bin/extra_background_selector.c:73 +#: src/bin/extra_wallpaper_selector.c:73 msgid "Uninstall" msgstr "Afinstaller" -#: src/bin/extra_background_selector.c:79 src/bin/extra_theme_selector.c:83 +#: src/bin/extra_wallpaper_selector.c:79 src/bin/extra_theme_selector.c:83 msgid "Install" msgstr "Installer" -#: src/bin/extra_background_selector.c:89 src/bin/extra_theme_selector.c:173 +#: src/bin/extra_wallpaper_selector.c:89 src/bin/extra_theme_selector.c:173 msgid "Show fullscreen" msgstr "Vis fuldskærm" -#: src/bin/extra_background_selector.c:100 src/bin/extra_theme_selector.c:182 +#: src/bin/extra_wallpaper_selector.c:100 src/bin/extra_theme_selector.c:182 msgid "Show Details" msgstr "Vis detaljer" diff --git a/po/de.po b/po/de.po index a315403..a9603f4 100644 --- a/po/de.po +++ b/po/de.po @@ -23,30 +23,30 @@ msgid "Themes" msgstr "Themes" #: src/bin/extra_main.c:71 -msgid "Backgrounds" +msgid "Wallpapers" msgstr "Hintergrund" #: src/bin/extra_main.c:85 -msgid "Updating themes and backgrounds" +msgid "Updating themes and wallpapers" msgstr "Aktualisiere Themes und Hintergründe" -#: src/bin/extra_background_selector.c:25 -msgid "Installing background" +#: src/bin/extra_wallpaper_selector.c:25 +msgid "Installing wallpaper" msgstr "Installiere Hintergrund" -#: src/bin/extra_background_selector.c:73 +#: src/bin/extra_wallpaper_selector.c:73 msgid "Uninstall" msgstr "Deinstalliere" -#: src/bin/extra_background_selector.c:79 src/bin/extra_theme_selector.c:83 +#: src/bin/extra_wallpaper_selector.c:79 src/bin/extra_theme_selector.c:83 msgid "Install" msgstr "Installiere" -#: src/bin/extra_background_selector.c:89 src/bin/extra_theme_selector.c:173 +#: src/bin/extra_wallpaper_selector.c:89 src/bin/extra_theme_selector.c:173 msgid "Show fullscreen" msgstr "Vollbild" -#: src/bin/extra_background_selector.c:100 src/bin/extra_theme_selector.c:182 +#: src/bin/extra_wallpaper_selector.c:100 src/bin/extra_theme_selector.c:182 msgid "Show Details" msgstr "Details" diff --git a/po/extra.pot b/po/extra.pot index 4940235..8ee0f6e 100644 --- a/po/extra.pot +++ b/po/extra.pot @@ -22,30 +22,30 @@ msgid "Themes" msgstr "" #: src/bin/extra_main.c:71 -msgid "Backgrounds" +msgid "Wallpapers" msgstr "" #: src/bin/extra_main.c:85 -msgid "Updating themes and backgrounds" +msgid "Updating themes and wallpapers" msgstr "" -#: src/bin/extra_background_selector.c:25 -msgid "Installing background" +#: src/bin/extra_wallpaper_selector.c:25 +msgid "Installing wallpaper" msgstr "" -#: src/bin/extra_background_selector.c:73 +#: src/bin/extra_wallpaper_selector.c:73 msgid "Uninstall" msgstr "" -#: src/bin/extra_background_selector.c:79 src/bin/extra_theme_selector.c:83 +#: src/bin/extra_wallpaper_selector.c:79 src/bin/extra_theme_selector.c:83 msgid "Install" msgstr "" -#: src/bin/extra_background_selector.c:89 src/bin/extra_theme_selector.c:173 +#: src/bin/extra_wallpaper_selector.c:89 src/bin/extra_theme_selector.c:173 msgid "Show fullscreen" msgstr "" -#: src/bin/extra_background_selector.c:100 src/bin/extra_theme_selector.c:182 +#: src/bin/extra_wallpaper_selector.c:100 src/bin/extra_theme_selector.c:182 msgid "Show Details" msgstr "" diff --git a/po/it.po b/po/it.po index 0be6e3a..ef4bfad 100644 --- a/po/it.po +++ b/po/it.po @@ -20,30 +20,30 @@ msgid "Themes" msgstr "Temi" #: src/bin/extra_main.c:71 -msgid "Backgrounds" +msgid "Wallpapers" msgstr "Sfondi" #: src/bin/extra_main.c:85 -msgid "Updating themes and backgrounds" +msgid "Updating themes and wallpapers" msgstr "Aggiornamento temi e sfondi" -#: src/bin/extra_background_selector.c:25 -msgid "Installing background" +#: src/bin/extra_wallpaper_selector.c:25 +msgid "Installing wallpaper" msgstr "Installazione sfondi" -#: src/bin/extra_background_selector.c:73 +#: src/bin/extra_wallpaper_selector.c:73 msgid "Uninstall" msgstr "Disinstalla" -#: src/bin/extra_background_selector.c:79 src/bin/extra_theme_selector.c:83 +#: src/bin/extra_wallpaper_selector.c:79 src/bin/extra_theme_selector.c:83 msgid "Install" msgstr "Installa" -#: src/bin/extra_background_selector.c:89 src/bin/extra_theme_selector.c:173 +#: src/bin/extra_wallpaper_selector.c:89 src/bin/extra_theme_selector.c:173 msgid "Show fullscreen" msgstr "Mostra a tutto schermo" -#: src/bin/extra_background_selector.c:100 src/bin/extra_theme_selector.c:182 +#: src/bin/extra_wallpaper_selector.c:100 src/bin/extra_theme_selector.c:182 msgid "Show Details" msgstr "Mostra dettagli" diff --git a/src/bin/extra_main.c b/src/bin/extra_main.c index 5ccc1cc..612fa9f 100644 --- a/src/bin/extra_main.c +++ b/src/bin/extra_main.c @@ -31,7 +31,7 @@ _item_changed(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UN elm_segment_control_item_selected_get(obj); Evas_Object *new = elm_object_item_data_get(it); - evas_object_hide(_ui.background_selector); + evas_object_hide(_ui.wallpaper_selector); evas_object_hide(_ui.theme_selector); evas_object_show(new); @@ -48,8 +48,8 @@ _extra_win_sync_done_cb(void *data EINA_UNUSED) evas_object_size_hint_align_set(table, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(table); - _ui.background_selector = extra_ui_site_add(&background_site); - elm_table_pack(table, _ui.background_selector, 0, 1, 1, 1); + _ui.wallpaper_selector = extra_ui_site_add(&wallpaper_site); + elm_table_pack(table, _ui.wallpaper_selector, 0, 1, 1, 1); _ui.theme_selector = extra_ui_site_add(&theme_site); elm_table_pack(table, _ui.theme_selector, 0, 1, 1, 1); @@ -68,7 +68,7 @@ _extra_win_sync_done_cb(void *data EINA_UNUSED) elm_object_item_data_set(it, obj); \ IC_ADD("preferences-desktop-theme", _("Themes"), _ui.theme_selector); - IC_ADD("preferences-desktop-wallpaper", _("Backgrounds"), _ui.background_selector); + IC_ADD("preferences-desktop-wallpaper", _("Wallpapers"), _ui.wallpaper_selector); #undef IC_ADD @@ -82,7 +82,7 @@ extra_win_sync(void) { Extra_Progress *progress; - progress = extra_ui_progress_popup_show(_("Updating themes and backgrounds"), _extra_win_sync_done_cb, NULL); + progress = extra_ui_progress_popup_show(_("Updating themes and wallpapers"), _extra_win_sync_done_cb, NULL); extra_sync(progress); } diff --git a/src/bin/extra_private.h b/src/bin/extra_private.h index 5678693..3a50c94 100644 --- a/src/bin/extra_private.h +++ b/src/bin/extra_private.h @@ -11,13 +11,13 @@ typedef struct { Evas_Object *win; - Evas_Object *background_selector; + Evas_Object *wallpaper_selector; Evas_Object *theme_selector; Evas_Object *popup_toolbar; } Ui; extern Ui _ui; extern Extra_Ui_Site_Template theme_site; -extern Extra_Ui_Site_Template background_site; +extern Extra_Ui_Site_Template wallpaper_site; #endif diff --git a/src/bin/extra_background_selector.c b/src/bin/extra_wallpaper_selector.c similarity index 66% rename from src/bin/extra_background_selector.c rename to src/bin/extra_wallpaper_selector.c index e5bb1df..f65fd42 100644 --- a/src/bin/extra_background_selector.c +++ b/src/bin/extra_wallpaper_selector.c @@ -4,44 +4,44 @@ #include "../lib/extra.h" static Extra_Ui_Small_Preview_Accessor acc = { - ((Extra_ui_preview_get*) extra_background_preview_get), - ((Extra_ui_preview_download*) extra_background_preview_download), + ((Extra_ui_preview_get*) extra_wallpaper_preview_get), + ((Extra_ui_preview_download*) extra_wallpaper_preview_download), }; static void -_background_installed(void *data EINA_UNUSED) +_wallpaper_installed(void *data EINA_UNUSED) { /*TODO FIND A WAY TO REMOTE OPEN ENLIGHTENMENT BACKGROUND SELECTOR*/ - gengrid_reapply_state(_ui.background_selector); + gengrid_reapply_state(_ui.wallpaper_selector); } static void -_install_background(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_install_wallpaper(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { - Extra_Background *b = data; + Extra_Wallpaper *b = data; Extra_Progress *p; - p = extra_ui_progress_popup_show(_("Installing background"), _background_installed, b); - extra_background_download(p, b); + p = extra_ui_progress_popup_show(_("Installing wallpaper"), _wallpaper_installed, b); + extra_wallpaper_download(p, b); } static void -_uninstall_background(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_uninstall_wallpaper(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { - Extra_Background *b = data; + Extra_Wallpaper *b = data; - extra_background_delete(b); - gengrid_reapply_state(_ui.background_selector); + extra_wallpaper_delete(b); + gengrid_reapply_state(_ui.wallpaper_selector); } static void -_fullscreen_background(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_fullscreen_wallpaper(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { - Extra_Background *b = data; + Extra_Wallpaper *b = data; char *path; - path = extra_background_preview_get(b); + path = extra_wallpaper_preview_get(b); if (!path) return; extra_ui_fullscreen_preview(path); @@ -50,17 +50,17 @@ _fullscreen_background(void *data, Evas_Object *obj EINA_UNUSED, void *event_inf static void _show_details(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { - Extra_Background *background = data; + Extra_Wallpaper *wallpaper = data; Evas_Object *o; - o = extra_ui_base_object_detail(background, &background->obj, acc, _ui.win); + o = extra_ui_base_object_detail(wallpaper, &wallpaper->obj, acc, _ui.win); extra_ui_details_window_show(o); evas_object_del(_ui.popup_toolbar); } static void -_show_tooltip(Extra_Background *b) +_show_tooltip(Extra_Wallpaper *b) { Evas_Object *box, *o, *icon; @@ -70,17 +70,17 @@ _show_tooltip(Extra_Background *b) o = elm_button_add(box); icon = elm_icon_add(o); - if (extra_background_installed(b)) + if (extra_wallpaper_installed(b)) { elm_object_text_set(o, _("Uninstall")); elm_icon_standard_set(icon, "edit-delete"); - evas_object_smart_callback_add(o, "clicked", _uninstall_background, b); + evas_object_smart_callback_add(o, "clicked", _uninstall_wallpaper, b); } else { elm_object_text_set(o, _("Install")); elm_icon_standard_set(icon, "emblem-downloads"); - evas_object_smart_callback_add(o, "clicked", _install_background, b); + evas_object_smart_callback_add(o, "clicked", _install_wallpaper, b); } elm_object_part_content_set(o, "icon", icon); elm_box_pack_end(box, o); @@ -89,7 +89,7 @@ _show_tooltip(Extra_Background *b) //view-fullscreen o = elm_button_add(box); elm_object_text_set(o, _("Show fullscreen")); - evas_object_smart_callback_add(o, "clicked", _fullscreen_background , b); + evas_object_smart_callback_add(o, "clicked", _fullscreen_wallpaper , b); elm_box_pack_end(box, o); evas_object_show(o); icon = elm_icon_add(o); @@ -121,7 +121,7 @@ _content_basic_get(void *data, Evas_Object *obj, const char *source) static char* _text_basic_get(void *data, Evas_Object *obj EINA_UNUSED, const char *source EINA_UNUSED) { - Extra_Background *t = data; + Extra_Wallpaper *t = data; return strdup(t->obj.name); } @@ -134,8 +134,8 @@ _item_selected(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event _show_tooltip(elm_object_item_data_get(it)); } -Extra_Ui_Site_Template background_site = { - extra_backgrounds_list, +Extra_Ui_Site_Template wallpaper_site = { + extra_wallpapers_list, "thumb", _content_basic_get, _text_basic_get, diff --git a/src/bin/meson.build b/src/bin/meson.build index 973742e..ff48d16 100644 --- a/src/bin/meson.build +++ b/src/bin/meson.build @@ -2,7 +2,7 @@ files = [ 'extra_main.c', 'extra_util.c', 'extra_util.h', - 'extra_background_selector.c', + 'extra_wallpaper_selector.c', 'extra_theme_selector.c', 'extra_private.h', 'gettext.h' diff --git a/src/lib/extra.c b/src/lib/extra.c index 85ad0da..e324b21 100644 --- a/src/lib/extra.c +++ b/src/lib/extra.c @@ -14,7 +14,7 @@ static Ecore_Event_Handler *_complete; int _extra_lib_log_dom = -1; Eina_List *_theme_list = NULL; -Eina_List *_background_list = NULL; +Eina_List *_wallpaper_list = NULL; #define sec_strdup(v) v ? eina_strbuf_string_steal(v) : NULL @@ -85,14 +85,14 @@ _fill_themes(Eina_Strbuf *buf) //================ -//background stuff +//wallpaper stuff typedef struct { - Extra_Background background; + Extra_Wallpaper wallpaper; Extra_Request *preview; Extra_Request *cache_preview; Extra_Request *main; -} Extra_Background_Private; +} Extra_Wallpaper_Private; typedef struct { Eina_Strbuf *author; @@ -100,40 +100,40 @@ typedef struct { Eina_Strbuf *source; Eina_Strbuf *version; Eina_Strbuf *id; -} Background_Object; +} Wallpaper_Object; static Eina_Bool -_fill_backgrounds(Eina_Strbuf *buf) +_fill_wallpapers(Eina_Strbuf *buf) { - Background_Object *obj; + Wallpaper_Object *obj; - eina_list_free(_background_list); - _background_list = NULL; + eina_list_free(_wallpaper_list); + _wallpaper_list = NULL; - EXTRA_JSON_TO_LIST_TEMPLATE_INIT(template, Background_Object, - EXTRA_JSON_STRUCT_FIELD("author", Background_Object, author, EINA_FALSE), - EXTRA_JSON_STRUCT_FIELD("source", Background_Object, source, EINA_FALSE), - EXTRA_JSON_STRUCT_FIELD("name", Background_Object, name, EINA_TRUE), - EXTRA_JSON_STRUCT_FIELD("version", Background_Object, version, EINA_TRUE), - EXTRA_JSON_STRUCT_FIELD("background-id", Background_Object, id, EINA_TRUE), + EXTRA_JSON_TO_LIST_TEMPLATE_INIT(template, Wallpaper_Object, + EXTRA_JSON_STRUCT_FIELD("author", Wallpaper_Object, author, EINA_FALSE), + EXTRA_JSON_STRUCT_FIELD("source", Wallpaper_Object, source, EINA_FALSE), + EXTRA_JSON_STRUCT_FIELD("name", Wallpaper_Object, name, EINA_TRUE), + EXTRA_JSON_STRUCT_FIELD("version", Wallpaper_Object, version, EINA_TRUE), + EXTRA_JSON_STRUCT_FIELD("background-id", Wallpaper_Object, id, EINA_TRUE), ); Eina_List *lst = extra_json_to_list(&template, buf); EINA_LIST_FREE(lst, obj) { - Extra_Background_Private *background = calloc(1, sizeof(Extra_Background_Private)); + Extra_Wallpaper_Private *wallpaper = calloc(1, sizeof(Extra_Wallpaper_Private)); int versionNumb; versionNumb = atoi(eina_strbuf_string_get(obj->version)); - background->background.obj.author = sec_strdup(obj->author); - background->background.obj.id = sec_strdup(obj->id); - background->background.obj.name = sec_strdup(obj->name); - background->background.obj.source = sec_strdup(obj->source); - background->background.obj.version = versionNumb; + wallpaper->wallpaper.obj.author = sec_strdup(obj->author); + wallpaper->wallpaper.obj.id = sec_strdup(obj->id); + wallpaper->wallpaper.obj.name = sec_strdup(obj->name); + wallpaper->wallpaper.obj.source = sec_strdup(obj->source); + wallpaper->wallpaper.obj.version = versionNumb; - _background_list = eina_list_append(_background_list, background); + _wallpaper_list = eina_list_append(_wallpaper_list, wallpaper); extra_json_list_part_free(&template, obj); } @@ -249,20 +249,20 @@ typedef struct { Extra_Progress *progress; Ecore_Con_Url *themes; Eina_Strbuf *themes_content; - Ecore_Con_Url *backgrounds; - Eina_Strbuf *background_content; + Ecore_Con_Url *wallpapers; + Eina_Strbuf *wallpaper_content; } Extra_Sync_Request; static void _extra_sync_request_end_eval(Extra_Sync_Request *req) { - if (!req->themes_content || !req->background_content) return; + if (!req->themes_content || !req->wallpaper_content) return; if (_fill_themes(req->themes_content)) _cache_content(req->themes_content, "themes"); - if (_fill_backgrounds(req->background_content)) - _cache_content(req->background_content, "backgrounds"); + if (_fill_wallpapers(req->wallpaper_content)) + _cache_content(req->wallpaper_content, "wallpapers"); if (req->progress->done_cb) req->progress->done_cb(req->progress->data); @@ -277,9 +277,9 @@ _url_complete_cb(void *data, int type EINA_UNUSED, void *event_info) Ecore_Con_Event_Url_Complete *complete = event_info; Extra_Sync_Request *request = data; - if (complete->url_con == request->backgrounds) + if (complete->url_con == request->wallpapers) { - request->background_content = ecore_con_url_data_get(complete->url_con); + request->wallpaper_content = ecore_con_url_data_get(complete->url_con); _extra_sync_request_end_eval(request); } else if (complete->url_con == request->themes) @@ -305,14 +305,14 @@ extra_sync(Extra_Progress *progress) ecore_con_url_additional_header_add(req->themes, "Accept", "text/json"); ecore_con_url_data_set(req->themes, eina_strbuf_new()); - req->backgrounds = ecore_con_url_custom_new("https://"; HOSTNAME "/v1/backgrounds/", "GET"); - ecore_con_url_additional_header_add(req->backgrounds, "Accept", "text/json"); - ecore_con_url_data_set(req->backgrounds, eina_strbuf_new()); + req->wallpapers = ecore_con_url_custom_new("https://"; HOSTNAME "/v1/backgrounds/", "GET"); + ecore_con_url_additional_header_add(req->wallpapers, "Accept", "text/json"); + ecore_con_url_data_set(req->wallpapers, eina_strbuf_new()); _data = ecore_event_handler_add(ECORE_CON_EVENT_URL_DATA, _url_data_cb, req); _complete = ecore_event_handler_add(ECORE_CON_EVENT_URL_COMPLETE, _url_complete_cb, req); - ecore_con_url_get(req->backgrounds); + ecore_con_url_get(req->wallpapers); ecore_con_url_get(req->themes); } @@ -632,21 +632,21 @@ extra_theme_installed_old(Extra_Theme *t) } //============== -//background api +//wallpaper api EAPI Eina_List* -extra_backgrounds_list(void) +extra_wallpapers_list(void) { - return _background_list; + return _wallpaper_list; } -EAPI Extra_Background* -extra_background_get(const char *id) +EAPI Extra_Wallpaper* +extra_wallpaper_get(const char *id) { Eina_List *n; - Extra_Background *b; + Extra_Wallpaper *b; - EINA_LIST_FOREACH(_background_list, n, b) + EINA_LIST_FOREACH(_wallpaper_list, n, b) { if (!strcmp(id, b->obj.id)) return b; @@ -656,16 +656,16 @@ extra_background_get(const char *id) } EAPI char * -extra_background_download_url_get(Extra_Background *background) +extra_wallpaper_download_url_get(Extra_Wallpaper *wallpaper) { Eina_Strbuf *buf; char *url; - EINA_SAFETY_ON_NULL_RETURN_VAL(background, NULL); + EINA_SAFETY_ON_NULL_RETURN_VAL(wallpaper, NULL); buf = eina_strbuf_new(); eina_strbuf_append(buf, "https://"; HOSTNAME "/backgrounds/"); - eina_strbuf_append_printf(buf, "%s-%d.edj", background->obj.id, background->obj.version); + eina_strbuf_append_printf(buf, "%s-%d.edj", wallpaper->obj.id, wallpaper->obj.version); url = eina_strbuf_string_steal(buf); eina_strbuf_free(buf); @@ -674,18 +674,18 @@ extra_background_download_url_get(Extra_Background *background) } EAPI char * -extra_background_install_path_get(Extra_Background *background) +extra_wallpaper_install_path_get(Extra_Wallpaper *wallpaper) { Eina_Strbuf *buf; char *path; - EINA_SAFETY_ON_NULL_RETURN_VAL(background, NULL); + EINA_SAFETY_ON_NULL_RETURN_VAL(wallpaper, NULL); buf = eina_strbuf_new(); eina_strbuf_append(buf, eina_environment_home_get()); eina_strbuf_append(buf, "/.e/e/backgrounds/"); - eina_strbuf_append_printf(buf, "%s-%d.edj", background->obj.id, background->obj.version); + eina_strbuf_append_printf(buf, "%s-%d.edj", wallpaper->obj.id, wallpaper->obj.version); path = eina_strbuf_string_steal(buf); eina_strbuf_free(buf); @@ -693,14 +693,14 @@ extra_background_install_path_get(Extra_Background *background) } EAPI Eina_Bool -extra_background_installed(Extra_Background *background) +extra_wallpaper_installed(Extra_Wallpaper *wallpaper) { char *path; Eina_Bool exists; - EINA_SAFETY_ON_NULL_RETURN_VAL(background, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(wallpaper, EINA_FALSE); - path = extra_background_install_path_get(background); + path = extra_wallpaper_install_path_get(wallpaper); exists = ecore_file_exists(path); free(path); @@ -708,13 +708,13 @@ extra_background_installed(Extra_Background *background) } EAPI Extra_Request* -extra_background_download(Extra_Progress *progress, Extra_Background *background) +extra_wallpaper_download(Extra_Progress *progress, Extra_Wallpaper *wallpaper) { char *path, *urlstr = NULL; - Extra_Background_Private *priv = ((Extra_Background_Private*) background); + Extra_Wallpaper_Private *priv = ((Extra_Wallpaper_Private*) wallpaper); EINA_SAFETY_ON_NULL_RETURN_VAL(progress, NULL); - EINA_SAFETY_ON_NULL_RETURN_VAL(background, NULL); + EINA_SAFETY_ON_NULL_RETURN_VAL(wallpaper, NULL); if (priv->preview) { @@ -724,8 +724,8 @@ extra_background_download(Extra_Progress *progress, Extra_Background *background return NULL; } - urlstr = extra_background_download_url_get(background); - path = extra_background_install_path_get(background); + urlstr = extra_wallpaper_download_url_get(wallpaper); + path = extra_wallpaper_install_path_get(wallpaper); extra_file_download(progress, urlstr, path, &priv->main); @@ -737,15 +737,15 @@ extra_background_download(Extra_Progress *progress, Extra_Background *background EAPI char* -extra_background_preview_get(Extra_Background *background) +extra_wallpaper_preview_get(Extra_Wallpaper *wallpaper) { - Extra_Background_Private *priv = (Extra_Background_Private*) background; + Extra_Wallpaper_Private *priv = (Extra_Wallpaper_Private*) wallpaper; Extra_Path_Pair *pair; char *local; if (priv->preview) return NULL; - pair = _extra_preview_path_pair_gen("backgrounds", &background->obj); + pair = _extra_preview_path_pair_gen("backgrounds", &wallpaper->obj); local = pair->local; if (!ecore_file_exists(local)) @@ -769,9 +769,9 @@ extra_background_preview_get(Extra_Background *background) } EAPI Extra_Request* -extra_background_preview_download(Extra_Progress *progress, Extra_Background *background) +extra_wallpaper_preview_download(Extra_Progress *progress, Extra_Wallpaper *wallpaper) { - Extra_Background_Private *priv = (Extra_Background_Private*) background; + Extra_Wallpaper_Private *priv = (Extra_Wallpaper_Private*) wallpaper; Extra_Path_Pair *pair; if (priv->preview) @@ -782,7 +782,7 @@ extra_background_preview_download(Extra_Progress *progress, Extra_Background *ba return NULL; } - pair = _extra_preview_path_pair_gen("backgrounds", &background->obj); + pair = _extra_preview_path_pair_gen("backgrounds", &wallpaper->obj); extra_file_download(progress, pair->remote, pair->local, &priv->preview); @@ -792,11 +792,11 @@ extra_background_preview_download(Extra_Progress *progress, Extra_Background *ba } EAPI void -extra_background_delete(Extra_Background *b) +extra_wallpaper_delete(Extra_Wallpaper *b) { char *path; - path = extra_background_install_path_get(b); + path = extra_wallpaper_install_path_get(b); ecore_file_remove(path); diff --git a/src/lib/extra.h b/src/lib/extra.h index 1e76a89..e0b6947 100644 --- a/src/lib/extra.h +++ b/src/lib/extra.h @@ -57,10 +57,10 @@ typedef struct _Extra_Theme const char *description; } Extra_Theme; -typedef struct _Extra_Background +typedef struct _Extra_Wallpaper { Extra_Base_Object obj; -} Extra_Background; +} Extra_Wallpaper; typedef struct _Extra_Progress { @@ -182,15 +182,15 @@ EAPI void extra_theme_reset(void); * @} */ -EAPI Eina_List* extra_backgrounds_list(void); -EAPI Extra_Background* extra_background_get(const char *id); +EAPI Eina_List* extra_wallpapers_list(void); +EAPI Extra_Wallpaper* extra_wallpaper_get(const char *id); -EAPI Eina_Bool extra_background_installed(Extra_Background *b); -EAPI Extra_Request* extra_background_download(Extra_Progress *progress, Extra_Background *b); -EAPI void extra_background_delete(Extra_Background *b); +EAPI Eina_Bool extra_wallpaper_installed(Extra_Wallpaper *b); +EAPI Extra_Request* extra_wallpaper_download(Extra_Progress *progress, Extra_Wallpaper *b); +EAPI void extra_wallpaper_delete(Extra_Wallpaper *b); -EAPI char* extra_background_preview_get(Extra_Background *background); -EAPI Extra_Request* extra_background_preview_download(Extra_Progress *progress, Extra_Background *background); +EAPI char* extra_wallpaper_preview_get(Extra_Wallpaper *wallpaper); +EAPI Extra_Request* extra_wallpaper_preview_download(Extra_Progress *progress, Extra_Wallpaper *wallpaper); EAPI void extra_request_mute(Extra_Request *req); --
