Menu
▾
▴
[Gaim-commits] CVS: gaim/src gtkblist.c,1.180,1.181 prpl.c,1.141,1.142 prpl.h,1.186,1.187 status.c,1.13,1.14 status.h,1.4,1.5
|
From: Mark D. <the...@us...> - 2004-09-11 04:17:59
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32498/src Modified Files: gtkblist.c prpl.c prpl.h status.c status.h Log Message: This is a patch from Dave West. He says it makes people show up as online/offline for him. It crashes for me. I've changed some things from his patch, so I'm gonna commit it and let people work from there. I feel it's a step in the right direction. Index: gtkblist.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkblist.c,v retrieving revision 1.180 retrieving revision 1.181 diff -u -d -p -r1.180 -r1.181 --- gtkblist.c 9 Sep 2004 03:36:34 -0000 1.180 +++ gtkblist.c 10 Sep 2004 04:09:36 -0000 1.181 @@ -3476,13 +3476,13 @@ static gboolean get_iter_from_node(GaimB /* XXX: why do we assume we have a buddy here? */ if (!gtknode) { #if 0 - gaim_debug(GAIM_DEBUG_ERROR, "gtkblist", "buddy %s has no ui_data\n", ((GaimBuddy *)node)->name); + gaim_debug_error("gtkblist", "buddy %s has no ui_data\n", ((GaimBuddy *)node)->name); #endif return FALSE; } if (!gtkblist) { - gaim_debug(GAIM_DEBUG_ERROR, "gtkblist", "get_iter_from_node was called, but we don't seem to have a blist\n"); + gaim_debug_error("gtkblist", "get_iter_from_node was called, but we don't seem to have a blist\n"); return FALSE; } @@ -3766,10 +3766,11 @@ static void gaim_gtk_blist_update_contac contact = (GaimContact*)node; buddy = gaim_contact_get_priority_buddy(contact); - if(buddy && (buddy->present != GAIM_BUDDY_OFFLINE || - (gaim_account_is_connected(buddy->account) && - gaim_prefs_get_bool("/gaim/gtk/blist/show_offline_buddies")) || - gaim_blist_node_get_bool(node, "show_offline"))) { + if (buddy && (gaim_presence_is_online(buddy->presence) || + (gaim_account_is_connected(buddy->account) && + gaim_prefs_get_bool("/gaim/gtk/blist/show_offline_buddies")) || + gaim_blist_node_get_bool(node, "show_offline"))) + { GtkTreeIter iter; if(!insert_node(list, node, &iter)) @@ -3819,14 +3820,15 @@ static void gaim_gtk_blist_update_buddy( /* First things first, update the contact */ gaim_gtk_blist_update_contact(list, node->parent); - if(gtkparentnode->contact_expanded && - (buddy->present != GAIM_BUDDY_OFFLINE || + if (gtkparentnode->contact_expanded && + (gaim_presence_is_online(buddy->presence) || (gaim_account_is_connected(buddy->account) && - gaim_prefs_get_bool("/gaim/gtk/blist/show_offline_buddies")) || - gaim_blist_node_get_bool(node->parent, "show_offline"))) { + gaim_prefs_get_bool("/gaim/gtk/blist/show_offline_buddies")) || + gaim_blist_node_get_bool(node->parent, "show_offline"))) + { GtkTreeIter iter; - if(!insert_node(list, node, &iter)) + if (!insert_node(list, node, &iter)) return; buddy_node(buddy, &iter, node); @@ -4556,7 +4558,7 @@ void gaim_gtk_blist_docklet_toggle() { } else { /* we're logging in or something... do nothing */ /* or should I make the blist? */ - gaim_debug(GAIM_DEBUG_WARNING, "blist", + gaim_debug_warning("gtkblist", "docklet_toggle called with gaim_connections_get_all() " "but no blist!\n"); } @@ -4599,6 +4601,19 @@ void gaim_gtk_blist_docklet_remove() } } +void gaim_gtk_blist_status_changed(GaimBuddy *buddy, GaimStatus *status) +{ + g_return_if_fail(buddy != NULL); + + /* + * What do we do with status here? + * g_return_if_fail(status != NULL); + */ + + gaim_debug_info("gtkblist", "Updating buddy list\n"); + gaim_gtk_blist_update(gaim_get_blist(), (GaimBlistNode*)buddy); +} + static GaimBlistUiOps blist_ui_ops = { gaim_gtk_blist_new_list, @@ -4610,7 +4625,8 @@ static GaimBlistUiOps blist_ui_ops = gaim_gtk_blist_set_visible, gaim_gtk_blist_request_add_buddy, gaim_gtk_blist_request_add_chat, - gaim_gtk_blist_request_add_group + gaim_gtk_blist_request_add_group, + gaim_gtk_blist_status_changed }; Index: prpl.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/prpl.c,v retrieving revision 1.141 retrieving revision 1.142 diff -u -d -p -r1.141 -r1.142 --- prpl.c 4 Sep 2004 04:27:05 -0000 1.141 +++ prpl.c 10 Sep 2004 04:09:36 -0000 1.142 @@ -256,12 +256,7 @@ gaim_prpl_got_user_login_time(GaimAccoun presence = gaim_buddy_get_presence(buddy); - /* - * TODO: Set a presence's sign-on time. We don't support this yet. - */ - gaim_debug_warning("prpl", - "Attempting to set a user's sign-on time, but we " - "don't support this yet! FIX IT!\n"); + gaim_presence_set_login_time(presence, login_time); } void @@ -339,6 +334,36 @@ gaim_prpl_set_account_status(GaimAccount prpl_info->set_status(account, status); } +GList * +gaim_prpl_get_statuses(GaimAccount *account, GaimPresence *presence) +{ + GaimPlugin *prpl; + GaimPluginProtocolInfo *prpl_info; + GList *statuses = NULL; + GList *l; + GaimStatus *status; + + g_return_val_if_fail(account != NULL, NULL); + g_return_val_if_fail(presence != NULL, NULL); + + prpl = gaim_find_prpl(gaim_account_get_protocol_id(account)); + + if (prpl == NULL) + return NULL; + + prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl); + if (prpl_info == NULL || prpl_info->status_types == NULL) + return NULL; + + for (l = prpl_info->status_types(account); l != NULL; l = l->next) + { + status = gaim_status_new((GaimStatusType *)l->data, presence); + statuses = g_list_append(statuses, status); + } + + return statuses; +} + /************************************************************************** * Protocol Plugin Subsystem API Index: prpl.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/prpl.h,v retrieving revision 1.186 retrieving revision 1.187 diff -u -d -p -r1.186 -r1.187 --- prpl.h 9 Sep 2004 22:06:06 -0000 1.186 +++ prpl.h 10 Sep 2004 04:09:36 -0000 1.187 @@ -409,6 +409,16 @@ void gaim_prpl_got_user_warning_level(Ga */ void gaim_prpl_set_account_status(GaimAccount *account, GaimStatus *status); +/** + * Retrieves the list of stock status types from a prpl. + * + * @param account The account the user is on. + * @param presence The presence for which we're going to get statuses + * + * @return List of statuses + */ +GList *gaim_prpl_get_statuses(GaimAccount *account, GaimPresence *presence); + /*@}*/ /**************************************************************************/ Index: status.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/status.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -p -r1.13 -r1.14 --- status.c 4 Sep 2004 04:27:05 -0000 1.13 +++ status.c 10 Sep 2004 04:09:36 -0000 1.14 @@ -67,6 +67,7 @@ struct _GaimPresence gboolean idle; time_t idle_time; + time_t login_time; unsigned int warning_level; @@ -117,6 +118,7 @@ typedef struct { GaimAccount *account; char *name; + guint id; } GaimStatusBuddyKey; @@ -216,6 +218,7 @@ gaim_status_type_new_with_attrs(GaimStat 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); @@ -567,6 +570,8 @@ notify_status_update(GaimPresence *prese { GaimPresenceContext context = gaim_presence_get_context(presence); + gaim_debug_info("notify_status_update", "Context is %d\n", context); + if (context == GAIM_PRESENCE_CONTEXT_ACCOUNT) { GaimAccountUiOps *ops = gaim_accounts_get_ui_ops(); @@ -613,11 +618,11 @@ gaim_status_set_active(GaimStatus *statu status_type = gaim_status_get_type(status); - if (!active && gaim_status_type_is_independent(status_type)) + if (!active && !gaim_status_type_is_independent(status_type)) { gaim_debug(GAIM_DEBUG_ERROR, "status", - "Cannot deactivate an exclusive status (%s).\n", - gaim_status_type_get_id(status_type)); + "Cannot deactivate an exclusive status (%s).\n", + gaim_status_type_get_id(status_type)); return; } @@ -628,14 +633,12 @@ gaim_status_set_active(GaimStatus *statu { const GList *l; - for (l = gaim_presence_get_statuses(presence); - l != NULL; - l = l->next) + for (l = gaim_presence_get_statuses(presence); l != NULL; l = l->next) { GaimStatus *temp_status = (GaimStatus *)l->data; GaimStatusType *temp_type; - if (temp_status == status) + if (!gaim_status_compare(temp_status, status)) continue; temp_type = gaim_status_get_type(temp_status); @@ -912,12 +915,11 @@ GaimPresence * gaim_presence_new_for_account(GaimAccount *account) { GaimPresence *presence; - g_return_val_if_fail(account != NULL, NULL); presence = gaim_presence_new(GAIM_PRESENCE_CONTEXT_ACCOUNT); - presence->u.account = account; + presence->statuses = gaim_prpl_get_statuses(account, presence); return presence; } @@ -930,8 +932,8 @@ gaim_presence_new_for_conv(GaimConversat g_return_val_if_fail(conv != NULL, NULL); presence = gaim_presence_new(GAIM_PRESENCE_CONTEXT_CONV); - presence->u.chat.conv = conv; + /* presence->statuses = gaim_prpl_get_statuses(conv->account, presence); ? */ return presence; } @@ -941,19 +943,31 @@ gaim_presence_new_for_buddy(GaimBuddy *b { GaimPresence *presence; GaimStatusBuddyKey *key; + GaimAccount *account; + gchar *hash_seed; g_return_val_if_fail(buddy != NULL, NULL); + account = buddy->account; + hash_seed = g_strdup_printf("%s:%s:%s", buddy->name, account->username, + account->protocol_id); + key = g_new0(GaimStatusBuddyKey, 1); key->account = buddy->account; key->name = g_strdup(buddy->name); + key->id = g_str_hash(hash_seed); - if ((presence = g_hash_table_lookup(buddy_presences, key)) == NULL) + g_free(hash_seed); + hash_seed = NULL; + + presence = g_hash_table_lookup(buddy_presences, key); + if (presence == NULL) { presence = gaim_presence_new(GAIM_PRESENCE_CONTEXT_BUDDY); presence->u.buddy.name = g_strdup(buddy->name); presence->u.buddy.account = buddy->account; + presence->statuses = gaim_prpl_get_statuses(buddy->account, presence); g_hash_table_insert(buddy_presences, key, presence); } @@ -997,6 +1011,9 @@ gaim_presence_destroy(GaimPresence *pres g_free(presence->u.chat.user); } + if (buddy_presences != NULL) + g_hash_table_destroy(buddy_presences); + if (presence->statuses != NULL) g_list_free(presence->statuses); @@ -1174,6 +1191,17 @@ gaim_presence_set_idle(GaimPresence *pre } void +gaim_presence_set_login_time(GaimPresence *presence, time_t login_time) +{ + g_return_if_fail(presence != NULL); + + if (presence->login_time == login_time) + return; + + presence->login_time = login_time; +} + +void gaim_presence_set_warning_level(GaimPresence *presence, unsigned int level) { g_return_if_fail(presence != NULL); @@ -1267,12 +1295,29 @@ GaimStatus * gaim_presence_get_status(const GaimPresence *presence, const char *status_id) { GaimStatus *status; + const GList *l = NULL; g_return_val_if_fail(presence != NULL, NULL); g_return_val_if_fail(status_id != NULL, NULL); - status = (GaimStatus *)g_hash_table_lookup(presence->status_table, - status_id); + /* What's the purpose of this hash table? */ + status = (GaimStatus *)g_hash_table_lookup(presence->status_table, + status_id); + + if (status == NULL) { + for (l = gaim_presence_get_statuses(presence); + l != NULL && status == NULL; l = l->next) + { + GaimStatus *temp_status = l->data; + + if (!strcmp(status_id, gaim_status_get_id(temp_status))) + status = temp_status; + } + + if (status != NULL) + g_hash_table_insert(presence->status_table, + g_strdup(gaim_status_get_id(status)), status); + } return status; } @@ -1446,6 +1491,24 @@ score_pref_changed_cb(const char *name, primitive_scores[index] = GPOINTER_TO_INT(value); } +guint +gaim_buddy_presences_hash(gconstpointer key) +{ + return ((GaimStatusBuddyKey *)key)->id; +} + +gboolean +gaim_buddy_presences_equal(gconstpointer a, gconstpointer b) +{ + GaimStatusBuddyKey *key_a = (GaimStatusBuddyKey *)a; + GaimStatusBuddyKey *key_b = (GaimStatusBuddyKey *)b; + + if (key_a->id == key_b->id) + return TRUE; + else + return FALSE; +} + void gaim_statuses_init(void) { @@ -1483,6 +1546,10 @@ gaim_statuses_init(void) gaim_prefs_connect_callback("/core/status/scores/idle", score_pref_changed_cb, GINT_TO_POINTER(SCORE_IDLE)); + + /* XXX - I don't think this is destroyed correctly. --Mark */ + buddy_presences = g_hash_table_new(gaim_buddy_presences_hash, + gaim_buddy_presences_equal); } void Index: status.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/status.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -p -r1.4 -r1.5 --- status.h 8 Sep 2004 04:34:51 -0000 1.4 +++ status.h 10 Sep 2004 04:09:36 -0000 1.5 @@ -654,6 +654,14 @@ void gaim_presence_set_idle(GaimPresence time_t idle_time); /** + * Sets the login time on a presence. + * + * @param presence The presence. + * @param level The login time. + */ +void gaim_presence_set_login_time(GaimPresence *presence, time_t login_time); + +/** * Sets the warning level on a presence. * * @param presence The presence. |