Index: src/gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.318
diff -u -p -u -r1.318 gtkimhtml.c
--- src/gtkimhtml.c	22 Apr 2004 16:24:05 -0000	1.318
+++ src/gtkimhtml.c	23 Apr 2004 18:36:45 -0000
@@ -539,13 +539,14 @@ gboolean gtk_key_pressed_cb(GtkIMHtml *i
 #if GTK_CHECK_VERSION(2,2,0)
 static void gtk_imhtml_clipboard_get(GtkClipboard *clipboard, GtkSelectionData *selection_data, guint info, GtkIMHtml *imhtml) {
 	char *text;
+	gboolean primary;
 	GtkTextIter start, end;
 	GtkTextMark *sel = gtk_text_buffer_get_selection_bound(imhtml->text_buffer);
 	GtkTextMark *ins = gtk_text_buffer_get_insert(imhtml->text_buffer);
 	
 	gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &start, sel);
 	gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &end, ins);
-	gboolean primary = gtk_widget_get_clipboard(GTK_WIDGET(imhtml), GDK_SELECTION_PRIMARY) == clipboard;
+	primary = gtk_widget_get_clipboard(GTK_WIDGET(imhtml), GDK_SELECTION_PRIMARY) == clipboard;
 
 	if (info == TARGET_HTML) {
 		int len;
Index: src/gtkrequest.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkrequest.c,v
retrieving revision 1.65
diff -u -p -u -r1.65 gtkrequest.c
--- src/gtkrequest.c	18 Apr 2004 06:22:41 -0000	1.65
+++ src/gtkrequest.c	23 Apr 2004 18:36:46 -0000
@@ -260,6 +260,7 @@ gaim_gtk_request_input(const char *title
 	GtkWidget *label;
 	GtkWidget *entry;
 	GtkWidget *img;
+	GtkWidget *toolbar;
 	char *label_text;
 
 	data            = g_new0(GaimGtkRequestData, 1);
@@ -338,7 +339,6 @@ gaim_gtk_request_input(const char *title
 		gtk_widget_set_size_request(sw, 320, 130);
 
 		/* Toolbar */
-		GtkWidget *toolbar;
 		toolbar = gtk_imhtmltoolbar_new();
 		gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0);
 
Index: src/protocols/novell/nmuser.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/novell/nmuser.c,v
retrieving revision 1.3
diff -u -p -u -r1.3 nmuser.c
--- src/protocols/novell/nmuser.c	21 Apr 2004 21:01:16 -0000	1.3
+++ src/protocols/novell/nmuser.c	23 Apr 2004 18:36:46 -0000
@@ -1690,6 +1690,7 @@ _update_contact_list(NMUser * user, NMFi
 {
 	NMField *list, *cursor, *locate;
 	gint objid1;
+	gpointer item;
 	NMContact *contact;
 	NMFolder *folder;
 
@@ -1713,8 +1714,7 @@ _update_contact_list(NMUser * user, NMFi
 				nm_locate_field(NM_A_SZ_OBJECT_ID, (NMField *) cursor->value);
 			if (locate != NULL && locate->value != 0) {
 				objid1 = atoi((char *) locate->value);
-				gpointer item =
-					nm_folder_find_item_by_object_id(user->root_folder, objid1);
+				item = nm_folder_find_item_by_object_id(user->root_folder, objid1);
 				if (item != NULL) {
 					if (cursor->method == NMFIELD_METHOD_ADD) {
 						if (g_ascii_strcasecmp(cursor->tag, NM_A_FA_CONTACT) == 0) {
Index: src/protocols/novell/novell.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/novell/novell.c,v
retrieving revision 1.9
diff -u -p -u -r1.9 novell.c
--- src/protocols/novell/novell.c	22 Apr 2004 01:53:15 -0000	1.9
+++ src/protocols/novell/novell.c	23 Apr 2004 18:36:46 -0000
@@ -893,6 +893,7 @@ _add_contacts_to_gaim_blist(NMUser * use
 	NMUserRecord *user_record = NULL;
 	NMContact *contact = NULL;
 	GaimBuddy *buddy = NULL;
+	GaimGroup *group = NULL;
 	NMERR_T cnt = 0, i;
 	const char *text = NULL;
 	const char *name = NULL;
@@ -912,7 +913,7 @@ _add_contacts_to_gaim_blist(NMUser * use
 									   nm_contact_get_display_name(contact));
 
 				/* Does the Gaim group exist already? */
-				GaimGroup *group = gaim_find_group(nm_folder_get_name(folder));
+				group = gaim_find_group(nm_folder_get_name(folder));
 
 				if (group == NULL) {
 					group = gaim_group_new(nm_folder_get_name(folder));
@@ -2062,6 +2063,7 @@ novell_rename_group(GaimConnection * gc,
 {
 	NMERR_T rc = NM_OK;
 	NMUser *user;
+	NMFolder *folder;
 
 	if (gc == NULL || old_name == NULL || new_name == NULL || tobemoved == NULL) {
 		return;
@@ -2078,7 +2080,7 @@ novell_rename_group(GaimConnection * gc,
 			return;
 		}
 
-		NMFolder *folder = nm_find_folder(user, old_name);
+		folder = nm_find_folder(user, old_name);
 
 		if (folder) {
 			rc = nm_send_rename_folder(user, folder, new_name,