Mercurial > pidgin.yaz

comparison pidgin/gtkblist.c @ 31823:d72d728226dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin' (head fb4d2b014576462db99d919dea15fbed03f1f48a) to branch 'im.pidgin.pidgin.next.minor' (head 4a5878f91c824f207ed343b57b36ae74e1baa438)
author John Bailey <rekkanoryo@rekkanoryo.org>
date Sun, 13 Mar 2011 18:14:04 +0000
parents 917c597beb97 2a5e10237d69
children 7281d151e492 c0a122c22475
comparison
equal deleted inserted replaced
31822:6c660dc7cb6a 31823:d72d728226dc
1738 { 1738 {
1739 GtkWidget *menu; 1739 GtkWidget *menu;
1740 gboolean autojoin, persistent; 1740 gboolean autojoin, persistent;
1741 1741
1742 menu = gtk_menu_new(); 1742 menu = gtk_menu_new();
1743 autojoin = (purple_blist_node_get_bool(node, "gtk-autojoin") || 1743 autojoin = purple_blist_node_get_bool(node, "gtk-autojoin");
1744 (purple_blist_node_get_string(node, "gtk-autojoin") != NULL));
1745 persistent = purple_blist_node_get_bool(node, "gtk-persistent"); 1744 persistent = purple_blist_node_get_bool(node, "gtk-persistent");
1746 1745
1747 pidgin_new_item_from_stock(menu, _("_Join"), PIDGIN_STOCK_CHAT, 1746 pidgin_new_item_from_stock(menu, _("_Join"), PIDGIN_STOCK_CHAT,
1748 G_CALLBACK(gtk_blist_menu_join_cb), node, 0, 0, NULL); 1747 G_CALLBACK(gtk_blist_menu_join_cb), node, 0, 0, NULL);
1749 pidgin_new_check_item(menu, _("Auto-Join"), 1748 pidgin_new_check_item(menu, _("Auto-Join"),
7416 chat = (PurpleChat *)cnode; 7415 chat = (PurpleChat *)cnode;
7417 7416
7418 if(chat->account != account) 7417 if(chat->account != account)
7419 continue; 7418 continue;
7420 7419
7421 if(purple_blist_node_get_bool((PurpleBlistNode*)chat, "gtk-autojoin") || 7420 if (purple_blist_node_get_bool((PurpleBlistNode*)chat, "gtk-autojoin"))
7422 (purple_blist_node_get_string((PurpleBlistNode*)chat,
7423 "gtk-autojoin") != NULL))
7424 serv_join_chat(gc, chat->components); 7421 serv_join_chat(gc, chat->components);
7425 } 7422 }
7426 } 7423 }
7427 7424
7428 /* Stop processing; we handled the autojoins. */ 7425 /* Stop processing; we handled the autojoins. */
7739 } 7736 }
7740 7737
7741 gtk_tree_store_append(gtkblist->treemodel, iter, &groupiter); 7738 gtk_tree_store_append(gtkblist->treemodel, iter, &groupiter);
7742 return; 7739 return;
7743 } else { 7740 } else {
7744 sort_method_none(node, blist, groupiter, cur, iter); 7741 sort_method_alphabetical(node, blist, groupiter, cur, iter);
7745 return; 7742 return;
7746 } 7743 }
7747 7744
7748 7745
7749 if (!gtk_tree_model_iter_children(GTK_TREE_MODEL(gtkblist->treemodel), &more_z, &groupiter)) { 7746 if (!gtk_tree_model_iter_children(GTK_TREE_MODEL(gtkblist->treemodel), &more_z, &groupiter)) {