formatting

SVN revision: 73003
This commit is contained in:
Mike Blumenkrantz 2012-06-28 13:12:13 +00:00
parent aefea9dfa9
commit 77dae71b13
22 changed files with 442 additions and 417 deletions

View File

@ -103,3 +103,4 @@ e_modapi_save(E_Module *m __UNUSED__)
{
return 1;
}

View File

@ -161,11 +161,11 @@ e_wizard_page_show(Evas_Object *obj)
EAPI E_Wizard_Page *
e_wizard_page_add(void *handle,
int (*init_cb) (E_Wizard_Page *pg),
int (*shutdown_cb) (E_Wizard_Page *pg),
int (*show_cb) (E_Wizard_Page *pg),
int (*hide_cb) (E_Wizard_Page *pg),
int (*apply_cb) (E_Wizard_Page *pg)
int (*init_cb)(E_Wizard_Page *pg),
int (*shutdown_cb)(E_Wizard_Page *pg),
int (*show_cb)(E_Wizard_Page *pg),
int (*hide_cb)(E_Wizard_Page *pg),
int (*apply_cb)(E_Wizard_Page *pg)
)
{
E_Wizard_Page *pg;
@ -262,19 +262,19 @@ _e_wizard_main_new(E_Zone *zone)
mask = 0;
kg = evas_object_key_grab(o, "Tab", mask, ~mask, 0);
if (!kg)
fprintf(stderr,"ERROR: unable to redirect \"Tab\" key events to object %p.\n", o);
fprintf(stderr, "ERROR: unable to redirect \"Tab\" key events to object %p.\n", o);
mask = evas_key_modifier_mask_get(popup->evas, "Shift");
kg = evas_object_key_grab(o, "Tab", mask, ~mask, 0);
if (!kg)
fprintf(stderr,"ERROR: unable to redirect \"Tab\" key events to object %p.\n", o);
fprintf(stderr, "ERROR: unable to redirect \"Tab\" key events to object %p.\n", o);
mask = 0;
kg = evas_object_key_grab(o, "Return", mask, ~mask, 0);
if (!kg)
fprintf(stderr,"ERROR: unable to redirect \"Return\" key events to object %p.\n", o);
fprintf(stderr, "ERROR: unable to redirect \"Return\" key events to object %p.\n", o);
mask = 0;
kg = evas_object_key_grab(o, "KP_Enter", mask, ~mask, 0);
if (!kg)
fprintf(stderr,"ERROR: unable to redirect \"KP_Enter\" key events to object %p.\n", o);
fprintf(stderr, "ERROR: unable to redirect \"KP_Enter\" key events to object %p.\n", o);
evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN,
_e_wizard_cb_key_down, popup);
@ -342,3 +342,4 @@ _e_wizard_cb_next(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char
{
e_wizard_next();
}

View File

@ -49,3 +49,4 @@ wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
{
return 1;
}

View File

@ -13,7 +13,7 @@ struct _E_Intl_Pair
const char *locale_translation;
};
const E_Intl_Pair basic_language_predefined_pairs[ ] =
const E_Intl_Pair basic_language_predefined_pairs[] =
{
{"ar_AE.UTF-8", "ara_flag.png", "العربية"},
{"bg_BG.UTF-8", "bg_flag.png", "Български"},
@ -78,7 +78,7 @@ _basic_lang_list_sort(const void *data1, const void *data2)
if (!ln2->locale_translation) return -1;
trans2 = ln2->locale_translation;
return (strcmp(trans1, trans2));
return strcmp(trans1, trans2);
}
EAPI int
@ -207,7 +207,7 @@ EAPI int
wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
{
// evas_object_del(pg->data);
/* special - language inits its stuff the moment it goes away */
/* special - language inits its stuff the moment it goes away */
eina_stringshare_del(e_config->language);
e_config->language = eina_stringshare_ref(lang);
e_intl_language_set(e_config->language);
@ -225,3 +225,4 @@ wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
e_wizard_labels_update();
return 1;
}

View File

@ -57,12 +57,12 @@ parse_rules(void)
FILE *f = fopen(rules_file, "r");
if (!f) return 0;
for (;;)
for (;; )
{
if (!fgets(buf, sizeof(buf), f)) goto err;
if (!strncmp(buf, "! layout", 8))
{
for (;;)
for (;; )
{
Layout *lay;
char name[4096], label[4096];
@ -191,3 +191,4 @@ wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
implement_layout();
return 1;
}

View File

@ -139,7 +139,7 @@ EAPI int
wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
{
// evas_object_del(pg->data);
// actually apply profile
// actually apply profile
if (!profile) profile = "standard";
e_config_profile_set(profile);
e_config_profile_del(e_config_profile_get());
@ -153,3 +153,4 @@ wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
{
return 1;
}

View File

@ -36,3 +36,4 @@ wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
{
return 1;
}

View File

@ -94,3 +94,4 @@ wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
{
return 1;
}

View File

@ -188,3 +188,4 @@ wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
{
return 1;
}

View File

@ -78,3 +78,4 @@ wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
{
return 1;
}

View File

@ -66,3 +66,4 @@ wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
{
return 1;
}

View File

@ -37,13 +37,15 @@ wizard_page_show(E_Wizard_Page *pg __UNUSED__)
if (buf[0] == '#') continue;
p = buf;
while (isspace(*p)) p++;
for (;;)
while (isspace(*p))
p++;
for (;; )
{
n = sscanf(p, "%s", name);
if (n != 1) break;
p += strlen(name);
while (isspace(*p)) p++;
while (isspace(*p))
p++;
snprintf(buf2, sizeof(buf2), "%s.desktop", name);
desk = efreet_util_desktop_file_id_find(buf2);
if (desk)
@ -70,3 +72,4 @@ wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
{
return 1;
}

View File

@ -128,3 +128,4 @@ wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
{
return 1;
}

View File

@ -102,3 +102,4 @@ wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
{
return 1;
}

View File

@ -83,6 +83,7 @@ _connman_timeout(void *data)
_recommend_connman(pg);
return EINA_FALSE;
}
#endif
EAPI int
@ -164,3 +165,4 @@ wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
{
return 1;
}

View File

@ -8,9 +8,9 @@
#endif
/*
static char *
read_file(const char *file)
{
static char *
read_file(const char *file)
{
FILE *f = fopen(file, "r");
size_t len;
char buf[4096], *p;
@ -28,8 +28,8 @@ read_file(const char *file)
}
fclose(f);
return strdup(buf);
}
*/
}
*/
EAPI int
wizard_page_init(E_Wizard_Page *pg __UNUSED__)
@ -85,3 +85,4 @@ wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
{
return 1;
}

View File

@ -53,3 +53,4 @@ wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
{
return 1;
}

View File

@ -54,3 +54,4 @@ wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
{
return 1;
}

View File

@ -211,3 +211,4 @@ wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
{
return 1;
}

View File

@ -65,3 +65,4 @@ wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
{
return 1;
}

View File

@ -78,3 +78,4 @@ wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
{
return 1;
}

View File

@ -37,3 +37,4 @@ wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
e_sys_action_do(E_SYS_RESTART, NULL);
return 1;
}