changeset 20201:6b17f0424f25

applied changes from 3fe67ca1381423cdd54205c19f3e983533025ebe through e45da041b0bbf7a5eac8c0538a38df015bf41f26
author Richard Laager <rlaager@wiktel.com>
date Fri, 28 Sep 2007 15:22:23 +0000
parents 440a2d75e976
children 71b9f22d97c7
files pidgin/gtkblist.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkblist.c	Fri Sep 28 15:21:51 2007 +0000
+++ b/pidgin/gtkblist.c	Fri Sep 28 15:22:23 2007 +0000
@@ -5420,7 +5420,8 @@
 		if (*whoalias == '\0')
 			whoalias = NULL;
 
-		if ((g = purple_find_group(grp)) == NULL)
+		g = NULL;
+		if ((grp != NULL) && (*grp != '\0') && ((g = purple_find_group(grp)) == NULL))
 		{
 			g = purple_group_new(grp);
 			purple_blist_add_group(g, NULL);
@@ -5630,7 +5631,8 @@
 
 	group_name = pidgin_text_combo_box_entry_get_text(data->group_combo);
 
-	if ((group = purple_find_group(group_name)) == NULL)
+	group = NULL;
+	if ((group_name != NULL) && (*group_name != '\0') && ((group = purple_find_group(group_name)) == NULL))
 	{
 		group = purple_group_new(group_name);
 		purple_blist_add_group(group, NULL);