From: <no-...@en...> - 2008-09-02 05:36:31
|
Author: englebass Date: 2008-09-01 22:36:27 -0700 (Mon, 01 Sep 2008) New Revision: 35790 Modified: trunk/e/src/bin/e_config.c Log: formatting Modified: trunk/e/src/bin/e_config.c =================================================================== --- trunk/e/src/bin/e_config.c 2008-09-02 03:39:32 UTC (rev 35789) +++ trunk/e/src/bin/e_config.c 2008-09-02 05:36:27 UTC (rev 35790) @@ -1903,11 +1903,11 @@ if (_e_config_eet_close_handle(ef, buf2)) { int ret; - - ret = ecore_file_mv(buf2, buf); - if (!ret) + + ret = ecore_file_mv(buf2, buf); + if (!ret) { - printf("*** Error saving profile. ***"); + printf("*** Error saving profile. ***"); } } ecore_file_unlink(buf2); @@ -1938,12 +1938,12 @@ ok = eet_data_write(ef, edd, "config", data, 1); if (_e_config_eet_close_handle(ef, buf2)) { - ret = ecore_file_mv(buf2, buf); - if (!ret) + ret = ecore_file_mv(buf2, buf); + if (!ret) { - printf("*** Error saving profile. ***"); + printf("*** Error saving profile. ***"); } - } + } ecore_file_unlink(buf2); } return ok; |
From: Enlightenment S. <no-...@en...> - 2008-10-26 20:48:49
|
Log: Correct callback for eina_hash_foreach. Author: englebass Date: 2008-10-26 13:48:44 -0700 (Sun, 26 Oct 2008) New Revision: 37169 Modified: trunk/e/src/bin/e_border.c trunk/e/src/bin/e_exec.c trunk/e/src/bin/e_filereg.c trunk/e/src/bin/e_fm_custom.c trunk/e/src/bin/e_fm_mime.c trunk/e/src/bin/e_font.c trunk/e/src/bin/e_int_config_modules.c trunk/e/src/bin/e_intl.c trunk/e/src/bin/e_manager.c trunk/e/src/bin/e_menu.c trunk/e/src/bin/e_path.c trunk/e/src/bin/e_theme.c Modified: trunk/e/src/bin/e_border.c =================================================================== --- trunk/e/src/bin/e_border.c 2008-10-26 20:05:59 UTC (rev 37168) +++ trunk/e/src/bin/e_border.c 2008-10-26 20:48:44 UTC (rev 37169) @@ -2639,7 +2639,7 @@ return 0; } -static int +static void _e_border_action_finish(void) { _e_border_action_input_win_del(); Modified: trunk/e/src/bin/e_exec.c =================================================================== --- trunk/e/src/bin/e_exec.c 2008-10-26 20:05:59 UTC (rev 37168) +++ trunk/e/src/bin/e_exec.c 2008-10-26 20:48:44 UTC (rev 37169) @@ -47,7 +47,7 @@ static int _e_exec_cb_expire_timer(void *data); static int _e_exec_cb_exit(void *data, int type, void *event); -static Evas_Bool _e_exec_startup_id_pid_find(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *value, void *data); +static Evas_Bool _e_exec_startup_id_pid_find(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *value, void *data); static void _e_exec_error_dialog(Efreet_Desktop *desktop, const char *exec, Ecore_Exe_Event_Del *event, Ecore_Exe_Event_Data *error, Ecore_Exe_Event_Data *read); static void _fill_data(E_Config_Dialog_Data *cfdata); @@ -362,7 +362,7 @@ } static Evas_Bool -_e_exec_startup_id_pid_find(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *value, void *data) +_e_exec_startup_id_pid_find(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *value, void *data) { E_Exec_Search *search; Eina_List *instances, *l; Modified: trunk/e/src/bin/e_filereg.c =================================================================== --- trunk/e/src/bin/e_filereg.c 2008-10-26 20:05:59 UTC (rev 37168) +++ trunk/e/src/bin/e_filereg.c 2008-10-26 20:48:44 UTC (rev 37169) @@ -18,7 +18,7 @@ }; static Evas_Bool _filereg_hash_cb_free(const Evas_Hash *hash __UNUSED__, - const char *key __UNUSED__, + const void *key __UNUSED__, void *data, void *fdata __UNUSED__); /* Externally accessible functions */ @@ -86,7 +86,7 @@ /* Private Functions */ static Evas_Bool -_filereg_hash_cb_free(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, +_filereg_hash_cb_free(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__) { Filereg_Item *fi; Modified: trunk/e/src/bin/e_fm_custom.c =================================================================== --- trunk/e/src/bin/e_fm_custom.c 2008-10-26 20:05:59 UTC (rev 37168) +++ trunk/e/src/bin/e_fm_custom.c 2008-10-26 20:48:44 UTC (rev 37169) @@ -3,12 +3,12 @@ */ #include "e.h" -static Evas_Bool _e_fm2_custom_file_hash_foreach_list(const Evas_Hash *hash, const char *key, void *data, void *fdata); +static Evas_Bool _e_fm2_custom_file_hash_foreach_list(const Evas_Hash *hash, const void *key, void *data, void *fdata); static Eina_List *_e_fm2_custom_hash_key_base_list(Evas_Hash *hash, const char *str); //static Evas_Bool _e_fm2_custom_file_hash_foreach_sub_list(Evas_Hash *hash, const char *key, void *data, void *fdata); //static Eina_List *_e_fm2_custom_hash_key_sub_list(Evas_Hash *hash, const char *str); -static Evas_Bool _e_fm2_custom_file_hash_foreach(const Evas_Hash *hash, const char *key, void *data, void *fdata); -static Evas_Bool _e_fm2_custom_file_hash_foreach_save(const Evas_Hash *hash, const char *key, void *data, void *fdata); +static Evas_Bool _e_fm2_custom_file_hash_foreach(const Evas_Hash *hash, const void *key, void *data, void *fdata); +static Evas_Bool _e_fm2_custom_file_hash_foreach_save(const Evas_Hash *hash, const void *key, void *data, void *fdata); static void _e_fm2_custom_file_info_load(void); static void _e_fm2_custom_file_info_save(void); static void _e_fm2_custom_file_info_free(void); @@ -220,7 +220,7 @@ }; static Evas_Bool -_e_fm2_custom_file_hash_foreach_list(const Evas_Hash *hash, const char *key, void *data, void *fdata) +_e_fm2_custom_file_hash_foreach_list(const Evas_Hash *hash, const void *key, void *data, void *fdata) { struct _E_Custom_List *cl; @@ -245,7 +245,7 @@ /* static Evas_Bool -_e_fm2_custom_file_hash_foreach_sub_list(const Evas_Hash *hash, const char *key, void *data, void *fdata) +_e_fm2_custom_file_hash_foreach_sub_list(const Evas_Hash *hash, const void *key, void *data, void *fdata) { struct _E_Custom_List *cl; @@ -258,7 +258,7 @@ /* static Eina_List * -_e_fm2_custom_hash_key_sub_list(const Evas_Hash *hash, const char *str) +_e_fm2_custom_hash_key_sub_list(const Evas_Hash *hash, const void *str) { struct _E_Custom_List cl; @@ -271,7 +271,7 @@ */ static Evas_Bool -_e_fm2_custom_file_hash_foreach(const Evas_Hash *hash, const char *key, void *data, void *fdata) +_e_fm2_custom_file_hash_foreach(const Evas_Hash *hash, const void *key, void *data, void *fdata) { E_Fm2_Custom_File *cf; @@ -283,7 +283,7 @@ } static Evas_Bool -_e_fm2_custom_file_hash_foreach_save(const Evas_Hash *hash, const char *key, void *data, void *fdata) +_e_fm2_custom_file_hash_foreach_save(const Evas_Hash *hash, const void *key, void *data, void *fdata) { Eet_File *ef; E_Fm2_Custom_File *cf; Modified: trunk/e/src/bin/e_fm_mime.c =================================================================== --- trunk/e/src/bin/e_fm_mime.c 2008-10-26 20:05:59 UTC (rev 37168) +++ trunk/e/src/bin/e_fm_mime.c 2008-10-26 20:48:44 UTC (rev 37169) @@ -12,8 +12,8 @@ }; /* local subsystem functions */ -static Evas_Bool _e_fm2_mime_handler_glob_match_foreach(const Evas_Hash *hash __UNUSED__, const char *key, void *data, void *fdata); -static Evas_Bool _e_fm_mime_icon_foreach(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata); +static Evas_Bool _e_fm2_mime_handler_glob_match_foreach(const Evas_Hash *hash __UNUSED__, const void *key, void *data, void *fdata); +static Evas_Bool _e_fm_mime_icon_foreach(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata); static Evas_Hash *icon_map = NULL; static Evas_Hash *_mime_handlers = NULL; @@ -356,7 +356,7 @@ /* local subsystem functions */ /* used to loop a glob hash and determine if the glob handler matches the filename */ static Evas_Bool -_e_fm2_mime_handler_glob_match_foreach(const Evas_Hash *hash __UNUSED__, const char *key, void *data, void *fdata) +_e_fm2_mime_handler_glob_match_foreach(const Evas_Hash *hash __UNUSED__, const void *key, void *data, void *fdata) { E_Fm2_Mime_Handler_Tuple *tuple; Eina_List *handlers = NULL; @@ -377,7 +377,7 @@ } static Evas_Bool -_e_fm_mime_icon_foreach(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata) +_e_fm_mime_icon_foreach(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata) { Eina_List **freelist; Modified: trunk/e/src/bin/e_font.c =================================================================== --- trunk/e/src/bin/e_font.c 2008-10-26 20:05:59 UTC (rev 37168) +++ trunk/e/src/bin/e_font.c 2008-10-26 20:48:44 UTC (rev 37169) @@ -5,7 +5,7 @@ #define E_TOK_STYLE ":style=" -static Evas_Bool _font_hash_free_cb(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata __UNUSED__); +static Evas_Bool _font_hash_free_cb(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__); static Evas_Hash *_e_font_available_hash_add(Evas_Hash *font_hash, const char *full_name); static E_Font_Properties *_e_font_fontconfig_name_parse(Evas_Hash **font_hash, E_Font_Properties *efp, const char *font); static char _fn_buf[1024]; @@ -151,7 +151,7 @@ } static Evas_Bool -_font_hash_free_cb(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata __UNUSED__) +_font_hash_free_cb(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__) { E_Font_Properties *efp; Modified: trunk/e/src/bin/e_int_config_modules.c =================================================================== --- trunk/e/src/bin/e_int_config_modules.c 2008-10-26 20:05:59 UTC (rev 37168) +++ trunk/e/src/bin/e_int_config_modules.c 2008-10-26 20:48:44 UTC (rev 37169) @@ -57,24 +57,24 @@ static void _load_modules (const char *dir); static void _fill_list (Evas_Object *obj, int enabled); static Evas_Bool _fill_list_types_avail(const Evas_Hash *hash __UNUSED__, - const char *key __UNUSED__, + const void *key __UNUSED__, void *data, void *fdata); static Evas_Bool _fill_list_types_load (const Evas_Hash *hash __UNUSED__, - const char *key __UNUSED__, + const void *key __UNUSED__, void *data, void *fdata); static Evas_Bool _fill_list_types (Evas_Object *obj, CFType *cft, int enabled); static Evas_Bool _types_hash_cb_free (const Evas_Hash *hash __UNUSED__, - const char *key __UNUSED__, + const void *key __UNUSED__, void *data, void *fdata __UNUSED__); static Evas_Bool _mod_hash_cb_free (const Evas_Hash *hash __UNUSED__, - const char *key __UNUSED__, + const void *key __UNUSED__, void *data, void *fdata __UNUSED__); static Evas_Bool _mod_hash_avail_list (const Evas_Hash *hash __UNUSED__, - const char *key __UNUSED__, + const void *key __UNUSED__, void *data, void *fdata); static Evas_Bool _mod_hash_load_list (const Evas_Hash *hash __UNUSED__, - const char *key __UNUSED__, + const void *key __UNUSED__, void *data, void *fdata); static int _mod_list_sort (void *data1, void *data2); static void _list_widget_load (Evas_Object *obj, Eina_List *list); @@ -82,23 +82,23 @@ static void _load_list_cb_change (void *data, Evas_Object *obj); static void _unselect_all_modules (void); static Evas_Bool _mod_hash_unselect (const Evas_Hash *hash __UNUSED__, - const char *key __UNUSED__, + const void *key __UNUSED__, void *data, void *fdata __UNUSED__); static void _select_all_modules (Evas_Object *obj, void *data); static void _btn_cb_unload (void *data, void *data2); static void _btn_cb_load (void *data, void *data2); static Evas_Bool _mod_hash_load (const Evas_Hash *hash __UNUSED__, - const char *key __UNUSED__, + const void *key __UNUSED__, void *data, void *fdata __UNUSED__); static Evas_Bool _mod_hash_unload (const Evas_Hash *hash __UNUSED__, - const char *key __UNUSED__, + const void *key __UNUSED__, void *data, void *fdata __UNUSED__); static void _enable_modules (int enable); static Evas_Bool _enable_modules_types_enable (const Evas_Hash *hash __UNUSED__, - const char *key __UNUSED__, + const void *key __UNUSED__, void *data, void *fdata); static Evas_Bool _enable_modules_types_disable (const Evas_Hash *hash __UNUSED__, - const char *key __UNUSED__, + const void *key __UNUSED__, void *data, void *fdata); /* local variables */ @@ -344,7 +344,7 @@ static Evas_Bool _fill_list_types_avail(const Evas_Hash *hash __UNUSED__, - const char *key __UNUSED__, void *data, void *fdata) + const void *key __UNUSED__, void *data, void *fdata) { CFType *cft; Evas_Object *obj; @@ -357,7 +357,7 @@ static Evas_Bool _fill_list_types_load(const Evas_Hash *hash __UNUSED__, - const char *key __UNUSED__, void *data, void *fdata) + const void *key __UNUSED__, void *data, void *fdata) { CFType *cft; Evas_Object *obj; @@ -413,7 +413,7 @@ } static Evas_Bool -_types_hash_cb_free(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, +_types_hash_cb_free(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__) { CFType *type = NULL; @@ -433,7 +433,7 @@ } static Evas_Bool -_mod_hash_cb_free(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, +_mod_hash_cb_free(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__) { CFModule *mod = NULL; @@ -449,7 +449,7 @@ } static Evas_Bool -_mod_hash_avail_list(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, +_mod_hash_avail_list(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata) { Eina_List **l; @@ -463,7 +463,7 @@ } static Evas_Bool -_mod_hash_load_list(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, +_mod_hash_load_list(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata) { Eina_List **l; @@ -587,7 +587,7 @@ } static Evas_Bool -_mod_hash_unselect(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, +_mod_hash_unselect(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__) { CFModule *mod = NULL; @@ -687,7 +687,7 @@ static Evas_Bool _enable_modules_types_enable(const Evas_Hash *hash __UNUSED__, - const char *key __UNUSED__, void *data, + const void *key __UNUSED__, void *data, void *fdata) { CFType *cft; @@ -700,7 +700,7 @@ static Evas_Bool _enable_modules_types_disable(const Evas_Hash *hash __UNUSED__, - const char *key __UNUSED__, void *data, + const void *key __UNUSED__, void *data, void *fdata) { CFType *cft; @@ -712,7 +712,7 @@ } static Evas_Bool -_mod_hash_load(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, +_mod_hash_load(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__) { CFModule *mod = NULL; @@ -729,7 +729,7 @@ } static Evas_Bool -_mod_hash_unload(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, +_mod_hash_unload(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__) { CFModule *mod = NULL; Modified: trunk/e/src/bin/e_intl.c =================================================================== --- trunk/e/src/bin/e_intl.c 2008-10-26 20:05:59 UTC (rev 37168) +++ trunk/e/src/bin/e_intl.c 2008-10-26 20:48:44 UTC (rev 37169) @@ -47,7 +47,7 @@ static Eina_List *_e_intl_locale_search_order_get(const char *locale); static int _e_intl_locale_validate(const char *locale); static void _e_intl_locale_hash_free(Evas_Hash *language_hash); -static Evas_Bool _e_intl_locale_hash_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata); +static Evas_Bool _e_intl_locale_hash_free_cb(const Evas_Hash *hash, const void *key, void *data, void *fdata); /* Input Method Configuration and Management */ static int _e_intl_cb_exit(void *data, int type, void *event); @@ -451,7 +451,7 @@ } static Evas_Bool -_e_intl_locale_hash_free_cb(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata __UNUSED__) +_e_intl_locale_hash_free_cb(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__) { free(data); return 1; Modified: trunk/e/src/bin/e_manager.c =================================================================== --- trunk/e/src/bin/e_manager.c 2008-10-26 20:05:59 UTC (rev 37168) +++ trunk/e/src/bin/e_manager.c 2008-10-26 20:48:44 UTC (rev 37169) @@ -16,7 +16,7 @@ static int _e_manager_cb_client_message(void *data, int ev_type, void *ev); static Evas_Bool _e_manager_frame_extents_free_cb(const Evas_Hash *hash __UNUSED__, - const char *key __UNUSED__, + const void *key __UNUSED__, void *data, void *fdata __UNUSED__); static E_Manager *_e_manager_get_for_root(Ecore_X_Window root); #if 0 /* use later - maybe */ @@ -856,7 +856,7 @@ } static Evas_Bool -_e_manager_frame_extents_free_cb(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, +_e_manager_frame_extents_free_cb(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__) { free(data); Modified: trunk/e/src/bin/e_menu.c =================================================================== --- trunk/e/src/bin/e_menu.c 2008-10-26 20:05:59 UTC (rev 37168) +++ trunk/e/src/bin/e_menu.c 2008-10-26 20:48:44 UTC (rev 37169) @@ -86,7 +86,7 @@ static int _e_menu_cb_window_shape (void *data, int ev_type, void *ev); static void _e_menu_cb_item_submenu_post_default (void *data, E_Menu *m, E_Menu_Item *mi); -static Evas_Bool _e_menu_categories_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata); +static Evas_Bool _e_menu_categories_free_cb(const Evas_Hash *hash, const void *key, void *data, void *fdata); /* local subsystem globals */ static Ecore_X_Window _e_menu_win = 0; @@ -2875,7 +2875,7 @@ static Evas_Bool -_e_menu_categories_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata) +_e_menu_categories_free_cb(const Evas_Hash *hash, const void *key, void *data, void *fdata) { Eina_List *l; E_Menu_Category *cat; Modified: trunk/e/src/bin/e_path.c =================================================================== --- trunk/e/src/bin/e_path.c 2008-10-26 20:05:59 UTC (rev 37168) +++ trunk/e/src/bin/e_path.c 2008-10-26 20:48:44 UTC (rev 37169) @@ -6,7 +6,7 @@ /* local subsystem functions */ static void _e_path_free(E_Path *ep); static void _e_path_cache_free(E_Path *ep); -static Evas_Bool _e_path_cache_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata); +static Evas_Bool _e_path_cache_free_cb(const Evas_Hash *hash, const void *key, void *data, void *fdata); /* externally accessible functions */ EAPI E_Path * @@ -387,7 +387,7 @@ } static Evas_Bool -_e_path_cache_free_cb(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata __UNUSED__) +_e_path_cache_free_cb(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__) { eina_stringshare_del(data); return 1; Modified: trunk/e/src/bin/e_theme.c =================================================================== --- trunk/e/src/bin/e_theme.c 2008-10-26 20:05:59 UTC (rev 37168) +++ trunk/e/src/bin/e_theme.c 2008-10-26 20:48:44 UTC (rev 37169) @@ -13,8 +13,8 @@ Evas_Hash *quickfind; }; -static Evas_Bool _e_theme_mappings_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata); -static Evas_Bool _e_theme_mappings_quickfind_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata); +static Evas_Bool _e_theme_mappings_free_cb(const Evas_Hash *hash, const void *key, void *data, void *fdata); +static Evas_Bool _e_theme_mappings_quickfind_free_cb(const Evas_Hash *hash, const void *key, void *data, void *fdata); static void _e_theme_category_register(const char *category); static Eina_List *_e_theme_collection_item_register(Eina_List *list, const char *name); static Eina_List *_e_theme_collection_items_find(const char *base, const char *collname); @@ -495,7 +495,7 @@ /* local subsystem functions */ static Evas_Bool -_e_theme_mappings_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata) +_e_theme_mappings_free_cb(const Evas_Hash *hash, const void *key, void *data, void *fdata) { E_Theme_Result *res; @@ -512,7 +512,7 @@ } static Evas_Bool -_e_theme_mappings_quickfind_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata) +_e_theme_mappings_quickfind_free_cb(const Evas_Hash *hash, const void *key, void *data, void *fdata) { eina_stringshare_del(key); return 1; |
From: Enlightenment S. <no-...@en...> - 2008-10-26 20:49:03
|
Log: No need to create string before showing error message. Author: englebass Date: 2008-10-26 13:48:57 -0700 (Sun, 26 Oct 2008) New Revision: 37170 Modified: trunk/e/src/bin/e_ipc.c Modified: trunk/e/src/bin/e_ipc.c =================================================================== --- trunk/e/src/bin/e_ipc.c 2008-10-26 20:48:44 UTC (rev 37169) +++ trunk/e/src/bin/e_ipc.c 2008-10-26 20:48:57 UTC (rev 37170) @@ -44,27 +44,21 @@ } else { - snprintf(buf, sizeof(buf), - _("Possible IPC Hack Attempt. The IPC socket\n" - "directory already exists BUT has permissions\n" - "that are too leanient (must only be readable\n" - "and writable by the owner, and nobody else)\n" - "or is not owned by you. Please check:\n" - "%s/enlightenment-%s\n"), - tmp, user); - e_error_message_show(buf); + e_error_message_show(_("Possible IPC Hack Attempt. The IPC socket\n" + "directory already exists BUT has permissions\n" + "that are too leanient (must only be readable\n" "and writable by the owner, and nobody else)\n" + "or is not owned by you. Please check:\n" + "%s/enlightenment-%s\n"), tmp, user); return 0; } } else { - snprintf(buf, sizeof(buf), - _("The IPC socket directory cannot be created or\n" - "examined.\n" - "Please check:\n" - "%s/enlightenment-%s\n"), - tmp, user); - e_error_message_show(buf); + e_error_message_show(_("The IPC socket directory cannot be created or\n" + "examined.\n" + "Please check:\n" + "%s/enlightenment-%s\n"), + tmp, user); return 0; } } |
From: Enlightenment S. <no-...@en...> - 2008-10-26 20:49:13
|
Log: Correct usage of e_util_dialog_show. Author: englebass Date: 2008-10-26 13:49:10 -0700 (Sun, 26 Oct 2008) New Revision: 37171 Modified: trunk/e/src/bin/e_config.c Modified: trunk/e/src/bin/e_config.c =================================================================== --- trunk/e/src/bin/e_config.c 2008-10-26 20:48:57 UTC (rev 37170) +++ trunk/e/src/bin/e_config.c 2008-10-26 20:49:10 UTC (rev 37171) @@ -1956,7 +1956,7 @@ static int _e_config_cb_timer(void *data) { - e_util_dialog_show(_("Configuration Upgraded"), data); + e_util_dialog_show(_("Configuration Upgraded"), _("Configuration Upgraded")); return 0; } |
From: Enlightenment S. <no-...@en...> - 2008-10-26 20:49:24
|
Log: Remove unused functions. Author: englebass Date: 2008-10-26 13:49:21 -0700 (Sun, 26 Oct 2008) New Revision: 37172 Modified: trunk/e/src/bin/e_utils.c Modified: trunk/e/src/bin/e_utils.c =================================================================== --- trunk/e/src/bin/e_utils.c 2008-10-26 20:49:10 UTC (rev 37171) +++ trunk/e/src/bin/e_utils.c 2008-10-26 20:49:21 UTC (rev 37172) @@ -27,7 +27,6 @@ /* local subsystem functions */ static int _e_util_cb_delayed_del(void *data); -static void _e_util_container_fake_mouse_up_cb(void *data); static int _e_util_wakeup_cb(void *data); /* local subsystem globals */ @@ -943,20 +942,6 @@ return 0; } -static void -_e_util_container_fake_mouse_up_cb(void *data) -{ - E_Util_Fake_Mouse_Up_Info *info; - - info = data; - if (info) - { - evas_event_feed_mouse_up(info->evas, info->button, EVAS_BUTTON_NONE, - ecore_x_current_time_get(), NULL); - free(info); - } -} - static int _e_util_wakeup_cb(void *data) { |
From: Enlightenment S. <no-...@en...> - 2008-10-26 20:49:36
|
Log: Correct usage of e_util_dialog_show. Author: englebass Date: 2008-10-26 13:49:32 -0700 (Sun, 26 Oct 2008) New Revision: 37173 Modified: trunk/e/src/bin/e_utils.c Modified: trunk/e/src/bin/e_utils.c =================================================================== --- trunk/e/src/bin/e_utils.c 2008-10-26 20:49:21 UTC (rev 37172) +++ trunk/e/src/bin/e_utils.c 2008-10-26 20:49:32 UTC (rev 37173) @@ -882,14 +882,11 @@ EAPI int e_util_dir_check(const char *dir) { - char msg[PATH_MAX]; - if (!ecore_file_exists(dir)) { if (!ecore_file_mkpath(dir)) { - snprintf (msg, sizeof (msg), "Failed to create directory: %s .<br>Check that you have correct permissions set.", dir); - e_util_dialog_show("Error creating directory", msg); + e_util_dialog_show("Error creating directory", "Failed to create directory: %s .<br>Check that you have correct permissions set.", dir); return 0; } } @@ -897,8 +894,7 @@ { if (!ecore_file_is_dir(dir)) { - snprintf (msg, sizeof (msg), "Failed to create directory: %s .<br>A file of that name already exists.", dir); - e_util_dialog_show("Error creating directory", msg); + e_util_dialog_show("Error creating directory", "Failed to create directory: %s .<br>A file of that name already exists.", dir); return 0; } } |
From: Enlightenment S. <no-...@en...> - 2008-10-26 20:49:47
|
Log: Correct sign on variable. Author: englebass Date: 2008-10-26 13:49:44 -0700 (Sun, 26 Oct 2008) New Revision: 37174 Modified: trunk/e/src/bin/e_hints.c Modified: trunk/e/src/bin/e_hints.c =================================================================== --- trunk/e/src/bin/e_hints.c 2008-10-26 20:49:32 UTC (rev 37173) +++ trunk/e/src/bin/e_hints.c 2008-10-26 20:49:44 UTC (rev 37174) @@ -1422,7 +1422,7 @@ { Ecore_X_Window *roots = NULL; int i, num; - int scale; + unsigned int scale; roots = ecore_x_window_root_list(&num); if (roots) |
From: Enlightenment S. <no-...@en...> - 2008-10-26 20:49:58
|
Log: No need to use fprintf to print a simple string. Author: englebass Date: 2008-10-26 13:49:55 -0700 (Sun, 26 Oct 2008) New Revision: 37175 Modified: trunk/e/src/bin/e_alert.c Modified: trunk/e/src/bin/e_alert.c =================================================================== --- trunk/e/src/bin/e_alert.c 2008-10-26 20:49:44 UTC (rev 37174) +++ trunk/e/src/bin/e_alert.c 2008-10-26 20:49:55 UTC (rev 37175) @@ -100,7 +100,7 @@ if ((!dd) || (!fs)) { - fprintf(stderr, text); + fputs(text, stderr); fflush(stderr); exit(-1); } |
From: Enlightenment S. <no-...@en...> - 2008-10-26 20:50:14
|
Log: Add comment about wrong code usage. Author: englebass Date: 2008-10-26 13:50:09 -0700 (Sun, 26 Oct 2008) New Revision: 37176 Modified: trunk/e/src/bin/e_desklock.c Modified: trunk/e/src/bin/e_desklock.c =================================================================== --- trunk/e/src/bin/e_desklock.c 2008-10-26 20:49:55 UTC (rev 37175) +++ trunk/e/src/bin/e_desklock.c 2008-10-26 20:50:09 UTC (rev 37176) @@ -297,6 +297,7 @@ edje_object_part_text_set(edp->login_box, "e.text.title", _("Please enter your unlock password")); edje_object_size_min_calc(edp->login_box, &mw, &mh); + /* FIXME: This is wrong, edje_file_group_exists needs a file, not an object! */ if (edje_file_group_exists(edp->bg_object, "e.swallow.login_box")) { edje_extern_object_min_size_set(edp->login_box, mw, mh); |
From: Enlightenment S. <no-...@en...> - 2008-10-26 20:50:25
|
Log: Remove unused variables. Author: englebass Date: 2008-10-26 13:50:21 -0700 (Sun, 26 Oct 2008) New Revision: 37177 Modified: trunk/e/src/bin/e_int_config_modules.c Modified: trunk/e/src/bin/e_int_config_modules.c =================================================================== --- trunk/e/src/bin/e_int_config_modules.c 2008-10-26 20:50:09 UTC (rev 37176) +++ trunk/e/src/bin/e_int_config_modules.c 2008-10-26 20:50:21 UTC (rev 37177) @@ -317,7 +317,6 @@ { Evas *evas; Evas_Coord w; - int i = 0; /* freeze evas, edje, and list widget */ evas = evas_object_evas_get(obj); @@ -675,8 +674,6 @@ static void _enable_modules(int enable) { - int i = 0; - if (!types_hash) return; if (enable) |
From: Enlightenment S. <no-...@en...> - 2008-10-27 07:33:25
|
Log: Fix callback for list sorting. Author: englebass Date: 2008-10-27 00:33:21 -0700 (Mon, 27 Oct 2008) New Revision: 37202 Modified: trunk/e/src/bin/e_actions.c trunk/e/src/bin/e_border.c trunk/e/src/bin/e_border.h trunk/e/src/bin/e_fm.c trunk/e/src/bin/e_gadcon.c trunk/e/src/bin/e_int_config_modules.c trunk/e/src/bin/e_int_menus.c trunk/e/src/bin/e_module.c trunk/e/src/bin/e_remember.c trunk/e/src/bin/e_shelf.c trunk/e/src/bin/e_xinerama.c Modified: trunk/e/src/bin/e_actions.c =================================================================== --- trunk/e/src/bin/e_actions.c 2008-10-27 06:46:01 UTC (rev 37201) +++ trunk/e/src/bin/e_actions.c 2008-10-27 07:33:21 UTC (rev 37202) @@ -68,7 +68,7 @@ /* local subsystem functions */ static void _e_action_free(E_Action *act); static E_Maximize _e_actions_maximize_parse(const char *maximize); -static int _action_groups_sort_cb(void *d1, void *d2); +static int _action_groups_sort_cb(const void *d1, const void *d2); /* to save writing this in N places - the sctions are defined here */ /***************************************************************************/ @@ -2881,9 +2881,9 @@ } static int -_action_groups_sort_cb(void *d1, void *d2) +_action_groups_sort_cb(const void *d1, const void *d2) { - E_Action_Group *g1, *g2; + const E_Action_Group *g1, *g2; g1 = d1; g2 = d2; Modified: trunk/e/src/bin/e_border.c =================================================================== --- trunk/e/src/bin/e_border.c 2008-10-27 06:46:01 UTC (rev 37201) +++ trunk/e/src/bin/e_border.c 2008-10-27 07:33:21 UTC (rev 37202) @@ -3363,7 +3363,7 @@ } EAPI const char * -e_border_name_get(E_Border *bd) +e_border_name_get(const E_Border *bd) { E_OBJECT_CHECK_RETURN(bd, ""); E_OBJECT_TYPE_CHECK_RETURN(bd, E_BORDER_TYPE, ""); Modified: trunk/e/src/bin/e_border.h =================================================================== --- trunk/e/src/bin/e_border.h 2008-10-27 06:46:01 UTC (rev 37201) +++ trunk/e/src/bin/e_border.h 2008-10-27 07:33:21 UTC (rev 37202) @@ -624,7 +624,7 @@ EAPI void e_border_frame_recalc(E_Border *bd); EAPI Eina_List *e_border_immortal_windows_get(void); -EAPI const char *e_border_name_get(E_Border *bd); +EAPI const char *e_border_name_get(const E_Border *bd); EAPI void e_border_signal_move_begin(E_Border *bd, const char *sig, const char *src); EAPI void e_border_signal_move_end(E_Border *bd, const char *sig, const char *src); Modified: trunk/e/src/bin/e_fm.c =================================================================== --- trunk/e/src/bin/e_fm.c 2008-10-27 06:46:01 UTC (rev 37201) +++ trunk/e/src/bin/e_fm.c 2008-10-27 07:33:21 UTC (rev 37202) @@ -264,7 +264,7 @@ static void _e_fm2_cb_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _e_fm2_cb_scroll_job(void *data); static void _e_fm2_cb_resize_job(void *data); -static int _e_fm2_cb_icon_sort(void *data1, void *data2); +static int _e_fm2_cb_icon_sort(const void *data1, const void *data2); static int _e_fm2_cb_scan_timer(void *data); static int _e_fm2_cb_sort_idler(void *data); @@ -359,7 +359,7 @@ static void _e_fm2_sel_rect_update(void *data); static inline void _e_fm2_context_menu_append(Evas_Object *obj, const char *path, Eina_List *l, E_Menu *mn, E_Fm2_Icon *ic); -static int _e_fm2_context_list_sort(void *data1, void *data2); +static int _e_fm2_context_list_sort(const void *data1, const void *data2); static char *_e_fm_string_append_char(char *str, size_t *size, size_t *len, char c); static char *_e_fm_string_append_quoted(char *str, size_t *size, size_t *len, const char *src); @@ -5927,9 +5927,9 @@ } static int -_e_fm2_cb_icon_sort(void *data1, void *data2) +_e_fm2_cb_icon_sort(const void *data1, const void *data2) { - E_Fm2_Icon *ic1, *ic2; + const E_Fm2_Icon *ic1, *ic2; char *l1, *l2; ic1 = data1; @@ -6785,9 +6785,9 @@ } static int -_e_fm2_context_list_sort(void *data1, void *data2) +_e_fm2_context_list_sort(const void *data1, const void *data2) { - E_Fm2_Mime_Handler *d1, *d2; + const E_Fm2_Mime_Handler *d1, *d2; if (!data1) return 1; if (!data2) return -1; Modified: trunk/e/src/bin/e_gadcon.c =================================================================== --- trunk/e/src/bin/e_gadcon.c 2008-10-27 06:46:01 UTC (rev 37201) +++ trunk/e/src/bin/e_gadcon.c 2008-10-27 07:33:21 UTC (rev 37202) @@ -2518,8 +2518,8 @@ static void _e_gadcon_layout_smart_min_cur_size_calc(E_Smart_Data *sd, int *min, int *mino, int *cur); void _e_gadcon_layout_smart_gadcons_width_adjust(E_Smart_Data *sd, int min, int cur); -static int _e_gadcon_layout_smart_sort_by_sequence_number_cb(void *d1, void *d2); -static int _e_gadcon_layout_smart_sort_by_position_cb(void *d1, void *d2); +static int _e_gadcon_layout_smart_sort_by_sequence_number_cb(const void *d1, const void *d2); +static int _e_gadcon_layout_smart_sort_by_position_cb(const void *d1, const void *d2); /* local subsystem globals */ static Evas_Smart *_e_smart = NULL; @@ -3340,9 +3340,9 @@ } static int -_e_gadcon_layout_smart_width_smart_sort_reverse_cb(void *d1, void *d2) +_e_gadcon_layout_smart_width_smart_sort_reverse_cb(const void *d1, const void *d2) { - E_Gadcon_Layout_Item *bi, *bi2; + const E_Gadcon_Layout_Item *bi, *bi2; bi = evas_object_data_get(d1, "e_gadcon_layout_data"); bi2 = evas_object_data_get(d2, "e_gadcon_layout_data"); @@ -3571,9 +3571,9 @@ } static int -_e_gadcon_layout_smart_sort_by_sequence_number_cb(void *d1, void *d2) +_e_gadcon_layout_smart_sort_by_sequence_number_cb(const void *d1, const void *d2) { - E_Gadcon_Layout_Item *bi, *bi2; + const E_Gadcon_Layout_Item *bi, *bi2; bi = evas_object_data_get(d1, "e_gadcon_layout_data"); bi2 = evas_object_data_get(d2, "e_gadcon_layout_data"); @@ -3586,9 +3586,9 @@ } static int -_e_gadcon_layout_smart_sort_by_position_cb(void *d1, void *d2) +_e_gadcon_layout_smart_sort_by_position_cb(const void *d1, const void *d2) { - E_Gadcon_Layout_Item *bi, *bi2; + const E_Gadcon_Layout_Item *bi, *bi2; bi = evas_object_data_get(d1, "e_gadcon_layout_data"); bi2 = evas_object_data_get(d2, "e_gadcon_layout_data"); @@ -3599,9 +3599,9 @@ } static int -_e_gadcon_layout_smart_containers_sort_cb(void *d1, void *d2) +_e_gadcon_layout_smart_containers_sort_cb(const void *d1, const void *d2) { - E_Layout_Item_Container *lc, *lc2; + const E_Layout_Item_Container *lc, *lc2; lc = d1; lc2 = d2; @@ -3613,9 +3613,9 @@ } static int -_e_gadcon_layout_smart_seq_sort_cb(void *d1, void *d2) +_e_gadcon_layout_smart_seq_sort_cb(const void *d1, const void *d2) { - E_Gadcon_Layout_Item *bi, *bi2; + const E_Gadcon_Layout_Item *bi, *bi2; bi = d1; bi2 = d2; Modified: trunk/e/src/bin/e_int_config_modules.c =================================================================== --- trunk/e/src/bin/e_int_config_modules.c 2008-10-27 06:46:01 UTC (rev 37201) +++ trunk/e/src/bin/e_int_config_modules.c 2008-10-27 07:33:21 UTC (rev 37202) @@ -76,7 +76,7 @@ static Evas_Bool _mod_hash_load_list (const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata); -static int _mod_list_sort (void *data1, void *data2); +static int _mod_list_sort (const void *data1, const void *data2); static void _list_widget_load (Evas_Object *obj, Eina_List *list); static void _avail_list_cb_change (void *data, Evas_Object *obj); static void _load_list_cb_change (void *data, Evas_Object *obj); @@ -476,9 +476,9 @@ } static int -_mod_list_sort(void *data1, void *data2) +_mod_list_sort(const void *data1, const void *data2) { - CFModule *m1, *m2; + const CFModule *m1, *m2; if (!(m1 = data1)) return 1; if (!(m2 = data2)) return -1; Modified: trunk/e/src/bin/e_int_menus.c =================================================================== --- trunk/e/src/bin/e_int_menus.c 2008-10-27 06:46:01 UTC (rev 37201) +++ trunk/e/src/bin/e_int_menus.c 2008-10-27 07:33:21 UTC (rev 37202) @@ -45,10 +45,10 @@ static void _e_int_menus_clients_item_cb (void *data, E_Menu *m, E_Menu_Item *mi); static void _e_int_menus_clients_icon_cb (void *data, E_Menu *m, E_Menu_Item *mi); static void _e_int_menus_clients_cleanup_cb (void *data, E_Menu *m, E_Menu_Item *mi); -static int _e_int_menus_clients_group_desk_cb (void *d1, void *d2); -static int _e_int_menus_clients_group_class_cb (void *d1, void *d2); -static int _e_int_menus_clients_sort_alpha_cb (void *d1, void *d2); -static int _e_int_menus_clients_sort_z_order_cb (void *d1, void *d2); +static int _e_int_menus_clients_group_desk_cb (const void *d1, const void *d2); +static int _e_int_menus_clients_group_class_cb (const void *d1, const void *d2); +static int _e_int_menus_clients_sort_alpha_cb (const void *d1, const void *d2); +static int _e_int_menus_clients_sort_z_order_cb (const void *d1, const void *d2); static void _e_int_menus_clients_add_by_class (Eina_List *borders, E_Menu *m); static void _e_int_menus_clients_add_by_desk (E_Desk *curr_desk, Eina_List *borders, E_Menu *m); static void _e_int_menus_clients_add_by_none (Eina_List *borders, E_Menu *m); @@ -948,11 +948,11 @@ } static int -_e_int_menus_clients_group_desk_cb(void *d1, void *d2) +_e_int_menus_clients_group_desk_cb(const void *d1, const void *d2) { - E_Border *bd1; - E_Border *bd2; - int j,k; + const E_Border *bd1; + const E_Border *bd2; + int j, k; if (!d1) return 1; if (!d2) return -1; @@ -969,10 +969,10 @@ } static int -_e_int_menus_clients_group_class_cb(void *d1, void *d2) +_e_int_menus_clients_group_class_cb(const void *d1, const void *d2) { - E_Border *bd1; - E_Border *bd2; + const E_Border *bd1; + const E_Border *bd2; if (!d1) return 1; if (!d2) return -1; @@ -992,10 +992,10 @@ } static int -_e_int_menus_clients_sort_alpha_cb(void *d1, void *d2) +_e_int_menus_clients_sort_alpha_cb(const void *d1, const void *d2) { - E_Border *bd1; - E_Border *bd2; + const E_Border *bd1; + const E_Border *bd2; const char *name1; const char *name2; @@ -1013,9 +1013,9 @@ } static int -_e_int_menus_clients_sort_z_order_cb(void *d1, void *d2) +_e_int_menus_clients_sort_z_order_cb(const void *d1, const void *d2) { - E_Border *bd1, *bd2; + const E_Border *bd1, *bd2; if (!d1) return 1; if (!d2) return -1; Modified: trunk/e/src/bin/e_module.c =================================================================== --- trunk/e/src/bin/e_module.c 2008-10-27 06:46:01 UTC (rev 37201) +++ trunk/e/src/bin/e_module.c 2008-10-27 07:33:21 UTC (rev 37202) @@ -16,7 +16,7 @@ static void _e_module_cb_dialog_disable(void *data, E_Dialog *dia); static void _e_module_event_update_free(void *data, void *event); static int _e_module_cb_idler(void *data); -static int _e_module_sort_priority(void *d1, void *d2); +static int _e_module_sort_priority(const void *d1, const void *d2); /* local subsystem globals */ static Eina_List *_e_modules = NULL; @@ -573,9 +573,9 @@ } static int -_e_module_sort_priority(void *d1, void *d2) +_e_module_sort_priority(const void *d1, const void *d2) { - E_Config_Module *m1, *m2; + const E_Config_Module *m1, *m2; m1 = d1; m2 = d2; Modified: trunk/e/src/bin/e_remember.c =================================================================== --- trunk/e/src/bin/e_remember.c 2008-10-27 06:46:01 UTC (rev 37201) +++ trunk/e/src/bin/e_remember.c 2008-10-27 07:33:21 UTC (rev 37202) @@ -8,7 +8,7 @@ /* local subsystem functions */ static void _e_remember_free(E_Remember *rem); -static int _e_remember_sort_list(void * d1, void * d2); +static int _e_remember_sort_list(const void * d1, const void * d2); static E_Remember *_e_remember_find(E_Border *bd, int check_usable); /* FIXME: match netwm window type */ @@ -466,9 +466,9 @@ } static int -_e_remember_sort_list(void * d1, void * d2) +_e_remember_sort_list(const void * d1, const void * d2) { - E_Remember *r1, *r2; + const E_Remember *r1, *r2; r1 = d1; r2 = d2; Modified: trunk/e/src/bin/e_shelf.c =================================================================== --- trunk/e/src/bin/e_shelf.c 2008-10-27 06:46:01 UTC (rev 37201) +++ trunk/e/src/bin/e_shelf.c 2008-10-27 07:33:21 UTC (rev 37202) @@ -19,7 +19,7 @@ static void _e_shelf_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info); static int _e_shelf_cb_mouse_in(void *data, int type, void *event); static int _e_shelf_cb_mouse_out(void *data, int type, void *event); -static int _e_shelf_cb_id_sort(void *data1, void *data2); +static int _e_shelf_cb_id_sort(const void *data1, const void *data2); static int _e_shelf_cb_hide_animator(void *data); static int _e_shelf_cb_hide_animator_timer(void *data); static int _e_shelf_cb_instant_hide_timer(void *data); @@ -1354,9 +1354,9 @@ } static int -_e_shelf_cb_id_sort(void *data1, void *data2) +_e_shelf_cb_id_sort(const void *data1, const void *data2) { - E_Shelf *es1, *es2; + const E_Shelf *es1, *es2; es1 = data1; es2 = data2; Modified: trunk/e/src/bin/e_xinerama.c =================================================================== --- trunk/e/src/bin/e_xinerama.c 2008-10-27 06:46:01 UTC (rev 37201) +++ trunk/e/src/bin/e_xinerama.c 2008-10-27 07:33:21 UTC (rev 37202) @@ -5,7 +5,7 @@ static void _e_xinerama_clean(void); static void _e_xinerama_update(void); -static int _e_xinerama_cb_screen_sort(void *data1, void *data2); +static int _e_xinerama_cb_screen_sort(const void *data1, const void *data2); static Eina_List *all_screens = NULL; static Eina_List *chosen_screens = NULL; @@ -204,9 +204,9 @@ } static int -_e_xinerama_cb_screen_sort(void *data1, void *data2) +_e_xinerama_cb_screen_sort(const void *data1, const void *data2) { - E_Screen *scr, *scr2; + const E_Screen *scr, *scr2; int dif; scr = data1; |
From: Enlightenment S. <no-...@en...> - 2008-10-27 07:33:37
|
Log: Right function prototype for ecore_timer_add callback. Author: englebass Date: 2008-10-27 00:33:33 -0700 (Mon, 27 Oct 2008) New Revision: 37203 Modified: trunk/e/src/bin/e_main.c Modified: trunk/e/src/bin/e_main.c =================================================================== --- trunk/e/src/bin/e_main.c 2008-10-27 07:33:21 UTC (rev 37202) +++ trunk/e/src/bin/e_main.c 2008-10-27 07:33:33 UTC (rev 37203) @@ -107,7 +107,7 @@ #define TS(x) #endif -static int stdbg(void) +static int stdbg(void *data __UNUSED__) { // enable to debug eina stringshare usage // eina_stringshare_dump(); |
From: Enlightenment S. <no-...@en...> - 2008-10-27 07:33:48
|
Log: Remove unused variables. Author: englebass Date: 2008-10-27 00:33:45 -0700 (Mon, 27 Oct 2008) New Revision: 37204 Modified: trunk/e/src/bin/e_fm.c trunk/e/src/bin/e_fm_main.c Modified: trunk/e/src/bin/e_fm.c =================================================================== --- trunk/e/src/bin/e_fm.c 2008-10-27 07:33:33 UTC (rev 37203) +++ trunk/e/src/bin/e_fm.c 2008-10-27 07:33:45 UTC (rev 37204) @@ -1681,7 +1681,6 @@ static int _e_fm2_client_file_symlink(const char *path, const char *dest, const char *rel, int rel_to, int x, int y, int res_w, int res_h) { - E_Fm2_Client *cl; char *d; int l1, l2, l3, l; @@ -2483,7 +2482,6 @@ { E_Fm2_Smart_Data *sd; Eina_List *paths; - const char *dirpath; const char *filepath; size_t length = 0; size_t size = 0; @@ -4721,8 +4719,6 @@ static void _e_fm_drop_menu_abort_cb(void *data, E_Menu *m, E_Menu_Item *mi) { - char *args = data; - if(!data) return; } @@ -4804,7 +4800,7 @@ E_Event_Dnd_Drop *ev; E_Fm2_Icon *ic; Eina_List *fsel, *l, *ll, *il, *isel; - char buf[4096], *fl; + char buf[4096]; const char *fp; Evas_Coord dx, dy, ox, oy, x, y; int adjust_icons = 0; Modified: trunk/e/src/bin/e_fm_main.c =================================================================== --- trunk/e/src/bin/e_fm_main.c 2008-10-27 07:33:33 UTC (rev 37203) +++ trunk/e/src/bin/e_fm_main.c 2008-10-27 07:33:45 UTC (rev 37204) @@ -1533,7 +1533,6 @@ { E_Fm_Slave *slave; const char *command; - int result; slave = malloc(sizeof(E_Fm_Slave)); @@ -1600,7 +1599,6 @@ Ecore_Exe_Event_Data *e = event; E_Fm_Slave *slave; int magic, id, size; - int response[3]; void *sdata; int ssize; |
From: Enlightenment S. <no-...@en...> - 2008-10-27 07:34:02
|
Log: Fix print formatting Author: englebass Date: 2008-10-27 00:33:59 -0700 (Mon, 27 Oct 2008) New Revision: 37205 Modified: trunk/e/src/bin/e_fm.c trunk/e/src/bin/e_fm_main.c trunk/e/src/bin/e_fm_op.c Modified: trunk/e/src/bin/e_fm.c =================================================================== --- trunk/e/src/bin/e_fm.c 2008-10-27 07:33:45 UTC (rev 37204) +++ trunk/e/src/bin/e_fm.c 2008-10-27 07:33:59 UTC (rev 37205) @@ -2126,18 +2126,18 @@ break; case E_FM_OP_ERROR:/*error*/ - printf("%s:%s(%d) Error from slave #%d: %s\n", __FILE__, __FUNCTION__, __LINE__, e->ref, e->data); + printf("%s:%s(%d) Error from slave #%d: %s\n", __FILE__, __FUNCTION__, __LINE__, e->ref, (char *)e->data); _e_fm_error_dialog(e->ref, e->data); break; case E_FM_OP_ERROR_RETRY_ABORT:/*error*/ - printf("%s:%s(%d) Error from slave #%d: %s\n", __FILE__, __FUNCTION__, __LINE__, e->ref, e->data); - _e_fm_retry_abort_dialog(e->ref, e->data); + printf("%s:%s(%d) Error from slave #%d: %s\n", __FILE__, __FUNCTION__, __LINE__, e->ref, (char *)e->data); + _e_fm_retry_abort_dialog(e->ref, (char *)e->data); break; case E_FM_OP_OVERWRITE:/*overwrite*/ - printf("%s:%s(%d) Overwrite from slave #%d: %s\n", __FILE__, __FUNCTION__, __LINE__, e->ref, e->data); - _e_fm_overwrite_dialog(e->ref, e->data); + printf("%s:%s(%d) Overwrite from slave #%d: %s\n", __FILE__, __FUNCTION__, __LINE__, e->ref, (char *)e->data); + _e_fm_overwrite_dialog(e->ref, (char *)e->data); break; case E_FM_OP_PROGRESS:/*progress*/ @@ -2158,7 +2158,7 @@ #undef UP src = p; dst = p + strlen(src) + 1; - printf("%s:%s(%d) Progress from slave #%d:\n\t%d%% done,\n\t%d seconds left,\n\t%lu done,\n\t%lu total,\n\tsrc = %s,\n\tdst = %s.\n", __FILE__, __FUNCTION__, __LINE__, e->ref, percent, seconds, done, total, src, dst); + printf("%s:%s(%d) Progress from slave #%d:\n\t%d%% done,\n\t%d seconds left,\n\t%d done,\n\t%d total,\n\tsrc = %s,\n\tdst = %s.\n", __FILE__, __FUNCTION__, __LINE__, e->ref, percent, seconds, done, total, src, dst); } break; Modified: trunk/e/src/bin/e_fm_main.c =================================================================== --- trunk/e/src/bin/e_fm_main.c 2008-10-27 07:33:45 UTC (rev 37204) +++ trunk/e/src/bin/e_fm_main.c 2008-10-27 07:33:59 UTC (rev 37205) @@ -1653,7 +1653,7 @@ slave = ecore_exe_data_get(e->exe); - printf("EFM: Data from STDERR of slave #%d: %.*s", slave->id, e->size, e->data); + printf("EFM: Data from STDERR of slave #%d: %.*s", slave->id, e->size, (char *)e->data); return 1; } Modified: trunk/e/src/bin/e_fm_op.c =================================================================== --- trunk/e/src/bin/e_fm_op.c 2008-10-27 07:33:45 UTC (rev 37204) +++ trunk/e/src/bin/e_fm_op.c 2008-10-27 07:33:59 UTC (rev 37205) @@ -833,7 +833,7 @@ write(STDOUT_FILENO, buf, 3*sizeof(int) + len + 1); - E_FM_OP_DEBUG(str); + E_FM_OP_DEBUG("%s", str); E_FM_OP_DEBUG(" Error sent.\n"); } |
From: Enlightenment S. <no-...@en...> - 2008-10-27 07:34:13
|
Log: Remove stray statement. Author: englebass Date: 2008-10-27 00:34:10 -0700 (Mon, 27 Oct 2008) New Revision: 37206 Modified: trunk/e/src/bin/e_fm_hal.c Modified: trunk/e/src/bin/e_fm_hal.c =================================================================== --- trunk/e/src/bin/e_fm_hal.c 2008-10-27 07:33:59 UTC (rev 37205) +++ trunk/e/src/bin/e_fm_hal.c 2008-10-27 07:34:10 UTC (rev 37206) @@ -304,7 +304,6 @@ /* FIXME: manipulate icon directly */ _e_fm2_file_force_update(buf); //_e_fm2_file_force_update(buf2); - e_config; } } |
From: Enlightenment S. <no-...@en...> - 2008-10-27 07:34:26
|
Log: Fix if formatting. Author: englebass Date: 2008-10-27 00:34:22 -0700 (Mon, 27 Oct 2008) New Revision: 37207 Modified: trunk/e/src/bin/e_dnd.c trunk/e/src/bin/e_fm.c trunk/e/src/bin/e_fm_hal.c trunk/e/src/bin/e_fm_main.c trunk/e/src/bin/e_fm_op.c Modified: trunk/e/src/bin/e_dnd.c =================================================================== --- trunk/e/src/bin/e_dnd.c 2008-10-27 07:34:10 UTC (rev 37206) +++ trunk/e/src/bin/e_dnd.c 2008-10-27 07:34:22 UTC (rev 37207) @@ -847,7 +847,7 @@ leave_ev.y = y - dy; if (E_INSIDE(x, y, dx, dy, dw, dh) && _e_drag_win_matches(h, win, 1)) { - if(e_drop_handler_responsive_get(h)) responsive = 1; + if (e_drop_handler_responsive_get(h)) responsive = 1; if (!h->entered) { @@ -1136,7 +1136,7 @@ ev = event; if (ev->win != _drag_win) return 1; - if(!_xdnd) _e_drag_update(_drag_win_root, ev->x, ev->y, ECORE_X_ATOM_XDND_ACTION_PRIVATE); + if (!_xdnd) _e_drag_update(_drag_win_root, ev->x, ev->y, ECORE_X_ATOM_XDND_ACTION_PRIVATE); return 1; } @@ -1302,7 +1302,7 @@ else { responsive = _e_drag_update(ev->win, ev->position.x, ev->position.y, ev->action); - if(responsive) + if (responsive) { ecore_x_dnd_send_status(1, 0, rect, _action); } Modified: trunk/e/src/bin/e_fm.c =================================================================== --- trunk/e/src/bin/e_fm.c 2008-10-27 07:34:10 UTC (rev 37206) +++ trunk/e/src/bin/e_fm.c 2008-10-27 07:34:22 UTC (rev 37207) @@ -2525,7 +2525,7 @@ args = _e_fm_string_append_quoted(args, &size, &length, sd->realpath); /* Roll the operation! */ - if(_e_fm_file_buffer_copying) + if (_e_fm_file_buffer_copying) { _e_fm_client_file_copy(args); } @@ -4295,7 +4295,7 @@ Evas_Object *obj = data; E_Fm2_Smart_Data *sd; - if(!data) return 0; + if (!data) return 0; sd = evas_object_smart_data_get(obj); if (!sd) return 0; @@ -4325,7 +4325,7 @@ _e_fm2_typebuf_match(obj); edje_object_part_text_set(sd->overlay, "e.text.typebuf_label", sd->typebuf.buf); - if(sd->typebuf.timer) + if (sd->typebuf.timer) { ecore_timer_del(sd->typebuf.timer); } @@ -4657,7 +4657,7 @@ void *data, *p; data = alloca(length); - if(!data) return; + if (!data) return; p = data; @@ -4677,10 +4677,10 @@ { E_Fm2_Custom_File *cf, new; - if(!file) return; + if (!file) return; cf = e_fm2_custom_file_get(file); - if(!cf) + if (!cf) { memset(&new, 0, sizeof(E_Fm2_Custom_File)); cf = &new; @@ -4701,7 +4701,7 @@ { char *args = data; - if(!data) return; + if (!data) return; _e_fm_client_file_copy(args); } @@ -4711,7 +4711,7 @@ { char *args = data; - if(!data) return; + if (!data) return; _e_fm_client_file_move(args); } @@ -4719,7 +4719,7 @@ static void _e_fm_drop_menu_abort_cb(void *data, E_Menu *m, E_Menu_Item *mi) { - if(!data) return; + if (!data) return; } static void @@ -4727,7 +4727,7 @@ { char *args = data; - if(!data) return; + if (!data) return; free(args); } @@ -4742,7 +4742,7 @@ E_Zone *zone = NULL; int x, y; - if(!menu) return; + if (!menu) return; item = e_menu_item_new(menu); e_menu_item_label_set(item, _("Copy")); @@ -4969,17 +4969,17 @@ } } - if(e_drop_handler_action_get() == ECORE_X_ATOM_XDND_ACTION_COPY) + if (e_drop_handler_action_get() == ECORE_X_ATOM_XDND_ACTION_COPY) { _e_fm_client_file_copy(args); free(args); } - else if(e_drop_handler_action_get() == ECORE_X_ATOM_XDND_ACTION_MOVE) + else if (e_drop_handler_action_get() == ECORE_X_ATOM_XDND_ACTION_MOVE) { _e_fm_client_file_move(args); free(args); } - else if(e_drop_handler_action_get() == ECORE_X_ATOM_XDND_ACTION_ASK) + else if (e_drop_handler_action_get() == ECORE_X_ATOM_XDND_ACTION_ASK) { _e_fm_drop_menu(args); } @@ -7396,7 +7396,7 @@ static char * _e_fm_string_append_char(char *str, size_t *size, size_t *len, char c) { - if(str == NULL) + if (str == NULL) { str = malloc(4096); str[0] = '\x00'; @@ -7404,7 +7404,7 @@ *len = 0; } - if(*len >= *size - 1) + if (*len >= *size - 1) { *size += 1024; str = realloc(str, *size); @@ -7467,7 +7467,7 @@ if (e_filereg_file_protected(buf)) continue; files = _e_fm_string_append_quoted(files, &size, &len, buf); - if(l->next) files = _e_fm_string_append_char(files, &size, &len, ' '); + if (l->next) files = _e_fm_string_append_char(files, &size, &len, ' '); } eina_list_free(sel); Modified: trunk/e/src/bin/e_fm_hal.c =================================================================== --- trunk/e/src/bin/e_fm_hal.c 2008-10-27 07:34:10 UTC (rev 37206) +++ trunk/e/src/bin/e_fm_hal.c 2008-10-27 07:34:22 UTC (rev 37207) @@ -294,7 +294,7 @@ v->udi); fclose(f); - if(e_config->hal_desktop) + if (e_config->hal_desktop) { snprintf(buf2, sizeof(buf2) - 1, "%s/Desktop/|%s_%d.desktop", e_user_homedir_get(), id, v->partition_number); @@ -325,7 +325,7 @@ ecore_file_unlink(buf); _e_fm2_file_force_update(buf); - if(e_config->hal_desktop) + if (e_config->hal_desktop) { snprintf(buf, sizeof(buf) - 1, "%s/.e/e/fileman/favorites/|%s_%d.desktop", e_user_homedir_get(), id, v->partition_number); @@ -510,7 +510,7 @@ { v = eina_list_data_get(l); - if(!v) continue; + if (!v) continue; if (!v->storage) continue; id = ecore_file_file_get(v->storage->udi); @@ -521,7 +521,7 @@ snprintf(buf2, sizeof(buf2) - 1, "%s/Desktop/|%s_%d.desktop", e_user_homedir_get(), id, v->partition_number); - if(ecore_file_exists(buf) && !ecore_file_exists(buf2)) + if (ecore_file_exists(buf) && !ecore_file_exists(buf2)) { ecore_file_symlink(buf, buf2); _e_fm2_file_force_update(buf2); @@ -541,7 +541,7 @@ { v = eina_list_data_get(l); - if(!v) continue; + if (!v) continue; if (!v->storage) continue; id = ecore_file_file_get(v->storage->udi); @@ -549,7 +549,7 @@ snprintf(buf, sizeof(buf) - 1, "%s/Desktop/|%s_%d.desktop", e_user_homedir_get(), id, v->partition_number); - if(ecore_file_exists(buf)) + if (ecore_file_exists(buf)) { ecore_file_unlink(buf); _e_fm2_file_force_update(buf); Modified: trunk/e/src/bin/e_fm_main.c =================================================================== --- trunk/e/src/bin/e_fm_main.c 2008-10-27 07:34:10 UTC (rev 37206) +++ trunk/e/src/bin/e_fm_main.c 2008-10-27 07:34:22 UTC (rev 37207) @@ -997,7 +997,7 @@ { E_Fm_Task *task = malloc(sizeof(E_Fm_Task)); - if(!task) return; + if (!task) return; task->id = id; task->type = E_FM_OP_MONITOR_START; @@ -1209,7 +1209,7 @@ while(l) { task = eina_list_data_get(l); - if(task->id == id) + if (task->id == id) return l; l = eina_list_next(l); @@ -1242,9 +1242,9 @@ _e_fm_tasks = eina_list_remove_list(_e_fm_tasks, l); - if(task->src) eina_stringshare_del(task->src); - if(task->dst) eina_stringshare_del(task->dst); - if(task->rel) eina_stringshare_del(task->rel); + if (task->src) eina_stringshare_del(task->src); + if (task->dst) eina_stringshare_del(task->dst); + if (task->rel) eina_stringshare_del(task->rel); free(task); } @@ -1254,7 +1254,7 @@ { char buf[PATH_MAX + 4096]; - if(mkdir(task->src, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) < 0) + if (mkdir(task->src, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) < 0) { snprintf(buf, sizeof(buf), "Cannot make directory '%s': %s.", task->src, strerror(errno)); _e_client_send(task->id, E_FM_OP_ERROR_RETRY_ABORT, buf, strlen(buf) + 1); @@ -1293,18 +1293,18 @@ E_Fm_Task *task = _e_fm_task_get(id); E_Fm_Slave *slave = NULL; - if(!task) + if (!task) { slave = _e_fm_slave_get(id); - if(slave) _e_fm_slave_send(slave, type, NULL, 0); + if (slave) _e_fm_slave_send(slave, type, NULL, 0); return; } - if(type == E_FM_OP_ERROR_RESPONSE_ABORT) + if (type == E_FM_OP_ERROR_RESPONSE_ABORT) { _e_fm_task_remove(task); } - else if(type == E_FM_OP_ERROR_RESPONSE_RETRY) + else if (type == E_FM_OP_ERROR_RESPONSE_RETRY) { switch(task->type) { @@ -2085,12 +2085,12 @@ char buffer[PATH_MAX]; char order[PATH_MAX]; - if(!file || !dst || !relative) return; - if(after != 0 && after != 1 && after != 2) return; + if (!file || !dst || !relative) return; + if (after != 0 && after != 1 && after != 2) return; // printf("%s:%s(%d) Reorder:\n\tfile = %s\n\tdst = %s\n\trelative = %s\n\tafter = %d\n", __FILE__, __FUNCTION__, __LINE__, file, dst, relative, after); snprintf(order, sizeof(order), "%s/.order", dst); - if(ecore_file_exists(order)) + if (ecore_file_exists(order)) { FILE *forder; Eina_List *files = NULL, *l; Modified: trunk/e/src/bin/e_fm_op.c =================================================================== --- trunk/e/src/bin/e_fm_op.c 2008-10-27 07:34:10 UTC (rev 37206) +++ trunk/e/src/bin/e_fm_op.c 2008-10-27 07:34:22 UTC (rev 37207) @@ -449,10 +449,10 @@ static void _e_fm_op_set_up_idlers() { - if(!_e_fm_op_scan_idler_p) + if (!_e_fm_op_scan_idler_p) _e_fm_op_scan_idler_p = ecore_idler_add(_e_fm_op_scan_idler, NULL); - if(!_e_fm_op_work_idler_p) + if (!_e_fm_op_work_idler_p) _e_fm_op_work_idler_p = ecore_idler_add(_e_fm_op_work_idler, NULL); } @@ -478,7 +478,7 @@ static void _e_fm_op_delete_idler(int *mark) { - if(mark == &_e_fm_op_work_error) + if (mark == &_e_fm_op_work_error) { ecore_idler_del(_e_fm_op_work_idler_p); _e_fm_op_work_idler_p = NULL; |
From: Enlightenment S. <no-...@en...> - 2008-10-27 07:34:37
|
Log: Fix for formatting. Author: englebass Date: 2008-10-27 00:34:34 -0700 (Mon, 27 Oct 2008) New Revision: 37208 Modified: trunk/e/src/bin/e_fm_hal.c Modified: trunk/e/src/bin/e_fm_hal.c =================================================================== --- trunk/e/src/bin/e_fm_hal.c 2008-10-27 07:34:22 UTC (rev 37207) +++ trunk/e/src/bin/e_fm_hal.c 2008-10-27 07:34:34 UTC (rev 37208) @@ -506,7 +506,7 @@ char buf2[PATH_MAX] = {0}; const char *id; - for(l = _e_vols; l; l = eina_list_next(l)) + for (l = _e_vols; l; l = eina_list_next(l)) { v = eina_list_data_get(l); @@ -537,7 +537,7 @@ char buf[PATH_MAX] = {0}; const char *id; - for(l = _e_vols; l; l = eina_list_next(l)) + for (l = _e_vols; l; l = eina_list_next(l)) { v = eina_list_data_get(l); |
From: Enlightenment S. <no-...@en...> - 2008-10-27 07:34:48
|
Log: Fix while formatting. Author: englebass Date: 2008-10-27 00:34:45 -0700 (Mon, 27 Oct 2008) New Revision: 37209 Modified: trunk/e/src/bin/e_fm_main.c Modified: trunk/e/src/bin/e_fm_main.c =================================================================== --- trunk/e/src/bin/e_fm_main.c 2008-10-27 07:34:34 UTC (rev 37208) +++ trunk/e/src/bin/e_fm_main.c 2008-10-27 07:34:45 UTC (rev 37209) @@ -1206,7 +1206,7 @@ Eina_List *l = _e_fm_tasks; E_Fm_Task *task; - while(l) + while (l) { task = eina_list_data_get(l); if (task->id == id) |
From: Enlightenment S. <no-...@en...> - 2008-10-27 10:53:12
|
Log: Revert my previous fix, and do a correct fix. Author: englebass Date: 2008-10-27 03:47:11 -0700 (Mon, 27 Oct 2008) New Revision: 37223 Modified: trunk/e/src/bin/e_config.c Modified: trunk/e/src/bin/e_config.c =================================================================== --- trunk/e/src/bin/e_config.c 2008-10-27 10:46:57 UTC (rev 37222) +++ trunk/e/src/bin/e_config.c 2008-10-27 10:47:11 UTC (rev 37223) @@ -1956,7 +1956,7 @@ static int _e_config_cb_timer(void *data) { - e_util_dialog_show(_("Configuration Upgraded"), _("Configuration Upgraded")); + e_util_dialog_show(_("Configuration Upgraded"), "%s", (char *)data); return 0; } |
From: Enlightenment S. <no-...@en...> - 2008-10-27 12:56:28
|
Log: ecore_strlcpy Author: englebass Date: 2008-10-27 05:56:23 -0700 (Mon, 27 Oct 2008) New Revision: 37238 Modified: trunk/e/src/bin/e_start_main.c Modified: trunk/e/src/bin/e_start_main.c =================================================================== --- trunk/e/src/bin/e_start_main.c 2008-10-27 12:34:35 UTC (rev 37237) +++ trunk/e/src/bin/e_start_main.c 2008-10-27 12:56:23 UTC (rev 37238) @@ -84,7 +84,7 @@ _prefix_path = malloc(p - _exe_path + 1); if (_prefix_path) { - strlcpy(_prefix_path, _exe_path, p - _exe_path + 1); + ecore_strlcpy(_prefix_path, _exe_path, p - _exe_path + 1); return 1; } else |
From: Enlightenment S. <no-...@en...> - 2008-10-27 13:32:11
|
Log: Create global drag object for border so we can manipulate it. Author: englebass Date: 2008-10-27 06:32:08 -0700 (Mon, 27 Oct 2008) New Revision: 37241 Modified: trunk/e/src/bin/e_border.c Modified: trunk/e/src/bin/e_border.c =================================================================== --- trunk/e/src/bin/e_border.c 2008-10-27 13:31:39 UTC (rev 37240) +++ trunk/e/src/bin/e_border.c 2008-10-27 13:32:08 UTC (rev 37241) @@ -57,6 +57,7 @@ static int _e_border_cb_mouse_up(void *data, int type, void *event); static int _e_border_cb_mouse_move(void *data, int type, void *event); static int _e_border_cb_grab_replay(void *data, int type, void *event); +static void _e_border_cb_drag_finished(E_Drag *drag, int dropped); static void _e_border_eval(E_Border *bd); static void _e_border_moveinfo_gather(E_Border *bd, const char *source); @@ -111,6 +112,7 @@ static E_Border *resize = NULL; static E_Border *move = NULL; +static E_Drag *drag_border = NULL; static int grabbed = 0; @@ -3743,6 +3745,7 @@ { E_Event_Border_Remove *ev; + printf("Border is gone\n"); if (bd->border_menu) e_menu_deactivate(bd->border_menu); if (bd->border_locks_dialog) @@ -5343,28 +5346,30 @@ /* start drag! */ if (bd->icon_object) { - E_Drag *drag; Evas_Object *o = NULL; Evas_Coord x, y, w, h; const char *drag_types[] = { "enlightenment/border" }; + e_object_ref(E_OBJECT(bd)); evas_object_geometry_get(bd->icon_object, &x, &y, &w, &h); - drag = e_drag_new(bd->zone->container, - bd->x + bd->fx.x + x, - bd->y + bd->fx.y + y, - drag_types, 1, bd, -1, NULL, NULL); - o = e_border_icon_add(bd, drag->evas); + drag_border = e_drag_new(bd->zone->container, + bd->x + bd->fx.x + x, + bd->y + bd->fx.y + y, + drag_types, 1, bd, -1, + NULL, + _e_border_cb_drag_finished); + o = e_border_icon_add(bd, drag_border->evas); if (!o) { /* FIXME: fallback icon for drag */ - o = evas_object_rectangle_add(drag->evas); + o = evas_object_rectangle_add(drag_border->evas); evas_object_color_set(o, 255, 255, 255, 255); } - e_drag_object_set(drag, o); + e_drag_object_set(drag_border, o); - e_drag_resize(drag, w, h); - e_drag_start(drag, bd->drag.x, bd->drag.y); + e_drag_resize(drag_border, w, h); + e_drag_start(drag_border, bd->drag.x, bd->drag.y); } bd->drag.start = 0; } @@ -5403,6 +5408,16 @@ return 0; } +static void +_e_border_cb_drag_finished(E_Drag *drag, int dropped) +{ + E_Border *bd; + + bd = drag->data; + e_object_unref(E_OBJECT(bd)); + drag_border = NULL; +} + static int _e_border_post_move_resize_job(void *data) { |
From: Enlightenment S. <no-...@en...> - 2008-10-27 13:32:34
|
Log: Don't use ecore_strlcpy in start as we don't link to ecore here. Author: englebass Date: 2008-10-27 06:32:30 -0700 (Mon, 27 Oct 2008) New Revision: 37242 Modified: trunk/e/src/bin/e_start_main.c Modified: trunk/e/src/bin/e_start_main.c =================================================================== --- trunk/e/src/bin/e_start_main.c 2008-10-27 13:32:08 UTC (rev 37241) +++ trunk/e/src/bin/e_start_main.c 2008-10-27 13:32:30 UTC (rev 37242) @@ -84,7 +84,8 @@ _prefix_path = malloc(p - _exe_path + 1); if (_prefix_path) { - ecore_strlcpy(_prefix_path, _exe_path, p - _exe_path + 1); + strncpy(_prefix_path, _exe_path, p - _exe_path); + _prefix_path[p - _exe_path] = 0; return 1; } else |
From: Enlightenment S. <no-...@en...> - 2008-10-27 14:14:48
|
Log: Clean up drag on border del. Author: englebass Date: 2008-10-27 07:14:42 -0700 (Mon, 27 Oct 2008) New Revision: 37245 Modified: trunk/e/src/bin/e_border.c trunk/e/src/bin/e_dnd.c Modified: trunk/e/src/bin/e_border.c =================================================================== --- trunk/e/src/bin/e_border.c 2008-10-27 14:05:09 UTC (rev 37244) +++ trunk/e/src/bin/e_border.c 2008-10-27 14:14:42 UTC (rev 37245) @@ -3745,7 +3745,11 @@ { E_Event_Border_Remove *ev; - printf("Border is gone\n"); + if ((drag_border) && (drag_border->data == bd)) + { + e_object_del(E_OBJECT(drag_border)); + drag_border = NULL; + } if (bd->border_menu) e_menu_deactivate(bd->border_menu); if (bd->border_locks_dialog) Modified: trunk/e/src/bin/e_dnd.c =================================================================== --- trunk/e/src/bin/e_dnd.c 2008-10-27 14:05:09 UTC (rev 37244) +++ trunk/e/src/bin/e_dnd.c 2008-10-27 14:14:42 UTC (rev 37245) @@ -883,6 +883,7 @@ E_Event_Dnd_Drop ev; int dx, dy, dw, dh; Ecore_X_Window win, ignore_win[2]; + E_Drag *tmp; if (!_drag_current) return; ignore_win[0] = _drag_current->evas_win; @@ -911,8 +912,9 @@ if (_drag_current && !_xdnd) { - e_object_del(E_OBJECT(_drag_current)); + tmp = _drag_current; _drag_current = NULL; + e_object_del(E_OBJECT(tmp)); } return; } @@ -951,8 +953,10 @@ } if (_drag_current->cb.finished) _drag_current->cb.finished(_drag_current, dropped); - e_object_del(E_OBJECT(_drag_current)); + + tmp = _drag_current; _drag_current = NULL; + e_object_del(E_OBJECT(tmp)); } else { @@ -1048,6 +1052,37 @@ { int i; + if (drag == _drag_current) + { + Eina_List *l; + E_Event_Dnd_Leave leave_ev; + + e_grabinput_release(_drag_win, _drag_win); + ecore_x_window_del(_drag_win); + _drag_win = 0; + _drag_win_root = 0; + + leave_ev.x = 0; + leave_ev.y = 0; + for (l = _drop_handlers; l; l = l->next) + { + E_Drop_Handler *h; + + h = l->data; + + if ((h->active) && (h->entered)) + { + if (h->cb.leave) + h->cb.leave(h->cb.data, h->active_type, &leave_ev); + _e_drag_win_hide(h); + } + } + if (drag->cb.finished) + drag->cb.finished(drag, 0); + } + + _drag_current = NULL; + _drag_list = eina_list_remove(_drag_list, drag); E_FREE(drag->shape_rects); @@ -1339,8 +1374,11 @@ if (_drag_current) { - e_object_del(E_OBJECT(_drag_current)); + E_Drag *tmp; + + tmp = _drag_current; _drag_current = NULL; + e_object_del(E_OBJECT(tmp)); } e_grabinput_release(_drag_win, _drag_win); |
From: Enlightenment S. <no-...@en...> - 2009-11-08 20:27:44
|
Log: Remove unused variables Author: englebass Date: 2009-11-08 12:27:32 -0800 (Sun, 08 Nov 2009) New Revision: 43542 Modified: trunk/e/src/bin/e_utils.c Modified: trunk/e/src/bin/e_utils.c =================================================================== --- trunk/e/src/bin/e_utils.c 2009-11-08 20:27:22 UTC (rev 43541) +++ trunk/e/src/bin/e_utils.c 2009-11-08 20:27:32 UTC (rev 43542) @@ -1074,7 +1074,6 @@ { Eina_List *l, *ll, *lll; - Eina_List *mans, *cons; E_Manager *man; E_Container *con; E_Zone *zone; |
From: Enlightenment S. <no-...@en...> - 2009-11-08 20:27:56
|
Log: Don't test for null on non pointer variable Author: englebass Date: 2009-11-08 12:27:42 -0800 (Sun, 08 Nov 2009) New Revision: 43543 Modified: trunk/e/src/bin/e_fm_hal.c Modified: trunk/e/src/bin/e_fm_hal.c =================================================================== --- trunk/e/src/bin/e_fm_hal.c 2009-11-08 20:27:32 UTC (rev 43542) +++ trunk/e/src/bin/e_fm_hal.c 2009-11-08 20:27:42 UTC (rev 43543) @@ -221,7 +221,7 @@ else snprintf(label, sizeof(label), _("Unknown Volume")); - if ((label) && (label[0])) + if (label[0]) { if (v->label) free(v->label); v->label = strdup(label); |