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 /libcaja-private/caja-file-operations.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 'libcaja-private/caja-file-operations.c')
| -rw-r--r-- | libcaja-private/caja-file-operations.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/libcaja-private/caja-file-operations.c b/libcaja-private/caja-file-operations.c index 55140e6b..24bb4a19 100644 --- a/libcaja-private/caja-file-operations.c +++ b/libcaja-private/caja-file-operations.c @@ -44,7 +44,6 @@ #include "caja-progress-info.h" -#include <eel/eel-alert-dialog.h> #include <eel/eel-glib-extensions.h> #include <eel/eel-gtk-extensions.h> #include <eel/eel-stock-dialogs.h> @@ -1065,12 +1064,16 @@ do_run_simple_dialog (gpointer _data) int response_id; /* Create the dialog. */ - dialog = eel_alert_dialog_new (*data->parent_window, - 0, - data->message_type, - GTK_BUTTONS_NONE, - data->primary_text, - data->secondary_text); + dialog = gtk_message_dialog_new (*data->parent_window, + 0, + data->message_type, + GTK_BUTTONS_NONE, + NULL); + + g_object_set (dialog, + "text", data->primary_text, + "secondary-text", data->secondary_text, + NULL); for (response_id = 0; data->button_titles[response_id] != NULL; @@ -1085,8 +1088,8 @@ do_run_simple_dialog (gpointer _data) } if (data->details_text) { - eel_alert_dialog_set_details_label (EEL_ALERT_DIALOG (dialog), - data->details_text); + eel_gtk_message_dialog_set_details_label (GTK_MESSAGE_DIALOG (dialog), + data->details_text); } /* Run it. */ @@ -1098,7 +1101,7 @@ do_run_simple_dialog (gpointer _data) result = gtk_dialog_run (GTK_DIALOG (dialog)); } - gtk_object_destroy (GTK_OBJECT (dialog)); + gtk_widget_destroy (dialog); data->result = result; |