[polari] room: Minor refactoring
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [polari] room: Minor refactoring
- Date: Thu, 1 Oct 2015 21:25:54 +0000 (UTC)
commit 3a578c523afa8194885af59afdbf46a5ddc678f4
Author: Florian Müllner <fmuellner gnome org>
Date: Thu Oct 1 17:14:32 2015 +0200
room: Minor refactoring
Turn update_identifier() into a standard property setter for :display-name
instead of tying it directly to :channel-name - the two may soon differ
in case.
https://bugzilla.gnome.org/show_bug.cgi?id=755722
src/lib/polari-room.c | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/src/lib/polari-room.c b/src/lib/polari-room.c
index 62682d4..5667122 100644
--- a/src/lib/polari-room.c
+++ b/src/lib/polari-room.c
@@ -273,14 +273,13 @@ update_self_nick (PolariRoom *room)
}
static void
-update_identifier (PolariRoom *room)
+set_display_name (PolariRoom *room,
+ const char *display_name)
{
PolariRoomPrivate *priv = room->priv;
- g_clear_pointer (&priv->display_name, g_free);
- if (priv->channel_name)
- priv->display_name = g_strdup (priv->channel_name +
- (priv->channel_name[0] == '#' ? 1 : 0));
+ g_free (priv->display_name);
+ priv->display_name = g_strdup (display_name);
g_object_notify_by_pspec (G_OBJECT (room), props[PROP_DISPLAY_NAME]);
}
@@ -506,7 +505,10 @@ polari_room_set_channel_name (PolariRoom *room,
g_free (priv->channel_name);
priv->channel_name = g_strdup (channel_name);
- update_identifier (room);
+ if (channel_name)
+ set_display_name (room, channel_name + (channel_name[0] == '#' ? 1 : 0));
+ else
+ set_display_name (room, NULL);
g_object_notify_by_pspec (G_OBJECT (room), props[PROP_CHANNEL_NAME]);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]