pidgin.yaz: plugins/musicmessaging/musicmessaging.c comparison

comparison plugins/musicmessaging/musicmessaging.c @ 11362:6ef19bbfb7cb

[gaim-migrate @ 13586] Fixed up the gaim communication logic. committer: Tailor Script <tailor@pidgin.im>

author	Christian Muise <christian.muise@gmail.com>
date	Mon, 29 Aug 2005 12:09:29 +0000
parents	6903f2f6d61f
children	817e52833803

comparison

equal deleted inserted replaced

-:e4868370c433
+:6ef19bbfb7cb
 #include "dbus-bindings.h"
 #include "dbus-server.h"
 #define MUSICMESSAGING_PLUGIN_ID "gtk-hazure-musicmessaging"
 #define MUSICMESSAGING_PREFIX "##MM##"
-#define MUSICMESSAGING_START_TAG "<a href=mm-plugin>"
+#define MUSICMESSAGING_START_MSG "A music messaging session has been requested. Please click the MM icon to accept."
+#define MUSICMESSAGING_CONFIRM_MSG "Music messaging session confirmed."
 /* Globals */
 /* List of sessions */
 GList *conversations;
 static void kill_editor(MMConversation *mmconv);
 static void add_button (MMConversation *mmconv);
 static void remove_widget (GtkWidget *button);
 static void init_conversation (GaimConversation *conv);
 static void conv_destroyed(GaimConversation *conv);
-static void intercept_sent(GaimAccount *account, GaimConversation *conv, char **message, void* pData);
+static gboolean intercept_sent(GaimAccount *account, GaimConversation *conv, char **message, void* pData);
-static void intercept_received(GaimAccount *account, char **sender, char **message, GaimConversation *conv, int *flags);
+static gboolean intercept_received(GaimAccount *account, char **sender, char **message, GaimConversation *conv, int *flags);
 /* DBus commands that can be sent to the editor */
 G_BEGIN_DECLS
 DBusConnection *gaim_dbus_get_connection(void);
 G_END_DECLS
 void send_change_request (const char *id, const char *command, const char *parameters)
 {
-	DBusMessage *signal;
+	DBusMessage *method_call;
-	signal = dbus_message_new_signal("/org/gscore/GScoreObject", "org.gscore.GScoreInterface", "gscore_change_request");
+	method_call = dbus_message_new_method_call(NULL, "/org/gscore/GScoreObject", "org.gscore.GScoreInterface", "gscore_change_request");
-	dbus_message_append_args(signal,
+	dbus_message_append_args(method_call,
 			DBUS_TYPE_STRING, &id,
 			DBUS_TYPE_STRING, &command,
 			DBUS_TYPE_STRING, &parameters,
 			DBUS_TYPE_INVALID);
-	dbus_connection_send(gaim_dbus_get_connection(), signal, NULL);
+	dbus_connection_send(gaim_dbus_get_connection(), method_call, NULL);
-	dbus_message_unref(signal);
+	dbus_message_unref(method_call);
 }
 void send_change_confirmed (const char *command, const char *parameters)
 {
-	DBusMessage *signal;
+	DBusMessage *method_call;
-	signal = dbus_message_new_signal("/org/gscore/GScoreObject", "org.gscore.GScoreInterface", "gscore_change_confirmed");
+	method_call = dbus_message_new_method_call(NULL, "/org/gscore/GScoreObject", "org.gscore.GScoreInterface", "gscore_change_confirmed");
-	dbus_message_append_args(signal,
+	dbus_message_append_args(method_call,
 			DBUS_TYPE_STRING, &command,
 			DBUS_TYPE_STRING, &parameters,
 			DBUS_TYPE_INVALID);
-	dbus_connection_send(gaim_dbus_get_connection(), signal, NULL);
+	dbus_connection_send(gaim_dbus_get_connection(), method_call, NULL);
-	dbus_message_unref(signal);
+	dbus_message_unref(method_call);
 }
+static MMConversation*
+mmconv_from_conv(GaimConversation *conv)
+{
+	MMConversation *mmconv_current = NULL;
+	guint i;
+	for (i = 0; i < g_list_length(conversations); i++)
+	{
+		mmconv_current = (MMConversation *)g_list_nth_data(conversations, i);
+		if (conv == mmconv_current->conv)
+		{
+			return mmconv_current;
+		}
+	}
+	return NULL;
+}
 static gboolean
 plugin_load(GaimPlugin *plugin) {
 /* First, we have to register our four exported functions with the
 main gaim dbus loop.  Without this statement, the gaim dbus
 		conv_destroyed(mmconv->conv);
 	}
 	return TRUE;
 }
-static void intercept_sent(GaimAccount *account, GaimConversation *conv, char **message, void* pData)
-{
-	GaimConvIm *imData = gaim_conversation_get_im_data(conv);
+static gboolean
+intercept_sent(GaimAccount *account, GaimConversation *conv, char **message, void* pData)
+{
 	GaimConnection *connection = gaim_conversation_get_gc(conv);
 	const char *convName = gaim_conversation_get_name(conv);
-	/* const char *who = gaim_account_get_username(account); */
 	if (0 == strncmp(*message, MUSICMESSAGING_PREFIX, strlen(MUSICMESSAGING_PREFIX)))
 	{
+		gaim_debug_misc("gaim-musicmessaging", "Sent MM Message: %s\n", *message);
+		serv_send_im(connection, convName, *message, GAIM_MESSAGE_SEND);
 		message = 0;
-		gaim_debug(GAIM_DEBUG_MISC, "gaim-musicmessaging", "Received MM Message\n");
+	}
-	}
+	else if (0 == strncmp(*message, MUSICMESSAGING_START_MSG, strlen(MUSICMESSAGING_START_MSG)))
-	else if (0 == strncmp(*message, MUSICMESSAGING_START_TAG, strlen(MUSICMESSAGING_START_TAG)))
+	{
-	{
+		gaim_debug_misc("gaim-musicmessaging", "Sent MM request.\n");
+		serv_send_im(connection, convName, *message, GAIM_MESSAGE_SEND);
+		message = 0;
+	}
+	else if (0 == strncmp(*message, MUSICMESSAGING_CONFIRM_MSG, strlen(MUSICMESSAGING_CONFIRM_MSG)))
+	{
+		gaim_debug_misc("gaim-musicmessagin", "Sent MM confirm.\n");
+		serv_send_im(connection, convName, *message, GAIM_MESSAGE_SEND);
+		message = 0;
+	}
+	else
+	{
+		return FALSE;
+		/* Do nothing...procceed as normal */
+	}
+	return TRUE;
+}
+static gboolean
+intercept_received(GaimAccount *account, char **sender, char **message, GaimConversation *conv, int *flags)
+{
+	MMConversation *mmconv = mmconv_from_conv(conv);
+	gaim_debug_misc("gaim-musicmessaging", "Intercepted: %s\n", *message);
+	if (strstr(*message, MUSICMESSAGING_PREFIX))
+	{
+		gaim_debug_misc("gaim-musicmessaging", "Received MM Message: %s\n",
+					strtok(strstr(*message, MUSICMESSAGING_PREFIX), "<"));
+		/* DEAL WITH A MM MESSAGE */
+		message = 0;
+	}
+	else if (strstr(*message, MUSICMESSAGING_START_MSG))
+	{
+		message = 0;
+		gaim_debug_misc("gaim-musicmessaging", "Received MM request.\n");
+		if (!(mmconv->originator))
+		{
+			mmconv->requested = TRUE;
+			return FALSE;
+		}
+	}
+	else if (strstr(*message, MUSICMESSAGING_CONFIRM_MSG))
+	{
+		message = 0;
+		gaim_debug_misc("gaim-musicmessagin", "Received MM confirm.\n");
+		if (mmconv->originator)
+		{
+			start_session(mmconv);
+		}
 	}
 	else
 	{
-		serv_send_im(connection, convName, *message, GAIM_MESSAGE_SEND);
+		return FALSE;
-		gaim_conv_im_write (imData, NULL, *message, GAIM_MESSAGE_SEND, time(NULL));
+		/* Do nothing. */
 	}
-}
+	return TRUE;
+}
-static void intercept_received(GaimAccount *account, char **sender, char **message, GaimConversation *conv, int *flags)
-{
+static void send_request(MMConversation *mmconv)
+{
-}
+	GaimConnection *connection = gaim_conversation_get_gc(mmconv->conv);
+	const char *convName = gaim_conversation_get_name(mmconv->conv);
+	serv_send_im(connection, convName, MUSICMESSAGING_START_MSG, GAIM_MESSAGE_SEND);
+}
+static void send_request_confirmed(MMConversation *mmconv)
+{
+	GaimConnection *connection = gaim_conversation_get_gc(mmconv->conv);
+	const char *convName = gaim_conversation_get_name(mmconv->conv);
+	serv_send_im(connection, convName, MUSICMESSAGING_CONFIRM_MSG, GAIM_MESSAGE_SEND);
+}
 static gboolean
 start_session(MMConversation *mmconv)
 {
-	if (!mmconv->requested)
-	{
-		mmconv->originator = TRUE;
-	}
 	run_editor(mmconv);
 	return TRUE;
 }
 static void music_button_toggled (GtkWidget *widget, gpointer data)
 {
 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
 {
-		start_session((MMConversation *) data);
+		if (((MMConversation *) data)->requested)
+		{
+			start_session((MMConversation *) data);
+			send_request_confirmed((MMConversation *) data);
+		}
+		else
+		{
+			((MMConversation *) data)->originator = TRUE;
+			send_request((MMConversation *) data);
+		}
 } else {
 ((MMConversation *)data)->started = FALSE;
+		((MMConversation *)data)->originator = FALSE;
+		((MMConversation *)data)->requested = FALSE;
 		kill_editor((MMConversation *) data);
 }
 }
 static void set_editor_path (GtkWidget *button, GtkWidget *text_field)
 	conversations = g_list_append(conversations, mmconv);
 }
 static void conv_destroyed (GaimConversation *conv)
 {
-	MMConversation *mmconv_current = NULL;
+	MMConversation *mmconv = mmconv_from_conv(conv);
-	MMConversation *mmconv = NULL;
-	guint i;
-	for (i = 0; i < g_list_length(conversations); i++)
-	{
-		mmconv_current = (MMConversation *)g_list_nth_data(conversations, i);
-		if (conv == mmconv_current->conv)
-		{
-			mmconv = mmconv_current;
-		}
-	}
 	remove_widget(mmconv->button);
 	remove_widget(mmconv->seperator);
 	if (mmconv->started)
 	{

Mercurial > pidgin.yaz

comparison plugins/musicmessaging/musicmessaging.c @ 11362:6ef19bbfb7cb