formatting

SVN revision: 74580
This commit is contained in:
Mike Blumenkrantz 2012-07-30 10:50:50 +00:00
parent 7cf1434f32
commit c3317861dd
1 changed files with 418 additions and 405 deletions

View File

@ -356,9 +356,9 @@ e_int_menus_lost_clients_new(void)
EAPI E_Int_Menu_Augmentation *
e_int_menus_menu_augmentation_add_sorted(const char *menu,
const char *sort_key,
void (*func_add) (void *data, E_Menu *m),
void (*func_add)(void *data, E_Menu *m),
void *data_add,
void (*func_del) (void *data, E_Menu *m),
void (*func_del)(void *data, E_Menu *m),
void *data_del)
{
E_Int_Menu_Augmentation *maug;
@ -420,9 +420,9 @@ e_int_menus_menu_augmentation_add_sorted(const char *menu,
EAPI E_Int_Menu_Augmentation *
e_int_menus_menu_augmentation_add(const char *menu,
void (*func_add) (void *data, E_Menu *m),
void (*func_add)(void *data, E_Menu *m),
void *data_add,
void (*func_del) (void *data, E_Menu *m),
void (*func_del)(void *data, E_Menu *m),
void *data_del)
{
return e_int_menus_menu_augmentation_add_sorted
@ -522,12 +522,12 @@ _e_int_menus_themes_about(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_It
}
/*
static void
_e_int_menus_fwin_favorites_item_cb(void *data, E_Menu *m, E_Menu_Item *mi)
{
static void
_e_int_menus_fwin_favorites_item_cb(void *data, E_Menu *m, E_Menu_Item *mi)
{
e_fwin_new(m->zone->container, "favorites", "/");
}
*/
}
*/
static void
_e_int_menus_main_showhide(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__)
@ -659,7 +659,7 @@ _e_int_menus_apps_free_hook2(void *obj)
m = obj;
// XXX TODO: this should be automatic in e_menu, just get references right!
// XXX TODO: fix references and remove me!!!
EINA_LIST_FOREACH_SAFE(m->items, l, l_next, mi)
EINA_LIST_FOREACH_SAFE (m->items, l, l_next, mi)
{
if (mi->submenu)
e_object_del(E_OBJECT(mi->submenu));
@ -678,15 +678,15 @@ _e_int_menus_apps_run(void *data, E_Menu *m, E_Menu_Item *mi __UNUSED__)
}
/*
static void
_e_int_menus_apps_drag_finished(E_Drag *drag, int dropped __UNUSED__)
{
static void
_e_int_menus_apps_drag_finished(E_Drag *drag, int dropped __UNUSED__)
{
Efreet_Desktop *desktop;
desktop = drag->data;
efreet_desktop_free(desktop);
}
*/
}
*/
static void
_e_int_menus_apps_drag(void *data, E_Menu *m, E_Menu_Item *mi)
@ -770,7 +770,7 @@ _e_int_menus_desktops_free_hook(void *obj)
m = obj;
// XXX TODO: this should be automatic in e_menu, just get references right!
// XXX TODO: fix references and remove me!!!
EINA_LIST_FOREACH_SAFE(m->items, l, l_next, mi)
EINA_LIST_FOREACH_SAFE (m->items, l, l_next, mi)
{
if (mi->submenu)
e_object_del(E_OBJECT(mi->submenu));
@ -895,7 +895,7 @@ _e_int_menus_clients_group_class_cb(const void *d1, const void *d2)
if (!bd2->client.icccm.class)
return 1;
return (strcmp(bd1->client.icccm.class, bd2->client.icccm.class) > 0 ? 1 : -1);
return strcmp(bd1->client.icccm.class, bd2->client.icccm.class) > 0 ? 1 : -1;
}
static int
@ -1192,7 +1192,7 @@ _e_int_menus_clients_title_abbrv(const char *title)
int max_len;
max_len = e_config->clientlist_max_caption_len;
if ((e_config->clientlist_limit_caption_len) && ((int) strlen(title) > max_len))
if ((e_config->clientlist_limit_caption_len) && ((int)strlen(title) > max_len))
{
char *abbv;
const char *left, *right;
@ -1422,9 +1422,9 @@ _e_int_menus_shelves_pre_cb(void *data __UNUSED__, E_Menu *m)
if (!s) continue;
if (s->zone->num != zone->num) continue;
if (s->cfg->container != (int) con->num) continue;
if (s->cfg->container != (int)con->num) continue;
name = e_shelf_orient_string_get (s);
name = e_shelf_orient_string_get(s);
snprintf(buf, sizeof(buf), "Shelf %s", name);
mi = e_menu_item_new(m);
@ -1435,39 +1435,51 @@ _e_int_menus_shelves_pre_cb(void *data __UNUSED__, E_Menu *m)
case E_GADCON_ORIENT_LEFT:
e_util_menu_item_theme_icon_set(mi, "preferences-position-left");
break;
case E_GADCON_ORIENT_RIGHT:
e_util_menu_item_theme_icon_set(mi, "preferences-position-right");
break;
case E_GADCON_ORIENT_TOP:
e_util_menu_item_theme_icon_set(mi, "preferences-position-top");
break;
case E_GADCON_ORIENT_BOTTOM:
e_util_menu_item_theme_icon_set(mi, "preferences-position-bottom");
break;
case E_GADCON_ORIENT_CORNER_TL:
e_util_menu_item_theme_icon_set(mi, "preferences-position-top-left");
break;
case E_GADCON_ORIENT_CORNER_TR:
e_util_menu_item_theme_icon_set(mi, "preferences-position-top-right");
break;
case E_GADCON_ORIENT_CORNER_BL:
e_util_menu_item_theme_icon_set(mi, "preferences-position-bottom-left");
break;
case E_GADCON_ORIENT_CORNER_BR:
e_util_menu_item_theme_icon_set(mi, "preferences-position-bottom-right");
break;
case E_GADCON_ORIENT_CORNER_LT:
e_util_menu_item_theme_icon_set(mi, "preferences-position-left-top");
break;
case E_GADCON_ORIENT_CORNER_RT:
e_util_menu_item_theme_icon_set(mi, "preferences-position-right-top");
break;
case E_GADCON_ORIENT_CORNER_LB:
e_util_menu_item_theme_icon_set(mi, "preferences-position-left-bottom");
break;
case E_GADCON_ORIENT_CORNER_RB:
e_util_menu_item_theme_icon_set(mi, "preferences-position-right-bottom");
break;
default:
e_util_menu_item_theme_icon_set(mi, "preferences-desktop-shelf");
break;
@ -1575,3 +1587,4 @@ _e_int_menus_item_label_set(Efreet_Menu *entry, E_Menu_Item *mi)
e_menu_item_label_set(mi, label);
}