From 0affc3ee5cfbb9a8cc7bb91f3a72b025394e132e Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Sat, 24 Dec 2005 20:01:03 +0000 Subject: [PATCH] Remove unused protos. Cleanups SVN revision: 19287 --- src/modules/battery/e_mod_config.c | 3 +-- src/modules/battery/e_mod_main.c | 28 ------------------------- src/modules/cpufreq/e_mod_main.c | 29 +------------------------- src/modules/ibox/e_mod_config.c | 2 -- src/modules/ibox/e_mod_main.c | 29 -------------------------- src/modules/pager/e_mod_config.c | 3 ++- src/modules/pager/e_mod_main.c | 23 -------------------- src/modules/start/e_mod_main.c | 10 --------- src/modules/temperature/e_mod_config.c | 1 - src/modules/temperature/e_mod_main.c | 28 ------------------------- 10 files changed, 4 insertions(+), 152 deletions(-) diff --git a/src/modules/battery/e_mod_config.c b/src/modules/battery/e_mod_config.c index 78b4666eb..b594b8df8 100644 --- a/src/modules/battery/e_mod_config.c +++ b/src/modules/battery/e_mod_config.c @@ -19,7 +19,6 @@ struct _Cfg_File_Data }; /* Protos */ -static Evas_Object *_create_widgets(E_Config_Dialog *cfd, Evas *evas, Config *cfdata); static void *_create_data(E_Config_Dialog *cfd); static void _free_data(E_Config_Dialog *cfd, CFData *cfdata); static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata); @@ -111,7 +110,7 @@ _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) { - Evas_Object *o, *of, *ob, *ot; + Evas_Object *o, *of, *ob; Battery *b; /* Use Sliders for both cfg options */ diff --git a/src/modules/battery/e_mod_main.c b/src/modules/battery/e_mod_main.c index 5380b0fc5..b94e160a1 100644 --- a/src/modules/battery/e_mod_main.c +++ b/src/modules/battery/e_mod_main.c @@ -57,7 +57,6 @@ static void _battery_face_disable(Battery_Face *face); static void _battery_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change change); static void _battery_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _battery_face_level_set(Battery_Face *ef, double level); -static void _battery_face_cb_menu_enabled(void *data, E_Menu *m, E_Menu_Item *mi); static void _battery_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi); static int _battery_int_get(char *buf); @@ -355,15 +354,6 @@ _battery_face_menu_new(Battery_Face *face) mn = e_menu_new(); face->menu = mn; - /* Enabled */ - /* - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Enabled")); - e_menu_item_check_set(mi, 1); - if (face->conf->enabled) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _battery_face_cb_menu_enabled, face); - */ - /* Config */ mi = e_menu_item_new(mn); e_menu_item_label_set(mi, _("Configuration")); @@ -1518,24 +1508,6 @@ _battery_face_level_set(Battery_Face *ef, double level) edje_object_message_send(ef->bat_object, EDJE_MESSAGE_FLOAT, 1, &msg); } -static void -_battery_face_cb_menu_enabled(void *data, E_Menu *m, E_Menu_Item *mi) -{ - Battery_Face *face; - unsigned char enabled; - - face = data; - enabled = e_menu_item_toggle_get(mi); - if ((face->conf->enabled) && (!enabled)) - { - _battery_face_disable(face); - } - else if ((!face->conf->enabled) && (enabled)) - { - _battery_face_enable(face); - } -} - static void _battery_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi) { diff --git a/src/modules/cpufreq/e_mod_main.c b/src/modules/cpufreq/e_mod_main.c index 828d4313f..7a6a2f523 100644 --- a/src/modules/cpufreq/e_mod_main.c +++ b/src/modules/cpufreq/e_mod_main.c @@ -43,7 +43,6 @@ static void _cpufreq_face_menu_new(Cpufreq_Face *face); static void _cpufreq_face_enable(Cpufreq_Face *face); static void _cpufreq_face_disable(Cpufreq_Face *face); static void _cpufreq_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change change); -static void _cpufreq_face_cb_menu_enabled(void *data, E_Menu *m, E_Menu_Item *mi); static void _cpufreq_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi); static void _cpufreq_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _cpufreq_face_update_available(Cpufreq_Face *face); @@ -932,15 +931,7 @@ _cpufreq_face_menu_new(Cpufreq_Face *face) mn = e_menu_new(); face->menu = mn; - - /* Enabled */ - /*mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, "Enabled"); - e_menu_item_check_set(mi, 1); - if (face->conf->enabled) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _cpufreq_face_cb_menu_enabled, face); - */ - + /* Edit */ mi = e_menu_item_new(mn); e_menu_item_label_set(mi, _("Edit Mode")); @@ -991,24 +982,6 @@ _cpufreq_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change ch } } -static void -_cpufreq_face_cb_menu_enabled(void *data, E_Menu *m, E_Menu_Item *mi) -{ - Cpufreq_Face *face; - unsigned char enabled; - - face = data; - enabled = e_menu_item_toggle_get(mi); - if ((face->conf->enabled) && (!enabled)) - { - _cpufreq_face_disable(face); - } - else if ((!face->conf->enabled) && (enabled)) - { - _cpufreq_face_enable(face); - } -} - static void _cpufreq_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi) { diff --git a/src/modules/ibox/e_mod_config.c b/src/modules/ibox/e_mod_config.c index 5ee337379..d80a5d0ed 100644 --- a/src/modules/ibox/e_mod_config.c +++ b/src/modules/ibox/e_mod_config.c @@ -21,7 +21,6 @@ struct _Cfg_File_Data }; /* Protos */ -static Evas_Object *_create_widgets(E_Config_Dialog *cfd, Evas *evas, Config *cfdata); static void *_create_data(E_Config_Dialog *cfd); static void _free_data(E_Config_Dialog *cfd, CFData *cfdata); static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata); @@ -96,7 +95,6 @@ static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) { IBox *ib; - Evas_List *l; ib = cfd->data; e_border_button_bindings_ungrab_all(); diff --git a/src/modules/ibox/e_mod_main.c b/src/modules/ibox/e_mod_main.c index e9f128082..87a8e9d0f 100644 --- a/src/modules/ibox/e_mod_main.c +++ b/src/modules/ibox/e_mod_main.c @@ -76,7 +76,6 @@ static void _ibox_icon_cb_mouse_in(void *data, Evas *e, Evas_Object *obj, voi static void _ibox_icon_cb_mouse_out(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _ibox_icon_cb_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info); -static void _ibox_box_cb_menu_enabled(void *data, E_Menu *m, E_Menu_Item *mi); static void _ibox_box_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi); static void _ibox_box_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi); @@ -445,15 +444,6 @@ _ibox_box_menu_new(IBox_Box *ibb) mn = e_menu_new(); ibb->menu = mn; - /* Enabled */ - /* - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, "Enabled"); - e_menu_item_check_set(mi, 1); - if (ibb->conf->enabled) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _ibox_box_cb_menu_enabled, ibb); - */ - /* Config */ mi = e_menu_item_new(mn); e_menu_item_label_set(mi, _("Configuration")); @@ -469,7 +459,6 @@ static void _ibox_box_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi) { IBox_Box *ibb; - E_Config_Dialog *cfd; ibb = (IBox_Box *)data; if (!ibb) return; @@ -1221,24 +1210,6 @@ _ibox_box_cb_iconsize_change(void *data) } } -static void -_ibox_box_cb_menu_enabled(void *data, E_Menu *m, E_Menu_Item *mi) -{ - IBox_Box *ibb; - unsigned char enabled; - - ibb = data; - enabled = e_menu_item_toggle_get(mi); - if ((ibb->conf->enabled) && (!enabled)) - { - _ibox_box_disable(ibb); - } - else if ((!ibb->conf->enabled) && (enabled)) - { - _ibox_box_enable(ibb); - } -} - static void _ibox_box_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi) { diff --git a/src/modules/pager/e_mod_config.c b/src/modules/pager/e_mod_config.c index 7546cebd6..b9000f0d7 100644 --- a/src/modules/pager/e_mod_config.c +++ b/src/modules/pager/e_mod_config.c @@ -20,7 +20,6 @@ struct _Cfg_File_Data }; /* Protos */ -static Evas_Object *_create_widgets(E_Config_Dialog *cfd, Evas *evas, Config *cfdata); static void *_create_data(E_Config_Dialog *cfd); static void _free_data(E_Config_Dialog *cfd, CFData *cfdata); static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata); @@ -130,6 +129,7 @@ _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) e_config_save_queue(); _pager_cb_config_updated(p); + return 1; } static Evas_Object @@ -191,4 +191,5 @@ _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata) e_config_save_queue(); _pager_cb_config_updated(p); + return 1; } diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c index 132f3bebe..ff66ec00a 100644 --- a/src/modules/pager/e_mod_main.c +++ b/src/modules/pager/e_mod_main.c @@ -54,7 +54,6 @@ static int _pager_cb_event_desk_show(void *data, int type, void *event); static int _pager_cb_event_desk_name_change(void *data, int type, void *event); static void _pager_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change change); -static void _pager_face_cb_menu_enabled(void *data, E_Menu *m, E_Menu_Item *mi); static void _pager_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi); static void _pager_desk_cb_mouse_in(void *data, Evas *e, Evas_Object *obj, void *event_info); @@ -510,14 +509,6 @@ _pager_face_menu_new(Pager_Face *face) mn = e_menu_new(); face->menu = mn; - /* - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, "Enabled"); - e_menu_item_check_set(mi, 1); - if (face->conf->enabled) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _pager_face_cb_menu_enabled, face); - */ - /* Config */ mi = e_menu_item_new(mn); e_menu_item_label_set(mi, _("Configuration")); @@ -1626,20 +1617,6 @@ _pager_cb_event_desk_name_change(void *data, int type, void *event) return 1; } -static void -_pager_face_cb_menu_enabled(void *data, E_Menu *m, E_Menu_Item *mi) -{ - Pager_Face *face; - unsigned char enabled; - - face = data; - enabled = e_menu_item_toggle_get(mi); - if ((face->conf->enabled) && (!enabled)) - _pager_face_disable(face); - else if ((!face->conf->enabled) && (enabled)) - _pager_face_enable(face); -} - static void _pager_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi) { diff --git a/src/modules/start/e_mod_main.c b/src/modules/start/e_mod_main.c index cdadccfff..8ce8b2ca0 100644 --- a/src/modules/start/e_mod_main.c +++ b/src/modules/start/e_mod_main.c @@ -9,7 +9,6 @@ static Start *_start_new(void); static Start_Face *_start_face_new(E_Container *con); static void _start_free(Start *e); static void _start_face_free(Start_Face *face); -static void _start_face_enable(Start_Face *e); static void _start_face_disable(Start_Face *e); static void _start_config_menu_new(Start *e); static void _start_face_menu_new(Start_Face *face); @@ -281,15 +280,6 @@ _start_face_disable(Start_Face *e) e_config_save_queue(); } -static void -_start_face_enable(Start_Face *e) -{ - e->conf->enabled = 1; - evas_object_show(e->button_object); - evas_object_show(e->event_object); - e_config_save_queue(); -} - static void _start_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change change) { diff --git a/src/modules/temperature/e_mod_config.c b/src/modules/temperature/e_mod_config.c index 8aacdcaca..74b18491d 100644 --- a/src/modules/temperature/e_mod_config.c +++ b/src/modules/temperature/e_mod_config.c @@ -42,7 +42,6 @@ struct _Cfg_File_Data }; /* Protos */ -static Evas_Object *_create_widgets(E_Config_Dialog *cfd, Evas *evas, Config *cfdata); static void *_create_data(E_Config_Dialog *cfd); static void _free_data(E_Config_Dialog *cfd, CFData *cfdata); static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata); diff --git a/src/modules/temperature/e_mod_main.c b/src/modules/temperature/e_mod_main.c index 0dc90a1a8..d58f3f9e5 100644 --- a/src/modules/temperature/e_mod_main.c +++ b/src/modules/temperature/e_mod_main.c @@ -30,7 +30,6 @@ static void _temperature_face_menu_new(Temperature_Face *face); static void _temperature_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change change); static void _temperature_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _temperature_face_level_set(Temperature_Face *ef, double level); -static void _temperature_face_cb_menu_enabled(void *data, E_Menu *m, E_Menu_Item *mi); static void _temperature_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi); static void _temperature_face_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi); @@ -343,15 +342,6 @@ _temperature_face_menu_new(Temperature_Face *face) mn = e_menu_new(); face->menu = mn; - - /* Enabled */ - /* - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Enabled")); - e_menu_item_check_set(mi, 1); - if (face->conf->enabled) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _temperature_face_cb_menu_enabled, face); - */ /* Config */ mi = e_menu_item_new(mn); @@ -593,24 +583,6 @@ _temperature_face_level_set(Temperature_Face *ef, double level) edje_object_message_send(ef->temp_object, EDJE_MESSAGE_FLOAT, 1, &msg); } -static void -_temperature_face_cb_menu_enabled(void *data, E_Menu *m, E_Menu_Item *mi) -{ - Temperature_Face *face; - unsigned char enabled; - - face = data; - enabled = e_menu_item_toggle_get(mi); - if ((face->conf->enabled) && (!enabled)) - { - _temperature_face_disable(face); - } - else if ((!face->conf->enabled) && (enabled)) - { - _temperature_face_enable(face); - } -} - static void _temperature_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi) {