Merge revisions 36534:36684 from trunk.

svn path=/branches/kill-bonobo/; revision=36685

3 files changed, 27 insertions, 19 deletions

diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog
index 202ce94ffa..884301b517 100644
--- a/plugins/groupwise-features/ChangeLog
+++ b/plugins/groupwise-features/ChangeLog
@@ -1,3 +1,14 @@
+2008-10-17  Matthew Barnes  <mbarnes@redhat.com>
+
+	* send-options.c (org_gnome_send-options):
+	Don't mix declarations and statements.
+
+2008-10-03  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* proxy-login.c:
+
 2008-10-01  Gabor Kelemen  <kelemeng@gnome.hu>
 
 	*  send-options.c: Mark two forgotten strings for translation. Fixes bug #553070
diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c
index 383e940fbe..1dc35e940b 100644
--- a/plugins/groupwise-features/proxy-login.c
+++ b/plugins/groupwise-features/proxy-login.c
@@ -1,25 +1,23 @@
-
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors:
- *  Shreyas Srinivasan <sshreyas@novell.com>
- *  Sankar P <psankar@novell.com>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * Authors:
+ *		Shreyas Srinivasan <sshreyas@novell.com>
+ *		Sankar P <psankar@novell.com>
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c
index 124fffe8f3..8a15d954dc 100644
--- a/plugins/groupwise-features/send-options.c
+++ b/plugins/groupwise-features/send-options.c
@@ -198,12 +198,11 @@ org_gnome_send_options (EPlugin *epl, EConfigHookItemFactoryData *data)
 {
 	EMConfigTargetAccount *target_account;
 	GtkWidget *frame, *button, *label, *vbox;
+	gchar *markup;
 
 	target_account = (EMConfigTargetAccount *)data->config->target;
 	account = target_account->account;
 
-	gchar *markup;
-
 	if(!g_strrstr (account->source->url, "groupwise://"))
 		return NULL;