AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-14 14:20:21 +00:00
Code Issues Projects Releases Wiki Activity

Rename GdkAppLaunchContextX11 to GdkX11AppLaunchContext

Browse Source
This commit is contained in:
Matthias Clasen 2010-12-21 02:32:15 -05:00
parent 3fb8c3415b
commit bd36374413
3 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gdk/gdk.symbols
View File

@ -509,6 +509,7 @@ gdk_window_unstick
gdk_window_withdraw gdk_window_withdraw
gdk_wm_decoration_get_type G_GNUC_CONST gdk_wm_decoration_get_type G_GNUC_CONST
gdk_wm_function_get_type G_GNUC_CONST gdk_wm_function_get_type G_GNUC_CONST
gdk_x11_app_launch_context_get_type
gdk_x11_atom_to_xatom gdk_x11_atom_to_xatom
gdk_x11_atom_to_xatom_for_display gdk_x11_atom_to_xatom_for_display
gdk_x11_cursor_get_type gdk_x11_cursor_get_type

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

@ -22,6 +22,7 @@
#include "config.h" #include "config.h"
#include "gdkx11applaunchcontext.h"
#include "gdkapplaunchcontextprivate.h" #include "gdkapplaunchcontextprivate.h"
#include "gdkscreen.h" #include "gdkscreen.h"
#include "gdkintl.h" #include "gdkintl.h"
@ -257,7 +258,7 @@ add_startup_timeout (GdkScreen *screen,
static char * static char *
gdk_app_launch_context_x11_get_startup_notify_id (GAppLaunchContext *context, gdk_x11_app_launch_context_get_startup_notify_id (GAppLaunchContext *context,
GAppInfo *info, GAppInfo *info,
GList *files) GList *files)
{ {
@ -387,8 +388,8 @@ gdk_app_launch_context_x11_get_startup_notify_id (GAppLaunchContext *context,
static void static void
gdk_app_launch_context_x11_launch_failed (GAppLaunchContext *context, gdk_x11_app_launch_context_launch_failed (GAppLaunchContext *context,
const char *startup_notify_id) const gchar *startup_notify_id)
{ {
GdkAppLaunchContext *ctx; GdkAppLaunchContext *ctx;
GdkScreen *screen; GdkScreen *screen;
@ -428,22 +429,30 @@ gdk_app_launch_context_x11_launch_failed (GAppLaunchContext *context,
} }
} }
typedef GdkAppLaunchContext GdkAppLaunchContextX11; struct _GdkX11AppLaunchContext
typedef GdkAppLaunchContextClass GdkAppLaunchContextX11Class; {
GdkAppLaunchContext parent_instance;
};
G_DEFINE_TYPE (GdkAppLaunchContextX11, _gdk_app_launch_context_x11, GDK_TYPE_APP_LAUNCH_CONTEXT) struct _GdkX11AppLaunchContextClass
{
GdkAppLaunchContextClass parent_class;
};
G_DEFINE_TYPE (GdkX11AppLaunchContext, gdk_x11_app_launch_context, GDK_TYPE_APP_LAUNCH_CONTEXT)
static void static void
_gdk_app_launch_context_x11_class_init (GdkAppLaunchContextX11Class *klass) gdk_x11_app_launch_context_class_init (GdkX11AppLaunchContextClass *klass)
{ {
GAppLaunchContextClass *ctx_class = G_APP_LAUNCH_CONTEXT_CLASS (klass); GAppLaunchContextClass *ctx_class = G_APP_LAUNCH_CONTEXT_CLASS (klass);
ctx_class->get_startup_notify_id = gdk_app_launch_context_x11_get_startup_notify_id; ctx_class->get_startup_notify_id = gdk_x11_app_launch_context_get_startup_notify_id;
ctx_class->launch_failed = gdk_app_launch_context_x11_launch_failed; ctx_class->launch_failed = gdk_x11_app_launch_context_launch_failed;
} }
static void static void
_gdk_app_launch_context_x11_init (GdkAppLaunchContextX11 *ctx) gdk_x11_app_launch_context_init (GdkX11AppLaunchContext *ctx)
{ {
} }
@ -452,7 +461,7 @@ _gdk_x11_display_get_app_launch_context (GdkDisplay *display)
{ {
GdkAppLaunchContext *ctx; GdkAppLaunchContext *ctx;
ctx = g_object_new (_gdk_app_launch_context_x11_get_type (), ctx = g_object_new (GDK_TYPE_X11_APP_LAUNCH_CONTEXT,
"display", display, "display", display,
NULL); NULL);

1
gdk/x11/gdkx.h
View File

@ -55,6 +55,7 @@
#define __GDKX_H_INSIDE__ #define __GDKX_H_INSIDE__
#include <gdk/x11/gdkx11applaunchcontext.h>
#include <gdk/x11/gdkx11cursor.h> #include <gdk/x11/gdkx11cursor.h>
#include <gdk/x11/gdkx11device-core.h> #include <gdk/x11/gdkx11device-core.h>
#include <gdk/x11/gdkx11device-xi.h> #include <gdk/x11/gdkx11device-xi.h>