1
1

1998-12-30 Jonathan Blandford <jrb@redhat.com>

* 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.
Этот коммит содержится в:
Jonathan Blandford 1998-12-30 18:29:32 +00:00
родитель 60336b711f
Коммит 3114c94e27
5 изменённых файлов: 20 добавлений и 10 удалений

Просмотреть файл

@ -1,3 +1,12 @@
1998-12-30 Jonathan Blandford <jrb@redhat.com>
* 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 <miguel@nuclecu.unam.mx>
* gdesktop.c (desktop_icon_delete): New function, used for

Просмотреть файл

@ -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;

Просмотреть файл

@ -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:

Просмотреть файл

@ -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;
}
}

Просмотреть файл

@ -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 }