Mercurial > pidgin.yaz
changeset 11494:3314953511de
[gaim-migrate @ 13738]
Some whitespace changes, from my editor. Perhaps I should add it to the
COPYRIGHT file?
Also, sadrul writes:
Hello.
The icon in the conversation-tabs don't alway change
when the status of a buddy changes. This patch fixes that.
committer: Tailor Script <tailor@pidgin.im>
author | Tim Ringenbach <marv@pidgin.im> |
---|---|
date | Sat, 10 Sep 2005 20:41:20 +0000 |
parents | 3fe6b56a39cc |
children | d5e4a3af7934 |
files | src/blist.c src/gtkblist.c |
diffstat | 2 files changed, 10 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/blist.c Sat Sep 10 19:19:20 2005 +0000 +++ b/src/blist.c Sat Sep 10 20:41:20 2005 +0000 @@ -749,6 +749,7 @@ GaimBlistUiOps *ops = gaimbuddylist->ui_ops; GaimPresence *presence; GaimStatus *status; + GaimConversation *conv; g_return_if_fail(buddy != NULL); @@ -805,6 +806,9 @@ gaim_contact_invalidate_priority_buddy(gaim_buddy_get_contact(buddy)); if (ops && ops->update) ops->update(gaimbuddylist, (GaimBlistNode *)buddy); + + if ((conv = gaim_find_conversation_with_account(GAIM_CONV_IM, buddy->name, buddy->account))) + gaim_conversation_update(conv, GAIM_CONV_UPDATE_AWAY); } void gaim_blist_update_buddy_icon(GaimBuddy *buddy)
--- a/src/gtkblist.c Sat Sep 10 19:19:20 2005 +0000 +++ b/src/gtkblist.c Sat Sep 10 20:41:20 2005 +0000 @@ -146,7 +146,7 @@ #ifdef WANT_DROP_SHADOW /**************************** Weird drop shadow stuff *******************/ -/* This is based on a patch for drop shadows in GTK+ menus available at +/* This is based on a patch for drop shadows in GTK+ menus available at * http://www.xfce.org/gtkmenu-shadow/ */ @@ -572,7 +572,7 @@ GtkTreeIter iter; GtkTreePath *path; const char *text = NULL; - + if (!(get_iter_from_node(node, &iter))) { /* This is either a bug, or the buddy is in a collapsed contact */ node = node->parent; @@ -3552,7 +3552,7 @@ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtkblist->treemodel = gtk_tree_store_new(BLIST_COLUMNS, - GDK_TYPE_PIXBUF, G_TYPE_BOOLEAN, + GDK_TYPE_PIXBUF, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_POINTER); gtkblist->treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(gtkblist->treemodel)); @@ -3648,7 +3648,7 @@ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item (gtkblist->ift, N_("/Tools/Mute Sounds"))), gaim_prefs_get_bool("/gaim/gtk/sound/mute")); if(!strcmp(gaim_prefs_get_string("/gaim/gtk/sound/method"), "none")) - gtk_widget_set_sensitive(gtk_item_factory_get_widget(gtkblist->ift, N_("/Tools/Mute Sounds")), FALSE); + gtk_widget_set_sensitive(gtk_item_factory_get_widget(gtkblist->ift, N_("/Tools/Mute Sounds")), FALSE); /* Update some dynamic things */ update_menu_bar(gtkblist); @@ -3768,7 +3768,7 @@ if (!gtknode->row) return FALSE; - + if ((path = gtk_tree_row_reference_get_path(gtknode->row)) == NULL) return FALSE; @@ -3866,7 +3866,7 @@ gtknode->row = gtk_tree_row_reference_new(GTK_TREE_MODEL(gtkblist->treemodel), newpath); - + gtk_tree_path_free(newpath); gtk_tree_store_set(gtkblist->treemodel, iter,