EmpathySmileyManager: use the proper Unicode characters

[empathy.git] / libempathy / empathy-chatroom.c

diff --git a/libempathy/empathy-chatroom.c b/libempathy/empathy-chatroom.c
index 5e3784ae723977a2c47125ff99af36ee9fd80e40..b186b2dd2aef8f4a63095413af0bd007f0a60c2d 100644 (file)
--- a/libempathy/empathy-chatroom.c
+++ b/libempathy/empathy-chatroom.c
@@ -20,13 +20,10 @@
  */
 
 #include "config.h"
+#include "empathy-chatroom.h"
 
-#include <string.h>
-
-#include <glib.h>
-#include <telepathy-glib/util.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
-#include "empathy-chatroom.h"
 #include "empathy-utils.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyChatroom)
@@ -213,6 +210,7 @@ chatroom_finalize (GObject *object)
        g_object_unref (priv->account);
        g_free (priv->room);
        g_free (priv->name);
+       g_free (priv->subject);
 
        (G_OBJECT_CLASS (empathy_chatroom_parent_class)->finalize) (object);
 }
@@ -273,10 +271,6 @@ chatroom_set_property (GObject      *object,
                       const GValue *value,
                       GParamSpec   *pspec)
 {
-       EmpathyChatroomPriv *priv;
-
-       priv = GET_PRIV (object);
-
        switch (param_id) {
        case PROP_ACCOUNT:
                empathy_chatroom_set_account (EMPATHY_CHATROOM (object),
@@ -421,7 +415,7 @@ empathy_chatroom_get_name (EmpathyChatroom *chatroom)
 
        priv = GET_PRIV (chatroom);
 
-       if (EMP_STR_EMPTY (priv->name)) {
+       if (TPAW_STR_EMPTY (priv->name)) {
                return priv->room;
        }