Add UNUSED.

Fix formatting, Remove unused variables, etc, etc.



SVN revision: 51432
This commit is contained in:
Christopher Michael 2010-08-19 18:25:49 +00:00
parent bd2fd46538
commit b83cc7780c
2 changed files with 23 additions and 17 deletions

View File

@ -47,7 +47,7 @@ e_int_config_shelf(E_Container *con, const char *params __UNUSED__)
} }
static void * static void *
_create_data(E_Config_Dialog *cfd) _create_data(E_Config_Dialog *cfd __UNUSED__)
{ {
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata;
@ -56,7 +56,7 @@ _create_data(E_Config_Dialog *cfd)
} }
static void static void
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{ {
E_FREE(cfdata); E_FREE(cfdata);
} }
@ -211,7 +211,7 @@ _ilist_cb_selected(void *data)
} }
static void static void
_cb_add(void *data, void *data2) _cb_add(void *data, void *data2 __UNUSED__)
{ {
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata;
E_Config_Shelf *cfg; E_Config_Shelf *cfg;
@ -246,7 +246,7 @@ _cb_add(void *data, void *data2)
} }
static void static void
_cb_delete(void *data, void *data2) _cb_delete(void *data, void *data2 __UNUSED__)
{ {
Shelf_Del_Confirm_Data *d; Shelf_Del_Confirm_Data *d;
char buf[4096]; char buf[4096];
@ -309,7 +309,7 @@ _cb_dialog_destroy(void *data)
} }
static void static void
_cb_config(void *data, void *data2) _cb_config(void *data, void *data2 __UNUSED__)
{ {
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata;
E_Shelf *es; E_Shelf *es;

View File

@ -2,8 +2,8 @@
#include "e_mod_main.h" #include "e_mod_main.h"
/* actual module specifics */ /* actual module specifics */
static void _e_mod_run_cb(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_mod_run_cb(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_mod_menu_add(void *data, E_Menu *m); static void _e_mod_menu_add(void *data, E_Menu *m);
static E_Module *conf_module = NULL; static E_Module *conf_module = NULL;
static E_Int_Menu_Augmentation *maug = NULL; static E_Int_Menu_Augmentation *maug = NULL;
@ -18,10 +18,14 @@ EAPI E_Module_Api e_modapi =
EAPI void * EAPI void *
e_modapi_init(E_Module *m) e_modapi_init(E_Module *m)
{ {
e_configure_registry_category_add("extensions", 90, _("Extensions"), NULL, "preferences-extensions"); e_configure_registry_category_add("extensions", 90, _("Extensions"), NULL,
e_configure_registry_item_add("extensions/shelves", 20, _("Shelves"), NULL, "preferences-desktop-shelf", e_int_config_shelf); "preferences-extensions");
maug = e_int_menus_menu_augmentation_add_sorted e_configure_registry_item_add("extensions/shelves", 20, _("Shelves"), NULL,
("config/1", _("Shelves"), _e_mod_menu_add, NULL, NULL, NULL); "preferences-desktop-shelf",
e_int_config_shelf);
maug =
e_int_menus_menu_augmentation_add_sorted("config/1", _("Shelves"),
_e_mod_menu_add, NULL, NULL, NULL);
conf_module = m; conf_module = m;
e_module_delayed_set(m, 1); e_module_delayed_set(m, 1);
@ -29,16 +33,18 @@ e_modapi_init(E_Module *m)
} }
EAPI int EAPI int
e_modapi_shutdown(E_Module *m) e_modapi_shutdown(E_Module *m __UNUSED__)
{ {
E_Config_Dialog *cfd; E_Config_Dialog *cfd;
/* remove module-supplied menu additions */ /* remove module-supplied menu additions */
if (maug) if (maug)
{ {
e_int_menus_menu_augmentation_del("config/1", maug); e_int_menus_menu_augmentation_del("config/1", maug);
maug = NULL; maug = NULL;
} }
while ((cfd = e_config_dialog_get("E", "extensions/shelves"))) e_object_del(E_OBJECT(cfd)); while ((cfd = e_config_dialog_get("E", "extensions/shelves")))
e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("extensions/shelves"); e_configure_registry_item_del("extensions/shelves");
e_configure_registry_category_del("extensions"); e_configure_registry_category_del("extensions");
conf_module = NULL; conf_module = NULL;
@ -46,21 +52,21 @@ e_modapi_shutdown(E_Module *m)
} }
EAPI int EAPI int
e_modapi_save(E_Module *m) e_modapi_save(E_Module *m __UNUSED__)
{ {
return 1; return 1;
} }
/* menu item callback(s) */ /* menu item callback(s) */
static void static void
_e_mod_run_cb(void *data, E_Menu *m, E_Menu_Item *mi) _e_mod_run_cb(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__)
{ {
e_configure_registry_call("extensions/shelves", m->zone->container, NULL); e_configure_registry_call("extensions/shelves", m->zone->container, NULL);
} }
/* menu item add hook */ /* menu item add hook */
static void static void
_e_mod_menu_add(void *data, E_Menu *m) _e_mod_menu_add(void *data __UNUSED__, E_Menu *m)
{ {
E_Menu_Item *mi; E_Menu_Item *mi;