simplify, just init efreet_mime once, etc.
make code simpler, just init efreet_mime at startup, just need ethumb once as well. SVN revision: 53199
This commit is contained in:
parent
cc899e3325
commit
844d8b6529
|
@ -9,15 +9,21 @@ int
|
||||||
main(int argc, char **argv)
|
main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
Ethumb_Client *client;
|
Ethumb_Client *client;
|
||||||
|
int r = 0;
|
||||||
|
|
||||||
elm_need_efreet();
|
elm_need_efreet();
|
||||||
elm_need_ethumb();
|
elm_need_ethumb();
|
||||||
elm_init(argc, argv);
|
elm_init(argc, argv);
|
||||||
|
|
||||||
|
if (!efreet_mime_init())
|
||||||
|
fprintf(stderr, "Could not init efreet_mime!\n");
|
||||||
|
|
||||||
client = elm_thumb_ethumb_client_get();
|
client = elm_thumb_ethumb_client_get();
|
||||||
if (!client)
|
if (!client)
|
||||||
{
|
{
|
||||||
ERR("could not get ethumb_client");
|
ERR("could not get ethumb_client");
|
||||||
return 1;
|
r = 1;
|
||||||
|
goto end_log_domain;
|
||||||
}
|
}
|
||||||
ethumb_client_size_set(client, 100, 100);
|
ethumb_client_size_set(client, 100, 100);
|
||||||
ethumb_client_crop_align_set(client, 0.5, 0.5);
|
ethumb_client_crop_align_set(client, 0.5, 0.5);
|
||||||
|
@ -27,10 +33,8 @@ main(int argc, char **argv)
|
||||||
if (!__log_domain)
|
if (!__log_domain)
|
||||||
{
|
{
|
||||||
EINA_LOG_ERR("Could not register log domain: Ephoto");
|
EINA_LOG_ERR("Could not register log domain: Ephoto");
|
||||||
elm_shutdown();
|
r = 1;
|
||||||
efreet_mime_shutdown();
|
goto end_log_domain;
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -39,12 +43,8 @@ main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
printf("Too Many Arguments!\n");
|
printf("Too Many Arguments!\n");
|
||||||
_ephoto_display_usage();
|
_ephoto_display_usage();
|
||||||
|
r = 1;
|
||||||
eina_log_domain_unregister(__log_domain);
|
goto end;
|
||||||
elm_shutdown();
|
|
||||||
efreet_mime_shutdown();
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
else if (argc < 2)
|
else if (argc < 2)
|
||||||
{
|
{
|
||||||
|
@ -53,18 +53,12 @@ main(int argc, char **argv)
|
||||||
else if (!strncmp(argv[1], "--help", 6))
|
else if (!strncmp(argv[1], "--help", 6))
|
||||||
{
|
{
|
||||||
_ephoto_display_usage();
|
_ephoto_display_usage();
|
||||||
|
r = 0;
|
||||||
eina_log_domain_unregister(__log_domain);
|
goto end;
|
||||||
elm_shutdown();
|
|
||||||
efreet_mime_shutdown();
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
else if (ecore_file_is_dir(argv[1]))
|
else if (ecore_file_is_dir(argv[1]))
|
||||||
{
|
{
|
||||||
char *real;
|
char *real = ecore_file_realpath(argv[1]);
|
||||||
|
|
||||||
real = ecore_file_realpath(argv[1]);
|
|
||||||
ephoto_create_main_window(real, NULL);
|
ephoto_create_main_window(real, NULL);
|
||||||
free(real);
|
free(real);
|
||||||
}
|
}
|
||||||
|
@ -84,20 +78,19 @@ main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
printf("Incorrect Argument!\n");
|
printf("Incorrect Argument!\n");
|
||||||
_ephoto_display_usage();
|
_ephoto_display_usage();
|
||||||
|
r = 1;
|
||||||
eina_log_domain_unregister(__log_domain);
|
goto end;
|
||||||
elm_shutdown();
|
|
||||||
efreet_mime_shutdown();
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
elm_run();
|
elm_run();
|
||||||
|
|
||||||
elm_shutdown();
|
end:
|
||||||
|
eina_log_domain_unregister(__log_domain);
|
||||||
|
end_log_domain:
|
||||||
efreet_mime_shutdown();
|
efreet_mime_shutdown();
|
||||||
|
elm_shutdown();
|
||||||
|
|
||||||
return 0;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*Display useage commands for ephoto*/
|
/*Display useage commands for ephoto*/
|
||||||
|
|
|
@ -106,10 +106,6 @@ Evas_Object *ephoto_directory_thumb_add(Evas_Object *parent, const char *path)
|
||||||
Directory_Thumb *dt;
|
Directory_Thumb *dt;
|
||||||
Evas_Object *thumb, *o;
|
Evas_Object *thumb, *o;
|
||||||
|
|
||||||
elm_need_ethumb();
|
|
||||||
if (!efreet_mime_init())
|
|
||||||
fprintf(stderr, "Could not init efreet_mime!\n");
|
|
||||||
|
|
||||||
dt = calloc(1, sizeof( Directory_Thumb));
|
dt = calloc(1, sizeof( Directory_Thumb));
|
||||||
dt->path = eina_stringshare_add(path);
|
dt->path = eina_stringshare_add(path);
|
||||||
dt->layout = elm_layout_add(parent);
|
dt->layout = elm_layout_add(parent);
|
||||||
|
|
|
@ -75,8 +75,6 @@ _ephoto_go_update(Ephoto_Flow_Browser *ef)
|
||||||
const char *file_type;
|
const char *file_type;
|
||||||
int success = 0;
|
int success = 0;
|
||||||
|
|
||||||
efreet_mime_init();
|
|
||||||
|
|
||||||
elm_layout_content_unset(ef->flow_browser, "ephoto.flow.swallow");
|
elm_layout_content_unset(ef->flow_browser, "ephoto.flow.swallow");
|
||||||
|
|
||||||
evas_object_hide(ef->image);
|
evas_object_hide(ef->image);
|
||||||
|
|
|
@ -364,9 +364,6 @@ ephoto_populate_thumbnails(Evas_Object *obj)
|
||||||
{
|
{
|
||||||
Ephoto_Thumb_Browser *tb = evas_object_data_get(obj, "thumb_browser");
|
Ephoto_Thumb_Browser *tb = evas_object_data_get(obj, "thumb_browser");
|
||||||
|
|
||||||
if (!efreet_mime_init())
|
|
||||||
fprintf(stderr, "Could not init efreet_mime!\n");
|
|
||||||
|
|
||||||
_ephoto_thumbnail_add(tb, PARENT_DIR, EINA_TRUE);
|
_ephoto_thumbnail_add(tb, PARENT_DIR, EINA_TRUE);
|
||||||
tb->list = eio_file_ls(em->config->directory,
|
tb->list = eio_file_ls(em->config->directory,
|
||||||
_ephoto_populate_filter_directory,
|
_ephoto_populate_filter_directory,
|
||||||
|
|
Loading…
Reference in New Issue