merging pre-gnome-2-8 branch

28 files changed, 94 insertions, 8 deletions

diff --git a/lib/eel-gconf-extensions.c b/lib/eel-gconf-extensions.c
index 387eb4e9e..f864f48e0 100644
--- a/lib/eel-gconf-extensions.c
+++ b/lib/eel-gconf-extensions.c
@@ -20,6 +20,8 @@
    Boston, MA 02111-1307, USA.
 
    Authors: Ramiro Estrugo <ramiro@eazel.com>
+
+   $Id$
 */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/eel-gconf-extensions.h b/lib/eel-gconf-extensions.h
index 4bc6167ef..410668273 100644
--- a/lib/eel-gconf-extensions.h
+++ b/lib/eel-gconf-extensions.h
@@ -20,6 +20,8 @@
    Boston, MA 02111-1307, USA.
 
    Authors: Ramiro Estrugo <ramiro@eazel.com>
+
+   $Id$
 */
 
 #ifndef EEL_GCONF_EXTENSIONS_H
diff --git a/lib/ephy-bonobo-extensions.c b/lib/ephy-bonobo-extensions.c
index 590be941c..cb1e96d36 100644
--- a/lib/ephy-bonobo-extensions.c
+++ b/lib/ephy-bonobo-extensions.c
@@ -26,9 +26,13 @@
 
    Authors: John Sullivan <sullivan@eazel.com>
             Darin Adler <darin@bentspoon.com>
+
+   $Id$
 */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ephy-bonobo-extensions.h"
 #include "ephy-string.h"
diff --git a/lib/ephy-bonobo-extensions.h b/lib/ephy-bonobo-extensions.h
index 7e840f49f..d096eba94 100644
--- a/lib/ephy-bonobo-extensions.h
+++ b/lib/ephy-bonobo-extensions.h
@@ -27,6 +27,8 @@
    Boston, MA 02111-1307, USA.
 
    Author: John Sullivan <sullivan@eazel.com>
+
+   $Id$
 */
 
 #ifndef EPHY_BONOBO_EXTENSIONS_H
diff --git a/lib/ephy-debug.c b/lib/ephy-debug.c
index 753678183..4f59c936e 100644
--- a/lib/ephy-debug.c
+++ b/lib/ephy-debug.c
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "ephy-debug.h"
 
 #include <string.h>
diff --git a/lib/ephy-dnd.c b/lib/ephy-dnd.c
index 857dd26df..fa2a7cf78 100644
--- a/lib/ephy-dnd.c
+++ b/lib/ephy-dnd.c
@@ -14,8 +14,14 @@
  *  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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "ephy-dnd.h"
 #include "ephy-string.h"
 #include "ephy-node.h"
diff --git a/lib/ephy-glade.c b/lib/ephy-glade.c
index 75c197b47..f6edad31a 100644
--- a/lib/ephy-glade.c
+++ b/lib/ephy-glade.c
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "ephy-glade.h"
 
 #include <glade/glade-xml.h>
diff --git a/lib/ephy-langs.c b/lib/ephy-langs.c
index dd3cf5133..b2282472a 100644
--- a/lib/ephy-langs.c
+++ b/lib/ephy-langs.c
@@ -41,9 +41,7 @@ static const EphyFontsLanguageInfo font_languages [] =
 	{ N_("Tamil"),					"x-tamil" },
 	{ N_("Thai"),					"th" },
 	{ N_("Traditional Chinese"),			"zh-TW" },
-#if MOZILLA_SNAPSHOT >= 11
 	{ N_("Traditional Chinese (Hong Kong)"),	"zh-HK" },
-#endif
 	{ N_("Turkish"),				"tr" },
 	{ N_("Unicode"),				"x-unicode" },
 	{ N_("Western"),				"x-western" }
diff --git a/lib/ephy-node-db.c b/lib/ephy-node-db.c
index 21cba5de0..e99743914 100644
--- a/lib/ephy-node-db.c
+++ b/lib/ephy-node-db.c
@@ -20,6 +20,10 @@
  *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "ephy-node-db.h"
 #include "ephy-file-helpers.h"
 #include "ephy-debug.h"
diff --git a/lib/ephy-node-filter.c b/lib/ephy-node-filter.c
index 863ddc8eb..229f99ad7 100644
--- a/lib/ephy-node-filter.c
+++ b/lib/ephy-node-filter.c
@@ -19,6 +19,10 @@
  *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
diff --git a/lib/ephy-state.c b/lib/ephy-state.c
index d0bf34d31..5cf37c744 100644
--- a/lib/ephy-state.c
+++ b/lib/ephy-state.c
@@ -17,8 +17,13 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
+ *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "ephy-state.h"
 #include "ephy-file-helpers.h"
 #include "ephy-node-db.h"
diff --git a/lib/ephy-stock-icons.c b/lib/ephy-stock-icons.c
index 06c77e3bb..7515323ce 100644
--- a/lib/ephy-stock-icons.c
+++ b/lib/ephy-stock-icons.c
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <gtk/gtk.h>
 #include <glib.h>
 #include <stdio.h>
diff --git a/lib/ephy-string.c b/lib/ephy-string.c
index df7fc7e11..dbda76275 100644
--- a/lib/ephy-string.c
+++ b/lib/ephy-string.c
@@ -14,6 +14,8 @@
  *  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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *  $Id$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/ephy-zoom.c b/lib/ephy-zoom.c
index af5d5f771..2e3a15a4a 100644
--- a/lib/ephy-zoom.c
+++ b/lib/ephy-zoom.c
@@ -14,8 +14,14 @@
  *  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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "ephy-zoom.h"
 
 #include <math.h>
diff --git a/lib/widgets/ephy-arrow-toolbutton.c b/lib/widgets/ephy-arrow-toolbutton.c
index 3273ce8f0..aea936a78 100644
--- a/lib/widgets/ephy-arrow-toolbutton.c
+++ b/lib/widgets/ephy-arrow-toolbutton.c
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "ephy-arrow-toolbutton.h"
 #include "ephy-marshal.h"
 #include "ephy-gui.h"
diff --git a/lib/widgets/ephy-arrow-toolbutton.h b/lib/widgets/ephy-arrow-toolbutton.h
index 59351b918..be1193cae 100644
--- a/lib/widgets/ephy-arrow-toolbutton.h
+++ b/lib/widgets/ephy-arrow-toolbutton.h
@@ -14,6 +14,8 @@
  *  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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *  $Id$
  */
 
 #ifndef EPHY_ARROW_TOOLBUTTON_H
diff --git a/lib/widgets/ephy-cell-renderer-progress.c b/lib/widgets/ephy-cell-renderer-progress.c
index ec4570d16..ba6474f3d 100644
--- a/lib/widgets/ephy-cell-renderer-progress.c
+++ b/lib/widgets/ephy-cell-renderer-progress.c
@@ -17,9 +17,14 @@
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
+ *
+ * $Id$
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <glib/gi18n.h>
 
@@ -145,7 +150,6 @@ ephy_cell_renderer_progress_set_property (GObject *object,
 		default:
 			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
 	}
-	g_object_notify (object, "value");
 }
 
 static void
diff --git a/lib/widgets/ephy-cell-renderer-progress.h b/lib/widgets/ephy-cell-renderer-progress.h
index 1bf3915a7..b4966251d 100644
--- a/lib/widgets/ephy-cell-renderer-progress.h
+++ b/lib/widgets/ephy-cell-renderer-progress.h
@@ -16,6 +16,8 @@
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
+ *
+ * $Id$
  */
 
 #ifndef EPHY_CELL_RENDERER_PROGRESS_H
diff --git a/lib/widgets/ephy-ellipsizing-label.c b/lib/widgets/ephy-ellipsizing-label.c
index 852d9e182..151ff744d 100644
--- a/lib/widgets/ephy-ellipsizing-label.c
+++ b/lib/widgets/ephy-ellipsizing-label.c
@@ -21,8 +21,14 @@
 
    Author: John Sullivan <sullivan@eazel.com>,
 	   Marco Pesenti Gritti <marco@it.gnome.org> Markup support
+
+  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "ephy-ellipsizing-label.h"
 
 #include <string.h>
diff --git a/lib/widgets/ephy-ellipsizing-label.h b/lib/widgets/ephy-ellipsizing-label.h
index a1d790d1e..1ea2121e6 100644
--- a/lib/widgets/ephy-ellipsizing-label.h
+++ b/lib/widgets/ephy-ellipsizing-label.h
@@ -18,6 +18,8 @@
    Boston, MA 02111-1307, USA.
 
    Author: John Sullivan <sullivan@eazel.com>,
+
+   $Id$
  */
 
 #ifndef EPHY_ELLIPSIZING_LABEL_H
diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c
index 1db59118a..08d591bf7 100644
--- a/lib/widgets/ephy-location-entry.c
+++ b/lib/widgets/ephy-location-entry.c
@@ -21,6 +21,10 @@
  *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "ephy-tree-model-node.h"
 #include "ephy-location-entry.h"
 #include "ephy-marshal.h"
diff --git a/lib/widgets/ephy-node-view.c b/lib/widgets/ephy-node-view.c
index f5e35d4b0..2e774d1f4 100644
--- a/lib/widgets/ephy-node-view.c
+++ b/lib/widgets/ephy-node-view.c
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <gtk/gtktreeselection.h>
 #include <gtk/gtktreeviewcolumn.h>
 #include <gtk/gtkcellrenderertext.h>
diff --git a/lib/widgets/ephy-search-entry.c b/lib/widgets/ephy-search-entry.c
index afa3d68ca..2d0318774 100644
--- a/lib/widgets/ephy-search-entry.c
+++ b/lib/widgets/ephy-search-entry.c
@@ -18,7 +18,9 @@
  *  $Id$
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gtk/gtklabel.h>
 #include <glib/gi18n.h>
diff --git a/lib/widgets/ephy-spinner.c b/lib/widgets/ephy-spinner.c
index 23678d150..19ddae8bb 100644
--- a/lib/widgets/ephy-spinner.c
+++ b/lib/widgets/ephy-spinner.c
@@ -24,6 +24,7 @@
  * 
  * This is the spinner (for busy feedback) for the location bar
  *
+ * $Id$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/widgets/ephy-tree-model-node.c b/lib/widgets/ephy-tree-model-node.c
index b60783af9..df3010345 100644
--- a/lib/widgets/ephy-tree-model-node.c
+++ b/lib/widgets/ephy-tree-model-node.c
@@ -18,7 +18,10 @@
  *  $Id$
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <time.h>
 #include <string.h>
diff --git a/lib/widgets/ephy-tree-model-sort.c b/lib/widgets/ephy-tree-model-sort.c
index 97e276150..6803be38e 100644
--- a/lib/widgets/ephy-tree-model-sort.c
+++ b/lib/widgets/ephy-tree-model-sort.c
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <gtk/gtkmarshal.h>
 #include <gtk/gtktreednd.h>
 #include <string.h>
diff --git a/lib/widgets/ephy-zoom-action.c b/lib/widgets/ephy-zoom-action.c
index c72d00cc3..5a55f60b0 100644
--- a/lib/widgets/ephy-zoom-action.c
+++ b/lib/widgets/ephy-zoom-action.c
@@ -190,7 +190,6 @@ ephy_zoom_action_set_property (GObject *object,
 	{
 		case PROP_ZOOM:
 			action->priv->zoom = g_value_get_float (value);
-			g_object_notify (object, "zoom");
 			break;
 	}
 }
diff --git a/lib/widgets/ephy-zoom-action.h b/lib/widgets/ephy-zoom-action.h
index 12d55c903..52a70e3fa 100644
--- a/lib/widgets/ephy-zoom-action.h
+++ b/lib/widgets/ephy-zoom-action.h
@@ -15,6 +15,8 @@
  *  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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *  $Id$
  */
 
 #ifndef EPHY_ZOOM_ACTION_H