From 851f8a733965f69444a0a0cfe61db34a881e56a3 Mon Sep 17 00:00:00 2001
From: Benedikt Heine <bebe@bebehei.de>
Date: Wed, 31 Oct 2018 14:24:03 +0100
Subject: [PATCH] Rename dbus methods consistently

---
 src/dbus.c  | 4 ++--
 src/dbus.h  | 4 ++--
 src/dunst.c | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/dbus.c b/src/dbus.c
index 7785853..1e4710d 100644
--- a/src/dbus.c
+++ b/src/dbus.c
@@ -569,7 +569,7 @@ static struct raw_image *get_raw_image_from_data_hint(GVariant *icon_data)
         return image;
 }
 
-int initdbus(void)
+int dbus_init(void)
 {
         guint owner_id;
 
@@ -592,7 +592,7 @@ int initdbus(void)
         return owner_id;
 }
 
-void dbus_tear_down(int owner_id)
+void dbus_teardown(int owner_id)
 {
         g_clear_pointer(&introspection_data, g_dbus_node_info_unref);
 
diff --git a/src/dbus.h b/src/dbus.h
index 217c74c..4a72479 100644
--- a/src/dbus.h
+++ b/src/dbus.h
@@ -15,8 +15,8 @@ enum reason {
         REASON_MAX = 4,   /**< Maximum value, useful for boundary checking */
 };
 
-int initdbus(void);
-void dbus_tear_down(int id);
+int dbus_init(void);
+void dbus_teardown(int id);
 void signal_notification_closed(struct notification *n, enum reason reason);
 void signal_action_invoked(const struct notification *n, const char *identifier);
 
diff --git a/src/dunst.c b/src/dunst.c
index 7b6b4b9..0be3d8f 100644
--- a/src/dunst.c
+++ b/src/dunst.c
@@ -141,7 +141,7 @@ int dunst_main(int argc, char *argv[])
                 usage(EXIT_SUCCESS);
         }
 
-        int owner_id = initdbus();
+        int dbus_owner_id = dbus_init();
 
         mainloop = g_main_loop_new(NULL, FALSE);
 
@@ -180,7 +180,7 @@ int dunst_main(int argc, char *argv[])
         g_source_remove(term_src);
         g_source_remove(int_src);
 
-        dbus_tear_down(owner_id);
+        dbus_teardown(dbus_owner_id);
 
         teardown();