Mercurial > pidgin.yaz

comparison libpurple/media.c @ 26507:90c65a8575bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make it compile with --disable-vv... again!
author Mike Ruprecht <maiku@soc.pidgin.im>
date Fri, 03 Apr 2009 19:28:00 +0000
parents 440e999c27ca
children 9131368ba4be df9042312063
comparison
equal deleted inserted replaced
26506:beb22a90bf5d 26507:90c65a8575bf
653 struct _PurpleMediaCandidate 653 struct _PurpleMediaCandidate
654 { 654 {
655 GObject parent; 655 GObject parent;
656 }; 656 };
657 657
658 #ifdef USE_VV
658 struct _PurpleMediaCandidatePrivate 659 struct _PurpleMediaCandidatePrivate
659 { 660 {
660 gchar *foundation; 661 gchar *foundation;
661 guint component_id; 662 guint component_id;
662 gchar *ip; 663 gchar *ip;
927 g_type_class_add_private(klass, sizeof(PurpleMediaCandidatePrivate)); 928 g_type_class_add_private(klass, sizeof(PurpleMediaCandidatePrivate));
928 } 929 }
929 930
930 G_DEFINE_TYPE(PurpleMediaCandidate, 931 G_DEFINE_TYPE(PurpleMediaCandidate,
931 purple_media_candidate, G_TYPE_OBJECT); 932 purple_media_candidate, G_TYPE_OBJECT);
933 #else
934 GType
935 purple_media_candidate_get_type()
936 {
937 return G_TYPE_NONE;
938 }
939 #endif
932 940
933 PurpleMediaCandidate * 941 PurpleMediaCandidate *
934 purple_media_candidate_new(const gchar *foundation, guint component_id, 942 purple_media_candidate_new(const gchar *foundation, guint component_id,
935 PurpleMediaCandidateType type, 943 PurpleMediaCandidateType type,
936 PurpleMediaNetworkProtocol proto, 944 PurpleMediaNetworkProtocol proto,
946 } 954 }
947 955
948 static PurpleMediaCandidate * 956 static PurpleMediaCandidate *
949 purple_media_candidate_copy(PurpleMediaCandidate *candidate) 957 purple_media_candidate_copy(PurpleMediaCandidate *candidate)
950 { 958 {
959 #ifdef USE_VV
951 PurpleMediaCandidatePrivate *priv; 960 PurpleMediaCandidatePrivate *priv;
952 PurpleMediaCandidate *new_candidate; 961 PurpleMediaCandidate *new_candidate;
953 962
954 if (candidate == NULL) 963 if (candidate == NULL)
955 return NULL; 964 return NULL;
965 "priority", priv->priority, 974 "priority", priv->priority,
966 "username", priv->username, 975 "username", priv->username,
967 "password", priv->password, 976 "password", priv->password,
968 "ttl", priv->ttl, NULL); 977 "ttl", priv->ttl, NULL);
969 return new_candidate; 978 return new_candidate;
979 #else
980 return NULL;
981 #endif
970 } 982 }
971 983
972 #ifdef USE_VV 984 #ifdef USE_VV
973 static FsCandidate * 985 static FsCandidate *
974 purple_media_candidate_to_fs(PurpleMediaCandidate *candidate) 986 purple_media_candidate_to_fs(PurpleMediaCandidate *candidate)
1238 struct _PurpleMediaCodec 1250 struct _PurpleMediaCodec
1239 { 1251 {
1240 GObject parent; 1252 GObject parent;
1241 }; 1253 };
1242 1254
1255 #ifdef USE_VV
1243 struct _PurpleMediaCodecPrivate 1256 struct _PurpleMediaCodecPrivate
1244 { 1257 {
1245 gint id; 1258 gint id;
1246 char *encoding_name; 1259 char *encoding_name;
1247 PurpleMediaSessionType media_type; 1260 PurpleMediaSessionType media_type;
1406 g_type_class_add_private(klass, sizeof(PurpleMediaCodecPrivate)); 1419 g_type_class_add_private(klass, sizeof(PurpleMediaCodecPrivate));
1407 } 1420 }
1408 1421
1409 G_DEFINE_TYPE(PurpleMediaCodec, 1422 G_DEFINE_TYPE(PurpleMediaCodec,
1410 purple_media_codec, G_TYPE_OBJECT); 1423 purple_media_codec, G_TYPE_OBJECT);
1424 #else
1425 GType
1426 purple_media_codec_get_type()
1427 {
1428 return G_TYPE_NONE;
1429 }
1430 #endif
1411 1431
1412 guint 1432 guint
1413 purple_media_codec_get_id(PurpleMediaCodec *codec) 1433 purple_media_codec_get_id(PurpleMediaCodec *codec)
1414 { 1434 {
1415 guint id; 1435 guint id;
1456 1476
1457 void 1477 void
1458 purple_media_codec_add_optional_parameter(PurpleMediaCodec *codec, 1478 purple_media_codec_add_optional_parameter(PurpleMediaCodec *codec,
1459 const gchar *name, const gchar *value) 1479 const gchar *name, const gchar *value)
1460 { 1480 {
1481 #ifdef USE_VV
1461 PurpleMediaCodecPrivate *priv; 1482 PurpleMediaCodecPrivate *priv;
1462 PurpleKeyValuePair *new_param; 1483 PurpleKeyValuePair *new_param;
1463 1484
1464 g_return_if_fail(codec != NULL); 1485 g_return_if_fail(codec != NULL);
1465 g_return_if_fail(name != NULL && value != NULL); 1486 g_return_if_fail(name != NULL && value != NULL);
1469 new_param = g_new0(PurpleKeyValuePair, 1); 1490 new_param = g_new0(PurpleKeyValuePair, 1);
1470 new_param->key = g_strdup(name); 1491 new_param->key = g_strdup(name);
1471 new_param->value = g_strdup(value); 1492 new_param->value = g_strdup(value);
1472 priv->optional_params = g_list_append( 1493 priv->optional_params = g_list_append(
1473 priv->optional_params, new_param); 1494 priv->optional_params, new_param);
1495 #endif
1474 } 1496 }
1475 1497
1476 void 1498 void
1477 purple_media_codec_remove_optional_parameter(PurpleMediaCodec *codec, 1499 purple_media_codec_remove_optional_parameter(PurpleMediaCodec *codec,
1478 PurpleKeyValuePair *param) 1500 PurpleKeyValuePair *param)
1479 { 1501 {
1502 #ifdef USE_VV
1480 PurpleMediaCodecPrivate *priv; 1503 PurpleMediaCodecPrivate *priv;
1481 1504
1482 g_return_if_fail(codec != NULL && param != NULL); 1505 g_return_if_fail(codec != NULL && param != NULL);
1483 1506
1484 priv = PURPLE_MEDIA_CODEC_GET_PRIVATE(codec); 1507 priv = PURPLE_MEDIA_CODEC_GET_PRIVATE(codec);
1487 g_free(param->value); 1510 g_free(param->value);
1488 g_free(param); 1511 g_free(param);
1489 1512
1490 priv->optional_params = 1513 priv->optional_params =
1491 g_list_remove(priv->optional_params, param); 1514 g_list_remove(priv->optional_params, param);
1515 #endif
1492 } 1516 }
1493 1517
1494 PurpleKeyValuePair * 1518 PurpleKeyValuePair *
1495 purple_media_codec_get_optional_parameter(PurpleMediaCodec *codec, 1519 purple_media_codec_get_optional_parameter(PurpleMediaCodec *codec,
1496 const gchar *name, const gchar *value) 1520 const gchar *name, const gchar *value)
1497 { 1521 {
1522 #ifdef USE_VV
1498 PurpleMediaCodecPrivate *priv; 1523 PurpleMediaCodecPrivate *priv;
1499 GList *iter; 1524 GList *iter;
1500 1525
1501 g_return_val_if_fail(codec != NULL, NULL); 1526 g_return_val_if_fail(codec != NULL, NULL);
1502 g_return_val_if_fail(name != NULL, NULL); 1527 g_return_val_if_fail(name != NULL, NULL);
1508 if (!g_ascii_strcasecmp(param->key, name) && 1533 if (!g_ascii_strcasecmp(param->key, name) &&
1509 (value == NULL || 1534 (value == NULL ||
1510 !g_ascii_strcasecmp(param->value, value))) 1535 !g_ascii_strcasecmp(param->value, value)))
1511 return param; 1536 return param;
1512 } 1537 }
1538 #endif
1513 1539
1514 return NULL; 1540 return NULL;
1515 } 1541 }
1516 1542
1517 PurpleMediaCodec * 1543 PurpleMediaCodec *
1528 } 1554 }
1529 1555
1530 static PurpleMediaCodec * 1556 static PurpleMediaCodec *
1531 purple_media_codec_copy(PurpleMediaCodec *codec) 1557 purple_media_codec_copy(PurpleMediaCodec *codec)
1532 { 1558 {
1559 #ifdef USE_VV
1533 PurpleMediaCodecPrivate *priv; 1560 PurpleMediaCodecPrivate *priv;
1534 PurpleMediaCodec *new_codec; 1561 PurpleMediaCodec *new_codec;
1535 GList *iter; 1562 GList *iter;
1536 1563
1537 if (codec == NULL) 1564 if (codec == NULL)
1549 purple_media_codec_add_optional_parameter(new_codec, 1576 purple_media_codec_add_optional_parameter(new_codec,
1550 param->key, param->value); 1577 param->key, param->value);
1551 } 1578 }
1552 1579
1553 return new_codec; 1580 return new_codec;
1581 #else
1582 return NULL;
1583 #endif
1554 } 1584 }
1555 1585
1556 #ifdef USE_VV 1586 #ifdef USE_VV
1557 static FsCodec * 1587 static FsCodec *
1558 purple_media_codec_to_fs(const PurpleMediaCodec *codec) 1588 purple_media_codec_to_fs(const PurpleMediaCodec *codec)