pidgin.vv: 13d49ead: Close the request dialog if the remote u...

maiku at soc.pidgin.im maiku at soc.pidgin.im
Thu Feb 5 03:55:30 EST 2009


-----------------------------------------------------------------
Revision: 13d49eadcf3b223135157fd3f1ca6fbd73c2cffe
Ancestor: 9962864c0254599a3f1180147855542d12036a47
Author: maiku at soc.pidgin.im
Date: 2009-02-05T08:46:05
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/13d49eadcf3b223135157fd3f1ca6fbd73c2cffe

Modified files:
        pidgin/gtkmedia.c

ChangeLog: 

Close the request dialog if the remote user hung up.

-------------- next part --------------
============================================================
--- pidgin/gtkmedia.c	32e1601e4f3381db76ba92ad46d8885102fa97ba
+++ pidgin/gtkmedia.c	8f529e50941c8d098859759ffe8635d052d28705
@@ -370,6 +370,7 @@ pidgin_media_dispose(GObject *media)
 	purple_debug_info("gtkmedia", "pidgin_media_dispose\n");
 
 	if (gtkmedia->priv->media) {
+		purple_request_close_with_handle(gtkmedia);
 		purple_media_remove_output_windows(gtkmedia->priv->media);
 		pidgin_media_disconnect_levels(gtkmedia->priv->media, gtkmedia);
 		g_object_unref(gtkmedia->priv->media);
@@ -785,7 +786,7 @@ pidgin_media_new_cb(PurpleMediaManager *
 	if (initiator == FALSE) {
 		gchar *message = g_strdup_printf("%s wishes to start a "
 				"media session with you\n", alias);
-		purple_request_accept_cancel(media, "Media invitation",
+		purple_request_accept_cancel(gtkmedia, "Media invitation",
 				message, NULL, 1, (void*)pc, screenname,
 				NULL, media, purple_media_accept,
 				purple_media_reject);


More information about the Commits mailing list