summaryrefslogtreecommitdiff
path: root/finch
diff options
context:
space:
mode:
authorElliott Sales de Andrade <quantum.analyst@gmail.com>2022-08-12 01:32:07 -0500
committerElliott Sales de Andrade <quantum.analyst@gmail.com>2022-08-12 01:32:07 -0500
commit8d9e05e24412b2d86eb92a6f633eac7a83674b14 (patch)
tree93edba847959e6e96938d9954115e7238dac13ac /finch
parent93ad3516ed5a302a4574e22f03ae917ca6bb3227 (diff)
downloadpidgin-8d9e05e24412b2d86eb92a6f633eac7a83674b14.tar.gz
Make VV libraries required
Testing Done: Compiled, opened Prefs, enabled VV test pipelines and ensured they disabled when switching tabs. Reviewed at https://reviews.imfreedom.org/r/1583/
Diffstat (limited to 'finch')
-rw-r--r--finch/gntmedia.c9
-rw-r--r--finch/gntui.c2
2 files changed, 0 insertions, 11 deletions
diff --git a/finch/gntmedia.c b/finch/gntmedia.c
index c47aa4f9c8..e396f618e5 100644
--- a/finch/gntmedia.c
+++ b/finch/gntmedia.c
@@ -33,7 +33,6 @@
#include "libfinch.h"
/* An incredibly large part of the following is from gtkmedia.c */
-#ifdef USE_VV
#undef hangup
@@ -372,11 +371,8 @@ call_cmd_cb(PurpleConversation *conv, const char *cmd, char **args,
return PURPLE_CMD_RET_OK;
}
-#endif /* USE_VV */
-
void finch_media_manager_init(void)
{
-#ifdef USE_VV
PurpleMediaManager *manager = purple_media_manager_get();
PurpleMediaElementInfo *audio_src = NULL;
PurpleMediaElementInfo *audio_sink = NULL;
@@ -418,16 +414,11 @@ void finch_media_manager_init(void)
purple_debug_info("gntmedia", "Registering media element types\n");
purple_media_manager_set_active_element(manager, audio_src);
purple_media_manager_set_active_element(manager, audio_sink);
-#endif
}
void finch_media_manager_uninit(void)
{
-#ifdef USE_VV
PurpleMediaManager *manager = purple_media_manager_get();
g_signal_handlers_disconnect_by_func(G_OBJECT(manager),
G_CALLBACK(finch_new_media), NULL);
-#endif
}
-
-
diff --git a/finch/gntui.c b/finch/gntui.c
index db67af1129..11ee3752b6 100644
--- a/finch/gntui.c
+++ b/finch/gntui.c
@@ -168,9 +168,7 @@ void finch_ui_uninit()
finch_roomlist_uninit();
purple_roomlist_set_ui_ops(NULL);
-#ifdef USE_VV
finch_media_manager_uninit();
-#endif
gnt_quit();