Use nul_array_t instead of GPtrArray

1 files changed, 8 insertions, 8 deletions

diff --git a/siv.c b/siv.c
index eb6d149..d349459 100644
--- a/siv.c
+++ b/siv.c
@@ -17,7 +17,7 @@ struct App
 
     GtkWidget *	chooser;
 
-    GPtrArray * windows;
+    SivWindow **windows;
 
     GHashTable *meta_data;
 }; 
@@ -88,7 +88,7 @@ app_register_window (App       *app,
 {
     ++app->n_windows;
 
-    g_ptr_array_add (app->windows, window);
+    app->windows = nul_array_append (app->windows, window);
 }
 
 static void
@@ -145,7 +145,7 @@ app_unregister_window (App *app, SivWindow *window)
     if (--app->n_windows == 0)
 	quit (app);
 
-    g_ptr_array_remove (app->windows, window);
+    app->windows = nul_array_remove (app->windows, window);
 }
 
 GtkWidget *
@@ -383,9 +383,9 @@ open_file (App *app,
     GError *err = NULL;
     int i;
 
-    for (i = 0; i < app->windows->len; ++i)
+    for (i = 0; i < nul_array_len (app->windows); ++i)
     {
-	SivWindow *w = app->windows->pdata[i];
+	SivWindow *w = app->windows[i];
 
 	if (window_matches_file (w, filename))
 	{
@@ -464,7 +464,7 @@ app_new (int argc, char **argv)
 
     app = g_new0 (App, 1);
 
-    app->windows = g_ptr_array_new ();
+    app->windows = nul_array_new (SivWindow *);
     app->meta_data = load_meta_data ();
 
     app_begin_load (app);
@@ -527,9 +527,9 @@ on_sigint (int signo, gpointer data)
 {
     App *app = data;
 
-    while (app->windows->len)
+    while (nul_array_len (app->windows))
     {
-	SivWindow *window = app->windows->pdata[0];
+	SivWindow *window = *app->windows;
 
 	window_free (window);
     }