Fix compiler warnings.

2004-09-26  Christian Persch  <chpe@cvs.gnome.org>

	* embed/mozilla/EphyBrowser.cpp:
	* embed/mozilla/EventContext.cpp:
	* embed/mozilla/GtkNSSDialogs.cpp:
	* embed/mozilla/mozilla-notifiers.cpp:
	* lib/egg/eggtrayicon.h:

	Fix compiler warnings.

	* src/ephy-window.c: (hide_embed_popup_cb), (show_embed_popup):

	Fix a signal leak.

8 files changed, 30 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index e35f7e4a6..9258b8d3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2004-09-26  Christian Persch  <chpe@cvs.gnome.org>
 
+	* embed/mozilla/EphyBrowser.cpp:
+	* embed/mozilla/EventContext.cpp:
+	* embed/mozilla/GtkNSSDialogs.cpp:
+	* embed/mozilla/mozilla-notifiers.cpp:
+	* lib/egg/eggtrayicon.h:
+
+	Fix compiler warnings.
+
+	* src/ephy-window.c: (hide_embed_popup_cb), (show_embed_popup):
+
+	Fix a signal leak.
+
+2004-09-26  Christian Persch  <chpe@cvs.gnome.org>
+
 	* src/popup-commands.c: (popup_cmd_bookmark_link),
 	(popup_cmd_copy_image_location):
 
diff --git a/Makefile.am b/Makefile.am
index a49482fbd..234ebe062 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,4 +22,4 @@ DISTCLEANFILES = 		\
 	intltool-merge 		\
 	intltool-update
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-schemas-install
diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp
index 77a2ed9eb..655c3b110 100644
--- a/embed/mozilla/EphyBrowser.cpp
+++ b/embed/mozilla/EphyBrowser.cpp
@@ -124,12 +124,12 @@ EphyFaviconEventListener::HandleFaviconLink (nsIDOMNode *node)
 	    g_ascii_strcasecmp (rel.get(), "ICON") == 0)
 	{
 		PRUnichar hrefAttr[] = { 'h', 'r', 'e', 'f', '\0' };
-		nsEmbedString value;
-		rv = linkElement->GetAttribute (nsEmbedString (hrefAttr), value);
-		if (NS_FAILED (rv) || !value.Length()) return NS_ERROR_FAILURE;
+		nsEmbedString hrefValue;
+		rv = linkElement->GetAttribute (nsEmbedString (hrefAttr), hrefValue);
+		if (NS_FAILED (rv) || !hrefValue.Length()) return NS_ERROR_FAILURE;
 
 		nsEmbedCString link;
-		NS_UTF16ToCString (value, NS_CSTRING_ENCODING_UTF8, link);
+		NS_UTF16ToCString (hrefValue, NS_CSTRING_ENCODING_UTF8, link);
 
 		nsCOMPtr<nsIDOMDocument> domDoc;
 		node->GetOwnerDocument(getter_AddRefs(domDoc));
diff --git a/embed/mozilla/EventContext.cpp b/embed/mozilla/EventContext.cpp
index c3891bc5f..dbe89959b 100644
--- a/embed/mozilla/EventContext.cpp
+++ b/embed/mozilla/EventContext.cpp
@@ -142,7 +142,6 @@ nsresult EventContext::GatherTextUnder (nsIDOMNode* aNode, nsAString& aResult)
 				}
 				else
 				{
-					nsCOMPtr<nsIDOMNode> nextSibling;
 					parentNode->GetNextSibling(getter_AddRefs(nextSibling));
 					node = nextSibling;
 					depth--;
@@ -371,7 +370,6 @@ nsresult EventContext::GetEventContext (nsIDOMEventTarget *EventTarget,
 			}
 		}
 
-		PRUint16 type;
 		rv = node->GetNodeType(&type);
 		if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
 
diff --git a/embed/mozilla/GtkNSSDialogs.cpp b/embed/mozilla/GtkNSSDialogs.cpp
index 2d49de941..1f8926760 100644
--- a/embed/mozilla/GtkNSSDialogs.cpp
+++ b/embed/mozilla/GtkNSSDialogs.cpp
@@ -1349,11 +1349,11 @@ GtkNSSDialogs::ViewCert(nsIInterfaceRequestor *ctx,
 		text = _("Could not verify this certificate for unknown reasons.");
 	}
 	
-	char *msg = g_strdup_printf ("<b>%s</b>", text);
+	char *vmsg = g_strdup_printf ("<b>%s</b>", text);
 	widget = glade_xml_get_widget (gxml, "label_verify_text");
 	g_return_val_if_fail (GTK_IS_LABEL (widget), NS_ERROR_FAILURE);
-	gtk_label_set_markup (GTK_LABEL (widget), msg);
-	g_free (msg);
+	gtk_label_set_markup (GTK_LABEL (widget), vmsg);
+	g_free (vmsg);
 
 	if (count > 0)
 	{
diff --git a/embed/mozilla/mozilla-notifiers.cpp b/embed/mozilla/mozilla-notifiers.cpp
index c00a18b6f..efb2f731d 100644
--- a/embed/mozilla/mozilla-notifiers.cpp
+++ b/embed/mozilla/mozilla-notifiers.cpp
@@ -757,7 +757,7 @@ get_system_language ()
 
 	if (sys_langs)
 	{
-		char *lang = (char *)sys_langs->data;
+		lang = (char *)sys_langs->data;
 
 		/* FIXME this probably need to be smarter */
 		/* FIXME this can be up to 8 chars, not just 2 */
diff --git a/lib/egg/eggtrayicon.h b/lib/egg/eggtrayicon.h
index 007f4c18e..9ce3173e2 100644
--- a/lib/egg/eggtrayicon.h
+++ b/lib/egg/eggtrayicon.h
@@ -58,6 +58,9 @@ struct _EggTrayIconClass
 
 GType        egg_tray_icon_get_type       (void);
 
+EggTrayIcon *egg_tray_icon_new_for_xscreen(Screen *xscreen,
+					   const char *name);
+
 EggTrayIcon *egg_tray_icon_new_for_screen (GdkScreen   *screen,
 					   const gchar *name);
 
diff --git a/src/ephy-window.c b/src/ephy-window.c
index b7c1ad036..428830d49 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -1559,9 +1559,12 @@ popup_menu_at_coords (GtkMenu *menu, gint *x, gint *y, gboolean *push_in,
 
 static void
 hide_embed_popup_cb (GtkWidget *popup,
-			EphyWindow *window)
+		     EphyWindow *window)
 {
 	enable_edit_actions_sensitivity (window);
+
+	g_signal_handlers_disconnect_by_func
+		(popup, G_CALLBACK (hide_embed_popup_cb), window);
 }
 
 static void