move header to astal-river.h

5 files changed, 18 insertions, 22 deletions

diff --git a/include/river.h b/include/astal-river.h
index e8576a3..e8576a3 100644
--- a/include/river.h
+++ b/include/astal-river.h
diff --git a/include/meson.build b/include/meson.build
index a835e6b..28a51f6 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -1,6 +1,6 @@
 astal_river_inc = include_directories('.')
 astal_river_headers = files(
-    'river.h',
+    'astal-river.h',
 )
 
-install_headers('river.h', subdir : 'astal')
+install_headers('astal-river.h')
diff --git a/include/river-private.h b/include/river-private.h
index d32e074..dae36be 100644
--- a/include/river-private.h
+++ b/include/river-private.h
@@ -4,7 +4,7 @@
 #include <wayland-client.h>
 
 #include "river-status-unstable-v1-client.h"
-#include "river.h"
+#include "astal-river.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/astal-river.c b/src/astal-river.c
index 000f26c..37f34d5 100644
--- a/src/astal-river.c
+++ b/src/astal-river.c
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 
 #include "gio/gio.h"
-#include "river.h"
+#include "astal-river.h"
 
 GMainLoop* loop;
 
@@ -34,11 +34,11 @@ int main(int argc, char** argv) {
         }
     }
 
-    GError *error = NULL;
+    GError* error = NULL;
     AstalRiverRiver* river = g_initable_new(ASTAL_RIVER_TYPE_RIVER, NULL, &error, NULL);
-    if(error) {
-      g_critical("%s\n", error->message);
-      exit(EXIT_FAILURE);
+    if (error) {
+        g_critical("%s\n", error->message);
+        exit(EXIT_FAILURE);
     }
     if (daemon) {
         loop = g_main_loop_new(NULL, FALSE);
diff --git a/src/river.c b/src/river.c
index c00a8c7..feb5e49 100644
--- a/src/river.c
+++ b/src/river.c
@@ -44,14 +44,14 @@ typedef enum {
     ASTAL_RIVER_RIVER_PROP_MODE,
     ASTAL_RIVER_RIVER_PROP_OUTPUTS,
     ASTAL_RIVER_RIVER_N_PROPERTIES
-} AstalRiverOutputProperties;
+} AstalRiverRiverProperties;
 
 typedef enum {
     ASTAL_RIVER_RIVER_SIGNAL_CHANGED,
     ASTAL_RIVER_RIVER_SIGNAL_OUTPUT_ADDED,
     ASTAL_RIVER_RIVER_SIGNAL_OUTPUT_REMOVED,
     ASTAL_RIVER_RIVER_N_SIGNALS
-} AstalRiverOutputSignals;
+} AstalRiverRiverSignals;
 
 static guint astal_river_river_signals[ASTAL_RIVER_RIVER_N_SIGNALS] = {
     0,
@@ -196,7 +196,7 @@ static void global_registry_handler(void* data, struct wl_registry* registry, ui
     AstalRiverRiver* self = ASTAL_RIVER_RIVER(data);
     AstalRiverRiverPrivate* priv = astal_river_river_get_instance_private(self);
     if (strcmp(interface, wl_output_interface.name) == 0) {
-        if(priv->river_status_manager == NULL) return;
+        if (priv->river_status_manager == NULL) return;
         struct wl_output* wl_out = wl_registry_bind(registry, id, &wl_output_interface, 4);
         AstalRiverOutput* output =
             astal_river_output_new(id, wl_out, priv->river_status_manager, priv->display);
@@ -280,8 +280,8 @@ static gboolean astal_river_river_initable_init(GInitable* initable, GCancellabl
                                                 GError** error) {
     AstalRiverRiver* self = ASTAL_RIVER_RIVER(initable);
     AstalRiverRiverPrivate* priv = astal_river_river_get_instance_private(self);
-  
-    if(priv->init) return TRUE;
+
+    if (priv->init) return TRUE;
 
     priv->wl_source = wl_source_new(NULL, NULL);
 
@@ -322,19 +322,14 @@ static void astal_river_river_initable_iface_init(GInitableIface* iface) {
     iface->init = astal_river_river_initable_init;
 }
 
-static void astal_river_river_init(AstalRiverRiver* self) { 
-    
+static void astal_river_river_init(AstalRiverRiver* self) {
     AstalRiverRiverPrivate* priv = astal_river_river_get_instance_private(self);
-    
-    self->outputs = NULL; 
-    
+    self->outputs = NULL;
     priv->init = FALSE;
     priv->seat = NULL;
     priv->display = NULL;
     priv->river_status_manager = NULL;
     priv->signal_ids = g_hash_table_new(g_direct_hash, g_direct_equal);
-
-
 }
 
 AstalRiverRiver* astal_river_river_new() {
@@ -368,8 +363,9 @@ static void astal_river_river_finalize(GObject* object) {
     g_clear_list(&self->outputs, g_object_unref);
     self->outputs = NULL;
 
-    if (priv->wl_registry != NULL)  wl_registry_destroy(priv->wl_registry);
-    if (priv->river_status_manager != NULL) zriver_status_manager_v1_destroy(priv->river_status_manager);
+    if (priv->wl_registry != NULL) wl_registry_destroy(priv->wl_registry);
+    if (priv->river_status_manager != NULL)
+        zriver_status_manager_v1_destroy(priv->river_status_manager);
     if (priv->river_seat_status != NULL) zriver_seat_status_v1_destroy(priv->river_seat_status);
     if (priv->seat != NULL) wl_seat_destroy(priv->seat);
     if (priv->display != NULL) wl_display_flush(priv->display);