From ad3761c9bded0e916001be1b175124053429fbf2 Mon Sep 17 00:00:00 2001 From: Sebastian Dransfeld Date: Tue, 24 Jul 2007 18:47:26 +0000 Subject: [PATCH] Fix warnings. SVN revision: 30963 --- src/bin/e_configure.c | 4 +-- src/bin/e_eap_editor.c | 2 -- src/bin/e_fm_mime.c | 1 - src/bin/e_int_border_menu.c | 1 - src/bin/e_int_config_clientlist.c | 2 +- src/bin/e_int_config_clientlist.h | 2 +- src/bin/e_int_config_desklock.c | 2 +- src/bin/e_int_config_desklock.h | 2 +- src/bin/e_int_config_desks.c | 2 +- src/bin/e_int_config_desks.h | 2 +- src/bin/e_int_config_dialogs.c | 2 +- src/bin/e_int_config_dialogs.h | 2 +- src/bin/e_int_config_display.c | 2 +- src/bin/e_int_config_display.h | 2 +- src/bin/e_int_config_dpms.c | 2 +- src/bin/e_int_config_dpms.h | 2 +- src/bin/e_int_config_exebuf.c | 2 +- src/bin/e_int_config_exebuf.h | 2 +- src/bin/e_int_config_focus.c | 2 +- src/bin/e_int_config_focus.h | 2 +- src/bin/e_int_config_keybindings.c | 2 +- src/bin/e_int_config_keybindings.h | 2 +- src/bin/e_int_config_menus.c | 2 +- src/bin/e_int_config_menus.h | 2 +- src/bin/e_int_config_mime.c | 2 +- src/bin/e_int_config_mime.h | 2 +- src/bin/e_int_config_modules.c | 4 +-- src/bin/e_int_config_modules.h | 2 +- src/bin/e_int_config_mouse.c | 2 +- src/bin/e_int_config_mouse.h | 2 +- src/bin/e_int_config_mousebindings.c | 2 +- src/bin/e_int_config_mousebindings.h | 2 +- src/bin/e_int_config_paths.c | 2 +- src/bin/e_int_config_paths.h | 2 +- src/bin/e_int_config_performance.c | 2 +- src/bin/e_int_config_performance.h | 2 +- src/bin/e_int_config_screensaver.c | 2 +- src/bin/e_int_config_screensaver.h | 2 +- src/bin/e_int_config_shelf.c | 2 +- src/bin/e_int_config_shelf.h | 2 +- src/bin/e_int_config_window_display.c | 2 +- src/bin/e_int_config_window_display.h | 2 +- src/bin/e_int_config_window_manipulation.c | 2 +- src/bin/e_int_config_window_manipulation.h | 2 +- src/bin/e_int_config_winlist.c | 2 +- src/bin/e_int_config_winlist.h | 2 +- src/bin/e_main.c | 2 +- .../conf_applications/e_int_config_apps.c | 10 +++--- .../conf_applications/e_int_config_apps.h | 10 +++--- .../conf_borders/e_int_config_borders.c | 2 +- .../conf_borders/e_int_config_borders.h | 2 +- .../conf_colors/e_int_config_color_classes.c | 2 +- .../conf_colors/e_int_config_color_classes.h | 2 +- src/modules/conf_fonts/e_int_config_fonts.c | 14 +------- src/modules/conf_fonts/e_int_config_fonts.h | 2 +- .../e_int_config_icon_themes.c | 2 +- .../e_int_config_icon_themes.h | 2 +- src/modules/conf_imc/e_int_config_imc.c | 3 +- src/modules/conf_imc/e_int_config_imc.h | 2 +- .../conf_imc/e_int_config_imc_import.c | 3 +- src/modules/conf_intl/e_int_config_intl.c | 2 +- src/modules/conf_intl/e_int_config_intl.h | 2 +- .../conf_mouse_cursor/e_int_config_cursor.c | 2 +- .../conf_mouse_cursor/e_int_config_cursor.h | 2 +- .../conf_profiles/e_int_config_profiles.c | 4 +-- .../conf_profiles/e_int_config_profiles.h | 2 +- .../conf_startup/e_int_config_startup.c | 2 +- .../conf_startup/e_int_config_startup.h | 2 +- src/modules/conf_theme/e_int_config_theme.c | 3 +- src/modules/conf_theme/e_int_config_theme.h | 2 +- .../conf_theme/e_int_config_theme_import.c | 1 + .../e_int_config_transitions.c | 2 +- .../e_int_config_transitions.h | 2 +- .../conf_wallpaper/e_int_config_wallpaper.c | 4 +-- .../conf_wallpaper/e_int_config_wallpaper.h | 2 +- src/modules/pager/e_mod_main.c | 36 ------------------- src/modules/temperature/e_mod_config.c | 5 ++- 77 files changed, 88 insertions(+), 139 deletions(-) diff --git a/src/bin/e_configure.c b/src/bin/e_configure.c index 7a1a591a5..c3df04b5c 100644 --- a/src/bin/e_configure.c +++ b/src/bin/e_configure.c @@ -161,7 +161,7 @@ e_configure_registry_item_del(const char *path) EAPI void e_configure_registry_category_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon) { - E_Configure_Cat *ecat, *ecat2; + E_Configure_Cat *ecat; Evas_List *l; ecat = E_NEW(E_Configure_Cat, 1); @@ -263,7 +263,7 @@ e_configure_registry_exists(const char *path) /* path is "category/item" */ cat = ecore_file_get_dir(path); - if (!cat) return; + if (!cat) return 0; item = ecore_file_get_file(path); for (l = _e_configure_registry; l; l = l->next) { diff --git a/src/bin/e_eap_editor.c b/src/bin/e_eap_editor.c index f051f0ac0..cceffa9e4 100644 --- a/src/bin/e_eap_editor.c +++ b/src/bin/e_eap_editor.c @@ -765,8 +765,6 @@ _e_desktop_edit_cb_exec_select_cancel(void *data, E_Dialog *dia) static void _e_desktop_editor_exec_update(E_Config_Dialog_Data *cfdata) { - Evas_Object *o; - if (!cfdata->editor->entry_widget) return; e_widget_entry_text_set(cfdata->editor->entry_widget, cfdata->exec); diff --git a/src/bin/e_fm_mime.c b/src/bin/e_fm_mime.c index 53876f904..f57f33974 100644 --- a/src/bin/e_fm_mime.c +++ b/src/bin/e_fm_mime.c @@ -6,7 +6,6 @@ /* local subsystem functions */ static Evas_Bool _e_fm_mime_icon_foreach(Evas_Hash *hash, const char *key, void *data, void *fdata); -static Evas_List *mimes = NULL; static Evas_Hash *icon_map = NULL; /* externally accessible functions */ diff --git a/src/bin/e_int_border_menu.c b/src/bin/e_int_border_menu.c index 7d37e1fc4..fa8a405bc 100644 --- a/src/bin/e_int_border_menu.c +++ b/src/bin/e_int_border_menu.c @@ -803,7 +803,6 @@ _e_border_menu_cb_border_pre(void *data, E_Menu *m, E_Menu_Item *mi) E_Menu *subm; E_Menu_Item *submi; E_Border *bd; - Evas_Object *o; Evas *evas; bd = data; diff --git a/src/bin/e_int_config_clientlist.c b/src/bin/e_int_config_clientlist.c index ff1299fb0..55e363a3d 100644 --- a/src/bin/e_int_config_clientlist.c +++ b/src/bin/e_int_config_clientlist.c @@ -22,7 +22,7 @@ struct _E_Config_Dialog_Data }; EAPI E_Config_Dialog * -e_int_config_clientlist(E_Container *con) +e_int_config_clientlist(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; diff --git a/src/bin/e_int_config_clientlist.h b/src/bin/e_int_config_clientlist.h index 2c0b0503b..6a0ae5007 100644 --- a/src/bin/e_int_config_clientlist.h +++ b/src/bin/e_int_config_clientlist.h @@ -22,7 +22,7 @@ #define E_CLIENTLIST_MAX_CAPTION_LEN 256 -EAPI E_Config_Dialog *e_int_config_clientlist(E_Container *con); +EAPI E_Config_Dialog *e_int_config_clientlist(E_Container *con, const char *params __UNUSED__); #endif #endif diff --git a/src/bin/e_int_config_desklock.c b/src/bin/e_int_config_desklock.c index 2f2cc9668..11135b328 100644 --- a/src/bin/e_int_config_desklock.c +++ b/src/bin/e_int_config_desklock.c @@ -50,7 +50,7 @@ struct _E_Config_Dialog_Data }; EAPI E_Config_Dialog * -e_int_config_desklock(E_Container *con) +e_int_config_desklock(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; diff --git a/src/bin/e_int_config_desklock.h b/src/bin/e_int_config_desklock.h index f4c85702d..fee683bde 100644 --- a/src/bin/e_int_config_desklock.h +++ b/src/bin/e_int_config_desklock.h @@ -3,7 +3,7 @@ #ifndef E_INT_CONFIG_DESKLOCK_H #define E_INT_CONFIG_DESKLOCK_H -EAPI E_Config_Dialog *e_int_config_desklock(E_Container *con); +EAPI E_Config_Dialog *e_int_config_desklock(E_Container *con, const char *params __UNUSED__); #endif #endif diff --git a/src/bin/e_int_config_desks.c b/src/bin/e_int_config_desks.c index 9ee099c09..d4f0d459f 100644 --- a/src/bin/e_int_config_desks.c +++ b/src/bin/e_int_config_desks.c @@ -37,7 +37,7 @@ struct _E_Config_Dialog_Data /* a nice easy setup function that does the dirty work */ EAPI E_Config_Dialog * -e_int_config_desks(E_Container *con) +e_int_config_desks(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; diff --git a/src/bin/e_int_config_desks.h b/src/bin/e_int_config_desks.h index e0dcdfd9e..c885e5d2f 100644 --- a/src/bin/e_int_config_desks.h +++ b/src/bin/e_int_config_desks.h @@ -6,7 +6,7 @@ #ifndef E_INT_CONFIG_DESKS_H #define E_INT_CONFIG_DESKS_H -EAPI E_Config_Dialog *e_int_config_desks(E_Container *con); +EAPI E_Config_Dialog *e_int_config_desks(E_Container *con, const char *params __UNUSED__); #endif #endif diff --git a/src/bin/e_int_config_dialogs.c b/src/bin/e_int_config_dialogs.c index 7a9643bcd..0a1c81e00 100644 --- a/src/bin/e_int_config_dialogs.c +++ b/src/bin/e_int_config_dialogs.c @@ -17,7 +17,7 @@ struct _E_Config_Dialog_Data }; EAPI E_Config_Dialog * -e_int_config_dialogs(E_Container *con) +e_int_config_dialogs(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; diff --git a/src/bin/e_int_config_dialogs.h b/src/bin/e_int_config_dialogs.h index a5da0a64c..998624339 100644 --- a/src/bin/e_int_config_dialogs.h +++ b/src/bin/e_int_config_dialogs.h @@ -3,7 +3,7 @@ #ifndef E_INT_CONFIG_DIALOGS_H #define E_INT_CONFIG_DIALOGS_H -EAPI E_Config_Dialog *e_int_config_dialogs(E_Container *con); +EAPI E_Config_Dialog *e_int_config_dialogs(E_Container *con, const char *params __UNUSED__); #endif #endif diff --git a/src/bin/e_int_config_display.c b/src/bin/e_int_config_display.c index b30da6983..4e6e948f8 100644 --- a/src/bin/e_int_config_display.c +++ b/src/bin/e_int_config_display.c @@ -225,7 +225,7 @@ _surebox_new(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) EAPI E_Config_Dialog * -e_int_config_display(E_Container *con) +e_int_config_display(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; diff --git a/src/bin/e_int_config_display.h b/src/bin/e_int_config_display.h index af6c7bdb9..5fd44b654 100644 --- a/src/bin/e_int_config_display.h +++ b/src/bin/e_int_config_display.h @@ -3,7 +3,7 @@ #ifndef E_INT_CONFIG_DISPLAY_H #define E_INT_CONFIG_DISPLAY_H -EAPI E_Config_Dialog *e_int_config_display(E_Container *con); +EAPI E_Config_Dialog *e_int_config_display(E_Container *con, const char *params __UNUSED__); #endif #endif diff --git a/src/bin/e_int_config_dpms.c b/src/bin/e_int_config_dpms.c index 1eb9aba10..eaf70ac6d 100644 --- a/src/bin/e_int_config_dpms.c +++ b/src/bin/e_int_config_dpms.c @@ -86,7 +86,7 @@ _e_int_config_dpms_available(void) } EAPI E_Config_Dialog * -e_int_config_dpms(E_Container *con) +e_int_config_dpms(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; diff --git a/src/bin/e_int_config_dpms.h b/src/bin/e_int_config_dpms.h index 085fc9748..e5aa2753e 100644 --- a/src/bin/e_int_config_dpms.h +++ b/src/bin/e_int_config_dpms.h @@ -3,7 +3,7 @@ #ifndef E_INT_CONFIG_DPMS_H #define E_INT_CONFIG_DPMS_H -EAPI E_Config_Dialog *e_int_config_dpms(E_Container *con); +EAPI E_Config_Dialog *e_int_config_dpms(E_Container *con, const char *params __UNUSED__); #endif #endif diff --git a/src/bin/e_int_config_exebuf.c b/src/bin/e_int_config_exebuf.c index 769475ac3..a189488b4 100644 --- a/src/bin/e_int_config_exebuf.c +++ b/src/bin/e_int_config_exebuf.c @@ -28,7 +28,7 @@ struct _E_Config_Dialog_Data }; EAPI E_Config_Dialog * -e_int_config_exebuf(E_Container *con) +e_int_config_exebuf(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; diff --git a/src/bin/e_int_config_exebuf.h b/src/bin/e_int_config_exebuf.h index c8193312d..8efc3fe58 100644 --- a/src/bin/e_int_config_exebuf.h +++ b/src/bin/e_int_config_exebuf.h @@ -3,7 +3,7 @@ #ifndef E_INT_CONFIG_EXEBUF_H #define E_INT_CONFIG_EXEBUF_H -EAPI E_Config_Dialog *e_int_config_exebuf(E_Container *con); +EAPI E_Config_Dialog *e_int_config_exebuf(E_Container *con, const char *params __UNUSED__); #endif #endif diff --git a/src/bin/e_int_config_focus.c b/src/bin/e_int_config_focus.c index 120093c74..6fffbafba 100644 --- a/src/bin/e_int_config_focus.c +++ b/src/bin/e_int_config_focus.c @@ -29,7 +29,7 @@ struct _E_Config_Dialog_Data /* a nice easy setup function that does the dirty work */ EAPI E_Config_Dialog * -e_int_config_focus(E_Container *con) +e_int_config_focus(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; diff --git a/src/bin/e_int_config_focus.h b/src/bin/e_int_config_focus.h index 4e9ed3e3a..736f589f0 100644 --- a/src/bin/e_int_config_focus.h +++ b/src/bin/e_int_config_focus.h @@ -6,7 +6,7 @@ #ifndef E_INT_CONFIG_FOCUS_H #define E_INT_CONFIG_FOCUS_H -EAPI E_Config_Dialog *e_int_config_focus(E_Container *con); +EAPI E_Config_Dialog *e_int_config_focus(E_Container *con, const char *params __UNUSED__); #endif #endif diff --git a/src/bin/e_int_config_keybindings.c b/src/bin/e_int_config_keybindings.c index 3010a7683..30a77d67e 100644 --- a/src/bin/e_int_config_keybindings.c +++ b/src/bin/e_int_config_keybindings.c @@ -76,7 +76,7 @@ struct _E_Config_Dialog_Data }; EAPI E_Config_Dialog * -e_int_config_keybindings(E_Container *con) +e_int_config_keybindings(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; diff --git a/src/bin/e_int_config_keybindings.h b/src/bin/e_int_config_keybindings.h index 0e8a6bfed..3ffb983cf 100644 --- a/src/bin/e_int_config_keybindings.h +++ b/src/bin/e_int_config_keybindings.h @@ -3,7 +3,7 @@ #ifndef E_INT_CONFIG_KEYBINDINGS_H #define E_INT_CONFIG_KEYBINDINGS_H -EAPI E_Config_Dialog *e_int_config_keybindings(E_Container *con); +EAPI E_Config_Dialog *e_int_config_keybindings(E_Container *con, const char *params __UNUSED__); #endif #endif diff --git a/src/bin/e_int_config_menus.c b/src/bin/e_int_config_menus.c index 28bf0bae3..3b1975c11 100644 --- a/src/bin/e_int_config_menus.c +++ b/src/bin/e_int_config_menus.c @@ -25,7 +25,7 @@ struct _E_Config_Dialog_Data }; EAPI E_Config_Dialog * -e_int_config_menus(E_Container *con) +e_int_config_menus(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; diff --git a/src/bin/e_int_config_menus.h b/src/bin/e_int_config_menus.h index adf0768c0..194f0d043 100644 --- a/src/bin/e_int_config_menus.h +++ b/src/bin/e_int_config_menus.h @@ -3,7 +3,7 @@ #ifndef E_INT_CONFIG_MENUS_H #define E_INT_CONFIG_MENUS_H -EAPI E_Config_Dialog *e_int_config_menus(E_Container *con); +EAPI E_Config_Dialog *e_int_config_menus(E_Container *con, const char *params __UNUSED__); #endif #endif diff --git a/src/bin/e_int_config_mime.c b/src/bin/e_int_config_mime.c index f9eac667a..dd7b3272a 100644 --- a/src/bin/e_int_config_mime.c +++ b/src/bin/e_int_config_mime.c @@ -48,7 +48,7 @@ static void _cb_config (void *data, void *data2); Evas_List *types = NULL; EAPI E_Config_Dialog * -e_int_config_mime(E_Container *con) +e_int_config_mime(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; diff --git a/src/bin/e_int_config_mime.h b/src/bin/e_int_config_mime.h index 3d4e95140..d8f27561c 100644 --- a/src/bin/e_int_config_mime.h +++ b/src/bin/e_int_config_mime.h @@ -3,7 +3,7 @@ #ifndef E_INT_CONFIG_MIME_H #define E_INT_CONFIG_MIME_H -EAPI E_Config_Dialog *e_int_config_mime(E_Container *con); +EAPI E_Config_Dialog *e_int_config_mime(E_Container *con, const char *params __UNUSED__); EAPI void e_int_config_mime_edit_done(void *data); #endif diff --git a/src/bin/e_int_config_modules.c b/src/bin/e_int_config_modules.c index f1b68283d..22b80e0a7 100644 --- a/src/bin/e_int_config_modules.c +++ b/src/bin/e_int_config_modules.c @@ -40,7 +40,7 @@ static Evas_List *monitors = NULL; Ecore_File_Monitor *mod_mon, *dir_mon; EAPI E_Config_Dialog * -e_int_config_modules(E_Container *con) +e_int_config_modules(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -196,7 +196,7 @@ _load_modules(E_Config_Dialog_Data *cfdata) dirs = ecore_file_ls(epd->dir); if (!dirs) continue; ecore_list_goto_first(dirs); - while (mod = ecore_list_next(dirs)) + while ((mod = ecore_list_next(dirs))) { E_Module *module; char buf[4096]; diff --git a/src/bin/e_int_config_modules.h b/src/bin/e_int_config_modules.h index eb6a2b25c..dfc98baa9 100644 --- a/src/bin/e_int_config_modules.h +++ b/src/bin/e_int_config_modules.h @@ -6,7 +6,7 @@ #ifndef E_INT_CONFIG_MODULES_H #define E_INT_CONFIG_MODULES_H -EAPI E_Config_Dialog *e_int_config_modules(E_Container *con); +EAPI E_Config_Dialog *e_int_config_modules(E_Container *con, const char *params __UNUSED__); #endif #endif diff --git a/src/bin/e_int_config_mouse.c b/src/bin/e_int_config_mouse.c index 0c90c7756..6fcb5e091 100644 --- a/src/bin/e_int_config_mouse.c +++ b/src/bin/e_int_config_mouse.c @@ -16,7 +16,7 @@ struct _E_Config_Dialog_Data }; EAPI E_Config_Dialog * -e_int_config_mouse(E_Container *con) +e_int_config_mouse(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; diff --git a/src/bin/e_int_config_mouse.h b/src/bin/e_int_config_mouse.h index f5ceb68bc..643b27515 100644 --- a/src/bin/e_int_config_mouse.h +++ b/src/bin/e_int_config_mouse.h @@ -3,7 +3,7 @@ #ifndef E_INT_CONFIG_MOUSE_H #define E_INT_CONFIG_MOUSE_H -EAPI E_Config_Dialog *e_int_config_mouse(E_Container *con); +EAPI E_Config_Dialog *e_int_config_mouse(E_Container *con, const char *params __UNUSED__); #endif #endif diff --git a/src/bin/e_int_config_mousebindings.c b/src/bin/e_int_config_mousebindings.c index 9ffca4650..470bc14f2 100644 --- a/src/bin/e_int_config_mousebindings.c +++ b/src/bin/e_int_config_mousebindings.c @@ -94,7 +94,7 @@ struct _E_Config_Dialog_Data }; EAPI E_Config_Dialog * -e_int_config_mousebindings(E_Container *con) +e_int_config_mousebindings(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; diff --git a/src/bin/e_int_config_mousebindings.h b/src/bin/e_int_config_mousebindings.h index c23b53ae0..26965870f 100644 --- a/src/bin/e_int_config_mousebindings.h +++ b/src/bin/e_int_config_mousebindings.h @@ -3,7 +3,7 @@ #ifndef E_INT_CONFIG_MOUSEBINDINGS_H #define E_INT_CONFIG_MOUSEBINDINGS_H -EAPI E_Config_Dialog *e_int_config_mousebindings(E_Container *con); +EAPI E_Config_Dialog *e_int_config_mousebindings(E_Container *con, const char *params __UNUSED__); #endif #endif diff --git a/src/bin/e_int_config_paths.c b/src/bin/e_int_config_paths.c index 0c4ea88b0..5568fc970 100644 --- a/src/bin/e_int_config_paths.c +++ b/src/bin/e_int_config_paths.c @@ -48,7 +48,7 @@ struct _E_Config_Dialog_Data }; EAPI E_Config_Dialog * -e_int_config_paths(E_Container *con) +e_int_config_paths(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; diff --git a/src/bin/e_int_config_paths.h b/src/bin/e_int_config_paths.h index 6a986f7e4..acd433cca 100644 --- a/src/bin/e_int_config_paths.h +++ b/src/bin/e_int_config_paths.h @@ -6,7 +6,7 @@ #ifndef E_INT_CONFIG_PATHS_H #define E_INT_CONFIG_PATHS_H -EAPI E_Config_Dialog *e_int_config_paths(E_Container *con); +EAPI E_Config_Dialog *e_int_config_paths(E_Container *con, const char *params __UNUSED__); #endif #endif diff --git a/src/bin/e_int_config_performance.c b/src/bin/e_int_config_performance.c index 1eeb3d335..3a8de7a94 100644 --- a/src/bin/e_int_config_performance.c +++ b/src/bin/e_int_config_performance.c @@ -20,7 +20,7 @@ struct _E_Config_Dialog_Data }; EAPI E_Config_Dialog * -e_int_config_performance(E_Container *con) +e_int_config_performance(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; diff --git a/src/bin/e_int_config_performance.h b/src/bin/e_int_config_performance.h index 2b23412b8..c181a500f 100644 --- a/src/bin/e_int_config_performance.h +++ b/src/bin/e_int_config_performance.h @@ -3,7 +3,7 @@ #ifndef E_INT_CONFIG_PERFORMANCE_H #define E_INT_CONFIG_PERFORMANCE_H -EAPI E_Config_Dialog *e_int_config_performance(E_Container *con); +EAPI E_Config_Dialog *e_int_config_performance(E_Container *con, const char *params __UNUSED__); #endif #endif diff --git a/src/bin/e_int_config_screensaver.c b/src/bin/e_int_config_screensaver.c index 0ad50176e..e679b31ae 100644 --- a/src/bin/e_int_config_screensaver.c +++ b/src/bin/e_int_config_screensaver.c @@ -29,7 +29,7 @@ struct _E_Config_Dialog_Data }; EAPI E_Config_Dialog * -e_int_config_screensaver(E_Container *con) +e_int_config_screensaver(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; diff --git a/src/bin/e_int_config_screensaver.h b/src/bin/e_int_config_screensaver.h index 834ce11d0..4c99865c2 100644 --- a/src/bin/e_int_config_screensaver.h +++ b/src/bin/e_int_config_screensaver.h @@ -3,7 +3,7 @@ #ifndef E_INT_CONFIG_SCREENSAVER_H #define E_INT_CONFIG_SCREENSAVER_H -EAPI E_Config_Dialog *e_int_config_screensaver(E_Container *con); +EAPI E_Config_Dialog *e_int_config_screensaver(E_Container *con, const char *params __UNUSED__); #endif #endif diff --git a/src/bin/e_int_config_shelf.c b/src/bin/e_int_config_shelf.c index 9e4777008..1c1d9ba82 100644 --- a/src/bin/e_int_config_shelf.c +++ b/src/bin/e_int_config_shelf.c @@ -29,7 +29,7 @@ struct _Shelf_Del_Confirm_Data EAPI E_Config_Dialog * -e_int_config_shelf(E_Container *con) +e_int_config_shelf(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; diff --git a/src/bin/e_int_config_shelf.h b/src/bin/e_int_config_shelf.h index 91faabce9..ef1e61244 100644 --- a/src/bin/e_int_config_shelf.h +++ b/src/bin/e_int_config_shelf.h @@ -3,7 +3,7 @@ #ifndef E_INT_CONFIG_SHELF_H #define E_INT_CONFIG_SHELF_H -EAPI E_Config_Dialog *e_int_config_shelf(E_Container *con); +EAPI E_Config_Dialog *e_int_config_shelf(E_Container *con, const char *params __UNUSED__); #endif #endif diff --git a/src/bin/e_int_config_window_display.c b/src/bin/e_int_config_window_display.c index 2258ccdc4..560bafead 100644 --- a/src/bin/e_int_config_window_display.c +++ b/src/bin/e_int_config_window_display.c @@ -34,7 +34,7 @@ struct _E_Config_Dialog_Data /* a nice easy setup function that does the dirty work */ EAPI E_Config_Dialog * -e_int_config_window_display(E_Container *con) +e_int_config_window_display(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; diff --git a/src/bin/e_int_config_window_display.h b/src/bin/e_int_config_window_display.h index 0377571db..9d693af46 100644 --- a/src/bin/e_int_config_window_display.h +++ b/src/bin/e_int_config_window_display.h @@ -6,7 +6,7 @@ #ifndef E_INT_CONFIG_WINDOW_DISPLAY_H #define E_INT_CONFIG_WINDOW_DISPLAY_H -EAPI E_Config_Dialog *e_int_config_window_display(E_Container *con); +EAPI E_Config_Dialog *e_int_config_window_display(E_Container *con, const char *params __UNUSED__); #endif #endif diff --git a/src/bin/e_int_config_window_manipulation.c b/src/bin/e_int_config_window_manipulation.c index b3b77df17..4ed3308c6 100644 --- a/src/bin/e_int_config_window_manipulation.c +++ b/src/bin/e_int_config_window_manipulation.c @@ -33,7 +33,7 @@ struct _E_Config_Dialog_Data /* a nice easy setup function that does the dirty work */ EAPI E_Config_Dialog * -e_int_config_window_manipulation(E_Container *con) +e_int_config_window_manipulation(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; diff --git a/src/bin/e_int_config_window_manipulation.h b/src/bin/e_int_config_window_manipulation.h index 47655de3f..ee8a10fc0 100644 --- a/src/bin/e_int_config_window_manipulation.h +++ b/src/bin/e_int_config_window_manipulation.h @@ -6,7 +6,7 @@ #ifndef E_INT_CONFIG_WINDOW_MANIPULATION_H #define E_INT_CONFIG_WINDOW_MANIPULATION_H -EAPI E_Config_Dialog *e_int_config_window_manipulation(E_Container *con); +EAPI E_Config_Dialog *e_int_config_window_manipulation(E_Container *con, const char *params __UNUSED__); #endif #endif diff --git a/src/bin/e_int_config_winlist.c b/src/bin/e_int_config_winlist.c index ee0030318..bf6bdc20a 100644 --- a/src/bin/e_int_config_winlist.c +++ b/src/bin/e_int_config_winlist.c @@ -36,7 +36,7 @@ struct _E_Config_Dialog_Data }; EAPI E_Config_Dialog * -e_int_config_winlist(E_Container *con) +e_int_config_winlist(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; diff --git a/src/bin/e_int_config_winlist.h b/src/bin/e_int_config_winlist.h index f271f2553..d2df20848 100644 --- a/src/bin/e_int_config_winlist.h +++ b/src/bin/e_int_config_winlist.h @@ -3,7 +3,7 @@ #ifndef E_INT_CONFIG_WINLIST_H #define E_INT_CONFIG_WINLIST_H -EAPI E_Config_Dialog *e_int_config_winlist(E_Container *con); +EAPI E_Config_Dialog *e_int_config_winlist(E_Container *con, const char *params __UNUSED__); #endif #endif diff --git a/src/bin/e_main.c b/src/bin/e_main.c index 62bd02c09..bdf6f1434 100644 --- a/src/bin/e_main.c +++ b/src/bin/e_main.c @@ -858,7 +858,7 @@ main(int argc, char **argv) e_module_all_load(); else { - e_int_config_modules(e_container_current_get(e_manager_current_get())); + e_int_config_modules(e_container_current_get(e_manager_current_get()), NULL); e_error_message_show (_("Enlightenment crashed early on start and has
" "been restarted. All modules have been disabled
" diff --git a/src/modules/conf_applications/e_int_config_apps.c b/src/modules/conf_applications/e_int_config_apps.c index d8ed4b3c4..94f016408 100644 --- a/src/modules/conf_applications/e_int_config_apps.c +++ b/src/modules/conf_applications/e_int_config_apps.c @@ -52,7 +52,7 @@ struct _E_Config_Dialog_Data }; EAPI E_Config_Dialog * -e_int_config_apps_add(E_Container *con) +e_int_config_apps_add(E_Container *con, const char *params __UNUSED__) { E_Desktop_Edit *ed; Efreet_Desktop *de = NULL; @@ -89,7 +89,7 @@ e_int_config_apps_add(E_Container *con) } EAPI E_Config_Dialog * -e_int_config_apps_favs(E_Container *con) +e_int_config_apps_favs(E_Container *con, const char *params __UNUSED__) { E_Config_Once *once; char buf[4096]; @@ -106,7 +106,7 @@ e_int_config_apps_favs(E_Container *con) } EAPI E_Config_Dialog * -e_int_config_apps_ibar(E_Container *con) +e_int_config_apps_ibar(E_Container *con, const char *params __UNUSED__) { E_Config_Once *once; char buf[4096]; @@ -139,7 +139,7 @@ e_int_config_apps_ibar_other(E_Container *con, const char *path) } EAPI E_Config_Dialog * -e_int_config_apps_startup(E_Container *con) +e_int_config_apps_startup(E_Container *con, const char *params __UNUSED__) { E_Config_Once *once; char buf[4096]; @@ -157,7 +157,7 @@ e_int_config_apps_startup(E_Container *con) } EAPI E_Config_Dialog * -e_int_config_apps_restart(E_Container *con) +e_int_config_apps_restart(E_Container *con, const char *params __UNUSED__) { E_Config_Once *once; char buf[4096]; diff --git a/src/modules/conf_applications/e_int_config_apps.h b/src/modules/conf_applications/e_int_config_apps.h index c0ab16d57..2492ecd82 100644 --- a/src/modules/conf_applications/e_int_config_apps.h +++ b/src/modules/conf_applications/e_int_config_apps.h @@ -3,12 +3,12 @@ #ifndef E_INT_CONFIG_APPS_H #define E_INT_CONFIG_APPS_H -EAPI E_Config_Dialog *e_int_config_apps_favs(E_Container *con); -EAPI E_Config_Dialog *e_int_config_apps_add(E_Container *con); -EAPI E_Config_Dialog *e_int_config_apps_ibar(E_Container *con); +EAPI E_Config_Dialog *e_int_config_apps_favs(E_Container *con, const char *params __UNUSED__); +EAPI E_Config_Dialog *e_int_config_apps_add(E_Container *con, const char *params __UNUSED__); +EAPI E_Config_Dialog *e_int_config_apps_ibar(E_Container *con, const char *params __UNUSED__); EAPI E_Config_Dialog *e_int_config_apps_ibar_other(E_Container *con, const char *path); -EAPI E_Config_Dialog *e_int_config_apps_startup(E_Container *con); -EAPI E_Config_Dialog *e_int_config_apps_restart(E_Container *con); +EAPI E_Config_Dialog *e_int_config_apps_startup(E_Container *con, const char *params __UNUSED__); +EAPI E_Config_Dialog *e_int_config_apps_restart(E_Container *con, const char *params __UNUSED__); #endif #endif diff --git a/src/modules/conf_borders/e_int_config_borders.c b/src/modules/conf_borders/e_int_config_borders.c index d9a4c42be..da0a52f2f 100644 --- a/src/modules/conf_borders/e_int_config_borders.c +++ b/src/modules/conf_borders/e_int_config_borders.c @@ -18,7 +18,7 @@ struct _E_Config_Dialog_Data }; EAPI E_Config_Dialog * -e_int_config_borders(E_Container *con) +e_int_config_borders(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; diff --git a/src/modules/conf_borders/e_int_config_borders.h b/src/modules/conf_borders/e_int_config_borders.h index 7dd8d9bdc..c0d767f91 100644 --- a/src/modules/conf_borders/e_int_config_borders.h +++ b/src/modules/conf_borders/e_int_config_borders.h @@ -3,7 +3,7 @@ #ifndef E_INT_CONFIG_BORDERS_H #define E_INT_CONFIG_BORDERS_H -EAPI E_Config_Dialog *e_int_config_borders(E_Container *con); +EAPI E_Config_Dialog *e_int_config_borders(E_Container *con, const char *params __UNUSED__); EAPI E_Config_Dialog *e_int_config_borders_border(E_Container *con, const char *params); #endif diff --git a/src/modules/conf_colors/e_int_config_color_classes.c b/src/modules/conf_colors/e_int_config_color_classes.c index 2357afd6b..e93a7affa 100644 --- a/src/modules/conf_colors/e_int_config_color_classes.c +++ b/src/modules/conf_colors/e_int_config_color_classes.c @@ -105,7 +105,7 @@ static void _color3_cb_change (void *data, Evas_Object *obj); static void _button_cb (void *data, void *data2); EAPI E_Config_Dialog * -e_int_config_color_classes(E_Container *con) +e_int_config_color_classes(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; diff --git a/src/modules/conf_colors/e_int_config_color_classes.h b/src/modules/conf_colors/e_int_config_color_classes.h index e796b234e..297c675a5 100644 --- a/src/modules/conf_colors/e_int_config_color_classes.h +++ b/src/modules/conf_colors/e_int_config_color_classes.h @@ -3,7 +3,7 @@ #ifndef E_INT_CONFIG_COLOR_CLASSES_H #define E_INT_CONFIG_COLOR_CLASSES_H -EAPI E_Config_Dialog *e_int_config_color_classes(E_Container *con); +EAPI E_Config_Dialog *e_int_config_color_classes(E_Container *con, const char *params __UNUSED__); #endif #endif diff --git a/src/modules/conf_fonts/e_int_config_fonts.c b/src/modules/conf_fonts/e_int_config_fonts.c index 577a6c186..0c7e8da17 100644 --- a/src/modules/conf_fonts/e_int_config_fonts.c +++ b/src/modules/conf_fonts/e_int_config_fonts.c @@ -16,7 +16,6 @@ static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E static void _basic_font_cb_change(void *data, Evas_Object *obj); static void _basic_enable_cb_change(void *data, Evas_Object *obj); -static void _basic_style_cb_change(void *data, Evas_Object *obj); static void _basic_init_data_fill(E_Config_Dialog_Data *cfdata); static void _adv_class_cb_change(void *data, Evas_Object *obj); @@ -148,7 +147,7 @@ struct _E_Config_Dialog_Data }; EAPI E_Config_Dialog * -e_int_config_fonts(E_Container *con) +e_int_config_fonts(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -472,17 +471,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf return ot; } -static void -_basic_style_cb_change(void *data, Evas_Object *obj) -{ - E_Config_Dialog_Data *cfdata; - - cfdata = data; - if (!cfdata) return; - - _font_preview_update(cfdata); -} - static void _basic_font_cb_change(void *data, Evas_Object *obj) { diff --git a/src/modules/conf_fonts/e_int_config_fonts.h b/src/modules/conf_fonts/e_int_config_fonts.h index e8df51a66..64b1b1eaa 100644 --- a/src/modules/conf_fonts/e_int_config_fonts.h +++ b/src/modules/conf_fonts/e_int_config_fonts.h @@ -6,7 +6,7 @@ #ifndef E_INT_CONFIG_FONTS_H #define E_INT_CONFIG_FONTS_H -EAPI E_Config_Dialog *e_int_config_fonts(E_Container *con); +EAPI E_Config_Dialog *e_int_config_fonts(E_Container *con, const char *params __UNUSED__); #endif #endif diff --git a/src/modules/conf_icon_theme/e_int_config_icon_themes.c b/src/modules/conf_icon_theme/e_int_config_icon_themes.c index ff19709d6..c7a118baf 100644 --- a/src/modules/conf_icon_theme/e_int_config_icon_themes.c +++ b/src/modules/conf_icon_theme/e_int_config_icon_themes.c @@ -33,7 +33,7 @@ struct _E_Config_Dialog_Data }; EAPI E_Config_Dialog * -e_int_config_icon_themes(E_Container *con) +e_int_config_icon_themes(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; diff --git a/src/modules/conf_icon_theme/e_int_config_icon_themes.h b/src/modules/conf_icon_theme/e_int_config_icon_themes.h index f338595e6..0ecba0d66 100644 --- a/src/modules/conf_icon_theme/e_int_config_icon_themes.h +++ b/src/modules/conf_icon_theme/e_int_config_icon_themes.h @@ -6,7 +6,7 @@ #ifndef E_INT_CONFIG_ICON_THEMES_H #define E_INT_CONFIG_ICON_THEMES_H -EAPI E_Config_Dialog *e_int_config_icon_themes(E_Container *con); +EAPI E_Config_Dialog *e_int_config_icon_themes(E_Container *con, const char *params __UNUSED__); #endif #endif diff --git a/src/modules/conf_imc/e_int_config_imc.c b/src/modules/conf_imc/e_int_config_imc.c index c27b143c8..9cbf212cb 100644 --- a/src/modules/conf_imc/e_int_config_imc.c +++ b/src/modules/conf_imc/e_int_config_imc.c @@ -3,6 +3,7 @@ */ #include "e.h" #include "e_int_config_imc.h" +#include "e_int_config_imc_import.h" typedef struct _E_Imc_Update_Data E_Imc_Update_Data; @@ -89,7 +90,7 @@ struct _E_Config_Dialog_Data }; EAPI E_Config_Dialog * -e_int_config_imc(E_Container *con) +e_int_config_imc(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; diff --git a/src/modules/conf_imc/e_int_config_imc.h b/src/modules/conf_imc/e_int_config_imc.h index 79b8dd401..00d43dab3 100644 --- a/src/modules/conf_imc/e_int_config_imc.h +++ b/src/modules/conf_imc/e_int_config_imc.h @@ -6,7 +6,7 @@ #ifndef E_INT_CONFIG_IMC_H #define E_INT_CONFIG_IMC_H -EAPI E_Config_Dialog *e_int_config_imc(E_Container *con); +EAPI E_Config_Dialog *e_int_config_imc(E_Container *con, const char *params __UNUSED__); EAPI void e_int_config_imc_import_done(E_Config_Dialog *dia); EAPI void e_int_config_imc_update(E_Config_Dialog *dia, const char *file); diff --git a/src/modules/conf_imc/e_int_config_imc_import.c b/src/modules/conf_imc/e_int_config_imc_import.c index 034c3d448..4d9d01fa5 100644 --- a/src/modules/conf_imc/e_int_config_imc_import.c +++ b/src/modules/conf_imc/e_int_config_imc_import.c @@ -1,4 +1,5 @@ #include "e.h" +#include "e_int_config_imc.h" typedef struct _Import Import; @@ -35,7 +36,7 @@ static void _imc_import_cb_key_down (void *data, Evas *e, Evas_Object *obj, void *event); EAPI E_Win * -e_int_config_imc_import(E_Config_Dialog *parent) +e_int_config_imc_import(E_Config_Dialog *parent) { Evas *evas; E_Win *win; diff --git a/src/modules/conf_intl/e_int_config_intl.c b/src/modules/conf_intl/e_int_config_intl.c index 8fc972495..290fa365d 100644 --- a/src/modules/conf_intl/e_int_config_intl.c +++ b/src/modules/conf_intl/e_int_config_intl.c @@ -563,7 +563,7 @@ const E_Intl_Pair charset_predefined_pairs[ ] = { EAPI E_Config_Dialog * -e_int_config_intl(E_Container *con) +e_int_config_intl(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; diff --git a/src/modules/conf_intl/e_int_config_intl.h b/src/modules/conf_intl/e_int_config_intl.h index 536cf7beb..295f4568f 100644 --- a/src/modules/conf_intl/e_int_config_intl.h +++ b/src/modules/conf_intl/e_int_config_intl.h @@ -6,7 +6,7 @@ #ifndef E_INT_CONFIG_INTL_H #define E_INT_CONFIG_INTL_H -EAPI E_Config_Dialog *e_int_config_intl(E_Container *con); +EAPI E_Config_Dialog *e_int_config_intl(E_Container *con, const char *params __UNUSED__); #endif #endif diff --git a/src/modules/conf_mouse_cursor/e_int_config_cursor.c b/src/modules/conf_mouse_cursor/e_int_config_cursor.c index 487175c30..232faa2c4 100644 --- a/src/modules/conf_mouse_cursor/e_int_config_cursor.c +++ b/src/modules/conf_mouse_cursor/e_int_config_cursor.c @@ -16,7 +16,7 @@ struct _E_Config_Dialog_Data }; EAPI E_Config_Dialog * -e_int_config_cursor(E_Container *con) +e_int_config_cursor(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; diff --git a/src/modules/conf_mouse_cursor/e_int_config_cursor.h b/src/modules/conf_mouse_cursor/e_int_config_cursor.h index 425132739..5d87bdb92 100644 --- a/src/modules/conf_mouse_cursor/e_int_config_cursor.h +++ b/src/modules/conf_mouse_cursor/e_int_config_cursor.h @@ -3,7 +3,7 @@ #ifndef E_INT_CONFIG_CURSOR_H #define E_INT_CONFIG_CURSOR_H -EAPI E_Config_Dialog *e_int_config_cursor(E_Container *con); +EAPI E_Config_Dialog *e_int_config_cursor(E_Container *con, const char *params __UNUSED__); #endif #endif diff --git a/src/modules/conf_profiles/e_int_config_profiles.c b/src/modules/conf_profiles/e_int_config_profiles.c index f5c9c6cdc..58351a70f 100644 --- a/src/modules/conf_profiles/e_int_config_profiles.c +++ b/src/modules/conf_profiles/e_int_config_profiles.c @@ -1,6 +1,5 @@ #include "e.h" -EAPI E_Config_Dialog *e_int_config_profiles(E_Container *con); static void *_create_data(E_Config_Dialog *cfd); static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static Evas_Object *_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); @@ -37,7 +36,7 @@ struct _Del_Profile_Confirm_Data }; EAPI E_Config_Dialog * -e_int_config_profiles(E_Container *con) +e_int_config_profiles(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -201,7 +200,6 @@ _cb_select(void *data, void *data2) static void _cb_delete(void *data, void *data2) { - E_Config_Dialog_Data *cfdata; Del_Profile_Confirm_Data *d; char buf[4096]; diff --git a/src/modules/conf_profiles/e_int_config_profiles.h b/src/modules/conf_profiles/e_int_config_profiles.h index 023458a37..2e1350389 100644 --- a/src/modules/conf_profiles/e_int_config_profiles.h +++ b/src/modules/conf_profiles/e_int_config_profiles.h @@ -3,7 +3,7 @@ #ifndef E_INT_CONFIG_PROFILES_H #define E_INT_CONFIG_PROFILES_H -EAPI E_Config_Dialog *e_int_config_profiles(E_Container *con); +EAPI E_Config_Dialog *e_int_config_profiles(E_Container *con, const char *params __UNUSED__); #endif #endif diff --git a/src/modules/conf_startup/e_int_config_startup.c b/src/modules/conf_startup/e_int_config_startup.c index 550d6700e..af15e3d84 100644 --- a/src/modules/conf_startup/e_int_config_startup.c +++ b/src/modules/conf_startup/e_int_config_startup.c @@ -22,7 +22,7 @@ struct _E_Config_Dialog_Data }; EAPI E_Config_Dialog * -e_int_config_startup(E_Container *con) +e_int_config_startup(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; diff --git a/src/modules/conf_startup/e_int_config_startup.h b/src/modules/conf_startup/e_int_config_startup.h index aab6569bb..b9f951de4 100644 --- a/src/modules/conf_startup/e_int_config_startup.h +++ b/src/modules/conf_startup/e_int_config_startup.h @@ -3,7 +3,7 @@ #ifndef E_INT_CONFIG_STARTUP_H #define E_INT_CONFIG_STARTUP_H -EAPI E_Config_Dialog *e_int_config_startup(E_Container *con); +EAPI E_Config_Dialog *e_int_config_startup(E_Container *con, const char *params __UNUSED__); #endif #endif diff --git a/src/modules/conf_theme/e_int_config_theme.c b/src/modules/conf_theme/e_int_config_theme.c index 445cb8ae1..3ae48d360 100644 --- a/src/modules/conf_theme/e_int_config_theme.c +++ b/src/modules/conf_theme/e_int_config_theme.c @@ -3,6 +3,7 @@ */ #include "e.h" +#include "e_int_config_theme_import.h" static void *_create_data (E_Config_Dialog *cfd); static void _free_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); @@ -40,7 +41,7 @@ struct _E_Config_Dialog_Data }; EAPI E_Config_Dialog * -e_int_config_theme(E_Container *con) +e_int_config_theme(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; diff --git a/src/modules/conf_theme/e_int_config_theme.h b/src/modules/conf_theme/e_int_config_theme.h index e778ca12d..4e00d0436 100644 --- a/src/modules/conf_theme/e_int_config_theme.h +++ b/src/modules/conf_theme/e_int_config_theme.h @@ -6,7 +6,7 @@ #ifndef E_INT_CONFIG_THEME_H #define E_INT_CONFIG_THEME_H -EAPI E_Config_Dialog *e_int_config_theme(E_Container *con); +EAPI E_Config_Dialog *e_int_config_theme(E_Container *con, const char *params __UNUSED__); EAPI void e_int_config_theme_import_done(E_Config_Dialog *dia); EAPI void e_int_config_theme_update(E_Config_Dialog *dia, char *file); diff --git a/src/modules/conf_theme/e_int_config_theme_import.c b/src/modules/conf_theme/e_int_config_theme_import.c index 20298fe13..4e1eaa18b 100644 --- a/src/modules/conf_theme/e_int_config_theme_import.c +++ b/src/modules/conf_theme/e_int_config_theme_import.c @@ -1,4 +1,5 @@ #include "e.h" +#include "e_int_config_theme.h" typedef struct _Import Import; diff --git a/src/modules/conf_transitions/e_int_config_transitions.c b/src/modules/conf_transitions/e_int_config_transitions.c index 5f956ea59..26bcc6d6c 100644 --- a/src/modules/conf_transitions/e_int_config_transitions.c +++ b/src/modules/conf_transitions/e_int_config_transitions.c @@ -27,7 +27,7 @@ struct _E_Config_Dialog_Data }; EAPI E_Config_Dialog * -e_int_config_transitions(E_Container *con) +e_int_config_transitions(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; diff --git a/src/modules/conf_transitions/e_int_config_transitions.h b/src/modules/conf_transitions/e_int_config_transitions.h index b66dd0f6e..66d762b7a 100644 --- a/src/modules/conf_transitions/e_int_config_transitions.h +++ b/src/modules/conf_transitions/e_int_config_transitions.h @@ -3,7 +3,7 @@ #ifndef E_INT_CONFIG_TRANSITIONS_H #define E_INT_CONFIG_TRANSITIONS_H -EAPI E_Config_Dialog *e_int_config_transitions(E_Container *con); +EAPI E_Config_Dialog *e_int_config_transitions(E_Container *con, const char *params __UNUSED__); #endif #endif diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper.c b/src/modules/conf_wallpaper/e_int_config_wallpaper.c index 35c3a9f7c..04eccd886 100644 --- a/src/modules/conf_wallpaper/e_int_config_wallpaper.c +++ b/src/modules/conf_wallpaper/e_int_config_wallpaper.c @@ -48,7 +48,7 @@ struct _E_Config_Dialog_Data }; EAPI E_Config_Dialog * -e_int_config_wallpaper(E_Container *con) +e_int_config_wallpaper(E_Container *con, const char *params __UNUSED__) { return _e_int_config_wallpaper_desk(con, -1, -1, -1, -1); } @@ -62,7 +62,7 @@ e_int_config_wallpaper_desk(E_Container *con, const char *params) con_num = zone_num = desk_x = desk_y = -1; if (sscanf(params, "%i %i %i %i", &con_num, &zone_num, &desk_x, &desk_y) != 4) return NULL; - _e_int_config_wallpaper_desk(con, con_num, zone_num, desk_x, desk_y); + return _e_int_config_wallpaper_desk(con, con_num, zone_num, desk_x, desk_y); } static E_Config_Dialog * diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper.h b/src/modules/conf_wallpaper/e_int_config_wallpaper.h index 951449266..308ffa5bc 100644 --- a/src/modules/conf_wallpaper/e_int_config_wallpaper.h +++ b/src/modules/conf_wallpaper/e_int_config_wallpaper.h @@ -7,7 +7,7 @@ typedef struct _E_Config_Wallpaper E_Config_Wallpaper; #ifndef E_INT_CONFIG_WALLPAPER_H #define E_INT_CONFIG_WALLPAPER_H -EAPI E_Config_Dialog *e_int_config_wallpaper(E_Container *con); +EAPI E_Config_Dialog *e_int_config_wallpaper(E_Container *con, const char *params __UNUSED__); EAPI E_Config_Dialog *e_int_config_wallpaper_desk(E_Container *con, const char *params); EAPI void e_int_config_wallpaper_update(E_Config_Dialog *dia, char *file); diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c index da6022ff6..3232e1e9d 100644 --- a/src/modules/pager/e_mod_main.c +++ b/src/modules/pager/e_mod_main.c @@ -440,8 +440,6 @@ _pager_desk_find(Pager *p, E_Desk *desk) static void _pager_desk_switch(Pager_Desk *pd1, Pager_Desk *pd2) { - int d1, d2; - int tmp_x, tmp_y; int c; E_Zone *zone1, *zone2; E_Desk *desk1, *desk2; @@ -1442,39 +1440,6 @@ _pager_cb_event_border_property(void *data, int type, void *event) return 1; } -static int -_pager_cb_event_border_skip_winlist(void *data, int type, void *event) -{ - E_Event_Border_Property *ev; - Evas_List *l, *l2; - - ev = event; - for (l = pager_config->instances; l; l = l->next) - { - Instance *inst; - - inst = l->data; - if (inst->pager->zone != ev->border->zone) continue; - for (l2 = inst->pager->desks; l2; l2 = l2->next) - { - Pager_Desk *pd; - Pager_Win *pw; - - pd = l2->data; - pw = _pager_desk_window_find(pd, ev->border); - if (pw && ev->border->client.netwm.state.skip_pager != pw->skip_winlist) - { - pw->skip_winlist = ev->border->client.netwm.state.skip_pager; - if (pw->skip_winlist) - evas_object_hide(pw->o_window); - else - evas_object_show(pw->o_window); - } - } - } - return 1; -} - static int _pager_cb_event_zone_desk_count_set(void *data, int type, void *event) { @@ -2051,7 +2016,6 @@ _pager_desk_cb_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_inf E_Drag *drag; Evas_Object *o, *oo, *o_icon; Evas_Coord x, y, w, h; - const char *file = NULL, *part = NULL; const char *drag_types[] = { "enlightenment/vdesktop" }; Pager_Win *pw; Evas_List *l; diff --git a/src/modules/temperature/e_mod_config.c b/src/modules/temperature/e_mod_config.c index a57c7fb24..6830b0971 100644 --- a/src/modules/temperature/e_mod_config.c +++ b/src/modules/temperature/e_mod_config.c @@ -117,12 +117,11 @@ _fill_data(E_Config_Dialog_Data *cfdata) switch (cfdata->inst->sensor_type) { case SENSOR_TYPE_NONE: - break; case SENSOR_TYPE_FREEBSD: - break; case SENSOR_TYPE_OMNIBOOK: - break; case SENSOR_TYPE_LINUX_MACMINI: + case SENSOR_TYPE_LINUX_PBOOK: + case SENSOR_TYPE_LINUX_INTELCORETEMP: break; case SENSOR_TYPE_LINUX_I2C: therms = temperature_get_i2c_files();