I don't changed anything that have relation with genlist (discussed in
ML a few days ago).
BR,
--
Fabiano Fidêncio
ProFUSION embedded systems
http://www.profusion.mobi
Index: src/lib/elm_gengrid.c
===================================================================
--- src/lib/elm_gengrid.c (revision 49475)
+++ src/lib/elm_gengrid.c (working copy)
@@ -924,7 +924,6 @@
{
Evas_Object *obj;
Evas *e;
- Evas_Coord minw, minh;
Widget_Data *wd;
static Evas_Smart *smart = NULL;
Index: src/lib/elm_config.c
===================================================================
--- src/lib/elm_config.c (revision 49475)
+++ src/lib/elm_config.c (working copy)
@@ -27,7 +27,6 @@
#define ATOM_COUNT 5
static Ecore_X_Atom _atom[ATOM_COUNT];
static Ecore_X_Atom _atom_config = 0;
-static Ecore_X_Atom _atom_config_specific = 0;
static const char *_atom_names[ATOM_COUNT] =
{
"ENLIGHTENMENT_SCALE",
@@ -51,8 +50,9 @@
int size = 0;
Ecore_X_Atom atom;
char buf[512];
- unsigned char *data = NULL, *config_data;
-
+ unsigned char *data = NULL;
+ Elm_Config *config_data;
+
snprintf(buf, sizeof(buf), "ENLIGHTENMENT_CONFIG_%s", _elm_profile);
atom = ecore_x_atom_get(buf);
_atom_config = atom;
Index: src/lib/Elementary.h.in
===================================================================
--- src/lib/Elementary.h.in (revision 49475)
+++ src/lib/Elementary.h.in (working copy)
@@ -69,6 +69,7 @@
#include <Ecore.h>
#include <Ecore_Evas.h>
#include <Ecore_File.h>
+#include <Ecore_IMF.h>
#include <Edje.h>
#ifdef ELM_EDBUS
Index: src/bin/test_launcher.c
===================================================================
--- src/bin/test_launcher.c (revision 49475)
+++ src/bin/test_launcher.c (working copy)
@@ -253,8 +253,8 @@
void
test_launcher2(void *data, Evas_Object *obj, void *event_info)
{
- Evas_Object *win, *bg, *sc, *tb, *pad, *bt, *ic, *lb, *tb2, *mb, *ck, *bx, *rc, *ly;
- int i, j, k, n, m;
+ Evas_Object *win, *bg, *sc, *tb, *bt, *mb, *ck, *bx,*ly;
+ int k;
char buf[PATH_MAX];
Eina_List *mbs = NULL;
@@ -320,9 +320,9 @@
elm_scroller_page_relative_set(sc, 1.0, 1.0);
evas_object_show(sc);
- tb2 = elm_table_add(win);
- evas_object_size_hint_weight_set(tb2, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, tb2);
+ tb = elm_table_add(win);
+ evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ elm_win_resize_object_add(win, tb);
ck = elm_check_add(win);
elm_check_label_set(ck, "Map");
@@ -330,7 +330,7 @@
evas_object_smart_callback_add(ck, "changed", mode_cb, win);
evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(ck, 0.05, 0.99);
- elm_table_pack(tb2, ck, 0, 0, 1, 1);
+ elm_table_pack(tb, ck, 0, 0, 1, 1);
evas_object_show(ck);
ck = elm_check_add(win);
@@ -339,7 +339,7 @@
evas_object_smart_callback_add(ck, "changed", alpha_cb, win);
evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(ck, 0.20, 0.99);
- elm_table_pack(tb2, ck, 1, 0, 1, 1);
+ elm_table_pack(tb, ck, 1, 0, 1, 1);
evas_object_show(ck);
ck = elm_check_add(win);
@@ -348,7 +348,7 @@
evas_object_smart_callback_add(ck, "changed", smooth_cb, win);
evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(ck, 0.40, 0.99);
- elm_table_pack(tb2, ck, 2, 0, 1, 1);
+ elm_table_pack(tb, ck, 2, 0, 1, 1);
evas_object_show(ck);
ck = elm_check_add(win);
@@ -357,7 +357,7 @@
evas_object_smart_callback_add(ck, "changed", full_cb, win);
evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(ck, 0.5, 0.99);
- elm_table_pack(tb2, ck, 3, 0, 1, 1);
+ elm_table_pack(tb, ck, 3, 0, 1, 1);
evas_object_show(ck);
bt = elm_button_add(win);
@@ -365,10 +365,10 @@
evas_object_smart_callback_add(bt, "clicked", close_cb, win);
evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(bt, 0.95, 0.99);
- elm_table_pack(tb2, bt, 4, 0, 1, 1);
+ elm_table_pack(tb, bt, 4, 0, 1, 1);
evas_object_show(bt);
- evas_object_show(tb2);
+ evas_object_show(tb);
evas_object_resize(win, 480, 800);
evas_object_show(win);
Index: src/bin/test_flip.c
===================================================================
--- src/bin/test_flip.c (revision 49475)
+++ src/bin/test_flip.c (working copy)
@@ -276,7 +276,7 @@
test_flip3(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win, *bg, *bx, *bx2, *bx3, *bx4, *bx5, *fl, *fl_f, *fl_b, *o,
- *bt, *ly, *lb;
+ *bt, *lb;
char buf[PATH_MAX];
win = elm_win_add(NULL, "flip flip", ELM_WIN_BASIC);
Index: src/bin/test_entry.c
===================================================================
--- src/bin/test_entry.c (revision 49475)
+++ src/bin/test_entry.c (working copy)
@@ -579,7 +579,7 @@
void
test_entry3(void *data, Evas_Object *obj, void *event_info)
{
- Evas_Object *win, *bg, *bx, *bx2, *bt, *en, *en_p, *sp;
+ Evas_Object *win, *bg, *bx, *bx2, *bt, *en;
win = elm_win_add(NULL, "entry3", ELM_WIN_BASIC);
elm_win_title_set(win, "Entry 3");
@@ -1206,7 +1206,7 @@
void
test_entry5(void *data, Evas_Object *obj, void *event_info)
{
- Evas_Object *win, *bg, *bx, *bx2, *bt, *en, *en_p, *sp;
+ Evas_Object *win, *bg, *bx, *bx2, *bt, *en;
win = elm_win_add(NULL, "entry5", ELM_WIN_BASIC);
elm_win_title_set(win, "Entry 5");
Index: src/bin/test_gengrid.c
===================================================================
--- src/bin/test_gengrid.c (revision 49475)
+++ src/bin/test_gengrid.c (working copy)
@@ -123,7 +123,7 @@
{
Evas_Object *win, *bg, *grid;
static Testitem ti[144];
- int i, j, n;
+ int i, n;
char buf[PATH_MAX];
const char *img[9] =
{
------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
