aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog14
-rw-r--r--src/ephy-encoding-dialog.c23
2 files changed, 29 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index edfe86877..4955d34e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
2004-01-04 Piers Cornwell <piers@myrealbox.com>
+ * src/ephy-encoding-dialog.c: (ephy_encoding_dialog_get_type),
+ (ephy_encoding_dialog_response_cb):
+
+ Add help button to encodings dialogue.
+
+2004-01-04 Christian Persch <chpe@cvs.gnome.org>
+
+ * embed/downloader-view.c: (downloader_view_remove_download):
+ * embed/mozilla/FilePicker.cpp:
+ * embed/mozilla/mozilla-embed-single.cpp:
+ * embed/print-dialog.c: (ephy_print_dialog_response_cb):
+
+2004-01-04 Piers Cornwell <piers@myrealbox.com>
+
* data/glade/certificate-dialogs.glade:
* data/glade/epiphany.glade:
* data/glade/print.glade:
diff --git a/src/ephy-encoding-dialog.c b/src/ephy-encoding-dialog.c
index 9ecadd9fd..e57ec558a 100644
--- a/src/ephy-encoding-dialog.c
+++ b/src/ephy-encoding-dialog.c
@@ -31,6 +31,7 @@
#include "ephy-node.h"
#include "ephy-node-view.h"
#include "ephy-debug.h"
+#include "ephy-gui.h"
#include <gtk/gtklabel.h>
#include <gtk/gtkbutton.h>
@@ -74,7 +75,7 @@ struct EphyEncodingDialogPrivate
static void ephy_encoding_dialog_class_init (EphyEncodingDialogClass *klass);
static void ephy_encoding_dialog_init (EphyEncodingDialog *ge);
void ephy_encoding_dialog_response_cb (GtkWidget *widget,
- gint response,
+ int response,
EphyEncodingDialog *dialog);
static GObjectClass *parent_class = NULL;
@@ -82,9 +83,9 @@ static GObjectClass *parent_class = NULL;
GType
ephy_encoding_dialog_get_type (void)
{
- static GType ephy_type_encoding_dialog = 0;
+ static GType type = 0;
- if (ephy_type_encoding_dialog == 0)
+ if (type == 0)
{
static const GTypeInfo our_info =
{
@@ -99,12 +100,12 @@ ephy_encoding_dialog_get_type (void)
(GInstanceInitFunc) ephy_encoding_dialog_init
};
- ephy_type_encoding_dialog = g_type_register_static (EPHY_TYPE_EMBED_DIALOG,
- "EphyEncodingDialog",
- &our_info, 0);
+ type = g_type_register_static (EPHY_TYPE_EMBED_DIALOG,
+ "EphyEncodingDialog",
+ &our_info, 0);
}
- return ephy_type_encoding_dialog;
+ return type;
}
static void
@@ -240,9 +241,15 @@ activate_choice (EphyEncodingDialog *dialog)
void
ephy_encoding_dialog_response_cb (GtkWidget *widget,
- gint response,
+ int response,
EphyEncodingDialog *dialog)
{
+ if (response == GTK_RESPONSE_HELP)
+ {
+ ephy_gui_help (GTK_WINDOW (widget), "epiphany", "text-encoding");
+ return;
+ }
+
g_object_unref (dialog);
}