From b0d08102b64ed36b92016c90ed775bb4462d4adf Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Mon, 20 May 2013 10:20:00 +0200 Subject: prepare 3.8.2 --- NEWS | 7 +++++++ configure.ac | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 5eae4d0d0..6060de12f 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ +NEW in 3.8.2 (20/05/2013) +============ +Bugs fixed: + - Fixed #697214, call-window: Remember that the audio output has been added (Olivier Crête) + - Fixed #699017, libempathy: Fix build by adding missing math.h header (Stef Walter) + - Fixed #699333, online-accounts-preferences crashes when accounts need access granted + NEW in 3.8.1 (15/04/2013) ============ Bugs fixed: diff --git a/configure.ac b/configure.ac index d4c07d0d0..cd032ee53 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,9 @@ dnl If not 1, append datestamp to the version number -m4_define(empathy_released, 0) +m4_define(empathy_released, 1) m4_define([empathy_major_version], [3]) m4_define([empathy_minor_version], [8]) -m4_define([empathy_micro_version], [1]) +m4_define([empathy_micro_version], [2]) m4_define([empathy_nano_version], [0]) dnl Display the nano_version only if it's not '0' -- cgit v1.2.3 From 460aeb4236d18d2b4d6486e16d1aa725b5a696fd Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Mon, 20 May 2013 10:25:17 +0200 Subject: remove released flag --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index cd032ee53..dc40bd89d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl If not 1, append datestamp to the version number -m4_define(empathy_released, 1) +m4_define(empathy_released, 0) m4_define([empathy_major_version], [3]) m4_define([empathy_minor_version], [8]) -- cgit v1.2.3 From 7e2db943e0c9a6f5764504460e64ffec9bb87d67 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Fri, 24 May 2013 14:43:27 +0200 Subject: Revert "log-window: escape the body of the message" This commit introduced a nasty regression breaking UTF-8 logs (#692746). I prefer to revert it as #691085 was a far less anoying bug. We'll re-fix #691085 once we'll have a UTF-8 friendly escape function in GLib (#89548). This reverts commit 1e7449f5a14e2f031389808206c9991f65d3ade7. --- libempathy-gtk/empathy-log-window.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c index 80733da1b..cba8ae2c7 100644 --- a/libempathy-gtk/empathy-log-window.c +++ b/libempathy-gtk/empathy-log-window.c @@ -1248,7 +1248,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; @@ -1272,23 +1271,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 (_("* %s %s"), alias, msg_escaped); + body = g_strdup_printf (_("* %s %s"), alias, msg->str); } else { /* Translators: this is a message: 'Danielle: hello' * The string in bold is the sender's name */ - body = g_strdup_printf (_("%s: %s"), alias, msg_escaped); + body = g_strdup_printf (_("%s: %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), -- cgit v1.2.3 From 06a14ea83b6f301eab4de9488df89838db4b2589 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Fri, 24 May 2013 15:29:47 +0200 Subject: new-chatroom-dialog: use tp_g_signal_connect_object() https://bugzilla.gnome.org/show_bug.cgi?id=696151 --- src/empathy-new-chatroom-dialog.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c index 5de844bd4..58cc3fde5 100644 --- a/src/empathy-new-chatroom-dialog.c +++ b/src/empathy-new-chatroom-dialog.c @@ -506,12 +506,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))) { -- cgit v1.2.3 From fa9fe6db3a9bf4cdb268a7cc1ec0c42201837b5d Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Fri, 24 May 2013 15:49:50 +0200 Subject: debug-window: pass the proper type when setting 'yalign' --- src/empathy-debug-window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c index 7d56b6849..37640f6c8 100644 --- a/src/empathy-debug-window.c +++ b/src/empathy-debug-window.c @@ -2046,7 +2046,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, -- cgit v1.2.3 From 0292ce27a6059f9dac82ecd55ae53f4bad6bda41 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Fri, 24 May 2013 15:53:24 +0200 Subject: 3.8.3 --- NEWS | 6 ++++++ configure.ac | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 6060de12f..86eb15a66 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +NEW in 3.8.3 (24/05/2013) +============ +Bugs fixed: + - Fixed #692746, history uses wrong encoding to show utf8 logs (Guillaume Desmottes) + - Fixed #696151, empathy crashed with SIGSEGV in listing_failed_cb() (Guillaume Desmottes) + NEW in 3.8.2 (20/05/2013) ============ Bugs fixed: diff --git a/configure.ac b/configure.ac index dc40bd89d..5d1930796 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,9 @@ dnl If not 1, append datestamp to the version number -m4_define(empathy_released, 0) +m4_define(empathy_released, 1) m4_define([empathy_major_version], [3]) m4_define([empathy_minor_version], [8]) -m4_define([empathy_micro_version], [2]) +m4_define([empathy_micro_version], [3]) m4_define([empathy_nano_version], [0]) dnl Display the nano_version only if it's not '0' -- cgit v1.2.3 From ec619f9805258aa9d623e2651fb604b80d49f795 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Fri, 24 May 2013 15:59:57 +0200 Subject: remove released flag --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 5d1930796..3ce63fe45 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl If not 1, append datestamp to the version number -m4_define(empathy_released, 1) +m4_define(empathy_released, 0) m4_define([empathy_major_version], [3]) m4_define([empathy_minor_version], [8]) -- cgit v1.2.3