[gtk+/gdk-backend: 55/91] Remove gdk_spawn functions
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gdk-backend: 55/91] Remove gdk_spawn functions
- Date: Sat, 18 Dec 2010 01:10:26 +0000 (UTC)
commit e4cda060a6b68ebac2e5b2047e3b033ec6b64524
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Dec 15 08:06:44 2010 -0500
Remove gdk_spawn functions
These functions were trivial g_spawn wrappers in all backends
except for X11, and they can be easily replaced by
g_app_info_create_for_commandline + GdkAppLaunchContext.
docs/reference/gdk/gdk3-sections.txt | 4 -
gdk/Makefile.am | 2 -
gdk/gdk.c | 3 +-
gdk/gdk.h | 1 -
gdk/gdk.symbols | 3 -
gdk/gdkspawn.h | 62 ----------
gdk/x11/Makefile.am | 1 -
gdk/x11/gdkspawn-x11.c | 214 ----------------------------------
gtk/gtkprintoperation-unix.c | 6 +-
9 files changed, 4 insertions(+), 292 deletions(-)
---
diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk3-sections.txt
index 02a3608..dc5db53 100644
--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@ -217,10 +217,6 @@ gdk_screen_get_resolution
gdk_screen_set_resolution
gdk_screen_get_active_window
gdk_screen_get_window_stack
-<SUBSECTION Spawning>
-gdk_spawn_on_screen
-gdk_spawn_on_screen_with_pipes
-gdk_spawn_command_line_on_screen
<SUBSECTION Standard>
GDK_SCREEN
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 2545e29..0e98049 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -84,7 +84,6 @@ gdk_public_h_sources = \
gdkrgba.h \
gdkscreen.h \
gdkselection.h \
- gdkspawn.h \
gdktestutils.h \
gdkthreads.h \
gdktypes.h \
@@ -210,7 +209,6 @@ x11_introspection_files = \
x11/gdkscreen-x11.c \
x11/gdkselection-x11.c \
x11/gdksettings.c \
- x11/gdkspawn-x11.c \
x11/gdktestutils-x11.c \
x11/gdkvisual-x11.c \
x11/gdkwindow-x11.c \
diff --git a/gdk/gdk.c b/gdk/gdk.c
index 5ca6326..7af9134 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -218,8 +218,7 @@ gdk_pre_parse_libgtk_only (void)
if (getenv ("GDK_NATIVE_WINDOWS"))
{
_gdk_native_windows = TRUE;
- /* Ensure that this is not propagated
- to spawned applications */
+ /* Ensure that this is not propagated to spawned applications */
g_unsetenv ("GDK_NATIVE_WINDOWS");
}
diff --git a/gdk/gdk.h b/gdk/gdk.h
index 938961e..2b84969 100644
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -51,7 +51,6 @@
#include <gdk/gdkrgba.h>
#include <gdk/gdkscreen.h>
#include <gdk/gdkselection.h>
-#include <gdk/gdkspawn.h>
#include <gdk/gdktestutils.h>
#include <gdk/gdkthreads.h>
#include <gdk/gdktypes.h>
diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index dc01651..511307a 100644
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -320,9 +320,6 @@ gdk_set_program_class
gdk_set_show_events
gdk_setting_action_get_type G_GNUC_CONST
gdk_setting_get
-gdk_spawn_command_line_on_screen
-gdk_spawn_on_screen
-gdk_spawn_on_screen_with_pipes
gdk_status_get_type G_GNUC_CONST
gdk_string_to_compound_text
gdk_string_to_compound_text_for_display
diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index 6c07ff4..d05a033 100644
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -44,7 +44,6 @@ libgdk_x11_la_SOURCES = \
gdkscreen-x11.c \
gdkscreen-x11.h \
gdkselection-x11.c \
- gdkspawn-x11.c \
gdktestutils-x11.c \
gdkvisual-x11.c \
gdkwindow-x11.c \
diff --git a/gtk/gtkprintoperation-unix.c b/gtk/gtkprintoperation-unix.c
index 51a17f4..1f216a4 100644
--- a/gtk/gtkprintoperation-unix.c
+++ b/gtk/gtkprintoperation-unix.c
@@ -202,7 +202,7 @@ _gtk_print_operation_platform_backend_launch_preview (GtkPrintOperation *op,
const gchar *filename)
{
GAppInfo *appinfo;
- GAppLaunchContext *context;
+ GdkAppLaunchContext *context;
gchar *cmd;
gchar *preview_cmd;
GtkSettings *settings;
@@ -291,8 +291,8 @@ _gtk_print_operation_platform_backend_launch_preview (GtkPrintOperation *op,
goto out;
context = gdk_display_get_app_launch_context (gdk_screen_get_display (screen));
- gdk_app_launch_context_set_screen (GDK_APP_LAUNCH_CONTEXT (context), screen);
- g_app_info_launch (appinfo, NULL, context, &error);
+ gdk_app_launch_context_set_screen (context, screen);
+ g_app_info_launch (appinfo, NULL, G_APP_LAUNCH_CONTEXT (context), &error);
g_object_unref (context);
g_object_unref (appinfo);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]