diff options
| author | Jasmine Hassan <[email protected]> | 2012-10-27 10:49:31 +0200 |
|---|---|---|
| committer | Jasmine Hassan <[email protected]> | 2012-11-16 09:45:49 +0200 |
| commit | a71f882835029bbcbd2f46f54f18407606a558a3 (patch) | |
| tree | a83b677fc88a1aa7720358ac54dbe8bda13fb4c0 /eel/eel-stock-dialogs.c | |
| parent | cebbe2c78c33b41e164d8e5318d7a51d8cd8839b (diff) | |
| download | caja-a71f882835029bbcbd2f46f54f18407606a558a3.tar.bz2 caja-a71f882835029bbcbd2f46f54f18407606a558a3.tar.xz | |
[all] use GtkMessageDialog instead of EelAlertDialog (going away)
This covers 4 commits:
file-operations: use GtkMessageDialog
http://git.gnome.org/browse/nautilus/commit/?id=51ec5861ca0697e802e8c003053211ac12f2fd54
mime-actions: use GtkMessageDialog
http://git.gnome.org/browse/nautilus/commit/?id=7a3dcdd4bf667aac271be74988770e18575a7df2
tree-view: don't include eel-alert-dialog.h
http://git.gnome.org/browse/nautilus/commit/?id=930af7f3058eed256a42c0c1558c7307bb93f411
[eel] use GtkMessageDialog for stock dialogs
http://git.gnome.org/browse/nautilus/commit/?id=82c5b6c0d82ebd8a705d542fcc9aa58e6e9b0da4
Diffstat (limited to 'eel/eel-stock-dialogs.c')
| -rw-r--r-- | eel/eel-stock-dialogs.c | 62 |
1 files changed, 37 insertions, 25 deletions
diff --git a/eel/eel-stock-dialogs.c b/eel/eel-stock-dialogs.c index eb675733..6cf48f02 100644 --- a/eel/eel-stock-dialogs.c +++ b/eel/eel-stock-dialogs.c @@ -25,10 +25,9 @@ #include <config.h> #include "eel-stock-dialogs.h" -#include "eel-alert-dialog.h" #include "eel-glib-extensions.h" -#include "eel-mate-extensions.h" -#include "eel-string.h" +#include "eel-gtk-extensions.h" + #include <glib/gi18n-lib.h> #include <gtk/gtk.h> @@ -203,12 +202,16 @@ timed_wait_callback (gpointer callback_data) /* Put up the timed wait window. */ button = wait->cancel_callback != NULL ? GTK_STOCK_CANCEL : GTK_STOCK_OK; - dialog = GTK_DIALOG (eel_alert_dialog_new (wait->parent_window, - 0, - GTK_MESSAGE_INFO, - GTK_BUTTONS_NONE, - wait->wait_message, - _("You can stop this operation by clicking cancel."))); + dialog = GTK_DIALOG (gtk_message_dialog_new (wait->parent_window, + 0, + GTK_MESSAGE_INFO, + GTK_BUTTONS_NONE, + NULL)); + + g_object_set (dialog, + "text", wait->wait_message, + "secondary-text", _("You can stop this operation by clicking cancel."), + NULL); gtk_dialog_add_button (GTK_DIALOG (dialog), button, GTK_RESPONSE_OK); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); @@ -340,12 +343,16 @@ eel_run_simple_dialog (GtkWidget *parent, gboolean ignore_close_box, } /* Create the dialog. */ - dialog = eel_alert_dialog_new (GTK_WINDOW (chosen_parent), - 0, - message_type, - GTK_BUTTONS_NONE, - primary_text, - secondary_text); + dialog = gtk_message_dialog_new (GTK_WINDOW (chosen_parent), + 0, + message_type, + GTK_BUTTONS_NONE, + NULL); + + g_object_set (dialog, + "text", primary_text, + "secondary-text", secondary_text, + NULL); va_start (button_title_args, secondary_text); response_id = 0; @@ -370,7 +377,7 @@ eel_run_simple_dialog (GtkWidget *parent, gboolean ignore_close_box, gtk_widget_show (GTK_WIDGET (dialog)); result = gtk_dialog_run (GTK_DIALOG (dialog)); } - gtk_object_destroy (GTK_OBJECT (dialog)); + gtk_widget_destroy (dialog); return result; } @@ -384,12 +391,17 @@ create_message_dialog (const char *primary_text, { GtkWidget *dialog; - dialog = eel_alert_dialog_new (parent, - 0, - type, - buttons_type, - primary_text, - secondary_text); + dialog = gtk_message_dialog_new (parent, + 0, + type, + buttons_type, + NULL); + + g_object_set (dialog, + "text", primary_text, + "secondary-text", secondary_text, + NULL); + return GTK_DIALOG (dialog); } @@ -405,9 +417,9 @@ show_message_dialog (const char *primary_text, dialog = create_message_dialog (primary_text, secondary_text, type, buttons_type, parent); - if (details_text != NULL) - { - eel_alert_dialog_set_details_label (EEL_ALERT_DIALOG (dialog), details_text); + if (details_text != NULL) { + eel_gtk_message_dialog_set_details_label (GTK_MESSAGE_DIALOG (dialog), + details_text); } gtk_widget_show (GTK_WIDGET (dialog)); |