diff options
author | David Walter Seikel | 2014-05-03 23:40:48 +1000 |
---|---|---|
committer | David Walter Seikel | 2014-05-03 23:40:48 +1000 |
commit | 160c161b57595fdae637936c50a162d193f1a982 (patch) | |
tree | 4400c1a5e91e402e9af612fecec61aed152d2e30 /src/extantz/woMan.c | |
parent | White space clean ups from uncrustify. (diff) | |
download | SledjHamr-160c161b57595fdae637936c50a162d193f1a982.zip SledjHamr-160c161b57595fdae637936c50a162d193f1a982.tar.gz SledjHamr-160c161b57595fdae637936c50a162d193f1a982.tar.bz2 SledjHamr-160c161b57595fdae637936c50a162d193f1a982.tar.xz |
More shuffling of gld -> ourGlobals and related cleanups.
Diffstat (limited to '')
-rw-r--r-- | src/extantz/woMan.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/extantz/woMan.c b/src/extantz/woMan.c index bef449c..2a1cfc8 100644 --- a/src/extantz/woMan.c +++ b/src/extantz/woMan.c | |||
@@ -139,13 +139,13 @@ static Evas_Object *_viewer_content_get(void *data, Evas_Object *obj, const char | |||
139 | 139 | ||
140 | static void _grid_sel_cb(void *data, Evas_Object *obj, void *event_info) | 140 | static void _grid_sel_cb(void *data, Evas_Object *obj, void *event_info) |
141 | { | 141 | { |
142 | // ezGrid *thisGrid = data; | 142 | globals *ourGlobals = evas_object_data_get(obj, "glob"); |
143 | // GLData *gld = thisGrid->gld; | 143 | ezGrid *thisGrid = data; |
144 | // char buf[PATH_MAX]; | 144 | char buf[PATH_MAX]; |
145 | 145 | ||
146 | // sprintf(buf, "dillo -f -g '%dx%d+%d+%d' %s &", gld->win_w - (gld->win_w / 5), gld->win_h - 30, gld->win_w / 5, gld->win_y, thisGrid->splashPage); | 146 | // sprintf(buf, "dillo -f -g '%dx%d+%d+%d' %s &", gld->win_w - (ourGlobals->win_w / 5), ourGlobals->win_h - 30, ourGlobals->win_w / 5, ourGlobals->win_y, thisGrid->splashPage); |
147 | // sprintf(buf, "uzbl -g '%dx%d+%d+%d' -u %s &", gld->win_w - (gld->win_w / 5), gld->win_h - 30, gld->win_w / 5, gld->win_y, thisGrid->splashPage); | 147 | sprintf(buf, "uzbl -g '%dx%d+%d+%d' -u %s &", ourGlobals->win_w - (ourGlobals->win_w / 5), ourGlobals->win_h - 30, ourGlobals->win_w / 5, ourGlobals->win_y, thisGrid->splashPage); |
148 | // printf("%s ### genlist obj [%p], item pointer [%p]\n", buf, obj, event_info); | 148 | printf("%s ### genlist obj [%p], item pointer [%p]\n", buf, obj, event_info); |
149 | // comment this out for now, busy dealing with input stuff, don't want to trigger this multiple times. | 149 | // comment this out for now, busy dealing with input stuff, don't want to trigger this multiple times. |
150 | // system(buf); | 150 | // system(buf); |
151 | } | 151 | } |
@@ -153,7 +153,6 @@ static void _grid_sel_cb(void *data, Evas_Object *obj, void *event_info) | |||
153 | 153 | ||
154 | void woMan_add(globals *ourGlobals) | 154 | void woMan_add(globals *ourGlobals) |
155 | { | 155 | { |
156 | GLData *gld = &ourGlobals->gld; | ||
157 | // Evas_Object *win, *bg, *bx, *ic, *bb, *av, *en, *bt, *nf, *tab, *tb, *gridList, *viewerList, *menu; | 156 | // Evas_Object *win, *bg, *bx, *ic, *bb, *av, *en, *bt, *nf, *tab, *tb, *gridList, *viewerList, *menu; |
158 | Evas_Object *win, *bx, *bt, *nf, *tab, *tb, *gridList, *viewerList, *menu; | 157 | Evas_Object *win, *bx, *bt, *nf, *tab, *tb, *gridList, *viewerList, *menu; |
159 | Elm_Object_Item *tb_it, *menu_it, *tab_it; | 158 | Elm_Object_Item *tb_it, *menu_it, *tab_it; |
@@ -195,6 +194,7 @@ void woMan_add(globals *ourGlobals) | |||
195 | 194 | ||
196 | gridList = elm_genlist_add(win); | 195 | gridList = elm_genlist_add(win); |
197 | grids = eina_hash_stringshared_new(free); | 196 | grids = eina_hash_stringshared_new(free); |
197 | evas_object_data_set(gridList, "glob", ourGlobals); | ||
198 | 198 | ||
199 | grid_gic = elm_genlist_item_class_new(); | 199 | grid_gic = elm_genlist_item_class_new(); |
200 | grid_gic->item_style = "double_label"; | 200 | grid_gic->item_style = "double_label"; |
@@ -214,7 +214,7 @@ void woMan_add(globals *ourGlobals) | |||
214 | thisGrid->loginURI = gridTest[i][1]; | 214 | thisGrid->loginURI = gridTest[i][1]; |
215 | thisGrid->splashPage = gridTest[i][2]; | 215 | thisGrid->splashPage = gridTest[i][2]; |
216 | thisGrid->icon = "folder"; | 216 | thisGrid->icon = "folder"; |
217 | thisGrid->gld = gld; | 217 | // thisGrid->gld = gld; |
218 | thisGrid->item = elm_genlist_item_append(gridList, grid_gic, thisGrid, NULL, ELM_GENLIST_ITEM_TREE, _grid_sel_cb, thisGrid); | 218 | thisGrid->item = elm_genlist_item_append(gridList, grid_gic, thisGrid, NULL, ELM_GENLIST_ITEM_TREE, _grid_sel_cb, thisGrid); |
219 | eina_hash_add(grids, thisGrid->name, thisGrid); | 219 | eina_hash_add(grids, thisGrid->name, thisGrid); |
220 | } | 220 | } |