Codebase list telepathy-glib / debian/0.19.9-1
New upstream release - remove all patches, applied upstream - update symbols file Simon McVittie 11 years ago
6 changed file(s) with 29 addition(s) and 186 deletion(s). Raw diff Collapse all Expand all
+8
-0
debian/changelog less more
0 telepathy-glib (0.19.9-1) experimental; urgency=low
1
2 * New upstream release
3 - remove all patches, applied upstream
4 - update symbols file
5
6 -- Simon McVittie <smcv@debian.org> Fri, 14 Sep 2012 12:20:24 +0100
7
08 telepathy-glib (0.19.8-2) experimental; urgency=low
19
210 * debian/patches/Fix-incorrect-error-on-UpdateLocalMediaDescription.patch:
+21
-6
debian/libtelepathy-glib0.symbols less more
5050 TELEPATHY_GLIB_0.18.0@TELEPATHY_GLIB_0.18.0 0.18.0
5151 TELEPATHY_GLIB_0.19.0@TELEPATHY_GLIB_0.19.0 0.19.0
5252 TELEPATHY_GLIB_0.19.1@TELEPATHY_GLIB_0.19.1 0.19.1
53 TELEPATHY_GLIB_0.19.2@TELEPATHY_GLIB_0.19.2 0.19.3
53 TELEPATHY_GLIB_0.19.2@TELEPATHY_GLIB_0.19.2 0.19.2
5454 TELEPATHY_GLIB_0.19.3@TELEPATHY_GLIB_0.19.3 0.19.3
55 TELEPATHY_GLIB_0.19.4@TELEPATHY_GLIB_0.19.4 0.19.6
55 TELEPATHY_GLIB_0.19.4@TELEPATHY_GLIB_0.19.4 0.19.4
5656 TELEPATHY_GLIB_0.19.6@TELEPATHY_GLIB_0.19.6 0.19.6
5757 TELEPATHY_GLIB_0.19.7@TELEPATHY_GLIB_0.19.7 0.19.7
5858 TELEPATHY_GLIB_0.19.8@TELEPATHY_GLIB_0.19.8 0.19.8
59 TELEPATHY_GLIB_0.19.9@TELEPATHY_GLIB_0.19.9 0.19.9
5960 TELEPATHY_GLIB_0.7.0@TELEPATHY_GLIB_0.7.0 0.7.1
6061 TELEPATHY_GLIB_0.7.10@TELEPATHY_GLIB_0.7.10 0.7.10
6162 TELEPATHY_GLIB_0.7.12@TELEPATHY_GLIB_0.7.12 0.7.12
175176 tp_account_manager_create_account_async@TELEPATHY_GLIB_0.9.0 0.9.0
176177 tp_account_manager_create_account_finish@TELEPATHY_GLIB_0.9.0 0.9.0
177178 tp_account_manager_dup@TELEPATHY_GLIB_0.9.0 0.9.0
179 tp_account_manager_dup_valid_accounts@TELEPATHY_GLIB_0.19.9 0.19.9
178180 tp_account_manager_enable_restart@TELEPATHY_GLIB_0.9.0 0.9.0
179181 tp_account_manager_ensure_account@TELEPATHY_GLIB_0.9.0 0.9.0
180182 tp_account_manager_get_feature_quark_core@TELEPATHY_GLIB_0.9.0 0.9.0
216218 tp_account_request_set_parameter_string@TELEPATHY_GLIB_0.19.1 0.19.1
217219 tp_account_request_set_requested_presence@TELEPATHY_GLIB_0.19.1 0.19.1
218220 tp_account_request_set_service@TELEPATHY_GLIB_0.19.1 0.19.1
219 tp_account_request_set_storage_provider@TELEPATHY_GLIB_0.19.4 0.19.6
221 tp_account_request_set_storage_provider@TELEPATHY_GLIB_0.19.4 0.19.4
220222 tp_account_request_unset_parameter@TELEPATHY_GLIB_0.19.1 0.19.1
221223 tp_account_set_automatic_presence_async@TELEPATHY_GLIB_0.13.8 0.13.8
222224 tp_account_set_automatic_presence_finish@TELEPATHY_GLIB_0.13.8 0.13.8
348350 tp_base_client_be_a_handler@TELEPATHY_GLIB_0.11.6 0.11.6
349351 tp_base_client_delegate_channels_async@TELEPATHY_GLIB_0.15.0 0.15.0
350352 tp_base_client_delegate_channels_finish@TELEPATHY_GLIB_0.15.0 0.15.0
353 tp_base_client_dup_handled_channels@TELEPATHY_GLIB_0.19.9 0.19.9
354 tp_base_client_dup_pending_requests@TELEPATHY_GLIB_0.19.9 0.19.9
351355 tp_base_client_get_account_manager@TELEPATHY_GLIB_0.11.14 0.11.14
352356 tp_base_client_get_bus_name@TELEPATHY_GLIB_0.11.5 0.11.5
353357 tp_base_client_get_channel_factory@TELEPATHY_GLIB_0.13.2 0.13.2
616620 tp_channel_dispatch_operation_close_channels_finish@TELEPATHY_GLIB_0.15.1 0.15.1
617621 tp_channel_dispatch_operation_destroy_channels_async@TELEPATHY_GLIB_0.15.2 0.15.2
618622 tp_channel_dispatch_operation_destroy_channels_finish@TELEPATHY_GLIB_0.15.2 0.15.2
623 tp_channel_dispatch_operation_get_account@TELEPATHY_GLIB_0.19.9 0.19.9
624 tp_channel_dispatch_operation_get_channels@TELEPATHY_GLIB_0.19.9 0.19.9
625 tp_channel_dispatch_operation_get_connection@TELEPATHY_GLIB_0.19.9 0.19.9
619626 tp_channel_dispatch_operation_get_feature_quark_core@TELEPATHY_GLIB_0.11.5 0.11.5
627 tp_channel_dispatch_operation_get_possible_handlers@TELEPATHY_GLIB_0.19.9 0.19.9
620628 tp_channel_dispatch_operation_get_type@TELEPATHY_GLIB_0.7.32 0.7.32
621629 tp_channel_dispatch_operation_handle_with_async@TELEPATHY_GLIB_0.11.5 0.11.5
622630 tp_channel_dispatch_operation_handle_with_finish@TELEPATHY_GLIB_0.11.5 0.11.5
631639 tp_channel_dispatcher_new@TELEPATHY_GLIB_0.7.32 0.7.32
632640 tp_channel_dispatcher_present_channel_async@TELEPATHY_GLIB_0.15.0 0.15.0
633641 tp_channel_dispatcher_present_channel_finish@TELEPATHY_GLIB_0.15.0 0.15.0
642 tp_channel_dup_immutable_properties@TELEPATHY_GLIB_0.19.9 0.19.9
634643 tp_channel_factory_iface_close_all@TELEPATHY_GLIB_0.7.0 0.7.1
635644 tp_channel_factory_iface_connected@TELEPATHY_GLIB_0.7.0 0.7.1
636645 tp_channel_factory_iface_connecting@TELEPATHY_GLIB_0.7.0 0.7.1
643652 tp_channel_get_channel_type@TELEPATHY_GLIB_0.7.12 0.7.12
644653 tp_channel_get_channel_type_id@TELEPATHY_GLIB_0.7.12 0.7.12
645654 tp_channel_get_chat_state@TELEPATHY_GLIB_0.11.3 0.11.3
655 tp_channel_get_connection@TELEPATHY_GLIB_0.19.9 0.19.9
646656 tp_channel_get_feature_quark_chat_states@TELEPATHY_GLIB_0.11.3 0.11.3
647657 tp_channel_get_feature_quark_contacts@TELEPATHY_GLIB_0.15.6 0.15.6
648658 tp_channel_get_feature_quark_core@TELEPATHY_GLIB_0.11.3 0.11.3
13261336 tp_connection_dup_contact_by_id_async@TELEPATHY_GLIB_0.19.0 0.19.0
13271337 tp_connection_dup_contact_by_id_finish@TELEPATHY_GLIB_0.19.0 0.19.0
13281338 tp_connection_dup_contact_if_possible@TELEPATHY_GLIB_0.13.9 0.13.9
1339 tp_connection_dup_contact_info_supported_fields@TELEPATHY_GLIB_0.19.9 0.19.9
13291340 tp_connection_dup_contact_list@TELEPATHY_GLIB_0.15.5 0.15.5
13301341 tp_connection_dup_detailed_error_vardict@TELEPATHY_GLIB_0.19.0 0.19.0
13311342 tp_connection_get_account@TELEPATHY_GLIB_0.15.5 0.15.5
14411452 tp_contact_authorize_publication_finish@TELEPATHY_GLIB_0.15.5 0.15.5
14421453 tp_contact_block_async@TELEPATHY_GLIB_0.17.0 0.17.0
14431454 tp_contact_block_finish@TELEPATHY_GLIB_0.17.0 0.17.0
1455 tp_contact_dup_contact_info@TELEPATHY_GLIB_0.19.9 0.19.9
14441456 tp_contact_feature_get_type@TELEPATHY_GLIB_0.11.5 0.11.5
14451457 tp_contact_get_account@TELEPATHY_GLIB_0.19.0 0.19.0
14461458 tp_contact_get_alias@TELEPATHY_GLIB_0.7.18 0.7.18
14951507 tp_contact_search_new_finish@TELEPATHY_GLIB_0.13.11 0.13.11
14961508 tp_contact_search_reset_async@TELEPATHY_GLIB_0.13.11 0.13.11
14971509 tp_contact_search_reset_finish@TELEPATHY_GLIB_0.13.11 0.13.11
1510 tp_contact_search_result_dup_fields@TELEPATHY_GLIB_0.19.9 0.19.9
14981511 tp_contact_search_result_get_field@TELEPATHY_GLIB_0.13.11 0.13.11
14991512 tp_contact_search_result_get_fields@TELEPATHY_GLIB_0.13.11 0.13.11
15001513 tp_contact_search_result_get_identifier@TELEPATHY_GLIB_0.13.11 0.13.11
15961609 tp_dtmf_player_play@TELEPATHY_GLIB_0.13.3 0.13.3
15971610 tp_dynamic_handle_repo_get_type@TELEPATHY_GLIB_0.7.0 0.7.1
15981611 tp_dynamic_handle_repo_lookup_exact@TELEPATHY_GLIB_0.7.0 0.7.1
1599 tp_dynamic_handle_repo_set_normalize_async@TELEPATHY_GLIB_0.19.2 0.19.3
1612 tp_dynamic_handle_repo_set_normalize_async@TELEPATHY_GLIB_0.19.2 0.19.2
16001613 tp_error_get_dbus_name@TELEPATHY_GLIB_0.7.31 0.7.31
16011614 tp_error_get_type@TELEPATHY_GLIB_0.7.0 0.7.1
16021615 tp_error_quark@TELEPATHY_GLIB_0.11.13 0.11.13
16941707 tp_handle_client_hold@TELEPATHY_GLIB_0.7.0 0.7.1
16951708 tp_handle_client_release@TELEPATHY_GLIB_0.7.0 0.7.1
16961709 tp_handle_ensure@TELEPATHY_GLIB_0.7.0 0.7.1
1697 tp_handle_ensure_async@TELEPATHY_GLIB_0.19.2 0.19.3
1698 tp_handle_ensure_finish@TELEPATHY_GLIB_0.19.2 0.19.3
1710 tp_handle_ensure_async@TELEPATHY_GLIB_0.19.2 0.19.2
1711 tp_handle_ensure_finish@TELEPATHY_GLIB_0.19.2 0.19.2
16991712 tp_handle_get_qdata@TELEPATHY_GLIB_0.7.0 0.7.1
17001713 tp_handle_inspect@TELEPATHY_GLIB_0.7.0 0.7.1
17011714 tp_handle_is_valid@TELEPATHY_GLIB_0.7.0 0.7.1
19972010 tp_proxy_get_dbus_connection@TELEPATHY_GLIB_0.7.17 0.7.17
19982011 tp_proxy_get_dbus_daemon@TELEPATHY_GLIB_0.7.17 0.7.17
19992012 tp_proxy_get_factory@TELEPATHY_GLIB_0.15.5 0.15.5
2013 tp_proxy_get_interface_by_id@TELEPATHY_GLIB_0.19.9 0.19.9
20002014 tp_proxy_get_invalidated@TELEPATHY_GLIB_0.7.17 0.7.17
20012015 tp_proxy_get_object_path@TELEPATHY_GLIB_0.7.17 0.7.17
20022016 tp_proxy_get_type@TELEPATHY_GLIB_0.7.1 0.7.1
25822596 tp_text_channel_ack_message_finish@TELEPATHY_GLIB_0.13.10 0.13.10
25832597 tp_text_channel_ack_messages_async@TELEPATHY_GLIB_0.13.10 0.13.10
25842598 tp_text_channel_ack_messages_finish@TELEPATHY_GLIB_0.13.10 0.13.10
2599 tp_text_channel_dup_pending_messages@TELEPATHY_GLIB_0.19.9 0.19.9
25852600 tp_text_channel_get_chat_state@TELEPATHY_GLIB_0.19.0 0.19.0
25862601 tp_text_channel_get_delivery_reporting_support@TELEPATHY_GLIB_0.13.10 0.13.10
25872602 tp_text_channel_get_feature_quark_chat_states@TELEPATHY_GLIB_0.19.0 0.19.0
+0
-75
debian/patches/0001-tls-certificate-test-GBytes-aren-t-0-terminated.patch less more
0 From 8c682d0122b066ad69cc7106884f383563c2ba6d Mon Sep 17 00:00:00 2001
1 From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
2 Date: Fri, 31 Aug 2012 15:33:08 +0200
3 Subject: [PATCH] tls-certificate test: GBytes aren't 0 terminated
4
5 ---
6 tests/dbus/tls-certificate.c | 2 +-
7 tests/lib/util.c | 20 ++++++++++++++++++++
8 tests/lib/util.h | 6 ++++++
9 3 files changed, 27 insertions(+), 1 deletion(-)
10
11 diff --git a/tests/dbus/tls-certificate.c b/tests/dbus/tls-certificate.c
12 index 752ea6d..ee67ff2 100644
13 --- a/tests/dbus/tls-certificate.c
14 +++ b/tests/dbus/tls-certificate.c
15 @@ -160,7 +160,7 @@ test_core (Test *test,
16 g_assert (cert_data != NULL);
17 g_assert_cmpuint (cert_data->len, ==, 1);
18 d = g_ptr_array_index (cert_data, 0);
19 - g_assert_cmpstr (g_bytes_get_data (d, NULL), ==, "BADGER");
20 + tp_tests_assert_bytes_equals (d, "BADGER", 6);
21 }
22
23 static void
24 diff --git a/tests/lib/util.c b/tests/lib/util.c
25 index 21d3855..9510cb0 100644
26 --- a/tests/lib/util.c
27 +++ b/tests/lib/util.c
28 @@ -176,6 +176,26 @@ _tp_tests_assert_strv_equals (const char *file,
29 }
30
31 void
32 +_tp_tests_assert_bytes_equal (const gchar *file, int line,
33 + GBytes *actual, gconstpointer expected_data,
34 + gsize expected_length)
35 +{
36 + if (expected_length != g_bytes_get_size (actual))
37 + {
38 + g_error ("%s:%d: assertion failed: expected %"G_GSIZE_FORMAT
39 + " bytes, got %"G_GSIZE_FORMAT,
40 + file, line, expected_length, g_bytes_get_size (actual));
41 + }
42 + else if (memcmp (g_bytes_get_data (actual, NULL),
43 + expected_data, expected_length) != 0)
44 + {
45 + g_error (
46 + "%s:%d: assertion failed: expected data didn't match the actual data",
47 + file, line);
48 + }
49 +}
50 +
51 +void
52 tp_tests_create_conn (GType conn_type,
53 const gchar *account,
54 gboolean connect,
55 diff --git a/tests/lib/util.h b/tests/lib/util.h
56 index d58138e..ce19d66 100644
57 --- a/tests/lib/util.h
58 +++ b/tests/lib/util.h
59 @@ -36,6 +36,12 @@ void _tp_tests_assert_strv_equals (const char *file, int line,
60 const char *actual_desc, gconstpointer actual_strv,
61 const char *expected_desc, gconstpointer expected_strv);
62
63 +#define tp_tests_assert_bytes_equals(actual, expected, expected_length) \
64 + _tp_tests_assert_bytes_equal (__FILE__, __LINE__, \
65 + actual, expected, expected_length)
66 +void _tp_tests_assert_bytes_equal (const gchar *file, int line,
67 + GBytes *actual, gconstpointer expected_data, gsize expected_length);
68 +
69 void tp_tests_create_conn (GType conn_type,
70 const gchar *account,
71 gboolean connect,
72 --
73 1.7.10.4
74
+0
-35
debian/patches/Fix-incorrect-error-on-UpdateLocalMediaDescription.patch less more
0 From 680a5dd2a492078a0cc497502aab1d81cdba39ac Mon Sep 17 00:00:00 2001
1 From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
2 Date: Mon, 3 Sep 2012 11:10:01 +0200
3 Subject: [PATCH 1/2] Fix incorrect error on UpdateLocalMediaDescription
4
5 Remove the code that errors out a local description update if there is
6 *any* outstanding offer. A bit later in the same function a proper check
7 is done to see if there is a offer for the update contact, which is
8 correct.
9 ---
10 telepathy-glib/base-media-call-content.c | 8 --------
11 1 file changed, 8 deletions(-)
12
13 diff --git a/telepathy-glib/base-media-call-content.c b/telepathy-glib/base-media-call-content.c
14 index a0032f4..b7cf8e1 100644
15 --- a/telepathy-glib/base-media-call-content.c
16 +++ b/telepathy-glib/base-media-call-content.c
17 @@ -683,14 +683,6 @@ tp_base_media_call_content_update_local_media_description (
18 GPtrArray *codecs;
19 gpointer contact;
20
21 - if (self->priv->current_offer != NULL)
22 - {
23 - GError error = { TP_ERROR, TP_ERROR_NOT_AVAILABLE,
24 - "There is a media description offer around so "
25 - "UpdateMediaDescription shouldn't be called." };
26 - dbus_g_method_return_error (context, &error);
27 - return;
28 - }
29
30 if (!g_hash_table_lookup_extended (properties,
31 TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_REMOTE_CONTACT,
32 --
33 1.7.10.4
34
+0
-67
debian/patches/Fix-retrieving-the-remove-contact-from-a-MediaDescri.patch less more
0 From a04137272f0468fc1f4904280a02633cea60c998 Mon Sep 17 00:00:00 2001
1 From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
2 Date: Mon, 3 Sep 2012 11:14:34 +0200
3 Subject: [PATCH 2/2] Fix retrieving the remove contact from a
4 MediaDescription hash
5
6 Correctly get the remote contact handle out of the MediaDescription
7 hash, it's an a{sv} not string => uint32.
8
9 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 Bug: https://bugs.freedesktop.org/show_bug.cgi?id=54425
11 ---
12 telepathy-glib/base-media-call-content.c | 15 ++++++++-------
13 1 file changed, 8 insertions(+), 7 deletions(-)
14
15 diff --git a/telepathy-glib/base-media-call-content.c b/telepathy-glib/base-media-call-content.c
16 index b7cf8e1..6256c06 100644
17 --- a/telepathy-glib/base-media-call-content.c
18 +++ b/telepathy-glib/base-media-call-content.c
19 @@ -681,12 +681,13 @@ tp_base_media_call_content_update_local_media_description (
20 TpBaseMediaCallContent *self = TP_BASE_MEDIA_CALL_CONTENT (iface);
21 GHashTable *current_properties;
22 GPtrArray *codecs;
23 - gpointer contact;
24 + TpHandle contact;
25 + gboolean valid;
26
27 + contact = tp_asv_get_uint32 (properties,
28 + TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_REMOTE_CONTACT, &valid);
29
30 - if (!g_hash_table_lookup_extended (properties,
31 - TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_REMOTE_CONTACT,
32 - NULL, &contact))
33 + if (!valid)
34 {
35 GError error = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
36 "The media description is missing the RemoteContact key." };
37 @@ -696,7 +697,7 @@ tp_base_media_call_content_update_local_media_description (
38
39 current_properties = g_hash_table_lookup (
40 self->priv->local_media_descriptions,
41 - contact);
42 + GUINT_TO_POINTER (contact));
43
44 if (current_properties == NULL)
45 {
46 @@ -719,7 +720,7 @@ tp_base_media_call_content_update_local_media_description (
47 }
48
49 if (self->priv->current_offer != NULL &&
50 - tp_call_content_media_description_get_remote_contact (self->priv->current_offer) == GPOINTER_TO_UINT (contact))
51 + tp_call_content_media_description_get_remote_contact (self->priv->current_offer) == contact)
52 {
53 GError error = { TP_ERROR, TP_ERROR_NOT_AVAILABLE,
54 "Can not update the media description while there is"
55 @@ -728,7 +729,7 @@ tp_base_media_call_content_update_local_media_description (
56 return;
57 }
58
59 - set_local_properties (self, GPOINTER_TO_UINT (contact), properties);
60 + set_local_properties (self, contact, properties);
61
62 tp_svc_call_content_interface_media_return_from_update_local_media_description
63 (context);
64 --
65 1.7.10.4
66
+0
-3
debian/patches/series less more
0 0001-tls-certificate-test-GBytes-aren-t-0-terminated.patch
1 Fix-incorrect-error-on-UpdateLocalMediaDescription.patch
2 Fix-retrieving-the-remove-contact-from-a-MediaDescri.patch