remove maximize from e21 builds: present in main

devs/discomfitor/sandblog2017
Mike Blumenkrantz 7 years ago
parent 6b4bd60895
commit 35b323adfd
  1. 7
      src/ds_config.c
  2. 4
      src/e_mod_main.c
  3. 4
      src/e_mod_main.h
  4. 2
      src/maximize.c

@ -32,7 +32,7 @@ _ds_menu_ruler(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi)
mr_init();
e_config_save_queue();
}
#if E_VERSION_MAJOR == 20
static void
_ds_menu_maximize(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi)
{
@ -43,6 +43,7 @@ _ds_menu_maximize(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi
maximize_init();
e_config_save_queue();
}
#endif
static void
_ds_menu_transitions(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi)
@ -90,13 +91,13 @@ _ds_menu_add(void *data EINA_UNUSED, E_Menu *m)
e_menu_item_check_set(mi, 1);
e_menu_item_toggle_set(mi, ds_config->disable_ruler);
e_menu_item_callback_set(mi, _ds_menu_ruler, NULL);
#if E_VERSION_MAJOR == 20
mi = e_menu_item_new(subm);
e_menu_item_label_set(mi, D_("Disable Maximize Effects"));
e_menu_item_check_set(mi, 1);
e_menu_item_toggle_set(mi, ds_config->disable_maximize);
e_menu_item_callback_set(mi, _ds_menu_maximize, NULL);
#endif
mi = e_menu_item_new(subm);
e_menu_item_label_set(mi, D_("Disable Transition Effects"));
e_menu_item_check_set(mi, 1);

@ -253,8 +253,10 @@ e_modapi_init(E_Module *m)
ds_init();
if (!ds_config->disable_ruler)
mr_init();
#if E_VERSION_MAJOR == 20
if (!ds_config->disable_maximize)
maximize_init();
#endif
pip_init();
zoom_init();
@ -277,8 +279,10 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED)
mag_shutdown();
zoom_shutdown();
pip_shutdown();
#if E_VERSION_MAJOR == 20
if (!ds_config->disable_maximize)
maximize_shutdown();
#endif
if (!ds_config->disable_ruler)
mr_shutdown();
if (!ds_config->disable_transitions)

@ -91,10 +91,10 @@ EINTERN void ds_shutdown(void);
EINTERN void mr_shutdown(void);
EINTERN void mr_init(void);
#if E_VERSION_MAJOR == 20
EINTERN void maximize_init(void);
EINTERN void maximize_shutdown(void);
#endif
EINTERN void pip_init(void);
EINTERN void pip_shutdown(void);

@ -1,4 +1,5 @@
#include "e_mod_main.h"
#if E_VERSION_MAJOR == 20
static Ecore_Event_Handler *eh = NULL;
@ -144,3 +145,4 @@ maximize_shutdown(void)
}
E_FREE_FUNC(eh, ecore_event_handler_del);
}
#endif

Loading…
Cancel
Save