From 56ae99797697a4a46b33b19bf1918ec619dee986 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 1 Jan 2014 15:47:35 -0500 Subject: [PATCH] deduplicate E_Remember edd what if we weren't insane and didn't have the same exact code in 2 places? --- src/bin/e_config.c | 9 +++--- src/bin/e_remember.c | 70 +------------------------------------------- src/bin/e_remember.h | 2 +- 3 files changed, 6 insertions(+), 75 deletions(-) diff --git a/src/bin/e_config.c b/src/bin/e_config.c index d771d0776..7c0c550cd 100644 --- a/src/bin/e_config.c +++ b/src/bin/e_config.c @@ -39,7 +39,6 @@ static E_Config_DD *_e_config_desktop_bg_edd = NULL; static E_Config_DD *_e_config_desklock_bg_edd = NULL; static E_Config_DD *_e_config_desktop_name_edd = NULL; static E_Config_DD *_e_config_desktop_window_profile_edd = NULL; -static E_Config_DD *_e_config_remember_edd = NULL; static E_Config_DD *_e_config_menu_applications_edd = NULL; static E_Config_DD *_e_config_color_class_edd = NULL; static E_Config_DD *_e_config_gadcon_edd = NULL; @@ -110,7 +109,7 @@ _e_config_edd_shutdown(void) E_CONFIG_DD_FREE(_e_config_desklock_bg_edd); E_CONFIG_DD_FREE(_e_config_desktop_name_edd); E_CONFIG_DD_FREE(_e_config_desktop_window_profile_edd); - E_CONFIG_DD_FREE(_e_config_remember_edd); + E_CONFIG_DD_FREE(e_remember_edd); E_CONFIG_DD_FREE(_e_config_menu_applications_edd); E_CONFIG_DD_FREE(_e_config_gadcon_edd); E_CONFIG_DD_FREE(_e_config_gadcon_client_edd); @@ -280,11 +279,11 @@ _e_config_edd_init(Eina_Bool old) E_CONFIG_VAL(D, T, load_time, LL); E_CONFIG_VAL(D, T, exec_valid, INT); - _e_config_remember_edd = E_CONFIG_DD_NEW("E_Remember", E_Remember); + e_remember_edd = E_CONFIG_DD_NEW("E_Remember", E_Remember); #undef T #undef D #define T E_Remember -#define D _e_config_remember_edd +#define D e_remember_edd E_CONFIG_VAL(D, T, match, INT); E_CONFIG_VAL(D, T, no_reopen, INT); E_CONFIG_VAL(D, T, apply_first_only, UCHAR); @@ -518,7 +517,7 @@ _e_config_edd_init(Eina_Bool old) E_CONFIG_VAL(D, T, transition_start, STR); /**/ E_CONFIG_VAL(D, T, transition_desk, STR); /**/ E_CONFIG_VAL(D, T, transition_change, STR); /**/ - E_CONFIG_LIST(D, T, remembers, _e_config_remember_edd); + E_CONFIG_LIST(D, T, remembers, e_remember_edd); E_CONFIG_LIST(D, T, menu_applications, _e_config_menu_applications_edd); E_CONFIG_VAL(D, T, remember_internal_windows, INT); E_CONFIG_VAL(D, T, remember_internal_fm_windows, UCHAR); diff --git a/src/bin/e_remember.c b/src/bin/e_remember.c index 1e42a6a09..60affe0c5 100644 --- a/src/bin/e_remember.c +++ b/src/bin/e_remember.c @@ -4,6 +4,7 @@ #define REMEMBER_SIMPLE 0 EAPI int E_EVENT_REMEMBER_UPDATE = -1; +EAPI E_Config_DD *e_remember_edd = NULL; typedef struct _E_Remember_List E_Remember_List; @@ -23,7 +24,6 @@ static Eina_Bool _e_remember_restore_cb(void *data, int type, void *event); /* local subsystem globals */ static Eina_List *hooks = NULL; -static E_Config_DD *e_remember_edd = NULL; static E_Config_DD *e_remember_list_edd = NULL; static E_Remember_List *remembers = NULL; static Eina_List *handlers = NULL; @@ -931,74 +931,6 @@ _e_remember_cb_hook_pre_post_fetch(void *data __UNUSED__, E_Client *ec) static void _e_remember_init_edd(void) { - e_remember_edd = E_CONFIG_DD_NEW("E_Remember", E_Remember); -#undef T -#undef D -#define T E_Remember -#define D e_remember_edd - E_CONFIG_VAL(D, T, match, INT); - E_CONFIG_VAL(D, T, no_reopen, INT); - E_CONFIG_VAL(D, T, apply_first_only, UCHAR); - E_CONFIG_VAL(D, T, keep_settings, UCHAR); - E_CONFIG_VAL(D, T, name, STR); - E_CONFIG_VAL(D, T, class, STR); - E_CONFIG_VAL(D, T, title, STR); - E_CONFIG_VAL(D, T, role, STR); - E_CONFIG_VAL(D, T, type, INT); - E_CONFIG_VAL(D, T, transient, UCHAR); - E_CONFIG_VAL(D, T, apply, INT); - E_CONFIG_VAL(D, T, max_score, INT); - E_CONFIG_VAL(D, T, prop.pos_x, INT); - E_CONFIG_VAL(D, T, prop.pos_y, INT); - E_CONFIG_VAL(D, T, prop.res_x, INT); - E_CONFIG_VAL(D, T, prop.res_y, INT); - E_CONFIG_VAL(D, T, prop.pos_w, INT); - E_CONFIG_VAL(D, T, prop.pos_h, INT); - E_CONFIG_VAL(D, T, prop.w, INT); - E_CONFIG_VAL(D, T, prop.h, INT); - E_CONFIG_VAL(D, T, prop.layer, INT); - E_CONFIG_VAL(D, T, prop.maximize, UINT); - E_CONFIG_VAL(D, T, prop.lock_user_location, UCHAR); - E_CONFIG_VAL(D, T, prop.lock_client_location, UCHAR); - E_CONFIG_VAL(D, T, prop.lock_user_size, UCHAR); - E_CONFIG_VAL(D, T, prop.lock_client_size, UCHAR); - E_CONFIG_VAL(D, T, prop.lock_user_stacking, UCHAR); - E_CONFIG_VAL(D, T, prop.lock_client_stacking, UCHAR); - E_CONFIG_VAL(D, T, prop.lock_user_iconify, UCHAR); - E_CONFIG_VAL(D, T, prop.lock_client_iconify, UCHAR); - E_CONFIG_VAL(D, T, prop.lock_user_desk, UCHAR); - E_CONFIG_VAL(D, T, prop.lock_client_desk, UCHAR); - E_CONFIG_VAL(D, T, prop.lock_user_sticky, UCHAR); - E_CONFIG_VAL(D, T, prop.lock_client_sticky, UCHAR); - E_CONFIG_VAL(D, T, prop.lock_user_shade, UCHAR); - E_CONFIG_VAL(D, T, prop.lock_client_shade, UCHAR); - E_CONFIG_VAL(D, T, prop.lock_user_maximize, UCHAR); - E_CONFIG_VAL(D, T, prop.lock_client_maximize, UCHAR); - E_CONFIG_VAL(D, T, prop.lock_user_fullscreen, UCHAR); - E_CONFIG_VAL(D, T, prop.lock_client_fullscreen, UCHAR); - E_CONFIG_VAL(D, T, prop.lock_border, UCHAR); - E_CONFIG_VAL(D, T, prop.lock_close, UCHAR); - E_CONFIG_VAL(D, T, prop.lock_focus_in, UCHAR); - E_CONFIG_VAL(D, T, prop.lock_focus_out, UCHAR); - E_CONFIG_VAL(D, T, prop.lock_life, UCHAR); - E_CONFIG_VAL(D, T, prop.border, STR); - E_CONFIG_VAL(D, T, prop.sticky, UCHAR); - E_CONFIG_VAL(D, T, prop.shaded, UCHAR); - E_CONFIG_VAL(D, T, prop.skip_winlist, UCHAR); - E_CONFIG_VAL(D, T, prop.skip_pager, UCHAR); - E_CONFIG_VAL(D, T, prop.skip_taskbar, UCHAR); - E_CONFIG_VAL(D, T, prop.fullscreen, UCHAR); - E_CONFIG_VAL(D, T, prop.desk_x, INT); - E_CONFIG_VAL(D, T, prop.desk_y, INT); - E_CONFIG_VAL(D, T, prop.zone, INT); - E_CONFIG_VAL(D, T, prop.head, INT); - E_CONFIG_VAL(D, T, prop.command, STR); - E_CONFIG_VAL(D, T, prop.icon_preference, UCHAR); - E_CONFIG_VAL(D, T, prop.desktop_file, STR); - E_CONFIG_VAL(D, T, prop.offer_resistance, UCHAR); - E_CONFIG_VAL(D, T, prop.opacity, UCHAR); -#undef T -#undef D e_remember_list_edd = E_CONFIG_DD_NEW("E_Remember_List", E_Remember_List); #undef T #undef D diff --git a/src/bin/e_remember.h b/src/bin/e_remember.h index e5c9f36ae..d96440cee 100644 --- a/src/bin/e_remember.h +++ b/src/bin/e_remember.h @@ -1,7 +1,7 @@ #ifdef E_TYPEDEFS EAPI extern int E_EVENT_REMEMBER_UPDATE; - +EAPI extern E_Config_DD *e_remember_edd; typedef struct E_Event_Remember_Update { E_Client *ec;