aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--src/ephy-toolbar-editor.c22
2 files changed, 17 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 1c85055db..0ba275894 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2006-08-07 Christian Persch <chpe@cvs.gnome.org>
+ * src/ephy-toolbar-editor.c:(ephy_toolbar_editor_response):
+
+ Make sure to destroy the dialogue in all cases.
+
+2006-08-07 Christian Persch <chpe@cvs.gnome.org>
+
* embed/mozilla/mozilla-embed-single.cpp:
R embed/mozilla/MozillaPrivate.cpp:
R embed/mozilla/MozillaPrivate.h:
diff --git a/src/ephy-toolbar-editor.c b/src/ephy-toolbar-editor.c
index e0ca065f3..da43d8f0e 100644
--- a/src/ephy-toolbar-editor.c
+++ b/src/ephy-toolbar-editor.c
@@ -134,22 +134,22 @@ combo_changed_cb (GtkComboBox *combo,
static void
ephy_toolbar_editor_response (GtkDialog *dialog,
- gint response_id)
+ gint response)
{
EphyToolbarEditorPrivate *priv = EPHY_TOOLBAR_EDITOR (dialog)->priv;
- switch (response_id)
+ if (response == RESPONSE_ADD_TOOLBAR)
{
- case GTK_RESPONSE_CLOSE:
- gtk_widget_destroy (GTK_WIDGET (dialog));
- break;
- case RESPONSE_ADD_TOOLBAR:
- egg_toolbars_model_add_toolbar (priv->model, -1, "UserCreated");
- break;
- case GTK_RESPONSE_HELP:
- ephy_gui_help (GTK_WINDOW (dialog), "epiphany", "to-edit-toolbars");
- break;
+ egg_toolbars_model_add_toolbar (priv->model, -1, "UserCreated");
+ return;
}
+ else if (response == GTK_RESPONSE_HELP)
+ {
+ ephy_gui_help (GTK_WINDOW (dialog), "epiphany", "to-edit-toolbars");
+ return;
+ }
+
+ gtk_widget_destroy (GTK_WIDGET (dialog));
}
static void