Index: main.c =================================================================== RCS file: /cvs/gpe/base/gpe-filemanager/main.c,v retrieving revision 1.86 retrieving revision 1.88 diff -u -r1.86 -r1.88 --- main.c 2 Sep 2004 12:42:43 -0000 1.86 +++ main.c 6 Sep 2004 10:43:47 -0000 1.88 @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -31,7 +32,6 @@ #include #include - #include #include #include @@ -42,6 +42,8 @@ #include #include #include +#include +#include #include "mime-sql.h" #include "mime-programs-sql.h" @@ -332,7 +334,8 @@ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), progress,FALSE,TRUE,0); g_object_set_data(G_OBJECT(dialog),"bar",progress); - g_signal_connect(G_OBJECT(dialog),"response",G_CALLBACK(progress_response),NULL); + g_signal_connect(G_OBJECT(dialog),"response", + G_CALLBACK(progress_response),NULL); gtk_widget_show_all(dialog); return dialog; } @@ -555,7 +558,11 @@ response = gnome_vfs_make_directory(diruri,S_IRWXU); if (response != GNOME_VFS_OK) gpe_error_box (gnome_vfs_result_to_string(response)); - refresh_current_directory(); + else + { + gpe_popup_infoprint(GDK_DISPLAY(), _("Directory created.")); + refresh_current_directory(); + } } gtk_widget_destroy(dialog); } @@ -579,11 +586,15 @@ (GnomeVFSXferProgressCallback) transfer_callback, NULL); if ((result != GNOME_VFS_OK) && (result != GNOME_VFS_ERROR_INTERRUPTED)) - { - error = g_strdup_printf ("Error: %s", gnome_vfs_result_to_string(result)); - gpe_error_box (error); - g_free (error); - } + { + error = g_strdup_printf ("Error: %s", gnome_vfs_result_to_string(result)); + gpe_error_box (error); + g_free (error); + } + else + { + gpe_popup_infoprint(GDK_DISPLAY(), _("File copied.")); + } gnome_vfs_uri_unref(uri_src); gnome_vfs_uri_unref(uri_dest); } @@ -598,6 +609,7 @@ gnome_vfs_get_uri_from_local_path(current_popup_file->filename); else file_clipboard = g_strdup(current_popup_file->filename); + gpe_popup_infoprint(GDK_DISPLAY(), _("File copied to clipboard.")); } @@ -665,9 +677,15 @@ FileInformation *file_info) { pid_t pid; - + if (application) { + gchar *msg = g_strdup_printf("%s %s",_("Starting"),application->name); + Display *dpy = GDK_DISPLAY(); + + gpe_popup_infoprint(dpy, msg); + g_free(msg); + pid = fork(); switch (pid) { @@ -709,40 +727,43 @@ GnomeVFSResult result; if (response_id == GTK_RESPONSE_ACCEPT) - { - gchar *tmp = g_strdup (current_popup_file->filename); - dest = g_strdup_printf ("%s/%s", dirname (tmp), gtk_entry_get_text (GTK_ENTRY (g_object_get_data (G_OBJECT (dialog_window), "entry")))); - g_free (tmp); - result = gnome_vfs_move_uri (gnome_vfs_uri_new (current_popup_file->filename), gnome_vfs_uri_new (dest), TRUE); - - if (result != GNOME_VFS_OK) - { - switch (result) { - case GNOME_VFS_ERROR_READ_ONLY: - error = g_strdup ("File is read only."); - break; - case GNOME_VFS_ERROR_ACCESS_DENIED: - error = g_strdup ("Access denied."); - break; - case GNOME_VFS_ERROR_READ_ONLY_FILE_SYSTEM: - error = g_strdup ("Read only file system."); - break; - case GNOME_VFS_ERROR_FILE_EXISTS: - error = g_strdup ("Destination file already exists."); - break; - default: - error = g_strdup_printf ("Error: %s", gnome_vfs_result_to_string(result)); - break; + gchar *tmp = g_strdup (current_popup_file->filename); + dest = g_strdup_printf ("%s/%s", dirname (tmp), gtk_entry_get_text (GTK_ENTRY (g_object_get_data (G_OBJECT (dialog_window), "entry")))); + g_free (tmp); + result = gnome_vfs_move_uri (gnome_vfs_uri_new (current_popup_file->filename), gnome_vfs_uri_new (dest), TRUE); + + if (result != GNOME_VFS_OK) + { + switch (result) + { + case GNOME_VFS_ERROR_READ_ONLY: + error = g_strdup ("File is read only."); + break; + case GNOME_VFS_ERROR_ACCESS_DENIED: + error = g_strdup ("Access denied."); + break; + case GNOME_VFS_ERROR_READ_ONLY_FILE_SYSTEM: + error = g_strdup ("Read only file system."); + break; + case GNOME_VFS_ERROR_FILE_EXISTS: + error = g_strdup ("Destination file already exists."); + break; + default: + error = g_strdup_printf ("Error: %s", + gnome_vfs_result_to_string(result)); + break; + } + gpe_error_box (error); + g_free (error); + } + else + { + gpe_popup_infoprint(GDK_DISPLAY(), _("File renamed.")); + } + g_free (dest); } - gpe_error_box (error); - g_free (error); - } - - g_free (dest); - } - gtk_widget_destroy (dialog_window); refresh_current_directory(); } @@ -758,32 +779,33 @@ result = gnome_vfs_move_uri (gnome_vfs_uri_new (current_popup_file->filename), gnome_vfs_uri_new (dest), TRUE); if (result != GNOME_VFS_OK) - { - switch (result) { - case GNOME_VFS_ERROR_NO_SPACE: - error = g_strdup ("No space left on device."); - break; - case GNOME_VFS_ERROR_READ_ONLY: - error = g_strdup ("Destination is read only."); - break; - case GNOME_VFS_ERROR_ACCESS_DENIED: - error = g_strdup ("Access denied."); - break; - case GNOME_VFS_ERROR_READ_ONLY_FILE_SYSTEM: - error = g_strdup ("Read only file system."); - break; - default: - error = g_strdup_printf ("Error: %s", gnome_vfs_result_to_string(result)); - break; + switch (result) + { + case GNOME_VFS_ERROR_NO_SPACE: + error = g_strdup ("No space left on device."); + break; + case GNOME_VFS_ERROR_READ_ONLY: + error = g_strdup ("Destination is read only."); + break; + case GNOME_VFS_ERROR_ACCESS_DENIED: + error = g_strdup ("Access denied."); + break; + case GNOME_VFS_ERROR_READ_ONLY_FILE_SYSTEM: + error = g_strdup ("Read only file system."); + break; + default: + error = g_strdup_printf ("Error: %s", gnome_vfs_result_to_string(result)); + break; + } + gpe_error_box (error); + g_free (error); } - - gpe_error_box (error); - g_free (error); - } else - refresh_current_directory(); - + { + gpe_popup_infoprint(GDK_DISPLAY(), _("File moved.")); + refresh_current_directory(); + } g_free (dest); } @@ -808,10 +830,19 @@ label_text = g_strdup_printf ("Rename file %s to:", current_popup_file->vfs->name); - dialog_window = gtk_dialog_new_with_buttons ("Rename file", GTK_WINDOW (window), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); - g_signal_connect (G_OBJECT (dialog_window), "delete_event", GTK_SIGNAL_FUNC (kill_widget), dialog_window); - g_signal_connect (G_OBJECT (dialog_window), "response", GTK_SIGNAL_FUNC (rename_file), NULL); - + dialog_window = gtk_dialog_new_with_buttons ("Rename file", + GTK_WINDOW (window), + GTK_DIALOG_MODAL + | GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_CANCEL, + GTK_RESPONSE_REJECT, + GTK_STOCK_OK, + GTK_RESPONSE_ACCEPT, NULL); + g_signal_connect (G_OBJECT (dialog_window), "delete_event", + G_CALLBACK (kill_widget), dialog_window); + g_signal_connect (G_OBJECT (dialog_window), "response", + G_CALLBACK (rename_file), NULL); + vbox = gtk_vbox_new (FALSE, 0); label = gtk_label_new (label_text); @@ -1681,7 +1712,9 @@ gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &iter, path); - gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, tree == view_widget ? COL_DATA : COL_DIRDATA, &i, -1); + gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, + tree == view_widget ? COL_DATA : COL_DIRDATA, + &i, -1); gtk_tree_path_free (path); if (b->button == 3) Index: main.c =================================================================== RCS file: /cvs/gpe/base/gpe-filemanager/main.c,v retrieving revision 1.88 diff -u -r1.88 main.c --- main.c 6 Sep 2004 10:43:47 -0000 1.88 +++ main.c 7 Sep 2004 15:33:42 -0000 @@ -1150,7 +1150,6 @@ { GnomeVFSMimeApplication *default_mime_application; FileInformation *file_info; - pid_t pid; file_info = (FileInformation *) udata; @@ -1194,21 +1193,7 @@ default_mime_application = gnome_vfs_mime_get_default_application (file_info->vfs->mime_type); if (default_mime_application != NULL) { - pid = fork(); - switch (pid) - { - case -1: - return; /* failed */ - break; - case 0: - if (default_mime_application->requires_terminal) - execlp(DEFAULT_TERMINAL,DEFAULT_TERMINAL,default_mime_application->command,file_info->filename); - else - execlp(default_mime_application->command,default_mime_application->command,file_info->filename,NULL); - break; - default: - break; - } + open_with(default_mime_application, file_info); } else ask_open_with (file_info);