[Gaim-commits] CVS: gaim/src buddy.c,1.404,1.405

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv25998/src

Modified Files:
	buddy.c 
Log Message:
Open source at work.  Thanks, Ha-King, Ethan.  I also shrunk the group folder
icon a bit.


Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -d -r1.404 -r1.405
--- buddy.c	10 Mar 2003 06:22:42 -0000	1.404
+++ buddy.c	10 Mar 2003 06:35:40 -0000	1.405
@@ -170,14 +170,17 @@
 	GaimBlistNode *node;
 	GValue val;
 
-	gtk_tree_selection_get_selected(sel, NULL, &iter);
-	gtk_tree_model_get_value (GTK_TREE_MODEL(gtkblist->treemodel), &iter, NODE_COLUMN, &val);
-	node = g_value_get_pointer(&val);
+	if (gtk_tree_selection_get_selected(sel, NULL, &iter)) {
+		gtk_tree_model_get_value (GTK_TREE_MODEL(gtkblist->treemodel), &iter, NODE_COLUMN, &val);
+		node = g_value_get_pointer(&val);
 	
-	if (GAIM_BLIST_NODE_IS_BUDDY(node)) 
-		show_add_buddy(NULL, NULL, ((struct group*)node->parent)->name, NULL);
-	else if (GAIM_BLIST_NODE_IS_GROUP(node))
-		show_add_buddy(NULL, NULL, ((struct group*)node)->name, NULL);
+		if (GAIM_BLIST_NODE_IS_BUDDY(node)) 
+			show_add_buddy(NULL, NULL, ((struct group*)node->parent)->name, NULL);
+		else if (GAIM_BLIST_NODE_IS_GROUP(node))
+			show_add_buddy(NULL, NULL, ((struct group*)node)->name, NULL);
+	} else {
+		show_add_buddy(NULL,NULL,NULL,NULL);
+	}
 	
 }
 
@@ -239,7 +242,7 @@
 	gchar *filename = NULL;	
 	const char *protoname = NULL;
 
-	char *se,*sw,*nw,*ne;
+	char *se = NULL, *sw = NULL ,*nw = NULL ,*ne = NULL;
 	
 	int scalesize = 30;
 
@@ -574,7 +577,7 @@
 								    node->parent->parent ? node->parent->parent->ui_data : NULL, insertatiter);
 					gtk_tree_store_set(gtkblist->treemodel, iter2, 
 							   STATUS_ICON_COLUMN, gtk_widget_render_icon
-							   (gtkblist->treeview,GTK_STOCK_OPEN,GTK_ICON_SIZE_LARGE_TOOLBAR,NULL),
+							   (gtkblist->treeview,GTK_STOCK_OPEN,GTK_ICON_SIZE_SMALL_TOOLBAR,NULL),
 							   NAME_COLUMN, mark,
 							   NODE_COLUMN, node->parent,
 							   -1);