callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of the _gdk_selection_property global

Browse Source
This commit is contained in:
Matthias Clasen
2010-12-15 18:42:38 -05:00
parent 185cdddb0d
commit d5803fa9b2
4 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gdk/x11/gdkdisplay-x11.c
View File

@ -154,7 +154,8 @@ static const char *const precache_atoms[] = {
"_NET_WM_WINDOW_TYPE", "_NET_WM_WINDOW_TYPE",
"_NET_WM_WINDOW_TYPE_NORMAL", "_NET_WM_WINDOW_TYPE_NORMAL",
"_NET_WM_USER_TIME", "_NET_WM_USER_TIME",
"_NET_VIRTUAL_ROOTS" "_NET_VIRTUAL_ROOTS",
"GDK_SELECTION"
}; };
static char *gdk_sm_client_id; static char *gdk_sm_client_id;
@ -2154,7 +2155,7 @@ gdk_x11_display_store_clipboard (GdkDisplay *display,
if (n_targets > 0) if (n_targets > 0)
{ {
property_name = gdk_x11_atom_to_xatom_for_display (display, _gdk_selection_property); property_name = gdk_x11_get_xatom_by_name_for_display (display, "GDK_SELECTION");
xatoms = g_new (Atom, n_targets); xatoms = g_new (Atom, n_targets);
for (i = 0; i < n_targets; i++) for (i = 0; i < n_targets; i++)

1
gdk/x11/gdkglobals-x11.c
View File

@ -33,5 +33,4 @@
gboolean _gdk_use_xshm = TRUE; /* used as a cmd line arg */ gboolean _gdk_use_xshm = TRUE; /* used as a cmd line arg */
GdkAtom _gdk_selection_property;
gboolean _gdk_synchronize = FALSE; gboolean _gdk_synchronize = FALSE;

2
gdk/x11/gdkmain-x11.c
View File

@ -102,8 +102,6 @@ _gdk_x11_windowing_init (void)
g_queue_init (&gdk_error_traps); g_queue_init (&gdk_error_traps);
XSetErrorHandler (gdk_x_error); XSetErrorHandler (gdk_x_error);
XSetIOErrorHandler (gdk_x_io_error); XSetIOErrorHandler (gdk_x_io_error);
_gdk_selection_property = gdk_atom_intern_static_string ("GDK_SELECTION");
} }
GdkGrabStatus GdkGrabStatus

4
gdk/x11/gdkselection-x11.c
View File

@ -243,7 +243,7 @@ gdk_selection_convert (GdkWindow *requestor,
XConvertSelection (GDK_WINDOW_XDISPLAY (requestor), XConvertSelection (GDK_WINDOW_XDISPLAY (requestor),
gdk_x11_atom_to_xatom_for_display (display, selection), gdk_x11_atom_to_xatom_for_display (display, selection),
gdk_x11_atom_to_xatom_for_display (display, target), gdk_x11_atom_to_xatom_for_display (display, target),
gdk_x11_atom_to_xatom_for_display (display, _gdk_selection_property), gdk_x11_get_xatom_by_name_for_display (display, "GDK_SELECTION"),
GDK_WINDOW_XID (requestor), time); GDK_WINDOW_XID (requestor), time);
} }
@ -298,7 +298,7 @@ gdk_selection_property_get (GdkWindow *requestor,
Otherwise there's no guarantee we'll win the race ... */ Otherwise there's no guarantee we'll win the race ... */
if (XGetWindowProperty (GDK_WINDOW_XDISPLAY (requestor), if (XGetWindowProperty (GDK_WINDOW_XDISPLAY (requestor),
GDK_WINDOW_XID (requestor), GDK_WINDOW_XID (requestor),
gdk_x11_atom_to_xatom_for_display (display, _gdk_selection_property), gdk_x11_get_xatom_by_name_for_display (display, "GDK_SELECTION"),
0, 0x1FFFFFFF /* MAXINT32 / 4 */, False, 0, 0x1FFFFFFF /* MAXINT32 / 4 */, False,
AnyPropertyType, &prop_type, &prop_format, AnyPropertyType, &prop_type, &prop_format,
&nitems, &nbytes, &t) != Success) &nitems, &nbytes, &t) != Success)