DeforaOS/Browser
DeforaOS/Browser
2
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Pierre Pronchery 2018-05-18 21:43:47 +02:00
parent 1d077abb0f
commit 0a52c58449
1 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/desktop/desktopicon.c
View File

@ -136,10 +136,10 @@ static void _on_icon_drag_data_received(GtkWidget * widget,
GdkDragContext * context, gint x, gint y, GdkDragContext * context, gint x, gint y,
GtkSelectionData * seldata, guint info, guint time, GtkSelectionData * seldata, guint info, guint time,
gpointer data); gpointer data);
static void _on_icon_open(gpointer data);
static void _on_icon_edit(gpointer data); static void _on_icon_edit(gpointer data);
static void _on_icon_run(gpointer data); static void _on_icon_open(gpointer data);
static void _on_icon_open_with(gpointer data); static void _on_icon_open_with(gpointer data);
static void _on_icon_run(gpointer data);
static void _on_icon_rename(gpointer data); static void _on_icon_rename(gpointer data);
static void _on_icon_delete(gpointer data); static void _on_icon_delete(gpointer data);
static void _on_icon_properties(gpointer data); static void _on_icon_properties(gpointer data);
@ -923,6 +923,17 @@ static void _popup_mime(Mime * mime, char const * mimetype, char const * action,
} }
/* on_icon_edit */
static void _on_icon_edit(gpointer data)
{
DesktopIcon * desktopicon = data;
Mime * mime;
mime = desktop_get_mime(desktopicon->desktop);
mime_action(mime, "edit", desktopicon->path);
}
/* on_icon_open */ /* on_icon_open */
static void _on_icon_open(gpointer data) static void _on_icon_open(gpointer data)
{ {
@ -956,14 +967,37 @@ static void _on_icon_open(gpointer data)
} }
/* on_icon_edit */ /* on_icon_open_with */
static void _on_icon_edit(gpointer data) static void _on_icon_open_with(gpointer data)
{ {
DesktopIcon * desktopicon = data; DesktopIcon * desktopicon = data;
Mime * mime; GtkWidget * dialog;
char * filename = NULL;
char * argv[] = { NULL, NULL, NULL, NULL };
const unsigned int flags = G_SPAWN_SEARCH_PATH
| G_SPAWN_FILE_AND_ARGV_ZERO;
GError * error = NULL;
mime = desktop_get_mime(desktopicon->desktop); dialog = gtk_file_chooser_dialog_new(_("Open with..."), NULL,
mime_action(mime, "edit", desktopicon->path); GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN,
GTK_RESPONSE_ACCEPT, NULL);
if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)
filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(
dialog));
gtk_widget_destroy(dialog);
if(filename == NULL)
return;
argv[0] = filename;
argv[1] = filename;
argv[2] = desktopicon->path;
if(g_spawn_async(NULL, argv, NULL, flags, NULL, NULL, NULL, &error)
!= TRUE)
{
desktop_error(desktopicon->desktop, NULL, error->message, 1);
g_error_free(error);
}
g_free(filename);
} }
@ -1125,40 +1159,6 @@ static void _run_link(DesktopIcon * desktopicon)
} }
/* on_icon_open_with */
static void _on_icon_open_with(gpointer data)
{
DesktopIcon * desktopicon = data;
GtkWidget * dialog;
char * filename = NULL;
char * argv[] = { NULL, NULL, NULL, NULL };
const unsigned int flags = G_SPAWN_SEARCH_PATH
| G_SPAWN_FILE_AND_ARGV_ZERO;
GError * error = NULL;
dialog = gtk_file_chooser_dialog_new(_("Open with..."), NULL,
GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN,
GTK_RESPONSE_ACCEPT, NULL);
if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)
filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(
dialog));
gtk_widget_destroy(dialog);
if(filename == NULL)
return;
argv[0] = filename;
argv[1] = filename;
argv[2] = desktopicon->path;
if(g_spawn_async(NULL, argv, NULL, flags, NULL, NULL, NULL, &error)
!= TRUE)
{
desktop_error(desktopicon->desktop, NULL, error->message, 1);
g_error_free(error);
}
g_free(filename);
}
/* on_icon_rename */ /* on_icon_rename */
static void _on_icon_rename(gpointer data) static void _on_icon_rename(gpointer data)
{ {