kee

commit 3ef60578eec7d1f3a4fa1cf881ab506fdc83abb1
parent 50ffa4663f523dc2b35927273f6b770378934632
Author: lash <dev@holbrook.no>
Date:   Thu, 21 Mar 2024 16:12:31 +0000

Null out kee-uicontext

Diffstat:
M
Makefile
 | 
7
-------
M
src/Makefile
 | 
7
-------
M
src/gtk/Makefile
 | 
11
-----------
M
src/gtk/kee-import.c
 | 
3
+--
M
src/gtk/main.c
 | 
5
+++--

5 files changed, 4 insertions(+), 29 deletions(-)
diff --git a/Makefile b/Makefile
@@ -22,10 +22,3 @@ debug: gtk all
 
 test: gtk all
 	make -C src/gtk/tests
-
-dev:
-	make -C src dev
-
-debug_dev: dev
-	G_DEBUG=3 G_MESSAGES_DEBUG=all ./src/gtk/a_dev.out
-
diff --git a/src/Makefile b/src/Makefile
@@ -19,11 +19,4 @@ clean:
 	make -C gtk clean
 	make -C aux clean
 
-dev:
-	$(CC) $(CFLAGS) -c settings.c -o settings.o $(LDFLAGS)
-	$(CC) $(CFLAGS) -c context.c -o context.o $(LDFLAGS)
-	$(CC) $(CFLAGS) -c camera.c -o camera.o $(LDFLAGS)
-	$(CC) $(CFLAGS) -c state.c -o state.o
-	make -C gtk dev
-
 .PHONY: clean aux
diff --git a/src/gtk/Makefile b/src/gtk/Makefile
@@ -22,14 +22,3 @@ clean:
 
 resource:
 	glib-compile-resources kee.gresource.xml --target=resources.c --generate-source
-
-dev:
-	$(CC) $(CFLAGS) -c debug.c -o debug.o
-	$(CC) $(CFLAGS) -c view.c -o view.o
-	$(CC) $(CFLAGS) -c nav.c -o nav.o
-	$(CC) $(CFLAGS) -c scan.c -o scan.o
-	$(CC) $(CFLAGS) -c ui.c -o ui.o
-	$(CC) $(CFLAGS) -c menu.c -o menu.o
-	$(CC) $(CFLAGS) -c kee-uicontext.c -o kee-uicontext.o
-	$(CC) $(CFLAGS) -c kee-import.c -o kee-import.o
-	$(CC) $(CFLAGS) main.c -o a_dev.out ../settings.o ../camera.o ../context.o ../state.o ./kee-uicontext.o ./kee-import.o ./debug.o ./menu.o ./scan.o ./ui.o ./view.o ./nav.o $(LDFLAGS)
diff --git a/src/gtk/kee-import.c b/src/gtk/kee-import.c
@@ -58,7 +58,7 @@ static void kee_import_init(KeeImport *o) {
 	o->camera_list = G_LIST_MODEL(g_list_store_new(GTK_TYPE_LABEL));
 	kee_import_refresh(o);
 	memset(&o->scan, 0, sizeof(struct kee_scanner));
-	o->stack = gtk_stack_new();
+	o->stack = GTK_STACK(gtk_stack_new());
 }
 
 static void kee_import_scanadd(KeeImport *o, GtkLabel *label) {
@@ -169,7 +169,6 @@ int kee_import_scanchange(KeeImport *o, const char *device) {
 
 	o->scan.bus = gst_element_get_bus(o->scan.pipeline);
 	gst_bus_add_watch(o->scan.bus, kee_import_scan_code_handler, o);
-	//scan_set_handler(&o->scan, kee_import_scan_code_handler);
 	return ERR_OK;
 }
 
diff --git a/src/gtk/main.c b/src/gtk/main.c
@@ -17,7 +17,7 @@ static void state_log(KeeUicontext *uctx, char state_hint, kee_state_t *new_stat
 }
 
 static void startup(GtkApplication *app, KeeUicontext *uctx) {
-	kee_uicontext_scaninit(uctx);
+//	kee_uicontext_scaninit(uctx);
 }
 
 static void activate(GtkApplication *app, KeeUicontext *uctx) {
@@ -47,9 +47,10 @@ int main(int argc, char **argv) {
 	settings_new_from_xdg(&settings);
 	settings_init(&settings);
 
-	uctx = g_object_new(KEE_TYPE_UICONTEXT, "gtk_application", gapp, "core_context", &ctx, NULL);
+	//uctx = g_object_new(KEE_TYPE_UICONTEXT, "gtk_application", gapp, "core_context", &ctx, NULL);
 	import = g_object_new(KEE_TYPE_IMPORT, "orientation", GTK_ORIENTATION_VERTICAL, NULL);
 	//db_connect(&ctx.db, "./testdata_mdb");
+	uctx = NULL;
 
 	g_signal_connect (gapp, "startup", G_CALLBACK (startup), uctx);
 	g_signal_connect (gapp, "activate", G_CALLBACK (activate), uctx);