# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 971174903 0
# Node ID 17ff662183b2883b6cf8ff644214c2549bdda4c9
# Parent  f7886476f9d97404569e2feefcf74e0deeab0b3c
[gaim-migrate @ 977]
small code clean-ups

committer: Tailor Script <tailor@pidgin.im>

diff -r f7886476f9d9 -r 17ff662183b2 src/aim.c
--- a/src/aim.c	Tue Oct 10 10:35:05 2000 +0000
+++ b/src/aim.c	Tue Oct 10 10:48:23 2000 +0000
@@ -183,7 +183,6 @@
 	GtkWidget *bbox;
 	GtkWidget *hbox;
 	GtkWidget *sbox;
-	GtkWidget *label;
 	GtkWidget *table;
 
 	GtkWidget *pmw;
diff -r f7886476f9d9 -r 17ff662183b2 src/dialogs.c
--- a/src/dialogs.c	Tue Oct 10 10:35:05 2000 +0000
+++ b/src/dialogs.c	Tue Oct 10 10:48:23 2000 +0000
@@ -29,6 +29,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <ctype.h>
 #include <sys/socket.h>
 #include <netdb.h>
 #include <netinet/in.h> 
diff -r f7886476f9d9 -r 17ff662183b2 src/prefs.c
--- a/src/prefs.c	Tue Oct 10 10:35:05 2000 +0000
+++ b/src/prefs.c	Tue Oct 10 10:48:23 2000 +0000
@@ -64,7 +64,6 @@
 
 static GtkWidget *prefdialog = NULL;
 static GtkWidget *debugbutton = NULL;
-static GtkWidget *prefrem = NULL;
 GtkWidget *prefs_away_list = NULL;
 
 static void destdeb(GtkWidget *m, gpointer n)
@@ -73,12 +72,6 @@
 	debugbutton = NULL;
 }
 
-static void remdes(GtkWidget *m, gpointer n)
-{
-	gtk_widget_destroy(prefrem);
-	prefrem = NULL;
-}
-
 static void general_page()
 {
 	GtkWidget *parent;
diff -r f7886476f9d9 -r 17ff662183b2 src/util.c
--- a/src/util.c	Tue Oct 10 10:35:05 2000 +0000
+++ b/src/util.c	Tue Oct 10 10:48:23 2000 +0000
@@ -917,13 +917,10 @@
 	{
 		label = gtk_label_new(text);
 		gtk_box_pack_start(GTK_BOX(button_box_3), label, FALSE, FALSE, 2);
+		gtk_widget_show(label);
 	}
 
 	gtk_widget_show(pixmap);
-	if (text)
-	{
-		gtk_widget_show(label);
-	}
 	gtk_widget_show(button_box_2);
 	gtk_widget_show(button_box_3);
 	gtk_widget_show(button_box);
@@ -958,6 +955,8 @@
 	button_box_2 = gtk_vbox_new(FALSE, 0);
 
 	gtk_box_pack_start(GTK_BOX(button_box), button_box_2, TRUE, TRUE, 0);
+	gtk_widget_show(button_box_2);
+	gtk_widget_show(button_box);
 	if (dispstyle == 2 || dispstyle == 0) {
 		pm = gdk_pixmap_create_from_xpm_d(window->window, &mask, NULL, xpm);
 		pixmap = gtk_pixmap_new(pm, mask);
@@ -965,6 +964,8 @@
 
 		gtk_widget_show(pixmap);
 
+		gdk_pixmap_unref(pm);
+		gdk_bitmap_unref(mask);
 	}
 
 	if (dispstyle == 2 || dispstyle == 1)
@@ -974,15 +975,8 @@
 		gtk_box_pack_end(GTK_BOX(button_box_2), label, FALSE, FALSE, 0);
 	}
 
-	gtk_widget_show(button_box_2);
-	gtk_widget_show(button_box);
+	gtk_tooltips_set_tip(tips, button, text, "Gaim");	
 	gtk_widget_show(button);
-	if (dispstyle == 2 || dispstyle == 0) {
-		gdk_pixmap_unref(pm);
-		gdk_bitmap_unref(mask);
-	}
-	
-	gtk_tooltips_set_tip(tips, button, text, "Gaim");	
 	return button;
 }