Account for dependency changes, platform testing

Signed-off-by: Andrew Opalach <andrew@akon.city>

2 files changed, 12 insertions, 10 deletions

diff --git a/src/fruits/cmc/cmc.c b/src/fruits/cmc/cmc.c
index 35f2d9b..af3e567 100644
--- a/src/fruits/cmc/cmc.c
+++ b/src/fruits/cmc/cmc.c
@@ -58,7 +58,7 @@ static void client_callback(void *userdata, u8 op, void *opaque)
         case CLI_ADD: {
             str *arg;
             al_array_foreach_ptr(c->args, i, arg) {
-                camu_client_add_from_path(&c->client, al_str_c("default"), arg);
+                camu_client_add_from_path(&c->client, &al_str_c("default"), arg);
                 al_str_free(arg);
             }
             camu_client_disconnect(&c->client);
@@ -67,7 +67,7 @@ static void client_callback(void *userdata, u8 op, void *opaque)
         case CLI_SEARCH: {
             str *arg;
             al_array_foreach_ptr(c->args, i, arg) {
-                camu_client_create_search(&c->client, al_str_c("youtube"), arg);
+                camu_client_create_search(&c->client, &al_str_c("youtube"), arg);
                 al_str_free(arg);
             }
             camu_client_disconnect(&c->client);
@@ -106,7 +106,7 @@ static void client_callback(void *userdata, u8 op, void *opaque)
             al_array_push(page->list, s);
         }
         al_array_push(search->pages, page);
-        camu_client_add_from_post(&c->client, al_str_c("default"), &al_array_at(page->list, 0), 0);
+        camu_client_add_from_post(&c->client, &al_str_c("default"), &al_array_at(page->list, 0), 0);
         break;
     }
     }
@@ -124,30 +124,32 @@ static bool parse_cmd(s32 argc, wchar_t **argv)
         c.command = CLI_OPEN_UI;
         return true;
     }
-    if (al_str_eq(al_str_cr(argv[1]), al_str_c("add"))) {
+
+    if (al_str_eq(&al_str_cr(argv[1]), &al_str_c("add"))) {
         if (argc < 3) return false;
         c.command = CLI_ADD;
         char path[PATH_MAX];
         str arg;
         for (s32 i = 2; i < argc; i++) {
             if (realpath(argv[i], path)) {
-                al_str_clone(&arg, al_str_cr(path));
+                al_str_clone(&arg, &al_str_cs(path));
                 al_array_push(c.args, arg);
             }
         }
-    } else if (al_str_eq(al_str_cr(argv[1]), al_str_c("search"))) {
+    } else if (al_str_eq(&al_str_cr(argv[1]), &al_str_c("search"))) {
         if (argc < 3) return false;
         c.command = CLI_SEARCH;
         str query;
         al_str_from(&query, "");
         for (s32 i = 2; i < argc; i++) {
-            al_str_cat(&query, al_str_cr(argv[i]));
+            al_str_cat(&query, &al_str_cr(argv[i]));
             if (i != argc - 1) {
-                al_str_cat(&query, al_str_c(" "));
+                al_str_cat(&query, &al_str_c(" "));
             }
         }
         al_array_push(c.args, query);
     }
+
     return true;
 }
 
@@ -169,7 +171,7 @@ s32 wmain(s32 argc, wchar_t **argv)
 
     c.client.callback = client_callback;
     c.client.userdata = &c;
-    if (!camu_client_login(&c.client, &c.loop, CAMU_TEST_TYPE, CAMU_TEST_ADDR, CAMU_PORT, al_str_c("andrew"))) {
+    if (!camu_client_login(&c.client, &c.loop, CAMU_TEST_TYPE, &CAMU_TEST_ADDR, CAMU_PORT, &al_str_c("andrew"))) {
         return EXIT_FAILURE;
     }
 
diff --git a/src/fruits/cmc/ui/pane_search.c b/src/fruits/cmc/ui/pane_search.c
index cc549e1..c3d1165 100644
--- a/src/fruits/cmc/ui/pane_search.c
+++ b/src/fruits/cmc/ui/pane_search.c
@@ -4,7 +4,7 @@
 
 void cmc_sp_init(struct cmc_ui *ui)
 {
-    if (ui->c->searches.size > 0) {
+    if (ui->c->searches.count > 0) {
         ui->sp.search = al_array_at(ui->c->searches, 0);
     }
     cmc_sp_layout(ui, notcurses_stdplane(ui->nc));