diff options
-rw-r--r-- | libempathy-gtk/empathy-log-window.c | 9 | ||||
-rw-r--r-- | src/empathy-debug-window.c | 2 | ||||
-rw-r--r-- | src/empathy-new-chatroom-dialog.c | 12 |
3 files changed, 9 insertions, 14 deletions
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c index 526569a51..4eb44c9b3 100644 --- a/libempathy-gtk/empathy-log-window.c +++ b/libempathy-gtk/empathy-log-window.c @@ -1244,7 +1244,6 @@ log_window_append_chat_message (TplEvent *event, GtkTreeStore *store = log_window->priv->store_events; GtkTreeIter iter, parent; gchar *pretty_date, *alias, *body; - gchar *msg_escaped; GDateTime *date; EmpathyStringParser *parsers; GString *msg; @@ -1268,23 +1267,19 @@ log_window_append_chat_message (TplEvent *event, empathy_string_parser_substr (empathy_message_get_body (message), -1, parsers, msg); - msg_escaped = g_strescape (msg->str, NULL); - if (tpl_text_event_get_message_type (TPL_TEXT_EVENT (event)) == TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION) { /* Translators: this is an emote: '* Danielle waves' */ - body = g_strdup_printf (_("<i>* %s %s</i>"), alias, msg_escaped); + body = g_strdup_printf (_("<i>* %s %s</i>"), alias, msg->str); } else { /* Translators: this is a message: 'Danielle: hello' * The string in bold is the sender's name */ - body = g_strdup_printf (_("<b>%s:</b> %s"), alias, msg_escaped); + body = g_strdup_printf (_("<b>%s:</b> %s"), alias, msg->str); } - g_free (msg_escaped); - gtk_tree_store_append (store, &iter, &parent); gtk_tree_store_set (store, &iter, COL_EVENTS_TS, tpl_event_get_timestamp (event), diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c index 6cc60098f..5aaf75ff7 100644 --- a/src/empathy-debug-window.c +++ b/src/empathy-debug-window.c @@ -2045,7 +2045,7 @@ am_prepared_cb (GObject *am, G_CALLBACK (debug_window_button_press_event_cb), object); renderer = gtk_cell_renderer_text_new (); - g_object_set (renderer, "yalign", 0, NULL); + g_object_set (renderer, "yalign", (gfloat) 0, NULL); gtk_tree_view_insert_column_with_data_func (GTK_TREE_VIEW (self->priv->view), -1, _("Time"), renderer, diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c index f0b6ec641..6ff365ce9 100644 --- a/src/empathy-new-chatroom-dialog.c +++ b/src/empathy-new-chatroom-dialog.c @@ -504,12 +504,12 @@ new_room_list_cb (GObject *source, return; } - g_signal_connect (self->priv->room_list, "got-room", - G_CALLBACK (new_chatroom_dialog_got_room_cb), self); - g_signal_connect (self->priv->room_list, "failed", - G_CALLBACK (listing_failed_cb), self); - g_signal_connect (self->priv->room_list, "notify::listing", - G_CALLBACK (new_chatroom_dialog_listing_cb), self); + tp_g_signal_connect_object (self->priv->room_list, "got-room", + G_CALLBACK (new_chatroom_dialog_got_room_cb), self, 0); + tp_g_signal_connect_object (self->priv->room_list, "failed", + G_CALLBACK (listing_failed_cb), self, 0); + tp_g_signal_connect_object (self->priv->room_list, "notify::listing", + G_CALLBACK (new_chatroom_dialog_listing_cb), self, 0); if (gtk_expander_get_expanded (GTK_EXPANDER (self->priv->expander_browse))) { |