From 33c1c3a2e91df54dc70f0c11993bfaad9c46bddb Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Mon, 7 Aug 2006 20:13:15 +0000 Subject: Make sure to destroy the dialogue in all cases. 2006-08-07 Christian Persch * src/ephy-toolbar-editor.c:(ephy_toolbar_editor_response): Make sure to destroy the dialogue in all cases. --- ChangeLog | 6 ++++++ src/ephy-toolbar-editor.c | 22 +++++++++++----------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1c85055db..0ba275894 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-08-07 Christian Persch + + * src/ephy-toolbar-editor.c:(ephy_toolbar_editor_response): + + Make sure to destroy the dialogue in all cases. + 2006-08-07 Christian Persch * embed/mozilla/mozilla-embed-single.cpp: 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 -- cgit v1.2.3