[Gaim-commits] CVS: gaim/src browser.c,1.23.2.3,1.23.2.4 buddy.c,1.317,1.317.2.1 gtkimhtml.c,1.108.2.1,1.108.2.2

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

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv30724/src

Modified Files:
      Tag: gtk1-stable
	browser.c buddy.c gtkimhtml.c 
Log Message:
Some bug fix patches from Ari Pollak


Index: browser.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/browser.c,v
retrieving revision 1.23.2.3
retrieving revision 1.23.2.4
diff -u -d -r1.23.2.3 -r1.23.2.4
--- browser.c	27 Aug 2002 22:27:12 -0000	1.23.2.3
+++ browser.c	29 Aug 2002 00:32:21 -0000	1.23.2.4
@@ -585,7 +585,7 @@
 			/* args will be allocated below but we don't bother
 			 * freeing it since we're just going to exec and
 			 * exit */
-			char **args;
+			char **args = NULL;
 			char command[1024];
 
 			if (web_browser == BROWSER_OPERA) {

Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.317
retrieving revision 1.317.2.1
diff -u -d -r1.317 -r1.317.2.1
--- buddy.c	15 Jun 2002 20:21:01 -0000	1.317
+++ buddy.c	29 Aug 2002 00:32:22 -0000	1.317.2.1
@@ -2033,23 +2033,28 @@
 }
 
 void hide_buddy_list() {
+	if(blist) {
 #ifdef USE_APPLET
-	applet_destroy_buddy(NULL, NULL, NULL);
+		applet_destroy_buddy(NULL, NULL, NULL);
 #else
-	XIconifyWindow(GDK_DISPLAY(),
+		XIconifyWindow(GDK_DISPLAY(),
 			GDK_WINDOW_XWINDOW(blist->window),
 			((_XPrivDisplay)GDK_DISPLAY())->default_screen);
 #endif
+	}
 }
 
 void unhide_buddy_list() {
+	if(blist) {
 #ifdef USE_APPLET
-	if (!applet_buddy_show) {
-		applet_buddy_show = TRUE;
-		createOnlinePopup();
-	}
+		if (!applet_buddy_show) {
+			applet_buddy_show = TRUE;
+			createOnlinePopup();
+		}
 #endif /* USE_APPLET */
-	gdk_window_show(blist->window);
+		if(blist)
+			gdk_window_show(blist->window);
+	}
 }
 
 static gint log_timeout(struct buddy_show *b)

Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.108.2.1
retrieving revision 1.108.2.2
diff -u -d -r1.108.2.1 -r1.108.2.2
--- gtkimhtml.c	28 Aug 2002 07:50:48 -0000	1.108.2.1
+++ gtkimhtml.c	29 Aug 2002 00:32:22 -0000	1.108.2.2
@@ -1590,7 +1590,7 @@
 
 		while (click) {
 			uw = (struct clickable *) click->data;
-			if ((x > uw->x) && (x < uw->x + uw->width) &&
+			if ((uw->bit->url) && (x > uw->x) && (x < uw->x + uw->width) &&
 			    (y > uw->y) && (y < uw->y + uw->height) &&
 			    (uw->bit->url || uw->bit->img)) {
 				if (imhtml->tip_bit != uw->bit) {