AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Drop gdk_app_launch_context_set_screen

Browse Source 
This function is not necessary, since we already know the display.
This commit is contained in:
Matthias Clasen 2017-10-30 23:01:34 -04:00
parent c20d217d8f
commit ba91af62ad
4 changed files with 3 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
gdk/gdkapplaunchcontext.c
View File

@ -42,7 +42,7 @@
* *
* context = gdk_display_get_app_launch_context (display); * context = gdk_display_get_app_launch_context (display);
* *
* gdk_app_launch_context_set_screen (screen); * gdk_app_launch_context_set_display (display);
* gdk_app_launch_context_set_timestamp (event->time); * gdk_app_launch_context_set_timestamp (event->time);
* *
* if (!g_app_info_launch_default_for_uri ("http://www.gtk.org", context, &error)) * if (!g_app_info_launch_default_for_uri ("http://www.gtk.org", context, &error))
@ -143,9 +143,6 @@ gdk_app_launch_context_finalize (GObject *object)
if (context->display) if (context->display)
g_object_unref (context->display); g_object_unref (context->display);
if (context->screen)
g_object_unref (context->screen);
if (context->icon) if (context->icon)
g_object_unref (context->icon); g_object_unref (context->icon);
@ -170,39 +167,6 @@ gdk_app_launch_context_get_display (GAppLaunchContext *context,
return g_strdup (gdk_display_get_name (display)); return g_strdup (gdk_display_get_name (display));
} }
/**
* gdk_app_launch_context_set_screen:
* @context: a #GdkAppLaunchContext
* @screen: a #GdkScreen
*
* Sets the screen on which applications will be launched when
* using this context. See also gdk_app_launch_context_set_display().
*
* If both @screen and @display are set, the @screen takes priority.
* If neither @screen or @display are set, the default screen and
* display are used.
*
* Since: 2.14
*/
void
gdk_app_launch_context_set_screen (GdkAppLaunchContext *context,
GdkScreen *screen)
{
g_return_if_fail (GDK_IS_APP_LAUNCH_CONTEXT (context));
g_return_if_fail (screen == NULL || GDK_IS_SCREEN (screen));
g_return_if_fail (screen == NULL || gdk_screen_get_display (screen) == context->display);
if (context->screen)
{
g_object_unref (context->screen);
context->screen = NULL;
}
if (screen)
context->screen = g_object_ref (screen);
}
/** /**
* gdk_app_launch_context_set_desktop: * gdk_app_launch_context_set_desktop:
* @context: a #GdkAppLaunchContext * @context: a #GdkAppLaunchContext

1
gdk/gdkapplaunchcontextprivate.h
View File

@ -36,7 +36,6 @@ struct _GdkAppLaunchContext
GAppLaunchContext parent_instance; GAppLaunchContext parent_instance;
GdkDisplay *display; GdkDisplay *display;
GdkScreen *screen;
gint workspace; gint workspace;
guint32 timestamp; guint32 timestamp;
GIcon *icon; GIcon *icon;

1
gdk/wayland/gdkapplaunchcontext-wayland.c
View File

@ -26,7 +26,6 @@
#include "gdkwayland.h" #include "gdkwayland.h"
#include "gdkprivate-wayland.h" #include "gdkprivate-wayland.h"
#include "gdkapplaunchcontextprivate.h" #include "gdkapplaunchcontextprivate.h"
#include "gdkscreen.h"
#include "gdkinternals.h" #include "gdkinternals.h"
#include "gdkintl.h" #include "gdkintl.h"

10
gdk/x11/gdkapplaunchcontext-x11.c
View File

@ -282,10 +282,7 @@ gdk_x11_app_launch_context_get_startup_notify_id (GAppLaunchContext *context,
ctx = GDK_APP_LAUNCH_CONTEXT (context); ctx = GDK_APP_LAUNCH_CONTEXT (context);
display = ctx->display; display = ctx->display;
if (ctx->screen) screen = gdk_display_get_default_screen (ctx->display);
screen = ctx->screen;
else
screen = gdk_display_get_default_screen (ctx->display);
fileinfo = NULL; fileinfo = NULL;
@ -402,10 +399,7 @@ gdk_x11_app_launch_context_launch_failed (GAppLaunchContext *context,
ctx = GDK_APP_LAUNCH_CONTEXT (context); ctx = GDK_APP_LAUNCH_CONTEXT (context);
if (ctx->screen) screen = gdk_display_get_default_screen (ctx->display);
screen = ctx->screen;
else
screen = gdk_display_get_default_screen (ctx->display);
data = g_object_get_data (G_OBJECT (screen), "appinfo-startup-data"); data = g_object_get_data (G_OBJECT (screen), "appinfo-startup-data");