[Gaim-commits] CVS: gaim/src Makefile.am,1.234,1.235 core.c,1.91,1.92 gtkblist.c,1.416,1.417 gtkmain.c,1.73,1.74 prpl.h,1.213,1.214 server.c,1.491,1.492 gtkmedia.c,1.3,NONE gtkmedia.h,1.2,NONE media.c,1.5,NONE media.h,1.4,NONE

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21889/src

Modified Files:
	Makefile.am core.c gtkblist.c gtkmain.c prpl.h server.c 
Removed Files:
	gtkmedia.c gtkmedia.h media.c media.h 
Log Message:
Nobody minds if I revert all that mediastreamer stuff, do they?


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/src/Makefile.am,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -d -p -r1.234 -r1.235
--- Makefile.am	11 Feb 2006 05:25:47 -0000	1.234
+++ Makefile.am	16 Feb 2006 00:45:22 -0000	1.235
@@ -1,4 +1,3 @@
-EXTRA_DIST = \
 		dbus-analyze-functions.py \
 		dbus-analyze-types.py \
 		gaim-notifications-example.py \
@@ -60,11 +59,7 @@ EXTRA_DIST = \
 		win32/nsis/translations/trad-chinese.nsh \
 		win32/nsis/translations/vietnamese.nsh
 
-if HAVE_VV
-SUBDIRS = protocols mediastreamer 
-else
 SUBDIRS = protocols
-endif
 
 gaim_coresources = \
 	account.c \
@@ -84,7 +79,6 @@ gaim_coresources = \
 	idle.c \
 	imgstore.c \
 	log.c \
-	media.c \
 	mime.c \
 	network.c \
 	ntlm.c \
@@ -133,7 +127,6 @@ gaim_coreheaders = \
 	idle.h \
 	imgstore.h \
 	log.h \
-	media.h \
 	mime.h \
 	network.h \
 	notify.h \
@@ -276,7 +269,6 @@ gaim_SOURCES = \
 	gtkimhtmltoolbar.c \
 	gtklog.c \
 	gtkmain.c \
-	gtkmedia.c \
 	gtkmenutray.c \
 	gtknotify.c \
 	gtkplugin.c \
@@ -322,7 +314,6 @@ gaim_headers = \
 	gtkimhtml.h \
 	gtkimhtmltoolbar.h \
 	gtklog.h \
-	gtkmedia.h \
 	gtkmenutray.h \
 	gtknickcolors.h \
 	gtknotify.h \
@@ -351,10 +342,6 @@ gaiminclude_HEADERS = \
 	$(gaim_coreheaders) \
 	$(gaim_headers)
 
-if HAVE_VV
-MS_LIBS=$(top_srcdir)/src/mediastreamer/libmediastreamer.la
-MS_INCLUDES=-I$(top_srcdir)/src/mediastreamer
-endif
 
 gaim_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS) $(MS_LIBS)
 gaim_LDFLAGS = -export-dynamic
@@ -368,9 +355,7 @@ gaim_LDADD = \
 	$(SM_LIBS) \
 	$(INTLLIBS) \
 	$(GTKSPELL_LIBS) \
-	$(STARTUP_NOTIFICATION_LIBS) \
-	$(VV_LIBS) \
-	$(MS_LIBS)
+	$(STARTUP_NOTIFICATION_LIBS) 
 
 AM_CPPFLAGS = \
 	-DBR_PTHREADS=0 \
@@ -379,8 +364,6 @@ AM_CPPFLAGS = \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-I$(top_srcdir)/plugins \
-	$(MS_INCLUDES) \
-	$(VV_CFLAGS) \
 	$(AUDIOFILE_CFLAGS) \
 	$(AO_CFLAGS) \
 	$(DEBUG_CFLAGS) \

Index: core.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/core.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -p -r1.91 -r1.92
--- core.c	8 Feb 2006 15:07:54 -0000	1.91
+++ core.c	16 Feb 2006 00:45:22 -0000	1.92
@@ -119,9 +119,6 @@ gaim_core_init(const char *ui)
 	gaim_blist_init();
 	gaim_log_init();
 	gaim_buddy_icons_init();
-#ifdef HAVE_VV
-	gaim_media_init();
-#endif
 	gaim_network_init();
 	gaim_privacy_init();
 	gaim_pounces_init();

Index: gtkblist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkblist.c,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -d -p -r1.416 -r1.417
--- gtkblist.c	11 Feb 2006 05:17:40 -0000	1.416
+++ gtkblist.c	16 Feb 2006 00:45:22 -0000	1.417
@@ -259,11 +259,6 @@ static void gtk_blist_menu_send_file_cb(
 	serv_send_file(b->account->gc, b->name, NULL);
 }
 
-static void gtk_blist_menu_voice_chat_cb(GtkWidget *w, GaimBuddy *b)
-{
-	serv_voice_chat(b->account->gc, b->name);
-}
-
 static void gtk_blist_menu_autojoin_cb(GtkWidget *w, GaimChat *chat)
 {
 	gaim_blist_node_set_bool((GaimBlistNode*)chat, "gtk-autojoin",
@@ -967,13 +962,6 @@ gaim_gtk_blist_make_buddy_menu(GtkWidget
 		}
 	}
 
-	if (prpl_info && prpl_info->media_prpl_ops && prpl_info->media_prpl_ops->call) {
-		gaim_new_item_from_stock(menu, _("Start _Voice Chat"),
-					 GAIM_STOCK_VOICE_CHAT,
-					 G_CALLBACK(gtk_blist_menu_voice_chat_cb),
-					 buddy, 0, 0, NULL);
-	}
-
 	gaim_new_item_from_stock(menu, _("Add Buddy _Pounce"), GAIM_STOCK_POUNCE,
 			G_CALLBACK(gtk_blist_menu_bp_cb), buddy, 0, 0, NULL);
 

Index: gtkmain.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkmain.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -p -r1.73 -r1.74
--- gtkmain.c	12 Feb 2006 16:30:57 -0000	1.73
+++ gtkmain.c	16 Feb 2006 00:45:22 -0000	1.74
@@ -48,7 +48,6 @@
 #include "gtkdialogs.h"
 #include "gtkeventloop.h"
 #include "gtkft.h"
-#include "gtkmedia.h"
 #include "gtkidle.h"
 #include "gtklog.h"
 #include "gtknotify.h"
@@ -260,9 +259,6 @@ gaim_gtk_ui_init(void)
 	gaim_gtk_xfers_init();
 	gaim_gtk_roomlist_init();
 	gaim_gtk_log_init();
-#ifdef HAVE_VV
-	gaim_gtk_media_init();
-#endif
 }
 
 static void

Index: prpl.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.h,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -d -p -r1.213 -r1.214
--- prpl.h	2 Feb 2006 21:34:39 -0000	1.213
+++ prpl.h	16 Feb 2006 00:45:22 -0000	1.214
@@ -68,7 +68,6 @@ typedef struct {
 #include "ft.h"
 #include "proxy.h"
 #include "plugin.h"
-#include "media.h"
 #include "roomlist.h"
 #include "status.h"
 #include "whiteboard.h"
@@ -299,7 +298,6 @@ struct _GaimPluginProtocolInfo
  	gboolean (*offline_message)(const GaimBuddy *buddy);
 
 	GaimWhiteboardPrplOps *whiteboard_prpl_ops;
-	GaimMediaPrplOps *media_prpl_ops;
 };
 
 #define GAIM_IS_PROTOCOL_PLUGIN(plugin) \

Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.491
retrieving revision 1.492
diff -u -d -p -r1.491 -r1.492
--- server.c	21 Jan 2006 22:33:12 -0000	1.491
+++ server.c	16 Feb 2006 00:45:22 -0000	1.492
@@ -825,14 +825,3 @@ void serv_send_file(GaimConnection *gc, 
 		}
 	}
 }
-
-void serv_voice_chat(GaimConnection *gc, const char *who)
-{
-	GaimPluginProtocolInfo *prpl_info = NULL;
-
-	if (gc != NULL && gc->prpl != NULL)
-		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
-	
-	if (prpl_info && prpl_info->media_prpl_ops && prpl_info->media_prpl_ops->call) 
-		prpl_info->media_prpl_ops->call(gc, who);
-}

--- gtkmedia.c DELETED ---

--- gtkmedia.h DELETED ---

--- media.c DELETED ---

--- media.h DELETED ---