fix bug 4239, 'Preferences: Text Options Header Display modal is not modal' (sic)

[claws.git] / src / message_search.c

diff --git a/src/message_search.c b/src/message_search.c
index c7f9299b4d72eae005f9720589416c7a0dc31f11..fab403bea0bf0a658715a1b6ca22b754eaa32f16 100644 (file)
--- a/src/message_search.c
+++ b/src/message_search.c
@@ -122,6 +122,17 @@ void message_search_compose(Compose *compose)
        message_search_other(&compose_interface, (void *)compose);
 }
 
+void message_search_close (void *obj)
+{
+       if(!search_window.window) {
+               return;
+       }
+       if (search_window.interface_obj == obj) {
+               gtk_widget_hide(search_window.window);
+               search_window.interface_obj = NULL;
+       }
+}
+
 void message_search_other(SearchInterface *interface, void *obj)
 {
        if (!search_window.window)
@@ -162,6 +173,7 @@ static void message_search_create(void)
                              _("Find in current message"));
        gtk_widget_set_size_request (window, 450, -1);
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
+       gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
        gtk_container_set_border_width (GTK_CONTAINER (window), 8);
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(gtk_widget_hide_on_delete), NULL);
@@ -306,7 +318,7 @@ static void message_search_execute(gboolean backward)
                        alertpanel_full(_("Search failed"),
                                        _("Search string not found."),
                                         GTK_STOCK_CLOSE, NULL, NULL, FALSE,
-                                        NULL, ALERT_WARNING, G_ALERTDEFAULT);
+                                        ALERTFOCUS_FIRST, NULL, ALERT_WARNING);
                        break;
                }
 
@@ -320,7 +332,7 @@ static void message_search_execute(gboolean backward)
                                "continue from beginning?");
 
                val = alertpanel(_("Search finished"), str,
-                                GTK_STOCK_NO, "+" GTK_STOCK_YES, NULL);
+                                GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_SECOND);
                if (G_ALERTALTERNATE == val) {
                        manage_window_focus_in(search_window.window,
                                               NULL, NULL);