[evolution-patches] a small patch for review (addressbook)

["leon.zhang" <leon zhang sun com>]

hi, Chris
This patch is for making sure the declaration is at the beginning of the block.
Orginal codes can make RH7.3 or solaris build fail
pls review it.
thx

leon

Index: addressbook/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1435.2.21
diff -u -r1.1435.2.21 ChangeLog
--- addressbook/ChangeLog	6 Nov 2003 05:35:48 -0000	1.1435.2.21
+++ addressbook/ChangeLog	7 Nov 2003 02:49:40 -0000
@@ -1,3 +1,9 @@
+2003-11-06 Leon ZHang <leon zhang sun com>
+
+	* gui/widgets/e-minicard.c: (e_minicard_event):
+	* gui/widgets/e-minicard-label.c: (e_minicard_label_event):
+	make sure the declaration is at the beginning of the block.
+
 2003-10-28 Leon Zhang <leon zhang sun com>
 
        * backend/pas/pas-backend-ldap.c:
Index: addressbook/gui/widgets/e-minicard-label.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/e-minicard-label.c,v
retrieving revision 1.36.4.1
diff -u -r1.36.4.1 e-minicard-label.c
--- addressbook/gui/widgets/e-minicard-label.c	6 Nov 2003 04:07:28 -0000	1.36.4.1
+++ addressbook/gui/widgets/e-minicard-label.c	7 Nov 2003 02:49:41 -0000
@@ -365,10 +365,10 @@
 		break;
 	case GDK_FOCUS_CHANGE: {
 		gboolean popup;
+		GdkEventFocus *focus_event = (GdkEventFocus *) event;
+
 		g_object_get (e_minicard_label->field, "has_popup", &popup, NULL);
 		if (popup) break;
-
-		GdkEventFocus *focus_event = (GdkEventFocus *) event;
 
 		e_minicard_label->has_focus = focus_event->in;
 		set_colors (e_minicard_label);
Index: addressbook/gui/widgets/e-minicard.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/e-minicard.c,v
retrieving revision 1.107.4.1
diff -u -r1.107.4.1 e-minicard.c
--- addressbook/gui/widgets/e-minicard.c	6 Nov 2003 04:07:28 -0000	1.107.4.1
+++ addressbook/gui/widgets/e-minicard.c	7 Nov 2003 02:49:42 -0000
@@ -555,6 +555,8 @@
 			/* if there is an activated popup menu, skip current event */
 			GList *list;
 			gboolean popup = FALSE;
+			GdkEventFocus *focus_event = (GdkEventFocus *) event;
+
                         for (list = e_minicard->fields; list; list = list->next) {
 				EMinicardField *field = E_MINICARD_FIELD(list->data);
 				EMinicardLabel *e_minicard_label = E_MINICARD_LABEL(GTK_OBJECT(field->label));
@@ -567,7 +569,6 @@
 			if (popup)
 				break;
 
-			GdkEventFocus *focus_event = (GdkEventFocus *) event;
 			d(g_print("%s: GDK_FOCUS_CHANGE: %s\n", G_GNUC_FUNCTION, focus_event->in?"in":"out"));
 			if (focus_event->in) {
 				/* Chris: When EMinicard gets the cursor, if it doesn't have the focus, it should take it.  */