aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS53
-rw-r--r--libempathy-gtk/empathy-account-widget-sip.ui6
-rw-r--r--libempathy-gtk/empathy-presence-chooser.c1
-rw-r--r--libempathy-gtk/empathy-status-preset-dialog.c2
-rw-r--r--src/empathy-event-manager.c11
5 files changed, 70 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 4b4e0ff86..f2e99ab57 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,56 @@
+NEW in 2.29.4
+=============
+
+The "The Snow of the Apocalypse" release.
+
+Empathy is now able to start SIP video calls using the new "New Call" dialog.
+It also indicates whether an incoming call contains video or is audio only.
+The contact list can now display the protocol used by contacts, and the
+accounts dialog shows the accounts' status (enabled/disabled,
+available/busy/away/offline, etc.).
+Thanks to K. Vishnoo Charan Reddy, Empathy gained icons for 4 protocols.
+
+Bugs fixed:
+ - Fixed #602821, accounts do not reconnect after toggling enable/disable (Felix Kaser)
+ - Fixed #603490, SIGSEGV crash when cancelling accounts creation (Felix Kaser)
+ - Fixed #570399, Call button should be disabled in "new conversation dialog" if CM doesn't support audio/video
+ - Fixed #576434, ellipsize long status messages in the status combobox (Pascal Potvin)
+ - Fixed #576542, tooltips for toolbar buttons in call window (Guillaume Desmottes)
+ - Fixed #582596, Should tell if we are receiving an audio only or audio/video call (Guillaume Desmottes)
+ - Fixed #582599, chat -> new conversation is not an obvious way to start an audio/video call (Guillaume Desmottes)
+ - Fixed #586290, Remember contact pane's width (ranjiao)
+ - Fixed #588812, Group 1-to-1 chats in one window and MUC's in another one (Abner Silva)
+ - Fixed #598964, contact list disappears on reconnect for group chats (Guillaume Desmottes)
+ - Fixed #602288, Shouldn't notify about scrollback messages (Guillaume Desmottes)
+ - Fixed #603393, Crash when trying to join a rom while being offline (Guillaume Desmottes)
+ - Fixed #603485, Crash when clicking the status icon just after a contact goes online/offline (Guillaume Desmottes)
+ - Fixed #603502, Myspace missing icon in create account dropdown menu (Guillaume Desmottes)
+ - Fixed #603508, Sametime missing icon in create account dropdown menu (Guillaume Desmottes)
+ - Fixed #603545, [Patch] gtk-missing-icon shown in add contact dialog before status is queried (Brian Pepple)
+ - Fixed #603593, assertion error when rejoining a chatroom because of reconnection (Guillaume Desmottes)
+ - Fixed #603634, Groupwise icon missing in create account dropdown menu (Guillaume Desmottes)
+ - Fixed #603877, [patch] add protocol icon to contact list (chantra)
+ - Fixed #603976, Don't re-enable chat window once reconnected (Guillaume Desmottes)
+ - Fixed #603980, new messages mixed with old in new conversation windows (Guillaume Desmottes)
+ - Fixed #604003, Separate geometry of private and muc chat windows (Guillaume Desmottes)
+ - Fixed #604097, EmpathyNewMessageDialog should inherit from GtkDialog (Guillaume Desmottes)
+ - Fixed #604166, account-chooser: display connected accounts first (Guillaume Desmottes)
+ - Fixed #604181, Should remove contact from 'stored' list when possible (Guillaume Desmottes)
+ - Fixed #604254, Contact list channels should be requested via EnsureChannel
+ - Fixed #604554, SILC missing icon in create account dropdown menu (Guillaume Desmottes)
+ - Fixed #604567, Yahoo!Japan missing icon in create account dropdown menu (Guillaume Desmottes)
+ - Fixed #599153, Accounts dialog should display the status of accounts (Felix Kaser)
+
+Translations:
+ - Updated es Translation (Jorge González)
+ - Updated he Translation (Yaron Sharabani)
+ - Updated nb Translation (Kjartan Maraas)
+ - Updated sl Translation (Matej Urbančič)
+ - Updated zh_CN Translation (Aron Xu)
+
+Documentation translations:
+ - Updated de Documentation translation (Christian Kirbach)
+
NEW in 2.29.3
==============
diff --git a/libempathy-gtk/empathy-account-widget-sip.ui b/libempathy-gtk/empathy-account-widget-sip.ui
index 10eae68fa..1f465e478 100644
--- a/libempathy-gtk/empathy-account-widget-sip.ui
+++ b/libempathy-gtk/empathy-account-widget-sip.ui
@@ -258,12 +258,13 @@ username.</property>
<property name="left_padding">12</property>
<child>
<object class="GtkCheckButton" id="checkbutton_discover-stun">
- <property name="label" translatable="yes" comments="look up the DNS SRV record at the service's domain for the host name of a STUN server.">Discover the STUN server automatically</property>
+ <property name="label" translatable="yes">Discover the STUN server automatically</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
+ <property name="tooltip_text" translatable="yes">Look up the DNS SRV record at the service's domain for the host name of a STUN server.</property>
</object>
</child>
</object>
@@ -286,6 +287,7 @@ username.</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
+ <property name="tooltip_text" translatable="yes">Update the registration binding if the external address for the client is discovered to be different from the local binding.</property>
</object>
</child>
</object>
@@ -404,6 +406,7 @@ username.</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
+ <property name="tooltip_text" translatable="yes">Use the loose routing behavior and the Route header as recommended in RFC 3261.</property>
</object>
</child>
</object>
@@ -462,6 +465,7 @@ username.</property>
<property name="invisible_char">&#x2022;</property>
<property name="adjustment">adjustment2</property>
<property name="climb_rate">1</property>
+ <property name="tooltip_text" translatable="yes">Port of the proxy for outbound requests.</property>
</object>
<packing>
<property name="left_attach">3</property>
diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c
index a434936e9..e5826ff76 100644
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@ -857,6 +857,7 @@ empathy_presence_chooser_init (EmpathyPresenceChooser *chooser)
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (chooser), renderer,
"markup", COL_DISPLAY_MARKUP,
NULL);
+ g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
g_signal_connect (chooser, "notify::popup-shown",
G_CALLBACK (presence_chooser_popup_shown_cb), NULL);
diff --git a/libempathy-gtk/empathy-status-preset-dialog.c b/libempathy-gtk/empathy-status-preset-dialog.c
index 4a4893b57..315a750a5 100644
--- a/libempathy-gtk/empathy-status-preset-dialog.c
+++ b/libempathy-gtk/empathy-status-preset-dialog.c
@@ -292,6 +292,8 @@ status_preset_dialog_setup_presets_treeview (EmpathyStatusPresetDialog *self)
g_object_set (renderer,
"editable", TRUE,
NULL);
+ g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+
g_signal_connect (renderer, "edited",
G_CALLBACK (status_preset_dialog_status_edited), self);
}
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index 72708b6b5..c9e925d21 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -96,6 +96,7 @@ struct _EventPriv {
EventFunc func;
gboolean inhibit;
gpointer user_data;
+ guint autoremove_timeout_id;
};
enum {
@@ -160,6 +161,9 @@ event_free (EventPriv *event)
g_free (event->public.header);
g_free (event->public.message);
+ if (event->autoremove_timeout_id != 0)
+ g_source_remove (event->autoremove_timeout_id);
+
if (event->public.contact)
{
g_object_unref (event->public.contact);
@@ -174,6 +178,7 @@ event_remove (EventPriv *event)
EmpathyEventManagerPriv *priv = GET_PRIV (event->manager);
DEBUG ("Removing event %p", event);
+
priv->events = g_slist_remove (priv->events, event);
g_signal_emit (event->manager, signals[EVENT_REMOVED], 0, event);
event_free (event);
@@ -182,6 +187,7 @@ event_remove (EventPriv *event)
static gboolean
autoremove_event_timeout_cb (EventPriv *event)
{
+ event->autoremove_timeout_id = 0;
event_remove (event);
return FALSE;
}
@@ -219,8 +225,9 @@ event_manager_add (EmpathyEventManager *manager,
if (!event->public.must_ack)
{
- g_timeout_add_seconds (NOTIFICATION_TIMEOUT,
- (GSourceFunc) autoremove_event_timeout_cb, event);
+ event->autoremove_timeout_id = g_timeout_add_seconds (
+ NOTIFICATION_TIMEOUT, (GSourceFunc) autoremove_event_timeout_cb,
+ event);
}
}