pidgin.vv: d0637728: Remove purple_media_reject.

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: d0637728c81f4df64c156e4cffb411348e3ebad9
Ancestor: 50499592af2b78408b09644bc9535f602afffec2
Author: maiku at soc.pidgin.im
Date: 2009-03-30T00:55:29
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/d0637728c81f4df64c156e4cffb411348e3ebad9

Modified files:
        finch/gntmedia.c libpurple/media.c libpurple/media.h
        pidgin/gtkmedia.c

ChangeLog: 

Remove purple_media_reject.

-------------- next part --------------
============================================================
--- finch/gntmedia.c	287496e722696b813757152e845142db0f901638
+++ finch/gntmedia.c	267d102e9e2b1055da9643481d8dca5a73d1f223
@@ -249,6 +249,13 @@ static void
 }
 
 static void
+finch_media_reject_cb(PurpleMedia *media, GntWidget *widget)
+{
+	purple_media_stream_info(media, PURPLE_MEDIA_INFO_REJECT,
+			NULL, NULL, TRUE);
+}
+
+static void
 finch_media_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
 {
 	FinchMedia *media;
@@ -266,7 +273,7 @@ finch_media_set_property (GObject *objec
 			g_signal_connect_swapped(G_OBJECT(media->priv->accept), "activate",
 				 G_CALLBACK(purple_media_accept), media->priv->media);
 			g_signal_connect_swapped(G_OBJECT(media->priv->reject), "activate",
-				 G_CALLBACK(purple_media_reject), media->priv->media);
+				 G_CALLBACK(finch_media_reject_cb), media->priv->media);
 			g_signal_connect_swapped(G_OBJECT(media->priv->hangup), "activate",
 				 G_CALLBACK(finch_media_hangup_cb), media->priv->media);
 
============================================================
--- libpurple/media.c	a1029d0dac289277acce0889864edba958913c3a
+++ libpurple/media.c	511f1f839fa89700dba2bba98336a275c4f15879
@@ -1392,15 +1392,6 @@ void
 }
 
 void
-purple_media_reject(PurpleMedia *media)
-{
-#ifdef USE_VV
-	purple_media_stream_info(media, PURPLE_MEDIA_INFO_REJECT,
-			NULL, NULL, TRUE);
-#endif
-}
-
-void
 purple_media_end(PurpleMedia *media,
 		const gchar *session_id, const gchar *participant)
 {
============================================================
--- libpurple/media.h	d2f02ce43267bcb4e172ab8256dc357a6a2f21ea
+++ libpurple/media.h	8af7944ee589d99bd409c93e9619d66a8c0d47ce
@@ -357,13 +357,6 @@ void purple_media_accept(PurpleMedia *me
 void purple_media_accept(PurpleMedia *media);
 
 /**
- * Set the media session to the rejected state.
- *
- * @param media The media object to set the state on.
- */
-void purple_media_reject(PurpleMedia *media);
-
-/**
  * Ends all streams that match the given parameters
  *
  * @param media The media object with which to end streams.
============================================================
--- pidgin/gtkmedia.c	b4d267890e89c5f26e43ba75d90a8b10b6cd11ea
+++ pidgin/gtkmedia.c	ec71bf3a3931c10c523dd782b79f9af3b6c03d23
@@ -812,6 +812,13 @@ pidgin_media_set_state(PidginMedia *gtkm
 	gtkmedia->priv->state = state;
 }
 
+static void
+pidgin_media_reject_cb(PurpleMedia *media, int index)
+{
+	purple_media_stream_info(media, PURPLE_MEDIA_INFO_REJECT,
+			NULL, NULL, TRUE);
+}
+
 static gboolean
 pidgin_media_new_cb(PurpleMediaManager *manager, PurpleMedia *media,
 		PurpleConnection *pc, gchar *screenname, gpointer nul)
@@ -833,7 +840,7 @@ pidgin_media_new_cb(PurpleMediaManager *
 		purple_request_accept_cancel(gtkmedia, "Media invitation",
 				message, NULL, PURPLE_DEFAULT_ACTION_NONE,
 				(void*)pc, screenname, NULL, media,
-				purple_media_accept, purple_media_reject);
+				purple_media_accept, pidgin_media_reject_cb);
 		g_free(message);
 	} else
 		gtk_widget_show(GTK_WIDGET(gtkmedia));