pidgin.next.minor: 1ea56c28: Added the ui-caps-changed signal to the ...

[maiku at pidgin.im]

-----------------------------------------------------------------
Revision: 1ea56c28d0b05573e07d9803f36c4f7f1cfa3299
Ancestor: c0b42b07b9f76c9a26daf4f24fff5228c345a07d
Author: maiku at pidgin.im
Date: 2009-10-20T00:11:44
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/1ea56c28d0b05573e07d9803f36c4f7f1cfa3299

Modified files:
        ChangeLog.API libpurple/marshallers.list
        libpurple/mediamanager.c

ChangeLog: 

Added the ui-caps-changed signal to the media manager.

-------------- next part --------------
============================================================
--- ChangeLog.API	4aaa95cf4bc660d9618a05eaf4daf2dcd40bf4b7
+++ ChangeLog.API	689b2f89b6738a09cf65e02b68722b33a9b2756e
@@ -6,6 +6,7 @@ version 2.7.0 (??/??/????):
 		* purple_account_get_name_for_display
 		* purple_network_get_all_local_system_ips
 		* purple_uuid_random
+		* ui-caps-changed media manager signal
 	
 	Pidgin:
 		Added:
============================================================
--- libpurple/marshallers.list	8259391678ec16ae8fb47235e9a76e210d9e651b
+++ libpurple/marshallers.list	e352c4710f2a1aceebca7afd075b7cb4d4b82ca1
@@ -4,3 +4,4 @@ VOID:ENUM,STRING,STRING,BOOLEAN
 VOID:STRING,STRING,DOUBLE
 VOID:ENUM,STRING,STRING
 VOID:ENUM,STRING,STRING,BOOLEAN
+VOID:FLAGS,FLAGS
============================================================
--- libpurple/mediamanager.c	9abbe036956017732314db6b64a292a99d01d65f
+++ libpurple/mediamanager.c	67c3ee4bb556e36af74dffe13ea9803e9602d6ef
@@ -100,6 +100,7 @@ enum {
 
 enum {
 	INIT_MEDIA,
+	UI_CAPS_CHANGED,
 	LAST_SIGNAL
 };
 static guint purple_media_manager_signals[LAST_SIGNAL] = {0};
@@ -148,6 +149,15 @@ purple_media_manager_class_init (PurpleM
 		purple_smarshal_BOOLEAN__OBJECT_POINTER_STRING,
 		G_TYPE_BOOLEAN, 3, PURPLE_TYPE_MEDIA,
 		G_TYPE_POINTER, G_TYPE_STRING);
+
+	purple_media_manager_signals[UI_CAPS_CHANGED] = g_signal_new ("ui-caps-changed",
+		G_TYPE_FROM_CLASS (klass),
+		G_SIGNAL_RUN_LAST,
+		0, NULL, NULL,
+		purple_smarshal_VOID__FLAGS_FLAGS,
+		G_TYPE_NONE, 2, PURPLE_MEDIA_TYPE_CAPS,
+		PURPLE_MEDIA_TYPE_CAPS);
+
 	g_type_class_add_private(klass, sizeof(PurpleMediaManagerPrivate));
 }
 
@@ -894,8 +904,17 @@ purple_media_manager_set_ui_caps(PurpleM
 		PurpleMediaCaps caps)
 {
 #ifdef USE_VV
+	PurpleMediaCaps oldcaps;
+
 	g_return_if_fail(PURPLE_IS_MEDIA_MANAGER(manager));
+
+	oldcaps = manager->priv->ui_caps;
 	manager->priv->ui_caps = caps;
+
+	if (caps != oldcaps)
+		g_signal_emit(manager,
+				purple_media_manager_signals[UI_CAPS_CHANGED],
+				0, caps, oldcaps);
 #endif
 }