merging pre-gnome-2-8 branch

14 files changed, 44 insertions, 5 deletions

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