diff options
| author | Anders Carlsson <andersca@gnu.org> | 2002-01-04 13:15:14 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@src.gnome.org> | 2002-01-04 13:15:14 +0000 |
| commit | 995efcdfaf619608b003a68f42452540c93d0270 (patch) | |
| tree | deae0b9f2d12c7e1980e524f08d63321537ef9ab /libnautilus-private/nautilus-program-choosing.c | |
| parent | eaca3673401d55c0547777b5f10e05402db25445 (diff) | |
| download | nautilus-995efcdfaf619608b003a68f42452540c93d0270.tar.gz | |
Update to matched changed return value from nautilus_program_chooser_new
2002-01-04 Anders Carlsson <andersca@gnu.org>
* libnautilus-private/nautilus-program-choosing.c:
Update to matched changed return value from
nautilus_program_chooser_new ().
* libnautilus-private/nautilus-program-chooser.h:
* libnautilus-private/nautilus-program-chooser.c:
Port to GtkTreeView, and make NautilusProgramChooser
into a real object.
* components/Makefile.am: Re-enable the music
view.
* components/music/nautilus-music-view.c: Port to
GtkTreeView and GNOME2.
Diffstat (limited to 'libnautilus-private/nautilus-program-choosing.c')
| -rw-r--r-- | libnautilus-private/nautilus-program-choosing.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libnautilus-private/nautilus-program-choosing.c b/libnautilus-private/nautilus-program-choosing.c index 200a6dced..526d5b6be 100644 --- a/libnautilus-private/nautilus-program-choosing.c +++ b/libnautilus-private/nautilus-program-choosing.c @@ -137,12 +137,12 @@ choose_component_destroy (ChooseComponentCallbackData *choose_data) * * Return value: The program-choosing dialog, ready to be run. */ -static GtkDialog * +static GtkWidget * set_up_program_chooser (NautilusFile *file, GnomeVFSMimeActionType type, GtkWindow *parent) { - GtkDialog *dialog; + GtkWidget *dialog; g_assert (NAUTILUS_IS_FILE (file)); @@ -172,7 +172,7 @@ choose_component_callback (NautilusFile *file, { ChooseComponentCallbackData *choose_data; NautilusViewIdentifier *identifier; - GtkDialog *dialog; + GtkWidget *dialog; choose_data = callback_data; @@ -191,8 +191,8 @@ choose_component_callback (NautilusFile *file, if (nautilus_mime_has_any_components_for_file (file)) { dialog = set_up_program_chooser (file, GNOME_VFS_MIME_ACTION_TYPE_COMPONENT, choose_data->parent_window); - if (gtk_dialog_run (dialog) == GTK_RESPONSE_OK) { - identifier = nautilus_program_chooser_get_component (dialog); + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) { + identifier = nautilus_program_chooser_get_component (NAUTILUS_PROGRAM_CHOOSER (dialog)); } } else { nautilus_program_chooser_show_no_choices_message (GNOME_VFS_MIME_ACTION_TYPE_COMPONENT, @@ -311,7 +311,7 @@ choose_application_callback (NautilusFile *file, gpointer callback_data) { ChooseApplicationCallbackData *choose_data; - GtkDialog *dialog; + GtkWidget *dialog; GnomeVFSMimeApplication *application; choose_data = callback_data; @@ -331,8 +331,8 @@ choose_application_callback (NautilusFile *file, if (nautilus_mime_has_any_applications_for_file_type (file)) { dialog = set_up_program_chooser (file, GNOME_VFS_MIME_ACTION_TYPE_APPLICATION, choose_data->parent_window); - if (gtk_dialog_run (dialog) == GTK_RESPONSE_OK) { - application = nautilus_program_chooser_get_application (dialog); + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) { + application = nautilus_program_chooser_get_application (NAUTILUS_PROGRAM_CHOOSER (dialog)); } } else { nautilus_program_chooser_show_no_choices_message (GNOME_VFS_MIME_ACTION_TYPE_APPLICATION, |