From e24a8e9088e4e9e2122ef9b3d30f013d0a3570d5 Mon Sep 17 00:00:00 2001
From: Arsen Musayelyan <moussaelianarsen@gmail.com>
Date: Wed, 24 Nov 2021 11:52:52 -0800
Subject: [PATCH] Use new helper functions

---
 calls.go  |  3 ---
 notifs.go | 10 +---------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/calls.go b/calls.go
index 39631f0..58d89fa 100644
--- a/calls.go
+++ b/calls.go
@@ -7,9 +7,6 @@ import (
 )
 
 func initCallNotifs(dev *infinitime.Device) error {
-	// Define rule to filter dbus messages
-	//rule := "type='signal',sender='org.freedesktop.ModemManager1',interface='org.freedesktop.ModemManager1.Modem.Voice',member='CallAdded'"
-
 	// Connect to dbus session monitorConn
 	monitorConn, err := newSystemBusConn()
 	if err != nil {
diff --git a/notifs.go b/notifs.go
index 6f0164e..5ce9775 100644
--- a/notifs.go
+++ b/notifs.go
@@ -30,15 +30,7 @@ import (
 
 func initNotifRelay(dev *infinitime.Device) error {
 	// Connect to dbus session bus
-	bus, err := dbus.SessionBusPrivate()
-	if err != nil {
-		return err
-	}
-	err = bus.Auth(nil)
-	if err != nil {
-		return err
-	}
-	err = bus.Hello()
+	bus, err := newSessionBusConn()
 	if err != nil {
 		return err
 	}