Move non GL_View stuff from gld -> ourGlobals. Plus some white space fixes.

1 files changed, 9 insertions, 8 deletions

diff --git a/src/extantz/woMan.c b/src/extantz/woMan.c
index 3bb42fe..bef449c 100644
--- a/src/extantz/woMan.c
+++ b/src/extantz/woMan.c
@@ -139,27 +139,28 @@ static Evas_Object *_viewer_content_get(void *data, Evas_Object *obj, const char
 
 static void _grid_sel_cb(void *data, Evas_Object *obj, void *event_info)
 {
-    ezGrid *thisGrid = data;
-    GLData *gld = thisGrid->gld;
-    char buf[PATH_MAX];
+//    ezGrid *thisGrid = data;
+//    GLData *gld = thisGrid->gld;
+//    char buf[PATH_MAX];
 
 //    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);
-    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);
-    printf("%s   ### genlist obj [%p], item pointer [%p]\n", buf, obj, event_info);
+//    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);
+//    printf("%s   ### genlist obj [%p], item pointer [%p]\n", buf, obj, event_info);
 // comment this out for now, busy dealing with input stuff, don't want to trigger this multiple times.
 //    system(buf);
 }
 
 
-void woMan_add(GLData *gld)
+void woMan_add(globals *ourGlobals)
 {
+  GLData *gld = &ourGlobals->gld;
 //    Evas_Object *win, *bg, *bx, *ic, *bb, *av, *en, *bt, *nf, *tab, *tb, *gridList, *viewerList, *menu;
     Evas_Object *win, *bx, *bt, *nf, *tab, *tb, *gridList, *viewerList, *menu;
     Elm_Object_Item *tb_it, *menu_it, *tab_it;
     char buf[PATH_MAX];
     int i;
 
-    win = fang_win_add(gld);
+    win = fang_win_add(ourGlobals);
 
     bx = elm_box_add(win);
     elm_win_resize_object_add(win, bx);
@@ -287,5 +288,5 @@ void woMan_add(GLData *gld)
     eo_unref(bt);
     evas_object_show(bx);
 
-    fang_win_complete(gld, win, 30, 30, gld->win_w / 3, gld->win_h / 3);
+    fang_win_complete(ourGlobals, win, 30, 30, ourGlobals->win_w / 3, ourGlobals->win_h / 3);
 }