Mercurial > pidgin.yaz
diff finch/gntmedia.c @ 31813:ea2a155b4439
propagate from branch 'im.pidgin.pidgin' (head 7d1d85421a7221e67b586df32625c65c1434f195)
to branch 'im.pidgin.pidgin.next.minor' (head 5806c0bc47c791300ede51ab92336dd817bd149c)
| author | John Bailey <rekkanoryo@rekkanoryo.org> |
|---|---|
| date | Sat, 08 Jan 2011 03:10:40 +0000 |
| parents | a8cc50c2279f |
| children |
line wrap: on
line diff
--- a/finch/gntmedia.c Sat Nov 20 13:37:33 2010 +0000 +++ b/finch/gntmedia.c Sat Jan 08 03:10:40 2011 +0000 @@ -252,7 +252,7 @@ } else if (state == PURPLE_MEDIA_STATE_CONNECTED) { finch_media_connected_cb(media, gntmedia); } else if (state == PURPLE_MEDIA_STATE_NEW && - sid != NULL && name != NULL && + sid != NULL && name != NULL && purple_media_is_initiator(media, sid, name) == FALSE) { PurpleAccount *account; PurpleBuddy *buddy; @@ -360,7 +360,7 @@ g_value_set_object(value, media->priv->media); break; default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; } } @@ -480,7 +480,7 @@ PURPLE_CMD_FLAG_IM, NULL, call_cmd_cb, _("call: Make an audio call."), NULL); - purple_media_manager_set_ui_caps(manager, + purple_media_manager_set_ui_caps(manager, PURPLE_MEDIA_CAPS_AUDIO | PURPLE_MEDIA_CAPS_AUDIO_SINGLE_DIRECTION);