Merge lp:~om26er/ubuntu/maverick/telepathy-haze/telepathy-haze-fix-652944 into lp:ubuntu/maverick/telepathy-haze

[Omer Akram]

backported from upstream git http://git.collabora.co.uk/?p=telepathy-haze.git;a=commitdiff;h=924fa3d90eb1a4949e431b0bd6284071f0d5b38b so that people dont get tricked into believing yahoo, icq etc support a/v calls

[lp:~om26er/ubuntu/maverick/telepathy-haze/telepathy-haze-fix-652944]

17. By Omer Akram on 2010-11-23

debian/patches/do_not_show_webcam_for_haze.patch:

[Artur Rona (ari-tczew)]

Could you complete your patch with DEP3 tags? Follow with https://wiki.ubuntu.com/UbuntuDevelopment/PatchTaggingGuidelines.

review: Needs Fixing

[lp:~om26er/ubuntu/maverick/telepathy-haze/telepathy-haze-fix-652944]

18. By Omer Akram on 2010-11-23

added DEP3 tags to the patch.

[Omer Akram (om26er)]

> Could you complete your patch with DEP3 tags? Follow with
> https://wiki.ubuntu.com/UbuntuDevelopment/PatchTaggingGuidelines.

yes sir done ;)

[Artur Rona (ari-tczew)]

Please use short URLs, so:
Bug: https://bugs.freedesktop.org/30594
Bug-Ubuntu: https://launchpad.net/bugs/652944

and full sentences, so:
Subject: Instantiate the media manager only if the protocol support calls.

review: Needs Fixing

[lp:~om26er/ubuntu/maverick/telepathy-haze/telepathy-haze-fix-652944]

19. By Omer Akram on 2010-11-23

more corrections

[Omer Akram (om26er)]

> Please use short URLs, so:
> Bug: https://bugs.freedesktop.org/30594
> Bug-Ubuntu: https://launchpad.net/bugs/652944
>
> and full sentences, so:
> Subject: Instantiate the media manager only if the protocol support calls.

sorry for the inconvenience i hope this time things are right.

[lp:~om26er/ubuntu/maverick/telepathy-haze/telepathy-haze-fix-652944]

20. By Omer Akram on 2010-11-25

put a '.' at the end of Subject just in case

[Omer Akram (om26er)]

now i think this branch is ready :)

[Martin Pitt (pitti)]

This looks good now, thanks Omer! I'll merge into the maverick-proposed branch and upload.

review: Approve

[Martin Pitt (pitti)]

OK, nevermind about the maverick-proposed branch; it doesn't exist, and apparently I can't create it either, so just using the maverick branch.

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-05 16:22:55 +0000
+++ debian/changelog	2010-11-25 17:12:46 +0000
@@ -1,3 +1,10 @@
+telepathy-haze (0.4.0-1ubuntu1) maverick-proposed; urgency=low
+
+  * debian/patches/do_not_show_webcam_for_haze.patch:
+    - instantiate the media manager only if the protocol support calls (LP: #652944)
+
+ -- Omer Akram <[e-mail]>  Tue, 23 Nov 2010 18:37:55 +0500
+
 telepathy-haze (0.4.0-1) unstable; urgency=low
 
   * New upstream release

=== modified file 'debian/control'
--- debian/control	2010-08-05 16:22:55 +0000
+++ debian/control	2010-11-25 17:12:46 +0000
@@ -1,7 +1,8 @@
 Source: telepathy-haze
 Section: net
 Priority: optional
-Maintainer: Debian Telepathy maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Telepathy maintainers <[e-mail]>
 Uploaders: Laurent Bigonville <[e-mail]>,
            Simon McVittie <[e-mail]>,
            Jonny Lamb <[e-mail]>

=== added directory 'debian/patches'
=== added file 'debian/patches/do_not_show_webcam_for_haze.patch'
--- debian/patches/do_not_show_webcam_for_haze.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/do_not_show_webcam_for_haze.patch	2010-11-25 17:12:46 +0000
@@ -0,0 +1,25 @@
+From: Guillaume Desmottes <[e-mail]>
+Subject: Instantiate the media manager only if the protocol support calls.
+Origin: http://git.collabora.co.uk/?p=telepathy-haze.git;a=commitdiff;h=924fa3d90eb1a4949e431b0bd6284071f0d5b38b
+Bug: https://bugs.freedesktop.org/30594
+Bug-Ubuntu: https://launchpad.net/bugs/652944
+
+--- a/src/connection.c
++++ b/src/connection.c
+@@ -446,9 +446,13 @@ _haze_connection_create_channel_managers (TpBaseConnection *base)
+     g_ptr_array_add (channel_managers, self->im_factory);
+ 
+ #ifdef ENABLE_MEDIA
+-    self->media_manager = HAZE_MEDIA_MANAGER (
+-        g_object_new (HAZE_TYPE_MEDIA_MANAGER, "connection", self, NULL));
+-    g_ptr_array_add (channel_managers, self->media_manager);
++    /* Instantiate the media manager only if the protocol support calls */
++    if (PURPLE_PROTOCOL_PLUGIN_HAS_FUNC (self->priv->prpl_info, initiate_media))
++      {
++        self->media_manager = HAZE_MEDIA_MANAGER (
++            g_object_new (HAZE_TYPE_MEDIA_MANAGER, "connection", self, NULL));
++        g_ptr_array_add (channel_managers, self->media_manager);
++      }
+ #endif
+ 
+     self->contact_list = HAZE_CONTACT_LIST (