changeset 12645:fc28451f5d96

[gaim-migrate @ 14983] SF Patch #1314512 from Sadrul (who has a patch for everything) "This patch introduces a flag for protocol plugins that support offline messages (like Y!M and ICQ). This was encouraged by the following conversation: <sadrul> should offline buddies be listed/enabled in the send-to menu? <rekkanoryo> i would think only for protocols that support offline messaging, if it's indicated that the buddy is offline -- <snip> -- <Bleeter> sadrul: personally, I'd like to see a 'supports offline' flag of some description <Bleeter> one could then redirect (via plugins) through email or alternative methods <Bleeter> just a thought <Paco-Paco> yeah, that sounds like a reasonble thing to have This patch uses this flag to disable the buddies in the send-to menu who are offline and the protocol doesn't support offline messages." I made this make the label insensitive instead of the whole menuitem. This should address SimGuy's concerns about inconsistency (i.e. you could create a conversation with someone via the buddy list that you couldn't create via the Send To menu). I also hacked up some voodoo to show the label as sensitive when moused-over, as that looks better (given the label-insensitive thing is itself a hack). I think this works quite well. BUG NOTE: This makes more obvious an existing bug. The Send To menu isn't updated when buddies sign on or off or change status (at least under some circumstances). We need to fix that anyway, so I'm not going to let it hold up this commit. Switching tabs will clear it up. I'm thinking we just might want to build the contents of that menu when it is selected. That would save us a mess of inefficient signal callbacks that update the Send To menus in open windows all the time. AIM NOTE: This assumes that AIM can't offline message. That's not strictly true. You can message invisible users on AIM. However, by design, we can't tell when a user is invisible without resorting to dirty hackery. In practice, this isn't a problem, as you can still select the AIM user from the menu. And really, how often will you be choosing the Invisible contact, rather than the user going Invisible in the middle of a conversation or IMing you while they're Invisible? JABBER NOTE: This assumes that Jabber can always offline message. This isn't strictly true. Sadrul said: I have updated Jabber according to this link which seems to talk about how to determine the existence offline-message support in a server: http://www.jabber.org/jeps/jep-0013.html#discover However, jabber.org doesn't seem to send the required info. So I am not sure about it. He later said: I talked to Nathan and he said offline message support is mostly assumed for most jabber servers. GTalk doesn't yet support it, but they are working on it. So I have made jabber to always return TRUE. If there is truly no way to detect offline messaging capability, then this is an acceptable solution. We could special case Google Talk because of its popularity, and remove that later. It's probably not worth it though. MSN NOTE: This assumes that MSN can never offline message. That's effectively true, but to be technically correct, MSN can offline message if there's already a switchboard conversation open with a user. We could write an offline_message function in the MSN prpl to detect that, but it'd be of limited usefulness, especially given that under most circumstances (where this might matter), the switchboard connection will be closed almost immediately. CVS NOTE: I'm writing to share a tragic little story. I have a PC that I use for Gaim development. One day, I was writing a commit message on it, when all of a suddent it went berserk. The screen started flashing, and the whole commit message just disappeared. All of it. And it was a good commit message! I had to cram and rewrite it really quickly. Needless to say, my rushed commit message wasn't nearly as good, and I blame the PC for that. Seriously, though, what kind of version control system loses your commit message on a broken connection to the server? Stupid! committer: Tailor Script <[e-mail]>

--- a/plugins/ChangeLog.API	Fri Dec 23 18:36:29 2005 +0000
+++ b/plugins/ChangeLog.API	Fri Dec 23 19:26:04 2005 +0000
@@ -81,6 +81,9 @@
 	* conversation-switched: This signal has been moved from conversation to
 	                         the UI and the signal-handlers only receive the
 	                         conversation that has been switched to.
+	* GaimPluginProtocolInfo: Added offline_message
+	* GaimPluginProtocolInfo: Added whiteboard_prpl_ops
+	* GaimPluginProtocolInfo: Added media_prpl_ops
 
 	Removed:
 	* gaim_gtk_sound_{get,set}_mute() (replaced by the /gaim/gtk/sound/mute
@@ -158,6 +161,7 @@
 	* gaim_account_remove_buddy()
 	* gaim_account_remove_buddies()
 	* gaim_account_change_password()
+	* gaim_account_supports_offline_message()
 	* gaim_conversation_close_logs(), to force a conversation's log(s) to
 	  be closed.  New logs will be opened as necessary.
 	* gaim_plugin_get_id()

--- a/src/account.c	Fri Dec 23 18:36:29 2005 +0000
+++ b/src/account.c	Fri Dec 23 19:26:04 2005 +0000
@@ -2065,6 +2065,25 @@
 		prpl_info->change_passwd(gc, orig_pw, new_pw);
 }
 
+gboolean gaim_account_supports_offline_message(GaimAccount *account, GaimBuddy *buddy)
+{
+	GaimConnection *gc;
+	GaimPluginProtocolInfo *prpl_info;
+
+	g_return_val_if_fail(account, FALSE);
+	g_return_val_if_fail(buddy, FALSE);
+
+	gc = gaim_account_get_connection(account);
+	if (gc == NULL)
+		return FALSE;
+	
+	prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
+
+	if (!prpl_info || !prpl_info->offline_message)
+		return FALSE;
+	return prpl_info->offline_message(buddy);
+}
+
 void
 gaim_accounts_add(GaimAccount *account)
 {

--- a/src/account.h	Fri Dec 23 18:36:29 2005 +0000
+++ b/src/account.h	Fri Dec 23 19:26:04 2005 +0000
@@ -777,6 +777,14 @@
 void gaim_account_change_password(GaimAccount *account, const char *orig_pw,
 									const char *new_pw);
 
+/**
+ * Whether the account supports sending offline messages to buddy.
+ *
+ * @param account The account
+ * @param buddy   The buddy
+ */
+gboolean gaim_account_supports_offline_message(GaimAccount *account, GaimBuddy *buddy);
+
 /*@}*/
 
 /**************************************************************************/

--- a/src/gtkconv.c	Fri Dec 23 18:36:29 2005 +0000
+++ b/src/gtkconv.c	Fri Dec 23 19:26:04 2005 +0000
@@ -2877,6 +2877,20 @@
 	return FALSE;
 }
 
+static gboolean
+send_to_item_enter_notify_cb(GtkWidget *menuitem, GdkEventCrossing *event, GtkWidget *label)
+{
+	gtk_widget_set_sensitive(GTK_WIDGET(label), TRUE);
+	return FALSE;
+}
+
+static gboolean
+send_to_item_leave_notify_cb(GtkWidget *menuitem, GdkEventCrossing *event, GtkWidget *label)
+{
+	gtk_widget_set_sensitive(GTK_WIDGET(label), FALSE);
+	return FALSE;
+}
+
 static void
 create_sendto_item(GtkWidget *menu, GtkSizeGroup *sg, GSList **group, GaimBuddy *buddy, GaimAccount *account, const char *name)
 {
@@ -2926,6 +2940,22 @@
 	gtk_box_pack_start(GTK_BOX(box), image, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(box), label, TRUE, TRUE, 4);
 
+	if (buddy != NULL &&
+	    !gaim_presence_is_online(gaim_buddy_get_presence(buddy)) &&
+	    !gaim_account_supports_offline_message(account, buddy))
+	{
+		gtk_widget_set_sensitive(label, FALSE);
+
+		/* Set the label sensitive when the menuitem is highlighted and
+		 * insensitive again when the mouse leaves it. This way, it
+		 * doesn't appear weird from the highlighting of the embossed
+		 * (insensitive style) text.*/
+		g_signal_connect(menuitem, "enter-notify-event",
+				 G_CALLBACK(send_to_item_enter_notify_cb), label);
+		g_signal_connect(menuitem, "leave-notify-event",
+				 G_CALLBACK(send_to_item_leave_notify_cb), label);
+	}
+
 	g_object_unref(label);
 
 	gtk_container_add(GTK_CONTAINER(menuitem), box);

--- a/src/protocols/gg/gg.c	Fri Dec 23 18:36:29 2005 +0000
+++ b/src/protocols/gg/gg.c	Fri Dec 23 19:26:04 2005 +0000
@@ -1921,6 +1921,7 @@
 	NULL,				/* can_receive_file */
 	NULL,				/* send_file */
 	NULL,				/* new_xfer */
+	NULL,				/* offline_message */
 	NULL,				/* whiteboard_prpl_ops */
 	NULL,				/* media_prpl_ops */
 };

--- a/src/protocols/irc/irc.c	Fri Dec 23 18:36:29 2005 +0000
+++ b/src/protocols/irc/irc.c	Fri Dec 23 19:26:04 2005 +0000
@@ -776,6 +776,7 @@
 	NULL,					/* can_receive_file */
 	irc_dccsend_send_file,	/* send_file */
 	irc_dccsend_new_xfer,	/* new_xfer */
+	NULL,					/* offline_message */
 	NULL,					/* whiteboard_prpl_ops */
 	NULL,					/* media_prpl_ops */
 };

--- a/src/protocols/jabber/jabber.c	Fri Dec 23 18:36:29 2005 +0000
+++ b/src/protocols/jabber/jabber.c	Fri Dec 23 19:26:04 2005 +0000
@@ -1605,6 +1605,11 @@
 	return GAIM_CMD_RET_OK;
 }
 
+static gboolean jabber_offline_message(GaimBuddy *buddy)
+{
+	return TRUE;
+}
+
 static void jabber_register_commands(void)
 {
 	gaim_cmd_register("config", "", GAIM_CMD_P_PRPL,
@@ -1733,6 +1738,7 @@
 	NULL,							/* can_receive_file */
 	jabber_si_xfer_send,			/* send_file */
 	jabber_si_new_xfer,				/* new_xfer */
+	jabber_offline_message,			/* offline_message */
 	NULL,							/* whiteboard_prpl_ops */
 	NULL,							/* media_prpl_ops */
 };

--- a/src/protocols/msn/msn.c	Fri Dec 23 18:36:29 2005 +0000
+++ b/src/protocols/msn/msn.c	Fri Dec 23 19:26:04 2005 +0000
@@ -1897,6 +1897,7 @@
 	msn_can_receive_file,	/* can_receive_file */
 	msn_send_file,			/* send_file */
 	msn_new_xfer,			/* new_xfer */
+	NULL,					/* offline_message */
 	NULL,					/* whiteboard_prpl_ops */
 	NULL,					/* media_prpl_ops */
 };

--- a/src/protocols/novell/novell.c	Fri Dec 23 18:36:29 2005 +0000
+++ b/src/protocols/novell/novell.c	Fri Dec 23 19:26:04 2005 +0000
@@ -3525,6 +3525,7 @@
 	NULL,						/* can_receive_file */
 	NULL,						/* send_file */
 	NULL,						/* new_xfer */
+	NULL,						/* offline_message */
 	NULL,						/* whiteboard_prpl_ops */
 	NULL,						/* media_prpl_ops */
 };

--- a/src/protocols/oscar/oscar.c	Fri Dec 23 18:36:29 2005 +0000
+++ b/src/protocols/oscar/oscar.c	Fri Dec 23 19:26:04 2005 +0000
@@ -8488,6 +8488,26 @@
 	return buf;
 }
 
+static gboolean oscar_offline_message(const GaimBuddy *buddy)
+{
+	OscarData *od;
+	GaimAccount *account;
+	GaimConnection *gc;
+
+	g_return_val_if_fail(buddy, FALSE);
+
+	account = gaim_buddy_get_account(buddy);
+	g_return_val_if_fail(account != NULL, FALSE);
+
+	gc = gaim_account_get_connection(account);
+	g_return_val_if_fail(gc != NULL, FALSE);
+
+	od = (OscarData *)gc->proto_data;
+	g_return_val_if_fail(od != NULL, FALSE);
+
+	return (od->icq && aim_sn_is_icq(gaim_account_get_username(account)));
+}
+
 static GaimPluginProtocolInfo prpl_info =
 {
 	OPT_PROTO_MAIL_CHECK | OPT_PROTO_IM_IMAGE,
@@ -8549,6 +8569,7 @@
 	oscar_can_receive_file,	/* can_receive_file */
 	oscar_send_file,		/* send_file */
 	oscar_new_xfer,			/* new_xfer */
+	oscar_offline_message,	/* offline_message */
 	NULL,					/* whiteboard_prpl_ops */
 	NULL,					/* media_prpl_ops */
 };

--- a/src/protocols/silc/silc.c	Fri Dec 23 18:36:29 2005 +0000
+++ b/src/protocols/silc/silc.c	Fri Dec 23 19:26:04 2005 +0000
@@ -1779,6 +1779,7 @@
 	NULL,						/* can_receive_file */
 	silcgaim_ftp_send_file,		/* send_file */
 	silcgaim_ftp_new_xfer,		/* new_xfer */
+	NULL,						/* offline_message */
 	&silcgaim_wb_ops,			/* whiteboard_prpl_ops */
 	NULL,						/* media_prpl_ops */
 };

--- a/src/protocols/simple/simple.c	Fri Dec 23 18:36:29 2005 +0000
+++ b/src/protocols/simple/simple.c	Fri Dec 23 19:26:04 2005 +0000
@@ -1415,6 +1415,7 @@
 	NULL,					/* can_receive_file */
 	NULL,					/* send_file */
 	NULL,					/* new_xfer */
+	NULL,					/* offline_message */
 	NULL,					/* whiteboard_prpl_ops */
 	NULL,					/* media_prpl_ops */
 };

--- a/src/protocols/yahoo/yahoo.c	Fri Dec 23 18:36:29 2005 +0000
+++ b/src/protocols/yahoo/yahoo.c	Fri Dec 23 19:26:04 2005 +0000
@@ -3518,6 +3518,12 @@
 	g_hash_table_destroy(comp);
 	return GAIM_CMD_RET_OK;
 }
+
+static gboolean yahoo_offline_message(const GaimBuddy *buddy)
+{
+	return TRUE;
+}
+
 /************************** Plugin Initialization ****************************/
 static void
 yahoogaim_register_commands(void)
@@ -3610,6 +3616,7 @@
 	NULL, /* can_receive_file */
 	yahoo_send_file,
 	yahoo_new_xfer,
+	yahoo_offline_message, /* offline_message */
 	&yahoo_whiteboard_prpl_ops,
 	NULL, /* media_prpl_ops */
 };

--- a/src/protocols/zephyr/zephyr.c	Fri Dec 23 18:36:29 2005 +0000
+++ b/src/protocols/zephyr/zephyr.c	Fri Dec 23 19:26:04 2005 +0000
@@ -2831,6 +2831,7 @@
 	NULL,					/* can_receive_file */
 	NULL,					/* send_file */
 	NULL,					/* new_xfer */
+	NULL,					/* offline_message */
 	NULL,					/* whiteboard_prpl_ops */
 	NULL,					/* media_prpl_ops */
 };

--- a/src/prpl.h	Fri Dec 23 18:36:29 2005 +0000
+++ b/src/prpl.h	Fri Dec 23 19:26:04 2005 +0000
@@ -296,6 +296,7 @@
 	gboolean (*can_receive_file)(GaimConnection *, const char *who);
 	void (*send_file)(GaimConnection *, const char *who, const char *filename);
 	GaimXfer *(*new_xfer)(GaimConnection *, const char *who);
+ 	gboolean (*offline_message)(const GaimBuddy *buddy);
 
 	GaimWhiteboardPrplOps *whiteboard_prpl_ops;
 	GaimMediaPrplOps *media_prpl_ops;