From 3114c94e27704e73151b4a42cef2d2b04d33a686 Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Wed, 30 Dec 1998 18:29:32 +0000 Subject: [PATCH] 1998-12-30 Jonathan Blandford * gaction.c (gmc_execute): now takes an filename instead of a file entry for an argument (gmc_open_filename): handles the new gmc_execute code. * gdesktop.c (desktop_icon_drop_uri_list): commented out action_drop. Needs defining. --- gnome/ChangeLog | 9 +++++++++ gnome/gaction.c | 12 ++++++------ gnome/gcmd.c | 1 + gnome/gdesktop.c | 6 +++--- gnome/glayout.c | 2 +- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/gnome/ChangeLog b/gnome/ChangeLog index d3162ac8b..76d6d9e7d 100644 --- a/gnome/ChangeLog +++ b/gnome/ChangeLog @@ -1,3 +1,12 @@ +1998-12-30 Jonathan Blandford + + * gaction.c (gmc_execute): now takes an filename instead of a file + entry for an argument + (gmc_open_filename): handles the new gmc_execute code. + + * gdesktop.c (desktop_icon_drop_uri_list): commented out + action_drop. Needs defining. + 1998-12-29 Miguel de Icaza * gdesktop.c (desktop_icon_delete): New function, used for diff --git a/gnome/gaction.c b/gnome/gaction.c index ac1bdc5b3..d8a46ddeb 100644 --- a/gnome/gaction.c +++ b/gnome/gaction.c @@ -20,9 +20,9 @@ #include "../vfs/vfs.h" static void -gmc_execute (file_entry *fe, char *buf) +gmc_execute (char *fname, char *buf) { - exec_extension (fe->fname, buf, NULL, NULL, 0); + exec_extension (fname, buf, NULL, NULL, 0); } int @@ -33,13 +33,13 @@ gmc_open_filename (char *fname, GList *args) int size; if (gnome_metadata_get (fname, "fm-open", &size, &buf) == 0){ - gmc_execute (fe, buf); + gmc_execute (fname, buf); free (buf); return 1; } if (gnome_metadata_get (fname, "open", &size, &buf) == 0){ - gmc_execute (fe, buf); + gmc_execute (fname, buf); free (buf); return 1; } @@ -52,13 +52,13 @@ gmc_open_filename (char *fname, GList *args) cmd = gnome_mime_get_value (mime_type, "fm-open"); if (cmd){ - gmc_execute (fe, cmd); + gmc_execute (fname, cmd); return 1; } cmd = gnome_mime_get_value (mime_type, "open"); if (cmd){ - gmc_execute (fe, cmd); + gmc_execute (fname, cmd); return 1; } return 0; diff --git a/gnome/gcmd.c b/gnome/gcmd.c index e801d92b1..ca83fb64e 100644 --- a/gnome/gcmd.c +++ b/gnome/gcmd.c @@ -183,6 +183,7 @@ gnome_custom_view_cmd (GtkWidget *widget, WPanel *panel) static void option_menu_sort_callback(GtkWidget *widget, gpointer data) { + g_print ("FIXME: implement this function;option_menu_sort_callback\n"); switch ((gint) data) { case SORT_NAME: diff --git a/gnome/gdesktop.c b/gnome/gdesktop.c index 83166ad04..6bb510ed6 100644 --- a/gnome/gdesktop.c +++ b/gnome/gdesktop.c @@ -1099,7 +1099,7 @@ setup_icon_dnd_source (struct desktop_icon_info *dii) static void desktop_icon_drop_uri_list (struct desktop_icon_info *dii, GdkDragContext *context, - GtkSelectionData *data); + GtkSelectionData *data) { char *filename; file_entry *fe; @@ -1124,7 +1124,7 @@ desktop_icon_drop_uri_list (struct desktop_icon_info *dii, * 2. Try to use a metadata-based drop action */ if (gnome_metadata_get (filename, "drop-action", &size, &buf) == 0){ - action_drop (filename, buf, context, data); + /*action_drop (filename, buf, context, data);*/ /* Fixme: i'm undefined */ free (buf); goto out; } @@ -1139,7 +1139,7 @@ desktop_icon_drop_uri_list (struct desktop_icon_info *dii, action = gnome_mime_get_value (mime_type, "drop-action"); if (action){ - action_drop (filename, action, context, data); + /*action_drop (filename, action, context, data);*/ /* Fixme: i'm undefined */ goto out; } } diff --git a/gnome/glayout.c b/gnome/glayout.c index ee59894e1..835738270 100644 --- a/gnome/glayout.c +++ b/gnome/glayout.c @@ -314,7 +314,7 @@ GnomeUIInfo gnome_panel_view_menu [] = { GnomeUIInfo gnome_panel_layout_menu [] = { { GNOME_APP_UI_ITEM, N_("_Sort By..."), N_("Confirmation settings"), gnome_sort_cmd }, - { GNOME_APP_UI_ITEM, N_("_Filter View..."), N_("Global option settings"), NULL }, + { GNOME_APP_UI_ITEM, N_("_Filter View..."), N_("Global option settings"), filter_cmd }, { GNOME_APP_UI_SEPARATOR }, { GNOME_APP_UI_RADIOITEMS, NULL , NULL, gnome_panel_view_menu}, { GNOME_APP_UI_ENDOFINFO, 0, 0 }