Add e.swallow.extra_buttons to illume-softkey (for ability to swallow other

buttons).
Formatting in illume2.
Remove EAPI from functions in both softkey & indicator modules for functions
that do not need to be exposed.



SVN revision: 43984

src/modules/illume-indicator/e_mod_config.c

@@ -6,7 +6,7 @@
 EAPI Il_Ind_Config *il_ind_cfg = NULL;
 static E_Config_DD *conf_edd = NULL;
 
-EAPI int 
+int 
 il_ind_config_init(E_Module *m) 
 {
    conf_edd = E_CONFIG_DD_NEW("Illume-Ind_Cfg", Il_Ind_Config);
@@ -39,7 +39,7 @@ il_ind_config_init(E_Module *m)
    return 1;
 }
 
-EAPI int 
+int 
 il_ind_config_shutdown(void) 
 {
    if (il_ind_cfg->mod_dir) eina_stringshare_del(il_ind_cfg->mod_dir);
@@ -52,7 +52,7 @@ il_ind_config_shutdown(void)
    return 1;
 }
 
-EAPI int 
+int 
 il_ind_config_save(void) 
 {
    return 1;

src/modules/illume-indicator/e_mod_config.h

@@ -14,9 +14,9 @@ struct _Il_Ind_Config
    const char *mod_dir;
 };
 
-EAPI int il_ind_config_init(E_Module *m);
-EAPI int il_ind_config_shutdown(void);
-EAPI int il_ind_config_save(void);
+int il_ind_config_init(E_Module *m);
+int il_ind_config_shutdown(void);
+int il_ind_config_save(void);
 
 extern EAPI Il_Ind_Config *il_ind_cfg;
 

src/modules/illume-indicator/e_mod_win.c

@@ -19,19 +19,19 @@ static void _il_ind_win_cb_menu_items_append(void *data, E_Gadcon_Client *gcc, E
 static void _il_ind_win_cb_menu_edit(void *data, E_Menu *mn, E_Menu_Item *mi);
 static void _il_ind_win_cb_menu_contents(void *data, E_Menu *mn, E_Menu_Item *mi);
 
-EAPI int 
+int 
 e_mod_ind_win_init(void) 
 {
    return 1;
 }
 
-EAPI int 
+int 
 e_mod_ind_win_shutdown(void) 
 {
    return 1;
 }
 
-EAPI Il_Ind_Win *
+Il_Ind_Win *
 e_mod_ind_win_new(void) 
 {
    Il_Ind_Win *iwin;

src/modules/illume-indicator/e_mod_win.h

@@ -1,8 +1,8 @@
 #ifndef E_MOD_WIN_H
 #define E_MOD_WIN_H
 
-EAPI int e_mod_ind_win_init(void);
-EAPI int e_mod_ind_win_shutdown(void);
-EAPI Il_Ind_Win *e_mod_ind_win_new(void);
+int e_mod_ind_win_init(void);
+int e_mod_ind_win_shutdown(void);
+Il_Ind_Win *e_mod_ind_win_new(void);
 
 #endif

src/modules/illume-softkey/e_mod_config.c

@@ -6,7 +6,7 @@ EAPI Il_Sk_Config *il_sk_cfg = NULL;
 static E_Config_DD *conf_edd = NULL;
 
 /* public functions */
-EAPI int 
+int 
 il_sk_config_init(E_Module *m) 
 {
    conf_edd = E_CONFIG_DD_NEW("Illume-Softkey_Cfg", Il_Sk_Config);
@@ -38,7 +38,7 @@ il_sk_config_init(E_Module *m)
    return 1;
 }
 
-EAPI int 
+int 
 il_sk_config_shutdown(void) 
 {
    if (il_sk_cfg->mod_dir) eina_stringshare_del(il_sk_cfg->mod_dir);
@@ -51,14 +51,14 @@ il_sk_config_shutdown(void)
    return 1;
 }
 
-EAPI int 
+int 
 il_sk_config_save(void) 
 {
    e_config_domain_save("module.illume-softkey", conf_edd, il_sk_cfg);
    return 1;
 }
 
-EAPI void 
+void 
 il_sk_config_show(E_Container *con, const char *params) 
 {
 

src/modules/illume-softkey/e_mod_config.h

@@ -12,10 +12,10 @@ struct _Il_Sk_Config
    const char *mod_dir;
 };
 
-EAPI int il_sk_config_init(E_Module *m);
-EAPI int il_sk_config_shutdown(void);
-EAPI int il_sk_config_save(void);
-EAPI void il_sk_config_show(E_Container *con, const char *params);
+int il_sk_config_init(E_Module *m);
+int il_sk_config_shutdown(void);
+int il_sk_config_save(void);
+void il_sk_config_show(E_Container *con, const char *params);
 
 extern EAPI Il_Sk_Config *il_sk_cfg;
 

src/modules/illume-softkey/e_mod_win.c

@@ -9,19 +9,19 @@ static void _il_sk_win_cb_resize(E_Win *win);
 static void _il_sk_win_cb_back_click(void *data, void *data2);
 static void _il_sk_win_cb_close_click(void *data, void *data2);
 
-EAPI int 
+int 
 e_mod_sk_win_init(void) 
 {
    return 1;
 }
 
-EAPI int 
+int 
 e_mod_sk_win_shutdown(void) 
 {
    return 1;
 }
 
-EAPI Il_Sk_Win *
+Il_Sk_Win *
 e_mod_sk_win_new(void) 
 {
    Il_Sk_Win *swin;
@@ -59,7 +59,7 @@ e_mod_sk_win_new(void)
                                 "modules/illume-softkey/window"))
      edje_object_file_set(swin->o_base, buff, "modules/illume-softkey/window");
    evas_object_move(swin->o_base, 0, 0);
-   evas_object_resize(swin->o_base, zone->w, 48);
+   evas_object_resize(swin->o_base, zone->w, 32);
    evas_object_show(swin->o_base);
 
    swin->o_box = e_widget_list_add(evas, 1, 1);
@@ -73,9 +73,9 @@ e_mod_sk_win_new(void)
                                        _il_sk_win_cb_close_click, swin, NULL);
    e_widget_list_object_append(swin->o_box, swin->b_close, 1, 0, 0.5);
 
-   e_win_size_min_set(swin->win, zone->w, 48);
+   e_win_size_min_set(swin->win, zone->w, 32);
    e_win_show(swin->win);
-   e_win_move_resize(swin->win, 0, (zone->h - 48), zone->w, 48);
+   e_win_move_resize(swin->win, 0, (zone->h - 32), zone->w, 32);
 
    return swin;
 }

src/modules/illume-softkey/e_mod_win.h

@@ -1,8 +1,8 @@
 #ifndef E_MOD_WIN_H
 #define E_MOD_WIN_H
 
-EAPI int e_mod_sk_win_init(void);
-EAPI int e_mod_sk_win_shutdown(void);
-EAPI Il_Sk_Win *e_mod_sk_win_new(void);
+int e_mod_sk_win_init(void);
+int e_mod_sk_win_shutdown(void);
+Il_Sk_Win *e_mod_sk_win_new(void);
 
 #endif

src/modules/illume2/e_mod_layout_illume.c

@@ -23,7 +23,7 @@ _border_focus_in(E_Border *bd)
 
 static void
 _border_focus_out(E_Border *bd)
-{ // do something if the rfocus exits a window
+{ // do something if the focus exits a window
    printf("Border Focus Out\n");
 }
 
@@ -118,15 +118,12 @@ _zone_move_resize(E_Zone *z)
 const Illume_Layout_Mode laymode =
 {
    "illume", "Illume", // FIXME: translatable?
-     // ---
      _border_add,
      _border_del,
      _border_focus_in,
      _border_focus_out,
-     // ---
      _zone_layout,
-     _zone_move_resize,
-     // ---
+     _zone_move_resize
 };
 
 void