comparison: src/gtkblist.c
src/gtkblist.c
- changeset 8197
- e9c666481979
- parent 8143
- ce4b6383777b
- child 8198
- 867abd109161
equal
deleted
inserted
replaced
| 8196:93597ab3dc67 | 8197:e9c666481979 |
|---|---|
| 892 | 892 |
| 893 static GtkWidget * | 893 static GtkWidget * |
| 894 create_chat_menu (GaimBlistNode *node) | 894 create_chat_menu (GaimBlistNode *node) |
| 895 { | 895 { |
| 896 GtkWidget *menu; | 896 GtkWidget *menu; |
| 897 gboolean autojoin = gaim_blist_node_get_bool(node, | 897 gboolean autojoin = (gaim_blist_node_get_bool(node, |
| 898 "gtk-autojoin"); | 898 "gtk-autojoin") || (gaim_blist_get_string(node, |
| 899 "gtk-autojoin") != NULL)) | |
| 899 | 900 |
| 900 menu = gtk_menu_new(); | 901 menu = gtk_menu_new(); |
| 901 gaim_new_item_from_stock(menu, _("_Join"), GAIM_STOCK_CHAT, | 902 gaim_new_item_from_stock(menu, _("_Join"), GAIM_STOCK_CHAT, |
| 902 G_CALLBACK(gtk_blist_menu_join_cb), node, 0, 0, NULL); | 903 G_CALLBACK(gtk_blist_menu_join_cb), node, 0, 0, NULL); |
| 903 gaim_new_check_item(menu, _("Auto-Join"), | 904 gaim_new_check_item(menu, _("Auto-Join"), |
| 4073 chat = (GaimChat *)cnode; | 4074 chat = (GaimChat *)cnode; |
| 4074 | 4075 |
| 4075 if(chat->account != account) | 4076 if(chat->account != account) |
| 4076 continue; | 4077 continue; |
| 4077 | 4078 |
| 4078 if(gaim_blist_node_get_bool((GaimBlistNode*)chat, "gtk-autojoin")) | 4079 if(gaim_blist_node_get_bool((GaimBlistNode*)chat, "gtk-autojoin") || |
| 4080 (gaim_blist_node_get_string(GaimBlistNode*)chat, | |
| 4081 "gtk-autojoin" != NULL)) | |
| 4079 serv_join_chat(gc, chat->components); | 4082 serv_join_chat(gc, chat->components); |
| 4080 } | 4083 } |
| 4081 } | 4084 } |
| 4082 } | 4085 } |
| 4083 | 4086 |
