[Gaim-commits] SF.net SVN: gaim: [16792] branches/v2_0_0/src/protocols/oscar/oscar.c

[<the...@us...>]

Revision: 16792
Author:   thekingant
Date:     2006-08-16 09:56:59 -0700 (Wed, 16 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16792&view=rev

Log Message:
-----------
Backport SVN revision #16791 from HEAD to v2_0_0
Patch from Henning Nor?\195?\169n
Change the DND, extended away and occupied statuses in oscar so that
they allow setting a message. Also change another place so that
we show messages for people who are in those statuses.

ViewCVS Links:
-------------
    http://svn.sourceforge.net/gaim/?rev=16791&view=rev

Modified Paths:
--------------
    branches/v2_0_0/src/protocols/oscar/oscar.c
Modified: branches/v2_0_0/src/protocols/oscar/oscar.c
===================================================================
--- branches/v2_0_0/src/protocols/oscar/oscar.c	2006-08-16 16:53:20 UTC (rev 16791)
+++ branches/v2_0_0/src/protocols/oscar/oscar.c	2006-08-16 16:56:59 UTC (rev 16792)
@@ -4368,7 +4368,8 @@
 		/* This is needed for us to un-set any previous away message. */
 		away = g_strdup("");
 	}
-	else if (primitive == GAIM_STATUS_AWAY)
+	else if ((primitive == GAIM_STATUS_AWAY) ||
+			 (primitive == GAIM_STATUS_EXTENDED_AWAY))
 	{
 		htmlaway = gaim_status_get_attr_string(status, "message");
 		if ((htmlaway == NULL) || (*htmlaway == '\0'))
@@ -5608,19 +5609,25 @@
 	status_types = g_list_append(status_types, type);
 
 	/* ICQ-specific status types */
-	type = gaim_status_type_new_full(GAIM_STATUS_UNAVAILABLE,
-									 OSCAR_STATUS_ID_OCCUPIED,
-									 _("Occupied"), TRUE, is_icq, FALSE);
+	type = gaim_status_type_new_with_attrs(GAIM_STATUS_UNAVAILABLE,
+				OSCAR_STATUS_ID_OCCUPIED,
+				_("Occupied"), TRUE, is_icq, FALSE,
+				"message", _("Message"),
+				gaim_value_new(GAIM_TYPE_STRING), NULL);
 	status_types = g_list_append(status_types, type);
 
-	type = gaim_status_type_new_full(GAIM_STATUS_EXTENDED_AWAY,
-									 OSCAR_STATUS_ID_DND,
-									 _("Do Not Disturb"), TRUE, is_icq, FALSE);
+	type = gaim_status_type_new_with_attrs(GAIM_STATUS_EXTENDED_AWAY,
+				OSCAR_STATUS_ID_DND,
+				_("Do Not Disturb"), TRUE, is_icq, FALSE,
+				"message", _("Message"),
+				gaim_value_new(GAIM_TYPE_STRING), NULL);
 	status_types = g_list_append(status_types, type);
 
-	type = gaim_status_type_new_full(GAIM_STATUS_EXTENDED_AWAY,
-									 OSCAR_STATUS_ID_NA,
-									 _("Not Available"), TRUE, is_icq, FALSE);
+	type = gaim_status_type_new_with_attrs(GAIM_STATUS_EXTENDED_AWAY,
+				OSCAR_STATUS_ID_NA,
+				_("Not Available"), TRUE, is_icq, FALSE,
+				"message", _("Message"),
+				gaim_value_new(GAIM_TYPE_STRING), NULL);
 	status_types = g_list_append(status_types, type);
 
 	type = gaim_status_type_new_full(GAIM_STATUS_OFFLINE,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.