gui: fix channel sort order (#17) #20

Merged
restitux merged 4 commits from fix-channel-order into main 2026-01-25 19:10:18 +00:00
2 changed files with 6 additions and 6 deletions
Showing only changes of commit 61eea0a858 - Show all commits
+4 -4
View File
1
@@ -95,7 +95,7 @@ pub struct ChannelState {
} }
impl ChannelState { impl ChannelState {
pub fn update_from_ChannelState( pub fn update_from_channel_state(
restitux marked this conversation as resolved Outdated
Outdated
Review

Nit: not snake case

Nit: not snake case
&mut self, &mut self,
channel_state: &mumble_protocol::control::msgs::ChannelState, channel_state: &mumble_protocol::control::msgs::ChannelState,
) { ) {
@@ -117,19 +117,19 @@ pub struct ChannelsState {
} }
impl ChannelsState { impl ChannelsState {
pub fn update_from_ChannelState( pub fn update_from_channel_state(
&mut self, &mut self,
channel_state: &mumble_protocol::control::msgs::ChannelState, channel_state: &mumble_protocol::control::msgs::ChannelState,
) { ) {
self.channels self.channels
.entry(channel_state.get_channel_id()) .entry(channel_state.get_channel_id())
.or_default() .or_default()
.update_from_ChannelState(channel_state); .update_from_channel_state(channel_state);
self.update_channel_parents(); self.update_channel_parents();
} }
pub fn update_from_ChannelRemove( pub fn update_from_channel_remove(
&mut self, &mut self,
channel_remove: &mumble_protocol::control::msgs::ChannelRemove, channel_remove: &mumble_protocol::control::msgs::ChannelRemove,
) { ) {
1
+2 -2
View File
@@ -335,11 +335,11 @@ fn accept_packet(
} }
ControlPacket::ChannelState(u) => { ControlPacket::ChannelState(u) => {
let mut server = STATE.server.write(); let mut server = STATE.server.write();
server.channels_state.update_from_ChannelState(&u); server.channels_state.update_from_channel_state(&u);
} }
ControlPacket::ChannelRemove(u) => { ControlPacket::ChannelRemove(u) => {
let mut server = STATE.server.write(); let mut server = STATE.server.write();
server.channels_state.update_from_ChannelRemove(&u); server.channels_state.update_from_channel_remove(&u);
} }
ControlPacket::UserState(u) => { ControlPacket::UserState(u) => {
let mut server = STATE.server.write(); let mut server = STATE.server.write();