Merge revisions 36685:36729 from trunk.

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

6 files changed, 42 insertions, 21 deletions

diff --git a/widgets/ChangeLog b/widgets/ChangeLog
index ef2cb7e355..296d3210d5 100644
--- a/widgets/ChangeLog
+++ b/widgets/ChangeLog
@@ -1,3 +1,17 @@
+2008-11-03  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #559041
+
+	* text/e-text.c (e_text_class_init):
+	Add translator comment for "im_context" property.
+
+2008-10-30  Matthew Barnes  <mbarnes@redhat.com>
+
+	* widgets/menus/gal-view-menus.c:
+	* widgets/misc/e-activity-handler.c:
+	* widgets/table/e-table-config-field.h:
+	Only include the toplevel GTK+ header.
+
 2008-10-17  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 85ec90411f..e7b9460b10 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-29  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* e-url-entry.c:
+	* e-url-entry.h:
+
 2008-10-21  Sankar P  <psankar@novell.com>
 
 	* e-spinner.c (e_spinner_stop),
diff --git a/widgets/misc/e-url-entry.c b/widgets/misc/e-url-entry.c
index 9db87b3ecd..26d081fc85 100644
--- a/widgets/misc/e-url-entry.c
+++ b/widgets/misc/e-url-entry.c
@@ -1,12 +1,8 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-url-entry.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.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) any later version.
+ * 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
@@ -14,11 +10,14 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		JP Rosevear <jpr@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * Author: JP Rosevear
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/widgets/misc/e-url-entry.h b/widgets/misc/e-url-entry.h
index f2ebf54eae..1c051ac0e8 100644
--- a/widgets/misc/e-url-entry.h
+++ b/widgets/misc/e-url-entry.h
@@ -1,12 +1,8 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-url-entry.h
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.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) any later version.
+ * 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
@@ -14,11 +10,14 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		JP Rosevear <jpr@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * Author: JP Rosevear
  */
 
 #ifndef _E_URL_ENTRY_H_
diff --git a/widgets/table/e-table-config-field.h b/widgets/table/e-table-config-field.h
index 3e21147ef5..382ff941b1 100644
--- a/widgets/table/e-table-config-field.h
+++ b/widgets/table/e-table-config-field.h
@@ -23,7 +23,7 @@
 #ifndef _E_TABLE_CONFIG_FIELD_H_
 #define _E_TABLE_CONFIG_FIELD_H_
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 #include <table/e-table-sort-info.h>
 #include <table/e-table-specification.h>
 
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index d608f7e96a..713a84050d 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -3777,7 +3777,9 @@ e_text_class_init (ETextClass *klass)
 
 	g_object_class_install_property (gobject_class, PROP_IM_CONTEXT,
 					 g_param_spec_object ("im_context",
+							      /* Translators: Input Method Context */
 							      _( "IM Context" ),
+							      /* Translators: Input Method Context */
 							      _( "IM Context" ),
 							      GTK_TYPE_IM_CONTEXT,
 							      G_PARAM_READWRITE));