diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-05-13 20:29:35 +0800 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-05-13 20:29:35 +0800 |
| commit | ef89dd5d34b2b4ccd8ee41258f824f7c8a5aa5ae (patch) | |
| tree | 208c9c9df8cad0846ccf77fb80ef5f089ad6e0f2 /libempathy | |
| parent | 1de2424c07f0f1326d7c2f982f4882b696f9d0fa (diff) | |
| parent | 8e3f9e7514cc2284496e0f1db23180e20be4bea0 (diff) | |
| download | gsoc2013-empathy-ef89dd5d34b2b4ccd8ee41258f824f7c8a5aa5ae.tar gsoc2013-empathy-ef89dd5d34b2b4ccd8ee41258f824f7c8a5aa5ae.tar.gz gsoc2013-empathy-ef89dd5d34b2b4ccd8ee41258f824f7c8a5aa5ae.tar.bz2 gsoc2013-empathy-ef89dd5d34b2b4ccd8ee41258f824f7c8a5aa5ae.tar.lz gsoc2013-empathy-ef89dd5d34b2b4ccd8ee41258f824f7c8a5aa5ae.tar.xz gsoc2013-empathy-ef89dd5d34b2b4ccd8ee41258f824f7c8a5aa5ae.tar.zst gsoc2013-empathy-ef89dd5d34b2b4ccd8ee41258f824f7c8a5aa5ae.zip | |
Merge branch 'empathy-skype' into debian
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-contact.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c index 955ee885f..42faad483 100644 --- a/libempathy/empathy-contact.c +++ b/libempathy/empathy-contact.c @@ -40,7 +40,6 @@ #endif #include "empathy-contact.h" -#include "empathy-camera-monitor.h" #include "empathy-utils.h" #include "empathy-enum-types.h" #include "empathy-marshal.h" @@ -1224,18 +1223,8 @@ empathy_contact_can_do_action (EmpathyContact *self, sensitivity = empathy_contact_can_voip_audio (self); break; case EMPATHY_ACTION_VIDEO_CALL: - { - EmpathyCameraMonitor *monitor; - - monitor = empathy_camera_monitor_dup_singleton (); - - sensitivity = empathy_contact_can_voip_video (self); - sensitivity = sensitivity && - empathy_camera_monitor_get_available (monitor); - - g_object_unref (monitor); - break; - } + sensitivity = empathy_contact_can_voip_video (self); + break; case EMPATHY_ACTION_VIEW_LOGS: sensitivity = contact_has_log (self); break; |