changeset 10382:9f28196ed769

[gaim-migrate @ 11608] some white space fixes for gtkblist.c Nathan, the changes to jabber probly are not the right fix, but they stop gaim from crashing on exit here. please look this over. committer: Tailor Script <[e-mail]>

--- a/src/gtkblist.c	Wed Dec 15 20:34:07 2004 +0000
+++ b/src/gtkblist.c	Wed Dec 15 20:53:44 2004 +0000
@@ -427,7 +427,7 @@
 	gdk_window_move_resize (blist->east_shadow,
 				x + widget->allocation.width, MAX(0,y),
 				5, MIN(widget->allocation.height, gdk_screen_height()));
-	
+
 	gdk_window_move_resize (blist->south_shadow,
 				MAX(0,x), y + widget->allocation.height,
 				MIN(widget->allocation.width + 5, gdk_screen_width()), 5);
@@ -2017,13 +2017,13 @@
 				GtkTreeIter iter;
 				GaimBlistNode *node;
 				GValue val = {0};
-				
+
 				gtk_tree_model_get_iter(GTK_TREE_MODEL(gtkblist->treemodel),
 							&iter, path);
 				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) || GAIM_BLIST_NODE_IS_CONTACT(node)) {
 					GaimBuddy *b = GAIM_BLIST_NODE_IS_BUDDY(node) ? (GaimBuddy*)node : gaim_contact_get_priority_buddy((GaimContact*)node);
 					gaim_dnd_file_manage(sd, b->account, b->name);
@@ -2031,7 +2031,7 @@
 				} else {
 					gtk_drag_finish(dc, FALSE, FALSE, t);
 				}
-			}	
+			}
 	}
 }
 
@@ -2120,9 +2120,9 @@
 
 	if (!gtknode->contact_expanded) {
 		GtkTreeIter i;
-		
+
 		gaim_gtk_blist_expand_contact_cb(NULL, node);
-		
+
 		gtk_tree_view_get_cell_area(GTK_TREE_VIEW(tv), path, NULL, &gtkblist->contact_rect);
 		gdk_drawable_get_size(GDK_DRAWABLE(tv->window), &(gtkblist->contact_rect.width), NULL);
 		gtkblist->mouseover_contact = node;
@@ -2373,7 +2373,7 @@
 		g_source_remove(gtkblist->timeout);
 		gtkblist->timeout = 0;
 	}
-	
+
 	if (gtkblist->drag_timeout) {
 		g_source_remove(gtkblist->drag_timeout);
 		gtkblist->drag_timeout = 0;

--- a/src/protocols/jabber/presence.c	Wed Dec 15 20:34:07 2004 +0000
+++ b/src/protocols/jabber/presence.c	Wed Dec 15 20:53:44 2004 +0000
@@ -89,14 +89,20 @@
 
 void jabber_presence_send(GaimAccount *account, GaimStatus *status)
 {
-	GaimConnection *gc = account->gc;
-	JabberStream *js = gc->proto_data;
+	GaimConnection *gc = NULL;
+	JabberStream *js = NULL;
 	xmlnode *presence, *x, *photo;
 	char *stripped = NULL;
 	const char *msg;
 	JabberBuddyState state;
 	int priority;
 
+	if(!account) return ;
+	gc = account->gc;
+
+	if(!gc) return ;
+	js= gc->proto_data;
+
 	gaim_status_to_jabber(status, &state, &msg, &priority);
 
 	if(msg)