comparison pidgin/gtkblist.c @ 20201:6b17f0424f25

applied changes from 3fe67ca1381423cdd54205c19f3e983533025ebe through e45da041b0bbf7a5eac8c0538a38df015bf41f26
author Richard Laager <rlaager@wiktel.com>
date Fri, 28 Sep 2007 15:22:23 +0000
parents cc5754b3bb8e
children d4e250c3cd44
comparison
equal deleted inserted replaced
20200:440a2d75e976 20201:6b17f0424f25
5418 grp = pidgin_text_combo_box_entry_get_text(data->combo); 5418 grp = pidgin_text_combo_box_entry_get_text(data->combo);
5419 whoalias = gtk_entry_get_text(GTK_ENTRY(data->entry_for_alias)); 5419 whoalias = gtk_entry_get_text(GTK_ENTRY(data->entry_for_alias));
5420 if (*whoalias == '\0') 5420 if (*whoalias == '\0')
5421 whoalias = NULL; 5421 whoalias = NULL;
5422 5422
5423 if ((g = purple_find_group(grp)) == NULL) 5423 g = NULL;
5424 if ((grp != NULL) && (*grp != '\0') && ((g = purple_find_group(grp)) == NULL))
5424 { 5425 {
5425 g = purple_group_new(grp); 5426 g = purple_group_new(grp);
5426 purple_blist_add_group(g, NULL); 5427 purple_blist_add_group(g, NULL);
5427 } 5428 }
5428 5429
5628 gtk_entry_get_text(GTK_ENTRY(data->alias_entry)), 5629 gtk_entry_get_text(GTK_ENTRY(data->alias_entry)),
5629 components); 5630 components);
5630 5631
5631 group_name = pidgin_text_combo_box_entry_get_text(data->group_combo); 5632 group_name = pidgin_text_combo_box_entry_get_text(data->group_combo);
5632 5633
5633 if ((group = purple_find_group(group_name)) == NULL) 5634 group = NULL;
5635 if ((group_name != NULL) && (*group_name != '\0') && ((group = purple_find_group(group_name)) == NULL))
5634 { 5636 {
5635 group = purple_group_new(group_name); 5637 group = purple_group_new(group_name);
5636 purple_blist_add_group(group, NULL); 5638 purple_blist_add_group(group, NULL);
5637 } 5639 }
5638 5640