From 1ff25e7c76cafd5abae29b7e7c058cee3f2f2299 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@cvs.gnome.org>
Date: Sun, 30 Oct 2005 23:14:00 +0000
Subject: R lib/ephy-glade.c: R lib/ephy-glade.h:

2005-10-31  Christian Persch  <chpe@cvs.gnome.org>

	* embed/mozilla/GtkNSSDialogs.cpp:
	* embed/print-dialog.c:
	* lib/Makefile.am:
	* lib/ephy-dialog.c: (impl_construct):
	R lib/ephy-glade.c:
	R lib/ephy-glade.h:

	Remove ephy-glade since we don't need autoconnect anymore.
---
 embed/mozilla/GtkNSSDialogs.cpp | 16 ++++++++++------
 embed/print-dialog.c            |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'embed')

diff --git a/embed/mozilla/GtkNSSDialogs.cpp b/embed/mozilla/GtkNSSDialogs.cpp
index 44b6897e2..95844b920 100644
--- a/embed/mozilla/GtkNSSDialogs.cpp
+++ b/embed/mozilla/GtkNSSDialogs.cpp
@@ -50,7 +50,7 @@
 #include <nsEmbedString.h>
 #define MOZILLA_INTERNAL_API 1
 
-#include <gconf/gconf-client.h>
+#include <glib/gi18n.h>
 #include <gtk/gtkdialog.h>
 #include <gtk/gtkstock.h>
 #include <gtk/gtkcheckbutton.h>
@@ -72,12 +72,13 @@
 #include <gtk/gtktextbuffer.h>
 #include <gtk/gtktextview.h>
 #include <gtk/gtkprogressbar.h>
-#include <glib/gi18n.h>
+#include <gtk/gtksizegroup.h>
+#include <glade/glade-xml.h>
+#include <gconf/gconf-client.h>
 #include <time.h>
 
 #include "GtkNSSDialogs.h"
 #include "ephy-file-helpers.h"
-#include "ephy-glade.h"
 #include "ephy-gui.h"
 
 NS_DEFINE_CID (kX509CertCID, NS_IX509CERT_IID);
@@ -1299,9 +1300,12 @@ GtkNSSDialogs::ViewCert(nsIInterfaceRequestor *ctx,
 	PRUnichar ** usage;
 	GtkSizeGroup * sizegroup;
 
-	gxml = ephy_glade_widget_new (ephy_file ("certificate-dialogs.glade"),
-				      "viewcert_dialog",
-				      &dialog, NULL, NULL);
+	gxml = glade_xml_new (ephy_file ("certificate-dialogs.glade"),
+			      "viewcert_dialog", NULL);
+	g_return_val_if_fail (gxml != NULL, NS_ERROR_FAILURE);
+
+	dialog = glade_xml_get_widget (gxml, "viewcert_dialog");
+	g_return_val_if_fail (dialog != NULL, NS_ERROR_FAILURE);
 
 	nsCOMPtr<nsIDOMWindow> parent = do_GetInterface (ctx);
 	GtkWindow *gparent = GTK_WINDOW (EphyUtils::FindGtkParent (parent));
diff --git a/embed/print-dialog.c b/embed/print-dialog.c
index a2eb47d33..72f39428c 100755
--- a/embed/print-dialog.c
+++ b/embed/print-dialog.c
@@ -185,7 +185,7 @@ ephy_print_get_print_info (void)
 	return info;
 }
 
-void
+static void
 ephy_print_dialog_response_cb (GtkDialog *dialog,
 			       int response,
 			       EmbedPrintInfo *info)
-- 
cgit v1.2.3