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

Small cleanups to debug messages for GtkPlug/GtkSocket

Browse Source 
2008-09-19  Owen Taylor  <otaylor@redhat.com>

        Small cleanups to debug messages for GtkPlug/GtkSocket

        * gtk/gtksocket-x11.c: Fix debug message to say "Socket" not "Plug"
        * gtk/gtkplug-x11.c: Remove excess newlines from the ends of debug messages.

svn path=/trunk/; revision=21458
This commit is contained in:
Owen Taylor 2008-09-19 22:52:33 +00:00 committed by Owen Taylor
parent 157488ad99
commit b48fc37a2c
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2008-09-19 Owen Taylor <otaylor@redhat.com>
Small cleanups to debug messages for GtkPlug/GtkSocket
* gtk/gtksocket-x11.c: Fix debug message to say "Socket" not "Plug"
* gtk/gtkplug-x11.c: Remove excess newlines from the ends of debug messages.
2008-09-19 Carlos Garnacho <carlos@imendio.com> 2008-09-19 Carlos Garnacho <carlos@imendio.com>
Bug 83935 – GtkEntry's default invisible char should be U+25CF Bug 83935 – GtkEntry's default invisible char should be U+25CF

8
gtk/gtkplug-x11.c
View File

@ -241,7 +241,7 @@ _gtk_plug_windowing_filter_func (GdkXEvent *gdk_xevent,
XReparentEvent *xre = &xevent->xreparent; XReparentEvent *xre = &xevent->xreparent;
gboolean was_embedded = plug->socket_window != NULL; gboolean was_embedded = plug->socket_window != NULL;
GTK_NOTE (PLUGSOCKET, g_message("GtkPlug: ReparentNotify received\n")); GTK_NOTE (PLUGSOCKET, g_message("GtkPlug: ReparentNotify received"));
return_val = GDK_FILTER_REMOVE; return_val = GDK_FILTER_REMOVE;
@ -251,7 +251,7 @@ _gtk_plug_windowing_filter_func (GdkXEvent *gdk_xevent,
{ {
/* End of embedding protocol for previous socket */ /* End of embedding protocol for previous socket */
GTK_NOTE (PLUGSOCKET, g_message ("GtkPlug: end of embedding\n")); GTK_NOTE (PLUGSOCKET, g_message ("GtkPlug: end of embedding"));
/* FIXME: race if we remove from another socket and /* FIXME: race if we remove from another socket and
* then add to a local window before we get notification * then add to a local window before we get notification
* Probably need check in _gtk_plug_add_to_socket * Probably need check in _gtk_plug_add_to_socket
@ -276,7 +276,7 @@ _gtk_plug_windowing_filter_func (GdkXEvent *gdk_xevent,
if (xre->parent == GDK_WINDOW_XWINDOW (gdk_screen_get_root_window (screen))) if (xre->parent == GDK_WINDOW_XWINDOW (gdk_screen_get_root_window (screen)))
{ {
GTK_NOTE (PLUGSOCKET, g_message ("GtkPlug: calling gtk_plug_send_delete_event()\n")); GTK_NOTE (PLUGSOCKET, g_message ("GtkPlug: calling gtk_plug_send_delete_event()"));
_gtk_plug_send_delete_event (widget); _gtk_plug_send_delete_event (widget);
g_object_notify (G_OBJECT (plug), "embedded"); g_object_notify (G_OBJECT (plug), "embedded");
@ -290,7 +290,7 @@ _gtk_plug_windowing_filter_func (GdkXEvent *gdk_xevent,
{ {
/* Start of embedding protocol */ /* Start of embedding protocol */
GTK_NOTE (PLUGSOCKET, g_message ("GtkPlug: start of embedding\n")); GTK_NOTE (PLUGSOCKET, g_message ("GtkPlug: start of embedding"));
plug->socket_window = gdk_window_lookup_for_display (display, xre->parent); plug->socket_window = gdk_window_lookup_for_display (display, xre->parent);
if (plug->socket_window) if (plug->socket_window)
{ {

2
gtk/gtksocket-x11.c
View File

@ -600,7 +600,7 @@ _gtk_socket_windowing_filter_func (GdkXEvent *gdk_xevent,
{ {
XReparentEvent *xre = &xevent->xreparent; XReparentEvent *xre = &xevent->xreparent;
GTK_NOTE (PLUGSOCKET, g_message ("GtkPlug: ReparentNotify received\n")); GTK_NOTE (PLUGSOCKET, g_message ("GtkSocket - ReparentNotify received"));
if (!socket->plug_window && xre->parent == GDK_WINDOW_XWINDOW (widget->window)) if (!socket->plug_window && xre->parent == GDK_WINDOW_XWINDOW (widget->window))
{ {
_gtk_socket_add_window (socket, xre->window, FALSE); _gtk_socket_add_window (socket, xre->window, FALSE);