projects
/
framework
/
uifw
/
elementary.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1600676
)
[externals] Sync with upstream changes
author
Mike McCormack
<mj.mccormack@samsung.com>
Wed, 23 Nov 2011 07:41:02 +0000
(16:41 +0900)
committer
Mike McCormack
<mj.mccormack@samsung.com>
Wed, 23 Nov 2011 07:41:02 +0000
(16:41 +0900)
src/edje_externals/elm.c
patch
|
blob
|
history
src/edje_externals/elm_bubble.c
patch
|
blob
|
history
src/edje_externals/elm_calendar.c
patch
|
blob
|
history
src/edje_externals/elm_entry.c
patch
|
blob
|
history
diff --git
a/src/edje_externals/elm.c
b/src/edje_externals/elm.c
index
7f5193a
..
185ec3b
100644
(file)
--- a/
src/edje_externals/elm.c
+++ b/
src/edje_externals/elm.c
@@
-144,7
+144,7
@@
external_signals_proxy(Evas_Object *obj, Evas_Object *edje, const char *part_nam
ctxt = malloc(sizeof(Elm_External_Signals_Proxy_Context) * total);
if (!ctxt) return;
evas_object_event_callback_add
ctxt = malloc(sizeof(Elm_External_Signals_Proxy_Context) * total);
if (!ctxt) return;
evas_object_event_callback_add
- (obj, EVAS_CALLBACK_
DEL
, _external_signal_proxy_free_cb, ctxt);
+ (obj, EVAS_CALLBACK_
FREE
, _external_signal_proxy_free_cb, ctxt);
for (; cls_count > 0; cls_count--, cls_descs++, ctxt++)
{
for (; cls_count > 0; cls_count--, cls_descs++, ctxt++)
{
diff --git
a/src/edje_externals/elm_bubble.c
b/src/edje_externals/elm_bubble.c
index
4868294
..
ee43e07
100644
(file)
--- a/
src/edje_externals/elm_bubble.c
+++ b/
src/edje_externals/elm_bubble.c
@@
-61,7
+61,7
@@
external_bubble_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ex
Evas_Object *content = \
external_common_param_edje_object_get(obj, param);
if ((strcmp(param->s, "")) && (!content)) return EINA_FALSE;
Evas_Object *content = \
external_common_param_edje_object_get(obj, param);
if ((strcmp(param->s, "")) && (!content)) return EINA_FALSE;
- elm_
bubble
_content_set(obj, content);
+ elm_
object
_content_set(obj, content);
return EINA_TRUE;
}
}
return EINA_TRUE;
}
}
@@
-137,8
+137,10
@@
external_bubble_params_parse(void *data __UNUSED__, Evas_Object *obj, const Eina
static Evas_Object *external_bubble_content_get(void *data __UNUSED__,
const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
{
static Evas_Object *external_bubble_content_get(void *data __UNUSED__,
const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
{
- ERR("No content.");
- return NULL;
+ if (!strcmp(content, "content"))
+ return elm_object_content_get(obj);
+ ERR("unknown content '%s'", content);
+ return NULL;
}
static void
}
static void
diff --git
a/src/edje_externals/elm_calendar.c
b/src/edje_externals/elm_calendar.c
index
98da9ca
..
c741956
100644
(file)
--- a/
src/edje_externals/elm_calendar.c
+++ b/
src/edje_externals/elm_calendar.c
@@
-13,7
+13,9
@@
typedef struct _Elm_Params_Calendar
} Elm_Params_Calendar;
static void
} Elm_Params_Calendar;
static void
-external_calendar_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+external_calendar_state_set(void *data __UNUSED__, Evas_Object *obj,
+ const void *from_params, const void *to_params,
+ float pos __UNUSED__)
{
const Elm_Params_Calendar *p;
int min,max;
{
const Elm_Params_Calendar *p;
int min,max;
@@
-23,27
+25,28
@@
external_calendar_state_set(void *data __UNUSED__, Evas_Object *obj, const void
else return;
if (p->year_min)
else return;
if (p->year_min)
- {
- elm_calendar_min_max_year_get(obj, NULL, &max);
- elm_calendar_min_max_year_set(obj, p->year_min, max);
- }
+
{
+
elm_calendar_min_max_year_get(obj, NULL, &max);
+
elm_calendar_min_max_year_set(obj, p->year_min, max);
+
}
if (p->year_max)
if (p->year_max)
- {
- elm_calendar_min_max_year_get(obj, &min, NULL);
- elm_calendar_min_max_year_set(obj, min, p->year_max);
- }
+
{
+
elm_calendar_min_max_year_get(obj, &min, NULL);
+
elm_calendar_min_max_year_set(obj, min, p->year_max);
+
}
if (p->sel_exists)
if (p->sel_exists)
-
elm_calendar_day_selection_enabled_set(obj, p->sel_enable);
+ elm_calendar_day_selection_enabled_set(obj, p->sel_enable);
if (p->weekday_color)
if (p->weekday_color)
-
elm_calendar_text_weekday_color_set(obj,p->weekday_color);
+ elm_calendar_text_weekday_color_set(obj,p->weekday_color);
if (p->saturday_color)
if (p->saturday_color)
-
elm_calendar_text_weekday_color_set(obj,p->saturday_color);
+ elm_calendar_text_weekday_color_set(obj,p->saturday_color);
if (p->sunday_color)
if (p->sunday_color)
-
elm_calendar_text_weekday_color_set(obj,p->sunday_color);
+ elm_calendar_text_weekday_color_set(obj,p->sunday_color);
}
static Eina_Bool
}
static Eina_Bool
-external_calendar_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+external_calendar_param_set(void *data __UNUSED__, Evas_Object *obj,
+ const Edje_External_Param *param)
{
int min,max;
{
int min,max;
@@
-105,9
+108,10
@@
external_calendar_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_
}
static Eina_Bool
}
static Eina_Bool
-external_calendar_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+external_calendar_param_get(void *data __UNUSED__, const Evas_Object *obj,
+ Edje_External_Param *param)
{
{
- int min,max;
+ int min,
max;
if (!strcmp(param->name, "year_min"))
{
if (!strcmp(param->name, "year_min"))
{
@@
-165,7
+169,9
@@
external_calendar_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_
}
static void *
}
static void *
-external_calendar_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+external_calendar_params_parse(void *data __UNUSED__,
+ Evas_Object *obj __UNUSED__,
+ const Eina_List *params)
{
Elm_Params_Calendar *mem;
Edje_External_Param *param;
{
Elm_Params_Calendar *mem;
Edje_External_Param *param;
@@
-177,36
+183,38
@@
external_calendar_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED_
EINA_LIST_FOREACH(params, l, param)
{
EINA_LIST_FOREACH(params, l, param)
{
- if (!strcmp(param->name, "year_min"))
-
mem->year_min = param->i;
+
if (!strcmp(param->name, "year_min"))
+ mem->year_min = param->i;
else if(!strcmp(param->name, "year_max"))
else if(!strcmp(param->name, "year_max"))
-
mem->year_max = param->i;
+ mem->year_max = param->i;
else if (!strcmp(param->name, "sel_enable"))
{
else if (!strcmp(param->name, "sel_enable"))
{
- mem->sel_enable = param->i;
- mem->sel_exists = EINA_TRUE;
+
mem->sel_enable = param->i;
+
mem->sel_exists = EINA_TRUE;
}
}
- else if (!strcmp(param->name, "weekday_color"))
- mem->weekday_color = param->i;
+
else if (!strcmp(param->name, "weekday_color"))
+ mem->weekday_color = param->i;
- else if (!strcmp(param->name, "saturday_color"))
- mem->saturday_color = param->i;
+
else if (!strcmp(param->name, "saturday_color"))
+ mem->saturday_color = param->i;
else if (!strcmp(param->name, "sunday_color"))
else if (!strcmp(param->name, "sunday_color"))
- mem->sunday_color = param->i;
+ mem->sunday_color = param->i;
}
return mem;
}
}
return mem;
}
-static Evas_Object *external_calendar_content_get(void *data __UNUSED__,
- const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+static Evas_Object *
+external_calendar_content_get(void *data __UNUSED__,
+ const Evas_Object *obj __UNUSED__,
+ const char *content __UNUSED__)
{
{
-
ERR("No content.");
-
return NULL;
+ ERR("No content.");
+ return NULL;
}
static void
}
static void
diff --git
a/src/edje_externals/elm_entry.c
b/src/edje_externals/elm_entry.c
index
05fcea1
..
7998f81
100644
(file)
--- a/
src/edje_externals/elm_entry.c
+++ b/
src/edje_externals/elm_entry.c
@@
-25,8
+25,8
@@
typedef struct _Elm_Params_Entry
#define CHOICE_GET(CHOICES, STR) \
unsigned int i; \
#define CHOICE_GET(CHOICES, STR) \
unsigned int i; \
- for (i = 0; i < sizeof(CHOICES)/sizeof
(CHOICES[0])
; i++) \
- if (strcmp(
STR, CHOICES
[i]) == 0) \
+ for (i = 0; i < sizeof(CHOICES)/sizeof
(CHOICES)[0]
; i++) \
+ if (strcmp(
(STR), (CHOICES)
[i]) == 0) \
return i
return i