[empathy: 76/148] Set the right initial value in the UI
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: svn-commits-list gnome org
- Subject: [empathy: 76/148] Set the right initial value in the UI
- Date: Mon, 1 Jun 2009 12:13:58 -0400 (EDT)
commit 997c9dabb5fd8ea6631a37a80576d312b0da56d5
Author: Cosimo Cecchi <cosimo cecchi collabora co uk>
Date: Thu May 14 19:57:25 2009 +0200
Set the right initial value in the UI
Set an initial value for the UI string in case we're not using hash.
---
src/empathy-ft-manager.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/empathy-ft-manager.c b/src/empathy-ft-manager.c
index a49daab..7c10717 100644
--- a/src/empathy-ft-manager.c
+++ b/src/empathy-ft-manager.c
@@ -747,8 +747,13 @@ ft_manager_add_handler_to_list (EmpathyFTManager *manager,
return;
}
- /* update the row with the initial values */
- if (empathy_ft_handler_is_incoming (handler)) {
+ /* update the row with the initial values.
+ * the only case where we postpone this is in case we're managing
+ * an outgoing+hashing transfer, as the hashing started signal will
+ * take care of updating the information.
+ */
+ if (empathy_ft_handler_is_incoming (handler) ||
+ !empathy_ft_handler_get_use_hash (handler)) {
first_line = ft_manager_format_contact_info (handler);
second_line = _("Waiting for the other participant's response");
message = g_strdup_printf ("%s\n%s", first_line, second_line);
@@ -759,7 +764,6 @@ ft_manager_add_handler_to_list (EmpathyFTManager *manager,
g_free (message);
}
-
/* hook up the signals and start the transfer */
ft_manager_start_transfer (manager, handler);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]