fix(dbus): Allow replacement when requesting name ownership

pdf · pdf · commit 4719f7b55ad1 · 2024-03-10T19:17:21.000+11:00
diff --git a/internal/dbus/notifications.go b/internal/dbus/notifications.go
@@ -179,7 +179,7 @@ func (n *notifications) GetServerInformation() (name, vendor, version, specVersi
 }
 
 func (n *notifications) init() error {
-	reply, err := n.conn.RequestName(notificationsName, dbus.NameFlagDoNotQueue)
+	reply, err := n.conn.RequestName(notificationsName, dbus.NameFlagDoNotQueue|dbus.NameFlagReplaceExisting|dbus.NameFlagAllowReplacement)
 	if err != nil {
 		return err
 	}
diff --git a/internal/dbus/snw.go b/internal/dbus/snw.go
@@ -299,7 +299,7 @@ func (s *statusNotifierWatcher) init() error {
 		return err
 	}
 
-	reply, err := s.conn.RequestName(snwName, dbus.NameFlagDoNotQueue)
+	reply, err := s.conn.RequestName(snwName, dbus.NameFlagDoNotQueue|dbus.NameFlagReplaceExisting|dbus.NameFlagAllowReplacement)
 	if err != nil {
 		return err
 	}

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ func (n *notifications) GetServerInformation() (name, vendor, version, specVersi`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`func (n *notifications) init() error {`
`182`		`- reply, err := n.conn.RequestName(notificationsName, dbus.NameFlagDoNotQueue)`
	`182`	`+ reply, err := n.conn.RequestName(notificationsName, dbus.NameFlagDoNotQueue\|dbus.NameFlagReplaceExisting\|dbus.NameFlagAllowReplacement)`
`183`	`183`	`if err != nil {`
`184`	`184`	`return err`
`185`	`185`	`}`
Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ func (s *statusNotifierWatcher) init() error {`
`299`	`299`	`return err`
`300`	`300`	`}`
`301`	`301`
`302`		`- reply, err := s.conn.RequestName(snwName, dbus.NameFlagDoNotQueue)`
	`302`	`+ reply, err := s.conn.RequestName(snwName, dbus.NameFlagDoNotQueue\|dbus.NameFlagReplaceExisting\|dbus.NameFlagAllowReplacement)`
`303`	`303`	`if err != nil {`
`304`	`304`	`return err`
`305`	`305`	`}`