Commit e3777b54 authored by Ernestas Kulik's avatar Ernestas Kulik 🦑

program-choosing: drop eel dependency

Terminal applications are launched via eel, and, since this file is the
only consumer of that API, the code from eel can be moved over.
parent ac0e5578
/* eel-gnome-extensions.c - implementation of new functions that operate on
* gnome classes. Perhaps some of these should be
* rolled into gnome someday.
*
* Copyright (C) 1999, 2000, 2001 Eazel, Inc.
*
* The Gnome Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* The Gnome Library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with the Gnome Library; see the file COPYING.LIB. If not,
* see <http://www.gnu.org/licenses/>.
*
* Authors: Darin Adler <darin@eazel.com>
*/
#include <config.h>
#define GNOME_DESKTOP_USE_UNSTABLE_API
#include "eel-gnome-extensions.h"
#include <gtk/gtk.h>
/* Return a command string containing the path to a terminal on this system. */
void
eel_gnome_open_terminal_on_screen (const char *command,
GdkScreen *screen)
{
GAppInfo *app;
GdkAppLaunchContext *ctx;
GError *error = NULL;
GdkDisplay *display;
app = g_app_info_create_from_commandline (command, NULL, G_APP_INFO_CREATE_NEEDS_TERMINAL, &error);
if (app != NULL && screen != NULL)
{
display = gdk_screen_get_display (screen);
ctx = gdk_display_get_app_launch_context (display);
gdk_app_launch_context_set_screen (ctx, screen);
g_app_info_launch (app, NULL, G_APP_LAUNCH_CONTEXT (ctx), &error);
g_object_unref (app);
g_object_unref (ctx);
}
if (error != NULL)
{
g_message ("Could not start application on terminal: %s", error->message);
g_error_free (error);
}
}
/* eel-gnome-extensions.h - interface for new functions that operate on
gnome classes. Perhaps some of these should be
rolled into gnome someday.
Copyright (C) 1999, 2000, 2001 Eazel, Inc.
The Gnome Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
The Gnome Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with the Gnome Library; see the file COPYING.LIB. If not,
see <http://www.gnu.org/licenses/>.
Authors: Darin Adler <darin@eazel.com>
*/
#ifndef EEL_GNOME_EXTENSIONS_H
#define EEL_GNOME_EXTENSIONS_H
#include <gtk/gtk.h>
/* Open up a new terminal, optionally passing in a command to execute */
void eel_gnome_open_terminal_on_screen (const char *command,
GdkScreen *screen);
#endif /* EEL_GNOME_EXTENSIONS_H */
......@@ -27,7 +27,6 @@
#include "eel-gtk-extensions.h"
#include "eel-glib-extensions.h"
#include "eel-gnome-extensions.h"
#include "eel-string.h"
#include <X11/Xlib.h>
......
......@@ -26,7 +26,6 @@
#include <eel/eel-art-extensions.h>
#include <eel/eel-gdk-extensions.h>
#include <eel/eel-glib-extensions.h>
#include <eel/eel-gnome-extensions.h>
#include <eel/eel-graphic-effects.h>
#include <eel/eel-gtk-extensions.h>
#include <eel/eel-self-checks.h>
......
......@@ -11,8 +11,6 @@ libeel_2_sources = [
'eel-gdk-extensions.c',
'eel-glib-extensions.h',
'eel-glib-extensions.c',
'eel-gnome-extensions.h',
'eel-gnome-extensions.c',
'eel-graphic-effects.h',
'eel-graphic-effects.c',
'eel-gtk-extensions.h',
......
......@@ -40,7 +40,6 @@
#include "nautilus-metadata.h"
#include "nautilus-selection-canvas-item.h"
#include <eel/eel-glib-extensions.h>
#include <eel/eel-gnome-extensions.h>
#include <eel/eel-graphic-effects.h>
#include <eel/eel-gtk-extensions.h>
#include <eel/eel-stock-dialogs.h>
......
......@@ -57,7 +57,6 @@
#include <fcntl.h>
#include <eel/eel-glib-extensions.h>
#include <eel/eel-gnome-extensions.h>
#include <eel/eel-gtk-extensions.h>
#include <eel/eel-stock-dialogs.h>
#include <eel/eel-string.h>
......
......@@ -26,7 +26,6 @@
#include "nautilus-global-preferences.h"
#include "nautilus-icon-info.h"
#include "nautilus-recent.h"
#include <eel/eel-gnome-extensions.h>
#include <eel/eel-stock-dialogs.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
......@@ -200,29 +199,32 @@ launch_application_from_command_internal (const gchar *full_command,
GdkScreen *screen,
gboolean use_terminal)
{
GAppInfo *app;
GdkAppLaunchContext *ctx;
GdkDisplay *display;
GAppInfoCreateFlags flags;
g_autoptr (GError) error = NULL;
g_autoptr (GAppInfo) app = NULL;
flags = G_APP_INFO_CREATE_NONE;
if (use_terminal)
{
eel_gnome_open_terminal_on_screen (full_command, screen);
flags = G_APP_INFO_CREATE_NEEDS_TERMINAL;
}
else
app = g_app_info_create_from_commandline (full_command, NULL, flags, &error);
if (app != NULL && !(use_terminal && screen == NULL))
{
app = g_app_info_create_from_commandline (full_command, NULL, 0, NULL);
GdkDisplay *display;
g_autoptr (GdkAppLaunchContext) context = NULL;
if (app != NULL)
{
display = gdk_screen_get_display (screen);
ctx = gdk_display_get_app_launch_context (display);
gdk_app_launch_context_set_screen (ctx, screen);
display = gdk_screen_get_display (screen);
context = gdk_display_get_app_launch_context (display);
gdk_app_launch_context_set_screen (context, screen);
g_app_info_launch (app, NULL, G_APP_LAUNCH_CONTEXT (ctx), NULL);
g_app_info_launch (app, NULL, G_APP_LAUNCH_CONTEXT (context), &error);
}
g_object_unref (app);
g_object_unref (ctx);
}
if (error != NULL)
{
g_message ("Could not start application: %s", error->message);
}
}
......
......@@ -39,7 +39,6 @@
#include <eel/eel-accessibility.h>
#include <eel/eel-glib-extensions.h>
#include <eel/eel-gnome-extensions.h>
#include <eel/eel-gtk-extensions.h>
#include <eel/eel-stock-dialogs.h>
#include <eel/eel-string.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment