diff src/protocols/bonjour/bonjour.c @ 12595:3169cd6727ad

[gaim-migrate @ 14925] I've been meaning to spend the time to commit these changes separately, but it's been a couple days without me finding the time... 1. Allow the creation of GaimStatusTypes by passing NULL for the name and/or id. The core uses the default name and/or id. This eliminates quite a bit of duplication in the prpls. 2. Make statuses more consistent. For example, in some prpls, "Busy" was descended from the UNAVAILABLE primitive and on others it was a case of AWAY. Another example... "On Vacation" is definitely an EXTENDED_AWAY not an AWAY. 3. Rename some pixmaps to elminate some special cases. The names of the pixmaps should now match the primitive default IDs. 4. Rename the HIDDEN primitive to INVISIBLE, since we seem to be using that term everywhere. In conjunction with #1, more duplication was eliminated. 5. Add a MOBILE status primitive. It's not used now. It'll be needed in the (hopefully not-too-distant) future, so I'm planning ahead. 6. Shrink the status select for small blist folks. Now if someone can get rid of that stupid extra padding, we'll be set (well, after we deal with imhtml space issues). I've fought with this for many many hours over several days and I can't get it. It's clear that the combo box is requesting more space than is really necessary, but I don't know why. This is really my first go at anything significant status-related. Everyone should check their favorite prpls carefully to make sure I didn't break anything. committer: Tailor Script <[e-mail]>

--- a/src/protocols/bonjour/bonjour.c	Wed Dec 21 07:59:45 2005 +0000
+++ b/src/protocols/bonjour/bonjour.c	Wed Dec 21 08:24:17 2005 +0000
@@ -243,19 +243,19 @@
 
 	type = gaim_status_type_new_full(GAIM_STATUS_OFFLINE,
 									 BONJOUR_STATUS_ID_OFFLINE,
-									 _("Offline"), TRUE, TRUE, FALSE);
+									 NULL, TRUE, TRUE, FALSE);
 	status_types = g_list_append(status_types, type);
 
 	type = gaim_status_type_new_with_attrs(GAIM_STATUS_AVAILABLE,
 										   BONJOUR_STATUS_ID_AVAILABLE,
-										   _("Available"), TRUE, TRUE, FALSE,
+										   NULL, TRUE, TRUE, FALSE,
 										   "message", _("Message"),
 										   gaim_value_new(GAIM_TYPE_STRING), NULL);
 	status_types = g_list_append(status_types, type);
 
 	type = gaim_status_type_new_with_attrs(GAIM_STATUS_AWAY,
 										   BONJOUR_STATUS_ID_AWAY,
-										   _("Away"), TRUE, TRUE, FALSE,
+										   NULL, TRUE, TRUE, FALSE,
 										   "message", _("Message"),
 										   gaim_value_new(GAIM_TYPE_STRING), NULL);
 	status_types = g_list_append(status_types, type);
@@ -269,11 +269,13 @@
 	GaimBuddy *buddy = gaim_find_buddy(connection->account, who);
 
 	if (buddy == NULL)
+	{
 		/*
 		 * This buddy is not in our buddy list, and therefore does not really
 		 * exist, so we won't have any data about them.
 		 */
 		return;
+	}
 
 	bonjour_jabber_close_conversation(((BonjourData*)(connection->proto_data))->jabber_data, buddy);
 }
@@ -281,7 +283,7 @@
 static void
 bonjour_list_emblems(GaimBuddy *buddy,
 								 const char **se, const char **sw,
-								 const char **nw,const char **ne)
+								 const char **nw, const char **ne)
 {
 	GaimPresence *presence;