pidgin.yaz: src/status.c comparison

comparison src/status.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 <tailor@pidgin.im>

author	Richard Laager <rlaager@wiktel.com>
date	Wed, 21 Dec 2005 08:24:17 +0000
parents	8afd25a37b35
children	57462d6542ea

comparison

equal deleted inserted replaced

-:3d34460ecfd6
+:3169cd6727ad
 {
 	0,      /* unset                    */
 	-500,   /* offline                  */
 	100,    /* available                */
 	-75,    /* unavailable              */
-	-50,    /* hidden                   */
+	-50,    /* invisible                */
 	-100,   /* away                     */
 	-200,   /* extended away            */
+	-400,   /* mobile                   */
 	-10,    /* idle, special case.      */
 	-5      /* idle time, special case. */
 };
 static GHashTable *buddy_presences = NULL;
 {
 	{ GAIM_STATUS_UNSET,           "unset",           N_("Unset")           },
 	{ GAIM_STATUS_OFFLINE,         "offline",         N_("Offline")         },
 	{ GAIM_STATUS_AVAILABLE,       "available",       N_("Available")       },
 	{ GAIM_STATUS_UNAVAILABLE,     "unavailable",     N_("Unavailable")     },
-	{ GAIM_STATUS_HIDDEN,          "hidden",          N_("Hidden")          },
+	{ GAIM_STATUS_INVISIBLE,       "invisible",       N_("Invisible")       },
 	{ GAIM_STATUS_AWAY,            "away",            N_("Away")            },
-	{ GAIM_STATUS_EXTENDED_AWAY,   "extended_away",   N_("Extended Away")   }
+	{ GAIM_STATUS_EXTENDED_AWAY,   "extended_away",   N_("Extended Away")   },
+	{ GAIM_STATUS_MOBILE,          "mobile",          N_("Mobile")          }
 };
 const char *
 gaim_primitive_get_id_from_type(GaimStatusPrimitive type)
 {
 {
 int i;
 for (i = 0; i < GAIM_STATUS_NUM_PRIMITIVES; i++)
 {
-		if (type == status_primitive_map[i].type)
+	if (type == status_primitive_map[i].type)
-			return status_primitive_map[i].name;
+		return status_primitive_map[i].name;
 }
 return status_primitive_map[0].name;
 }
 						  gboolean user_settable, gboolean independent)
 {
 	GaimStatusType *status_type;
 	g_return_val_if_fail(primitive != GAIM_STATUS_UNSET, NULL);
-	g_return_val_if_fail(id        != NULL,              NULL);
-	g_return_val_if_fail(name      != NULL,              NULL);
 	status_type = g_new0(GaimStatusType, 1);
 	GAIM_DBUS_REGISTER_POINTER(status_type, GaimStatusType);
 	status_type->primitive     = primitive;
-	status_type->id            = g_strdup(id);
-	status_type->name          = g_strdup(name);
 	status_type->saveable      = saveable;
 	status_type->user_settable = user_settable;
 	status_type->independent   = independent;
+	if (id != NULL)
+		status_type->id = g_strdup(id);
+	else
+		status_type->id = g_strdup(gaim_primitive_get_id_from_type(primitive));
+	if (name != NULL)
+		status_type->name = g_strdup(name);
+	else
+		status_type->name = g_strdup(_(gaim_primitive_get_name_from_type(primitive)));
 	return status_type;
 }
 GaimStatusType *
 gaim_status_type_new(GaimStatusPrimitive primitive, const char *id,
 					 const char *name, gboolean user_settable)
 {
 	g_return_val_if_fail(primitive != GAIM_STATUS_UNSET, NULL);
-	g_return_val_if_fail(id        != NULL,              NULL);
-	g_return_val_if_fail(name      != NULL,              NULL);
 	return gaim_status_type_new_full(primitive, id, name, FALSE,
 			user_settable, FALSE);
 }
 {
 	GaimStatusType *status_type;
 	va_list args;
 	g_return_val_if_fail(primitive  != GAIM_STATUS_UNSET, NULL);
-	g_return_val_if_fail(id         != NULL,              NULL);
-	g_return_val_if_fail(name       != NULL,              NULL);
 	g_return_val_if_fail(attr_id    != NULL,              NULL);
 	g_return_val_if_fail(attr_name  != NULL,              NULL);
 	g_return_val_if_fail(attr_value != NULL,              NULL);
 	status_type = gaim_status_type_new_full(primitive, id, name, saveable,
 	gaim_prefs_add_int("/core/status/scores/offline",
 			primitive_scores[GAIM_STATUS_OFFLINE]);
 	gaim_prefs_add_int("/core/status/scores/available",
 			primitive_scores[GAIM_STATUS_AVAILABLE]);
-	gaim_prefs_add_int("/core/status/scores/hidden",
+	gaim_prefs_add_int("/core/status/scores/invisible",
-			primitive_scores[GAIM_STATUS_HIDDEN]);
+			primitive_scores[GAIM_STATUS_INVISIBLE]);
 	gaim_prefs_add_int("/core/status/scores/away",
 			primitive_scores[GAIM_STATUS_AWAY]);
 	gaim_prefs_add_int("/core/status/scores/extended_away",
 			primitive_scores[GAIM_STATUS_EXTENDED_AWAY]);
 	gaim_prefs_add_int("/core/status/scores/idle",
 			score_pref_changed_cb,
 			GINT_TO_POINTER(GAIM_STATUS_OFFLINE));
 	gaim_prefs_connect_callback(handle, "/core/status/scores/available",
 			score_pref_changed_cb,
 			GINT_TO_POINTER(GAIM_STATUS_AVAILABLE));
-	gaim_prefs_connect_callback(handle, "/core/status/scores/hidden",
+	gaim_prefs_connect_callback(handle, "/core/status/scores/invisible",
 			score_pref_changed_cb,
-			GINT_TO_POINTER(GAIM_STATUS_HIDDEN));
+			GINT_TO_POINTER(GAIM_STATUS_INVISIBLE));
 	gaim_prefs_connect_callback(handle, "/core/status/scores/away",
 			score_pref_changed_cb,
 			GINT_TO_POINTER(GAIM_STATUS_AWAY));
 	gaim_prefs_connect_callback(handle, "/core/status/scores/extended_away",
 			score_pref_changed_cb,

Mercurial > pidgin.yaz

comparison src/status.c @ 12595:3169cd6727ad