*** empty log message ***

26 files changed, 68 insertions, 14 deletions

diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c
index ebaf2c5a5..6bdc0d72e 100644
--- a/src/bookmarks/ephy-bookmark-action.c
+++ b/src/bookmarks/ephy-bookmark-action.c
@@ -384,12 +384,10 @@ ephy_bookmark_action_set_property (GObject *object,
 			break;
 		case PROP_SMART_URL:
 			bmk->priv->smart_url = g_value_get_boolean (value);
-			g_object_notify (object, "smarturl");
 			break;
 		case PROP_ICON:
 			g_free (bmk->priv->icon);
 			bmk->priv->icon = g_value_dup_string (value);
-			g_object_notify (object, "icon");
 			break;
 	}
 }
diff --git a/src/bookmarks/ephy-bookmark-action.h b/src/bookmarks/ephy-bookmark-action.h
index ce834314b..1762ed315 100644
--- a/src/bookmarks/ephy-bookmark-action.h
+++ b/src/bookmarks/ephy-bookmark-action.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_BOOKMARK_ACTION_H
diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c
index f9fac1413..1e1c62a12 100644
--- a/src/bookmarks/ephy-bookmark-properties.c
+++ b/src/bookmarks/ephy-bookmark-properties.c
@@ -15,10 +15,11 @@
  *  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>
+#include "config.h"
 #endif
 
 #include "ephy-toolbars-model.h"
diff --git a/src/bookmarks/ephy-bookmarks-export.c b/src/bookmarks/ephy-bookmarks-export.c
index bd3b3db55..cd3ae9ccd 100644
--- a/src/bookmarks/ephy-bookmarks-export.c
+++ b/src/bookmarks/ephy-bookmarks-export.c
@@ -19,6 +19,10 @@
  *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "ephy-bookmarks-export.h"
 #include "ephy-node-common.h"
 #include "ephy-file-helpers.h"
diff --git a/src/bookmarks/ephy-bookmarks-export.h b/src/bookmarks/ephy-bookmarks-export.h
index d72530458..b0ee4a01a 100644
--- a/src/bookmarks/ephy-bookmarks-export.h
+++ b/src/bookmarks/ephy-bookmarks-export.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_BOOKMARKS_EXPORT_H
diff --git a/src/bookmarks/ephy-bookmarks-import.h b/src/bookmarks/ephy-bookmarks-import.h
index d72d6afd3..70bda36f9 100644
--- a/src/bookmarks/ephy-bookmarks-import.h
+++ b/src/bookmarks/ephy-bookmarks-import.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_BOOKMARKS_IMPORT_H
diff --git a/src/bookmarks/ephy-bookmarks-menu.h b/src/bookmarks/ephy-bookmarks-menu.h
index 2625a7f85..ea81ef3bf 100644
--- a/src/bookmarks/ephy-bookmarks-menu.h
+++ b/src/bookmarks/ephy-bookmarks-menu.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_BOOKMARKS_MENU_H
diff --git a/src/bookmarks/ephy-bookmarks.h b/src/bookmarks/ephy-bookmarks.h
index a1d43eff0..14b352e0a 100644
--- a/src/bookmarks/ephy-bookmarks.h
+++ b/src/bookmarks/ephy-bookmarks.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_BOOKMARKS_H
diff --git a/src/bookmarks/ephy-new-bookmark.c b/src/bookmarks/ephy-new-bookmark.c
index 3d9df6e7e..aab4f5aad 100644
--- a/src/bookmarks/ephy-new-bookmark.c
+++ b/src/bookmarks/ephy-new-bookmark.c
@@ -15,10 +15,11 @@
  *  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>
+#include "config.h"
 #endif
 
 #include <gtk/gtktable.h>
diff --git a/src/bookmarks/ephy-topic-action.h b/src/bookmarks/ephy-topic-action.h
index 95b2bd450..b0a462c50 100644
--- a/src/bookmarks/ephy-topic-action.h
+++ b/src/bookmarks/ephy-topic-action.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_TOPIC_ACTION_H
diff --git a/src/bookmarks/ephy-topics-selector.c b/src/bookmarks/ephy-topics-selector.c
index 7dd84a501..7983ca6f9 100644
--- a/src/bookmarks/ephy-topics-selector.c
+++ b/src/bookmarks/ephy-topics-selector.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002 Marco Pesenti Gritti <mpeseng@tin.it>
+ *  Copyright (C) 2002-2004 Marco Pesenti Gritti <mpeseng@tin.it>
  *
  *  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
@@ -15,8 +15,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-topics-selector.h"
 #include "ephy-debug.h"
 #include "ephy-node-view.h"
diff --git a/src/ephy-automation.c b/src/ephy-automation.c
index fd9e33257..c5aa84c32 100644
--- a/src/ephy-automation.c
+++ b/src/ephy-automation.c
@@ -19,6 +19,10 @@
  *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "ephy-automation.h"
 
 #include "EphyAutomation.h"
diff --git a/src/ephy-completion-model.c b/src/ephy-completion-model.c
index a3766cfcc..ea1c9a8c7 100644
--- a/src/ephy-completion-model.c
+++ b/src/ephy-completion-model.c
@@ -18,7 +18,9 @@
  *  $Id$
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ephy-completion-model.h"
 #include "ephy-node.h"
diff --git a/src/ephy-extension.c b/src/ephy-extension.c
index 1caf581b7..144104eee 100644
--- a/src/ephy-extension.c
+++ b/src/ephy-extension.c
@@ -19,6 +19,10 @@
  *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "ephy-extension.h"
 
 GType
diff --git a/src/ephy-favicon-action.c b/src/ephy-favicon-action.c
index 2ebdeb577..484687021 100644
--- a/src/ephy-favicon-action.c
+++ b/src/ephy-favicon-action.c
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "ephy-favicon-action.h"
 #include "ephy-window.h"
 #include "ephy-tab.h"
@@ -215,7 +219,6 @@ ephy_favicon_action_set_property (GObject *object,
 		case PROP_ICON:
 			g_free (fav->priv->icon);
 			fav->priv->icon = g_value_dup_string (value);
-			g_object_notify(object, "icon");
 			break;
 	}
 }
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index 17e5194e8..d7d67ccbb 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -19,7 +19,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #include <gtk/gtktable.h>
diff --git a/src/ephy-location-action.c b/src/ephy-location-action.c
index dd2de1431..92d5af64a 100644
--- a/src/ephy-location-action.c
+++ b/src/ephy-location-action.c
@@ -19,6 +19,10 @@
  *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "ephy-location-action.h"
 #include "ephy-location-entry.h"
 #include "ephy-shell.h"
@@ -271,7 +275,7 @@ connect_proxy (GtkAction *action, GtkWidget *proxy)
 	/* we need to connect to this before chaining up, since gtkaction's
 	 * connect_proxy connects a routine there which uses create_menu_item
 	 * method to generate a menu proxy (and create_menu_item CANNOT return
-	 * NULL. See bug #133446.
+	 * NULL. See bug #133446.)
 	 */
 	g_signal_connect_object (proxy, "create_menu_proxy",
 				 G_CALLBACK (create_menu_proxy_cb),
@@ -315,7 +319,6 @@ ephy_location_action_set_property (GObject *object,
 			break;
 		case PROP_EDITABLE:
 			action->priv->editable = g_value_get_boolean (value);
-			g_object_notify (G_OBJECT (action), "editable");
 			break;
 	}
 }
diff --git a/src/ephy-navigation-action.c b/src/ephy-navigation-action.c
index 0cf42896e..97987cd61 100644
--- a/src/ephy-navigation-action.c
+++ b/src/ephy-navigation-action.c
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "ephy-navigation-action.h"
 #include "ephy-arrow-toolbutton.h"
 #include "ephy-window.h"
diff --git a/src/ephy-toolbars-model.c b/src/ephy-toolbars-model.c
index 0de9d97f5..180e9a4d4 100755
--- a/src/ephy-toolbars-model.c
+++ b/src/ephy-toolbars-model.c
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "ephy-toolbars-model.h"
 #include "ephy-dnd.h"
 #include "ephy-bookmarks.h"
diff --git a/src/ephy-toolbars-model.h b/src/ephy-toolbars-model.h
index dd0a412ae..09f2aed55 100755
--- a/src/ephy-toolbars-model.h
+++ b/src/ephy-toolbars-model.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_TOOLBARS_MODEL_H
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 0b3a4fa5e..034b11d2e 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -1338,13 +1338,11 @@ show_embed_popup (EphyWindow *window, EphyTab *tab, EphyEmbedEvent *event)
 	{
 		popup = "/EphyImagePopup";
 	}
-#if MOZILLA_SNAPSHOT > 12
 	else if (context & EMBED_CONTEXT_INPUT)
 	{
 		showing_edit_actions = TRUE;
 		popup = "/EphyInputPopup";
 	}
-#endif
 	else
 	{
 		showing_edit_actions = TRUE;
diff --git a/src/popup-commands.h b/src/popup-commands.h
index 2a5c0929f..b999b28da 100644
--- a/src/popup-commands.h
+++ b/src/popup-commands.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$
  */
 
 #include <gtk/gtkaction.h>
diff --git a/src/ppview-toolbar.c b/src/ppview-toolbar.c
index bdf70f322..f3f93f7a5 100755
--- a/src/ppview-toolbar.c
+++ b/src/ppview-toolbar.c
@@ -19,7 +19,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #include "ppview-toolbar.h"
diff --git a/src/ppview-toolbar.h b/src/ppview-toolbar.h
index fd5c2337b..78b4a45ce 100644
--- a/src/ppview-toolbar.h
+++ b/src/ppview-toolbar.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 PPVIEW_TOOLBAR_H
diff --git a/src/prefs-dialog.h b/src/prefs-dialog.h
index caceec2d3..72f9fc079 100644
--- a/src/prefs-dialog.h
+++ b/src/prefs-dialog.h
@@ -1,5 +1,6 @@
 /*
- *  Copyright (C) 2000, 2001, 2002 Marco Pesenti Gritti
+ *  Copyright (C) 2000-2004 Marco Pesenti Gritti
+ *  Copyright (C) 2003-2004 Christian Persch
  *
  *  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
@@ -14,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 PREFS_DIALOG_H
diff --git a/src/toolbar.h b/src/toolbar.h
index 254145197..ff58e3f35 100644
--- a/src/toolbar.h
+++ b/src/toolbar.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 TOOLBAR_H