[gnome-panel/wip/segeiger/reload] panel-applet-frame.c: Add delete button in reload applet dialog

[Sebastian Geiger <segeiger src gnome org>]

commit 83ed771f3d1f0aba1ee4a061cf7976beef581bae
Author: Sebastian Geiger <sbastig gmx net>
Date:   Sun Aug 23 01:33:01 2015 +0200

    panel-applet-frame.c: Add delete button in reload applet dialog
    
    The "Don't reload" button will no longer delete the applet.
    There is a new "Delete" button that to delete the applet from the panel.
    
    Fixes https://bugzilla.gnome.org/show_bug.cgi?id=569216

 gnome-panel/panel-applet-frame.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/gnome-panel/panel-applet-frame.c b/gnome-panel/panel-applet-frame.c
index 948d77c..c76e207 100644
--- a/gnome-panel/panel-applet-frame.c
+++ b/gnome-panel/panel-applet-frame.c
@@ -686,7 +686,7 @@ panel_applet_frame_reload_response (GtkWidget        *dialog,
                /* if we can't write to applets list we can't really delete
                   it, so we'll just ignore this.  FIXME: handle this
                   more correctly I suppose. */
-               if (panel_layout_is_writable ())
+               if (panel_layout_is_writable () && response == GTK_RESPONSE_REJECT)
                        panel_layout_delete_object (panel_applet_get_id (info));
        }
 
@@ -724,13 +724,19 @@ _panel_applet_frame_applet_broken (PanelAppletFrame *frame)
                                         dialog_txt, applet_name ? applet_name : NULL);
 
        gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-                                                 _("If you reload a panel object, it will automatically "
-                                                   "be added back to the panel."));
+                                                 _("If you reload the panel object, it will automatically "
+                                                   "be added back to the panel.\nIf you do not reload the "
+                                                   "panel object, its settings will be kept and the panel 
object will be "
+                                                   "reloaded, when gnome-panel is restarted.\nFinally, you "
+                                                   "can decide to delete the panel object from the panel. In 
that "
+                                                   "case, the panel object will not be reloaded when the 
panel is restarted "
+                                                   "and the panel objects settings will be cleared."));
 
        gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
 
        gtk_dialog_add_buttons (GTK_DIALOG (dialog),
                                _("_Don't Reload"), GTK_RESPONSE_NO,
+                               _("D_elete"), GTK_RESPONSE_REJECT,
                                _("_Reload"), GTK_RESPONSE_YES,
                                NULL);