comparison: gtk/gtkblist.c
gtk/gtkblist.c
- changeset 14526
- 272b75278ff1
- parent 14518
- abe8c4704aaf
- child 14543
- cc2f90ffee6f
equal
deleted
inserted
replaced
| 14525:b278a2724686 | 14526:272b75278ff1 |
|---|---|
| 315 { | 315 { |
| 316 GtkTreeIter iter; | 316 GtkTreeIter iter; |
| 317 GtkTreePath *path; | 317 GtkTreePath *path; |
| 318 GValue val; | 318 GValue val; |
| 319 GaimBlistNode *node; | 319 GaimBlistNode *node; |
| 320 GaimGroup *dest; | |
| 320 | 321 |
| 321 path = gtk_tree_path_new_from_string (arg1); | 322 path = gtk_tree_path_new_from_string (arg1); |
| 322 gtk_tree_model_get_iter (GTK_TREE_MODEL(gtkblist->treemodel), &iter, path); | 323 gtk_tree_model_get_iter (GTK_TREE_MODEL(gtkblist->treemodel), &iter, path); |
| 323 gtk_tree_path_free (path); | 324 gtk_tree_path_free (path); |
| 324 val.g_type = 0; | 325 val.g_type = 0; |
| 348 case GAIM_BLIST_BUDDY_NODE: | 349 case GAIM_BLIST_BUDDY_NODE: |
| 349 gaim_blist_alias_buddy((GaimBuddy*)node, arg2); | 350 gaim_blist_alias_buddy((GaimBuddy*)node, arg2); |
| 350 serv_alias_buddy((GaimBuddy *)node); | 351 serv_alias_buddy((GaimBuddy *)node); |
| 351 break; | 352 break; |
| 352 case GAIM_BLIST_GROUP_NODE: | 353 case GAIM_BLIST_GROUP_NODE: |
| 353 gaim_blist_rename_group((GaimGroup*)node, arg2); | 354 dest = gaim_find_group(arg2); |
| 355 if (dest != NULL && strcmp(arg2, ((GaimGroup*) node)->name)) { | |
| 356 gaim_gtkdialogs_merge_groups((GaimGroup*) node, arg2); | |
| 357 } else | |
| 358 gaim_blist_rename_group((GaimGroup*)node, arg2); | |
| 354 break; | 359 break; |
| 355 case GAIM_BLIST_CHAT_NODE: | 360 case GAIM_BLIST_CHAT_NODE: |
| 356 gaim_blist_alias_chat((GaimChat*)node, arg2); | 361 gaim_blist_alias_chat((GaimChat*)node, arg2); |
| 357 break; | 362 break; |
| 358 default: | 363 default: |
