diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2005-10-31 07:14:00 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2005-10-31 07:14:00 +0800 |
| commit | 1ff25e7c76cafd5abae29b7e7c058cee3f2f2299 (patch) | |
| tree | c6551ba78e0f05700a7f1ad768d0b4b1cf1d0793 /lib/ephy-dialog.c | |
| parent | 362396c2bf69c659b5fcea2eaf3ed17b6ff93b09 (diff) | |
| download | gsoc2013-epiphany-1ff25e7c76cafd5abae29b7e7c058cee3f2f2299.tar gsoc2013-epiphany-1ff25e7c76cafd5abae29b7e7c058cee3f2f2299.tar.gz gsoc2013-epiphany-1ff25e7c76cafd5abae29b7e7c058cee3f2f2299.tar.bz2 gsoc2013-epiphany-1ff25e7c76cafd5abae29b7e7c058cee3f2f2299.tar.lz gsoc2013-epiphany-1ff25e7c76cafd5abae29b7e7c058cee3f2f2299.tar.xz gsoc2013-epiphany-1ff25e7c76cafd5abae29b7e7c058cee3f2f2299.tar.zst gsoc2013-epiphany-1ff25e7c76cafd5abae29b7e7c058cee3f2f2299.zip | |
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.
Diffstat (limited to 'lib/ephy-dialog.c')
| -rw-r--r-- | lib/ephy-dialog.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/lib/ephy-dialog.c b/lib/ephy-dialog.c index 9cd0518a3..ef264845c 100644 --- a/lib/ephy-dialog.c +++ b/lib/ephy-dialog.c @@ -22,7 +22,6 @@ #include "config.h" #include "ephy-dialog.h" -#include "ephy-glade.h" #include "ephy-state.h" #include "ephy-gui.h" #include "eel-gconf-extensions.h" @@ -36,6 +35,9 @@ #include <gtk/gtkspinbutton.h> #include <gtk/gtkeditable.h> #include <gtk/gtkentry.h> +#include <gtk/gtksizegroup.h> +#include <gtk/gtkdialog.h> +#include <glade/glade-xml.h> enum { @@ -1035,14 +1037,18 @@ impl_construct (EphyDialog *dialog, const char *name, const char *domain) { + EphyDialogPrivate *priv = dialog->priv; GladeXML *gxml; - gxml = ephy_glade_widget_new - (file, name, &(dialog->priv->dialog), dialog, domain); + gxml = glade_xml_new (file, name, domain); + g_return_if_fail (gxml != NULL); - if (dialog->priv->name == NULL) + priv->dialog = glade_xml_get_widget (gxml, name); + g_return_if_fail (priv->dialog != NULL); + + if (priv->name == NULL) { - dialog->priv->name = g_strdup (name); + priv->name = g_strdup (name); } if (properties) @@ -1050,10 +1056,8 @@ impl_construct (EphyDialog *dialog, init_props (dialog, properties, gxml); } - g_signal_connect_object (dialog->priv->dialog, - "destroy", - G_CALLBACK(dialog_destroy_cb), - dialog, 0); + g_signal_connect_object (dialog->priv->dialog, "destroy", + G_CALLBACK(dialog_destroy_cb), dialog, 0); g_object_unref (gxml); } |