diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-10-22 04:34:42 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-10-22 04:34:42 +0000 |
| commit | 46dde8042854304a12db1e687df00300d517d9e6 (patch) | |
| tree | d8d950524745bcdd4e4fcb87ecfc66e16cd370c7 /gtk/gtkplug.c | |
| parent | 724a552c7d00889bcc64127e8921cd11d3eb6ec4 (diff) | |
| download | gtk+-46dde8042854304a12db1e687df00300d517d9e6.tar.gz | |
Fix problem with g_return_if_fail return value.
Sun Oct 21 23:27:00 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_translate_coordinates): Fix
problem with g_return_if_fail return value.
* gdk/x11/gdkproperty-x11.c docs/Changes-2.0.txt: Move over the
virtual atom code from the gdk-multihead branch, removing the per-display
part. Virtualizing atoms needs to be done now to prevent compat
breakage in direct Xlib accessing code in the future. (#62208)
* gdk/x11/gdkx.h: gdk/gdk/x11/gdkproperty-x11.c: Export
gdk_x11_xatom_to_atom, gdk_x11_atom_to_xatom().
* gdk/gdktypes.h docs/Changes-2.0.txt: Make GdkAtom
an opaque pointer type so the compiler catches attempts
to mingle it with X atoms.
* gdk/x11/{gdkdnd-x11.c,gdkevents-x11.c,gdkglobals-x11.c,
gdkkeys-x11.c, gdkmain-x11.c, gdkprivate-x11.c,
gdkproperty-x11.c, gdkselection-x11.c, gdkwindow-x11.c}
gtk/{gtkclist.c,gtkctree.c,gtkdnd.c,gtkplug.c,gtksocket.c}
tests/testdnd.c,tests/testselection.c:
Fix up for above atom changes.
* gdk/gdkselection.h (GDK_SELECTION_CLIPBOARD): Add, since we
now have the ability to add custom predefines.
* gtk/{gtkentry.c,gtklabel.c,gtkoldeditable.c,gtktextview.c}:
Use GDK_SELECTION_CLIPBOARD instead of GDK_NONE in calls
to gtk_clipboard_get().
* gdk/win32/gdkproperty-win32.c: Add CLIPBOARD, fix up
for GdkAtom => pointer change.
* gdk/linux-fb/gdkproperty-fb.c: Fix handling of predefined
atoms, fix for GdkAtom => pointer change.
Diffstat (limited to 'gtk/gtkplug.c')
| -rw-r--r-- | gtk/gtkplug.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c index 9004e39c96..ed9ef18123 100644 --- a/gtk/gtkplug.c +++ b/gtk/gtkplug.c @@ -850,7 +850,7 @@ send_xembed_message (GtkPlug *plug, xevent.xclient.window = GDK_WINDOW_XWINDOW (plug->socket_window); xevent.xclient.type = ClientMessage; - xevent.xclient.message_type = gdk_atom_intern ("_XEMBED", FALSE); + xevent.xclient.message_type = gdk_x11_get_xatom_by_name ("_XEMBED"); xevent.xclient.format = 32; xevent.xclient.data.l[0] = time; xevent.xclient.data.l[1] = message; @@ -918,7 +918,7 @@ xembed_set_info (GdkWindow *gdk_window, Window window = GDK_WINDOW_XWINDOW (gdk_window); unsigned long buffer[2]; - Atom xembed_info_atom = gdk_atom_intern ("_XEMBED_INFO", FALSE); + Atom xembed_info_atom = gdk_x11_get_xatom_by_name ("_XEMBED_INFO"); buffer[1] = 0; /* Protocol version */ buffer[1] = flags; @@ -1015,7 +1015,7 @@ gtk_plug_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data) switch (xevent->type) { case ClientMessage: - if (xevent->xclient.message_type == gdk_atom_intern ("_XEMBED", FALSE)) + if (xevent->xclient.message_type == gdk_x11_get_xatom_by_name ("_XEMBED")) { handle_xembed_message (plug, xevent->xclient.data.l[1], @@ -1027,7 +1027,7 @@ gtk_plug_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data) return GDK_FILTER_REMOVE; } - else if (xevent->xclient.message_type == gdk_atom_intern ("WM_DELETE_WINDOW", FALSE)) + else if (xevent->xclient.message_type == gdk_x11_get_xatom_by_name ("WM_DELETE_WINDOW")) { /* We filter these out because we take being reparented back to the * root window as the reliable end of the embedding protocol |