Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/EionRobb/skype4pidgin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEion Robb <eion@robbmob.com>2011-11-29 08:08:14 +0400
committerEion Robb <eion@robbmob.com>2011-11-29 08:08:14 +0400
commit01546e9ff712bb4b76ba4d8229cbb44dbde9eb90 (patch)
tree7cd618b0d91fe97da99bdeab62091c60ac60c340 /libskype.c
parent8a3d5b7b0ec8d479e16e23cc3926b787efb13f28 (diff)
Instantbird also is missing media*.h from libpurple
Diffstat (limited to 'libskype.c')
-rw-r--r--libskype.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/libskype.c b/libskype.c
index 238a5e7..522e7e5 100644
--- a/libskype.c
+++ b/libskype.c
@@ -74,8 +74,7 @@
#include <cmds.h>
#include <status.h>
-//#ifdef USE_VV
-#if 1
+#ifndef INSTANTBIRD
#include <mediamanager.h>
gboolean skype_media_initiate(PurpleAccount *account, const char *who, PurpleMediaSessionType type);
PurpleMediaCaps skype_get_media_caps(PurpleAccount *account, const char *who);
@@ -336,10 +335,12 @@ PurplePluginProtocolInfo prpl_info = {
#endif
sizeof(PurplePluginProtocolInfo), /* struct_size */
NULL, /* get_account_text_table */
-//#ifdef USE_VV
-#if 1
+#ifndef INSTANTBIRD
skype_media_initiate,/* initiate_media */
skype_get_media_caps,/* can_do_media */
+#else
+ NULL, /* initiate_media */
+ NULL, /* can_do_media */
#endif
NULL, /* get_moods */
skype_set_public_alias, /* set_public_alias */
@@ -621,8 +622,7 @@ skype_node_menu(PurpleBlistNode *node)
NULL, NULL);
m = g_list_append(m, act);
#endif
-//#ifndef USE_VV
-#if 1
+#ifndef INSTANTBIRD
if (!purple_media_manager_get())
{
gint call_id = 0, i, j;
@@ -1834,8 +1834,7 @@ skype_close(PurpleConnection *gc)
g_hash_table_destroy(sms_convo_link_table);
sms_convo_link_table = NULL;
-//#ifdef USE_VV
-#if 1
+#ifndef INSTANTBIRD
g_hash_table_destroy(call_media_hash);
call_media_hash = NULL;
#endif
@@ -3319,8 +3318,7 @@ skype_uri_handler(const char *proto, const char *cmd, GHashTable *params)
return FALSE;
}
-//#ifdef USE_VV
-#if 1
+#ifndef INSTANTBIRD
/*
Skype info from developer.skype.com and forum.skype.com:
Audio: