Commit 7f2909bb authored by Tim Janik's avatar Tim Janik Committed by Tim Janik

restricted the --g*fatal-* arguments to --g-fatal-warnings again. this

Tue Aug 18 03:54:43 1998  Tim Janik  <timj@gtk.org>

        * gtk/gtkmain.c (gtk_init): restricted the --g*fatal-* arguments
        to --g-fatal-warnings again. this option now causes log levels of
        WARNING and CRITICAL to abort().

        * gdk/gdk.c:
        * gdk/gdkdnd.c:
        * gdk/gdkcc.c:
        * gdk/gdkfont.c:
        * gdk/gdkwindow.c:
        * gdk/gdkvisual.c:
        * gtk/gtkwidget.c:
        * gtk/gtktypeutils.c:
        * gtk/gtktree.c:
        * gtk/gtkfontsel.c:
        * gtk/gtkmain.c:
        * gtk/gtkobject.c:
        * gtk/gtkpreview.c:
        * gtk/gtkselection.c:
        * gtk/gtktext.c:
        * gtk/gtktree.c:
        * gtk/gtktreeitem.c:
        did a global search&replace to substitute g_print() calls with
        g_message(). libraries shouldn't use printf(), g_print() or
        g_printerr() at all.
        a bunch of the replacements should probably be wrapped into the
        G{D|T}K_NOTE() macros, so they are special cased for debugging
        purposes in a sane way, avoiding all the nasty #ifdef DEBUG_MY_TEDDY
        things.

        * gdk/gdkrgb.c: left this out currently.

        * gdk/gdkdnd.c: added copyright notice.
parent fdc36ada
Tue Aug 18 03:54:43 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c (gtk_init): restricted the --g*fatal-* arguments
to --g-fatal-warnings again. this option now causes log levels of
WARNING and CRITICAL to abort().
* gdk/gdk.c:
* gdk/gdkdnd.c:
* gdk/gdkcc.c:
* gdk/gdkfont.c:
* gdk/gdkwindow.c:
* gdk/gdkvisual.c:
* gtk/gtkwidget.c:
* gtk/gtktypeutils.c:
* gtk/gtktree.c:
* gtk/gtkfontsel.c:
* gtk/gtkmain.c:
* gtk/gtkobject.c:
* gtk/gtkpreview.c:
* gtk/gtkselection.c:
* gtk/gtktext.c:
* gtk/gtktree.c:
* gtk/gtktreeitem.c:
did a global search&replace to substitute g_print() calls with
g_message(). libraries shouldn't use printf(), g_print() or
g_printerr() at all.
a bunch of the replacements should probably be wrapped into the
G{D|T}K_NOTE() macros, so they are special cased for debugging
purposes in a sane way, avoiding all the nasty #ifdef DEBUG_MY_TEDDY
things.
* gdk/gdkrgb.c: left this out currently.
* gdk/gdkdnd.c: added copyright notice.
Mon Aug 17 17:28:00 Raph Levien <raph@gtk.org>
* gdk/gdkrgb.c: Further speedups of the 565_d case. It's
......
Tue Aug 18 03:54:43 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c (gtk_init): restricted the --g*fatal-* arguments
to --g-fatal-warnings again. this option now causes log levels of
WARNING and CRITICAL to abort().
* gdk/gdk.c:
* gdk/gdkdnd.c:
* gdk/gdkcc.c:
* gdk/gdkfont.c:
* gdk/gdkwindow.c:
* gdk/gdkvisual.c:
* gtk/gtkwidget.c:
* gtk/gtktypeutils.c:
* gtk/gtktree.c:
* gtk/gtkfontsel.c:
* gtk/gtkmain.c:
* gtk/gtkobject.c:
* gtk/gtkpreview.c:
* gtk/gtkselection.c:
* gtk/gtktext.c:
* gtk/gtktree.c:
* gtk/gtktreeitem.c:
did a global search&replace to substitute g_print() calls with
g_message(). libraries shouldn't use printf(), g_print() or
g_printerr() at all.
a bunch of the replacements should probably be wrapped into the
G{D|T}K_NOTE() macros, so they are special cased for debugging
purposes in a sane way, avoiding all the nasty #ifdef DEBUG_MY_TEDDY
things.
* gdk/gdkrgb.c: left this out currently.
* gdk/gdkdnd.c: added copyright notice.
Mon Aug 17 17:28:00 Raph Levien <raph@gtk.org>
* gdk/gdkrgb.c: Further speedups of the 565_d case. It's
......
Tue Aug 18 03:54:43 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c (gtk_init): restricted the --g*fatal-* arguments
to --g-fatal-warnings again. this option now causes log levels of
WARNING and CRITICAL to abort().
* gdk/gdk.c:
* gdk/gdkdnd.c:
* gdk/gdkcc.c:
* gdk/gdkfont.c:
* gdk/gdkwindow.c:
* gdk/gdkvisual.c:
* gtk/gtkwidget.c:
* gtk/gtktypeutils.c:
* gtk/gtktree.c:
* gtk/gtkfontsel.c:
* gtk/gtkmain.c:
* gtk/gtkobject.c:
* gtk/gtkpreview.c:
* gtk/gtkselection.c:
* gtk/gtktext.c:
* gtk/gtktree.c:
* gtk/gtktreeitem.c:
did a global search&replace to substitute g_print() calls with
g_message(). libraries shouldn't use printf(), g_print() or
g_printerr() at all.
a bunch of the replacements should probably be wrapped into the
G{D|T}K_NOTE() macros, so they are special cased for debugging
purposes in a sane way, avoiding all the nasty #ifdef DEBUG_MY_TEDDY
things.
* gdk/gdkrgb.c: left this out currently.
* gdk/gdkdnd.c: added copyright notice.
Mon Aug 17 17:28:00 Raph Levien <raph@gtk.org>
* gdk/gdkrgb.c: Further speedups of the 565_d case. It's
......
Tue Aug 18 03:54:43 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c (gtk_init): restricted the --g*fatal-* arguments
to --g-fatal-warnings again. this option now causes log levels of
WARNING and CRITICAL to abort().
* gdk/gdk.c:
* gdk/gdkdnd.c:
* gdk/gdkcc.c:
* gdk/gdkfont.c:
* gdk/gdkwindow.c:
* gdk/gdkvisual.c:
* gtk/gtkwidget.c:
* gtk/gtktypeutils.c:
* gtk/gtktree.c:
* gtk/gtkfontsel.c:
* gtk/gtkmain.c:
* gtk/gtkobject.c:
* gtk/gtkpreview.c:
* gtk/gtkselection.c:
* gtk/gtktext.c:
* gtk/gtktree.c:
* gtk/gtktreeitem.c:
did a global search&replace to substitute g_print() calls with
g_message(). libraries shouldn't use printf(), g_print() or
g_printerr() at all.
a bunch of the replacements should probably be wrapped into the
G{D|T}K_NOTE() macros, so they are special cased for debugging
purposes in a sane way, avoiding all the nasty #ifdef DEBUG_MY_TEDDY
things.
* gdk/gdkrgb.c: left this out currently.
* gdk/gdkdnd.c: added copyright notice.
Mon Aug 17 17:28:00 Raph Levien <raph@gtk.org>
* gdk/gdkrgb.c: Further speedups of the 565_d case. It's
......
Tue Aug 18 03:54:43 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c (gtk_init): restricted the --g*fatal-* arguments
to --g-fatal-warnings again. this option now causes log levels of
WARNING and CRITICAL to abort().
* gdk/gdk.c:
* gdk/gdkdnd.c:
* gdk/gdkcc.c:
* gdk/gdkfont.c:
* gdk/gdkwindow.c:
* gdk/gdkvisual.c:
* gtk/gtkwidget.c:
* gtk/gtktypeutils.c:
* gtk/gtktree.c:
* gtk/gtkfontsel.c:
* gtk/gtkmain.c:
* gtk/gtkobject.c:
* gtk/gtkpreview.c:
* gtk/gtkselection.c:
* gtk/gtktext.c:
* gtk/gtktree.c:
* gtk/gtktreeitem.c:
did a global search&replace to substitute g_print() calls with
g_message(). libraries shouldn't use printf(), g_print() or
g_printerr() at all.
a bunch of the replacements should probably be wrapped into the
G{D|T}K_NOTE() macros, so they are special cased for debugging
purposes in a sane way, avoiding all the nasty #ifdef DEBUG_MY_TEDDY
things.
* gdk/gdkrgb.c: left this out currently.
* gdk/gdkdnd.c: added copyright notice.
Mon Aug 17 17:28:00 Raph Levien <raph@gtk.org>
* gdk/gdkrgb.c: Further speedups of the 565_d case. It's
......
Tue Aug 18 03:54:43 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c (gtk_init): restricted the --g*fatal-* arguments
to --g-fatal-warnings again. this option now causes log levels of
WARNING and CRITICAL to abort().
* gdk/gdk.c:
* gdk/gdkdnd.c:
* gdk/gdkcc.c:
* gdk/gdkfont.c:
* gdk/gdkwindow.c:
* gdk/gdkvisual.c:
* gtk/gtkwidget.c:
* gtk/gtktypeutils.c:
* gtk/gtktree.c:
* gtk/gtkfontsel.c:
* gtk/gtkmain.c:
* gtk/gtkobject.c:
* gtk/gtkpreview.c:
* gtk/gtkselection.c:
* gtk/gtktext.c:
* gtk/gtktree.c:
* gtk/gtktreeitem.c:
did a global search&replace to substitute g_print() calls with
g_message(). libraries shouldn't use printf(), g_print() or
g_printerr() at all.
a bunch of the replacements should probably be wrapped into the
G{D|T}K_NOTE() macros, so they are special cased for debugging
purposes in a sane way, avoiding all the nasty #ifdef DEBUG_MY_TEDDY
things.
* gdk/gdkrgb.c: left this out currently.
* gdk/gdkdnd.c: added copyright notice.
Mon Aug 17 17:28:00 Raph Levien <raph@gtk.org>
* gdk/gdkrgb.c: Further speedups of the 565_d case. It's
......
Tue Aug 18 03:54:43 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c (gtk_init): restricted the --g*fatal-* arguments
to --g-fatal-warnings again. this option now causes log levels of
WARNING and CRITICAL to abort().
* gdk/gdk.c:
* gdk/gdkdnd.c:
* gdk/gdkcc.c:
* gdk/gdkfont.c:
* gdk/gdkwindow.c:
* gdk/gdkvisual.c:
* gtk/gtkwidget.c:
* gtk/gtktypeutils.c:
* gtk/gtktree.c:
* gtk/gtkfontsel.c:
* gtk/gtkmain.c:
* gtk/gtkobject.c:
* gtk/gtkpreview.c:
* gtk/gtkselection.c:
* gtk/gtktext.c:
* gtk/gtktree.c:
* gtk/gtktreeitem.c:
did a global search&replace to substitute g_print() calls with
g_message(). libraries shouldn't use printf(), g_print() or
g_printerr() at all.
a bunch of the replacements should probably be wrapped into the
G{D|T}K_NOTE() macros, so they are special cased for debugging
purposes in a sane way, avoiding all the nasty #ifdef DEBUG_MY_TEDDY
things.
* gdk/gdkrgb.c: left this out currently.
* gdk/gdkdnd.c: added copyright notice.
Mon Aug 17 17:28:00 Raph Levien <raph@gtk.org>
* gdk/gdkrgb.c: Further speedups of the 565_d case. It's
......
This diff is collapsed.
This diff is collapsed.
/* GDK - The GIMP Drawing Kit
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#include <X11/Xlib.h>
#include <X11/Xatom.h>
#include <string.h>
......@@ -12,7 +30,7 @@ gdk_dnd_set_drag_cursors(GdkCursor *default_cursor, GdkCursor *goahead_cursor)
gdk_dnd.c->gdk_cursor_dragdefault =
((GdkCursorPrivate *)default_cursor)->xcursor;
gdk_dnd.c->gdk_cursor_dragok = ((GdkCursorPrivate *)goahead_cursor)->xcursor;
if(gdk_dnd.dnd_grabbed)
{
if(gdk_dnd.c->drag_pm_default)
......@@ -42,7 +60,7 @@ gdk_dnd_set_drag_shape(GdkWindow *default_pixmapwin,
GdkPoint *goahead_hotspot)
{
g_return_if_fail(default_pixmapwin != NULL);
g_list_free(gdk_dnd.c->xids); gdk_dnd.c->xids = NULL;
if(gdk_dnd.c->drag_pm_default)
{
......@@ -54,9 +72,9 @@ gdk_dnd_set_drag_shape(GdkWindow *default_pixmapwin,
gdk_window_hide(gdk_dnd.c->drag_pm_ok);
gdk_window_unref(gdk_dnd.c->drag_pm_ok);
}
gdk_dnd.c->drag_pm_ok = NULL;
gdk_window_ref(default_pixmapwin);
gdk_dnd.c->drag_pm_default = default_pixmapwin;
gdk_dnd.c->default_hotspot = *default_hotspot;
......@@ -68,7 +86,7 @@ gdk_dnd_set_drag_shape(GdkWindow *default_pixmapwin,
gdk_dnd.c->drag_pm_ok = goahead_pixmapwin;
gdk_dnd.c->ok_hotspot = *goahead_hotspot;
}
if(gdk_dnd.dnd_grabbed)
{
gdk_dnd_display_drag_cursor(-1, -1,
......@@ -90,7 +108,7 @@ gdk_dnd_display_drag_cursor(gint x, gint y, gboolean drag_ok,
{
if(!gdk_dnd.dnd_grabbed)
return;
if(gdk_dnd.c->drag_pm_default)
{
/* We're doing pixmaps here... */
......@@ -99,29 +117,29 @@ gdk_dnd_display_drag_cursor(gint x, gint y, gboolean drag_ok,
gint itmp;
guint masktmp;
Window wtmp;
if(x == -2 && y == -2) /* Hide the cursors */
{
gdk_window_hide(gdk_dnd.c->drag_pm_ok);
gdk_window_hide(gdk_dnd.c->drag_pm_default);
GDK_NOTE(DND, g_print("Hiding both drag cursors\n"));
GDK_NOTE(DND, g_message("Hiding both drag cursors\n"));
return;
}
if(x == -1 && y == -1) /* We're supposed to find it out for ourselves */
XQueryPointer(gdk_display, gdk_root_window,
&wtmp, &wtmp, &x, &y, &itmp, &itmp, &masktmp);
if(drag_ok)
{
GDK_NOTE(DND, g_print("Switching to drag_ok cursor\n"));
GDK_NOTE(DND, g_message("Switching to drag_ok cursor\n"));
mypix = gdk_dnd.c->drag_pm_ok;
opix = gdk_dnd.c->drag_pm_default;
myhotspot = &gdk_dnd.c->ok_hotspot;
}
else
{
GDK_NOTE(DND, g_print("Switching to drag_default cursor\n"));
GDK_NOTE(DND, g_message("Switching to drag_default cursor\n"));
mypix = gdk_dnd.c->drag_pm_default;
opix = gdk_dnd.c->drag_pm_ok;
myhotspot = &gdk_dnd.c->default_hotspot;
......@@ -129,7 +147,7 @@ gdk_dnd_display_drag_cursor(gint x, gint y, gboolean drag_ok,
gdk_window_move(mypix, x - myhotspot->x, y - myhotspot->y);
if(change_made)
{
GDK_NOTE(DND, g_print("Cursors switched, hide & show\n"));
GDK_NOTE(DND, g_message("Cursors switched, hide & show\n"));
gdk_window_hide(opix);
}
gdk_window_move(mypix, x - myhotspot->x, y - myhotspot->y);
......
......@@ -72,9 +72,9 @@ gdk_fontset_load (gchar *fontset_name)
if (missing_charset_count)
{
gint i;
g_print ("Missing charsets in FontSet creation\n");
g_message ("Missing charsets in FontSet creation\n");
for (i=0;i<missing_charset_count;i++)
g_print (" %s\n", missing_charset_list[i]);
g_message (" %s\n", missing_charset_list[i]);
XFreeStringList (missing_charset_list);
}
......
......@@ -211,9 +211,9 @@ gdk_visual_init (void)
#ifdef G_ENABLE_DEBUG
if (gdk_debug_flags & GDK_DEBUG_MISC)
for (i = 0; i < nvisuals; i++)
g_print ("Gdk: visual: %s: %d\n",
visual_names[visuals[i].visual.type],
visuals[i].visual.depth);
g_message ("visual: %s: %d",
visual_names[visuals[i].visual.type],
visuals[i].visual.depth);
#endif /* G_ENABLE_DEBUG */
navailable_depths = 0;
......
......@@ -407,7 +407,7 @@ gdk_window_new (GdkWindow *parent,
(private->colormap != gdk_colormap_get_system ()) &&
(private->colormap != gdk_window_get_colormap (gdk_window_get_toplevel (window))))
{
GDK_NOTE (MISC, g_print ("adding colormap window\n"));
GDK_NOTE (MISC, g_message ("adding colormap window\n"));
gdk_window_add_colormap_windows (window);
}
......@@ -1771,7 +1771,7 @@ gdk_window_dnd_data_set (GdkWindow *window,
data_numbytes);
tmp = gdk_atom_name(window_private->dnd_drag_data_type);
#ifdef DEBUG_DND
g_print("DnD type %s on window %ld\n", tmp, window_private->xwindow);
g_message("DnD type %s on window %ld\n", tmp, window_private->xwindow);
#endif
g_free(tmp);
......@@ -1801,9 +1801,8 @@ gdk_window_dnd_data_set (GdkWindow *window,
if (!gdk_send_xevent (event->dragrequest.requestor, False,
StructureNotifyMask, &sev))
GDK_NOTE (DND, g_print("Sending XdeDataAvailable to %#x failed\n",
event->dragrequest.requestor));
GDK_NOTE (DND, g_message("Sending XdeDataAvailable to %#x failed\n",
event->dragrequest.requestor));
}
void
......
This diff is collapsed.
/* GDK - The GIMP Drawing Kit
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#include <X11/Xlib.h>
#include <X11/Xatom.h>
#include <string.h>
......@@ -12,7 +30,7 @@ gdk_dnd_set_drag_cursors(GdkCursor *default_cursor, GdkCursor *goahead_cursor)
gdk_dnd.c->gdk_cursor_dragdefault =
((GdkCursorPrivate *)default_cursor)->xcursor;
gdk_dnd.c->gdk_cursor_dragok = ((GdkCursorPrivate *)goahead_cursor)->xcursor;
if(gdk_dnd.dnd_grabbed)
{
if(gdk_dnd.c->drag_pm_default)
......@@ -42,7 +60,7 @@ gdk_dnd_set_drag_shape(GdkWindow *default_pixmapwin,
GdkPoint *goahead_hotspot)
{
g_return_if_fail(default_pixmapwin != NULL);
g_list_free(gdk_dnd.c->xids); gdk_dnd.c->xids = NULL;
if(gdk_dnd.c->drag_pm_default)
{
......@@ -54,9 +72,9 @@ gdk_dnd_set_drag_shape(GdkWindow *default_pixmapwin,
gdk_window_hide(gdk_dnd.c->drag_pm_ok);
gdk_window_unref(gdk_dnd.c->drag_pm_ok);
}
gdk_dnd.c->drag_pm_ok = NULL;
gdk_window_ref(default_pixmapwin);
gdk_dnd.c->drag_pm_default = default_pixmapwin;
gdk_dnd.c->default_hotspot = *default_hotspot;
......@@ -68,7 +86,7 @@ gdk_dnd_set_drag_shape(GdkWindow *default_pixmapwin,
gdk_dnd.c->drag_pm_ok = goahead_pixmapwin;
gdk_dnd.c->ok_hotspot = *goahead_hotspot;
}
if(gdk_dnd.dnd_grabbed)
{
gdk_dnd_display_drag_cursor(-1, -1,
......@@ -90,7 +108,7 @@ gdk_dnd_display_drag_cursor(gint x, gint y, gboolean drag_ok,
{
if(!gdk_dnd.dnd_grabbed)
return;
if(gdk_dnd.c->drag_pm_default)
{
/* We're doing pixmaps here... */
......@@ -99,29 +117,29 @@ gdk_dnd_display_drag_cursor(gint x, gint y, gboolean drag_ok,
gint itmp;
guint masktmp;
Window wtmp;
if(x == -2 && y == -2) /* Hide the cursors */
{
gdk_window_hide(gdk_dnd.c->drag_pm_ok);
gdk_window_hide(gdk_dnd.c->drag_pm_default);
GDK_NOTE(DND, g_print("Hiding both drag cursors\n"));
GDK_NOTE(DND, g_message("Hiding both drag cursors\n"));
return;
}
if(x == -1 && y == -1) /* We're supposed to find it out for ourselves */
XQueryPointer(gdk_display, gdk_root_window,
&wtmp, &wtmp, &x, &y, &itmp, &itmp, &masktmp);
if(drag_ok)
{
GDK_NOTE(DND, g_print("Switching to drag_ok cursor\n"));
GDK_NOTE(DND, g_message("Switching to drag_ok cursor\n"));
mypix = gdk_dnd.c->drag_pm_ok;
opix = gdk_dnd.c->drag_pm_default;
myhotspot = &gdk_dnd.c->ok_hotspot;
}
else
{
GDK_NOTE(DND, g_print("Switching to drag_default cursor\n"));
GDK_NOTE(DND, g_message("Switching to drag_default cursor\n"));
mypix = gdk_dnd.c->drag_pm_default;
opix = gdk_dnd.c->drag_pm_ok;
myhotspot = &gdk_dnd.c->default_hotspot;
......@@ -129,7 +147,7 @@ gdk_dnd_display_drag_cursor(gint x, gint y, gboolean drag_ok,
gdk_window_move(mypix, x - myhotspot->x, y - myhotspot->y);
if(change_made)
{
GDK_NOTE(DND, g_print("Cursors switched, hide & show\n"));
GDK_NOTE(DND, g_message("Cursors switched, hide & show\n"));
gdk_window_hide(opix);
}
gdk_window_move(mypix, x - myhotspot->x, y - myhotspot->y);
......
......@@ -72,9 +72,9 @@ gdk_fontset_load (gchar *fontset_name)
if (missing_charset_count)
{
gint i;
g_print ("Missing charsets in FontSet creation\n");
g_message ("Missing charsets in FontSet creation\n");
for (i=0;i<missing_charset_count;i++)
g_print (" %s\n", missing_charset_list[i]);
g_message (" %s\n", missing_charset_list[i]);
XFreeStringList (missing_charset_list);
}
......
This diff is collapsed.
......@@ -211,9 +211,9 @@ gdk_visual_init (void)
#ifdef G_ENABLE_DEBUG
if (gdk_debug_flags & GDK_DEBUG_MISC)
for (i = 0; i < nvisuals; i++)
g_print ("Gdk: visual: %s: %d\n",
visual_names[visuals[i].visual.type],
visuals[i].visual.depth);
g_message ("visual: %s: %d",
visual_names[visuals[i].visual.type],
visuals[i].visual.depth);
#endif /* G_ENABLE_DEBUG */
navailable_depths = 0;
......
......@@ -407,7 +407,7 @@ gdk_window_new (GdkWindow *parent,
(private->colormap != gdk_colormap_get_system ()) &&
(private->colormap != gdk_window_get_colormap (gdk_window_get_toplevel (window))))
{
GDK_NOTE (MISC, g_print ("adding colormap window\n"));
GDK_NOTE (MISC, g_message ("adding colormap window\n"));
gdk_window_add_colormap_windows (window);
}
......@@ -1771,7 +1771,7 @@ gdk_window_dnd_data_set (GdkWindow *window,
data_numbytes);
tmp = gdk_atom_name(window_private->dnd_drag_data_type);
#ifdef DEBUG_DND
g_print("DnD type %s on window %ld\n", tmp, window_private->xwindow);
g_message("DnD type %s on window %ld\n", tmp, window_private->xwindow);
#endif
g_free(tmp);
......@@ -1801,9 +1801,8 @@ gdk_window_dnd_data_set (GdkWindow *window,
if (!gdk_send_xevent (event->dragrequest.requestor, False,
StructureNotifyMask, &sev))
GDK_NOTE (DND, g_print("Sending XdeDataAvailable to %#x failed\n",
event->dragrequest.requestor));
GDK_NOTE (DND, g_message("Sending XdeDataAvailable to %#x failed\n",
event->dragrequest.requestor));
}
void
......
This diff is collapsed.
......@@ -361,56 +361,11 @@ gtk_init (int *argc,
}
else if (strcmp ("--g-fatal-warnings", (*argv)[i]) == 0)
{
GLogLevelFlags fatal_levels;
GLogLevelFlags fatal_mask;
fatal_levels = g_log_set_fatal_mask (g_log_domain_glib, G_LOG_FATAL_MASK);
fatal_levels |= G_LOG_LEVEL_WARNING;
g_log_set_fatal_mask (g_log_domain_glib, fatal_levels);
(*argv)[i] = NULL;
}
else if (strcmp ("--gdk-fatal-warnings", (*argv)[i]) == 0)
{
GLogLevelFlags fatal_levels;
fatal_levels = g_log_set_fatal_mask ("Gdk", G_LOG_FATAL_MASK);
fatal_levels |= G_LOG_LEVEL_WARNING;
g_log_set_fatal_mask ("Gdk", fatal_levels);
(*argv)[i] = NULL;
}
else if (strcmp ("--gtk-fatal-warnings", (*argv)[i]) == 0)
{
GLogLevelFlags fatal_levels;
fatal_levels = g_log_set_fatal_mask (G_LOG_DOMAIN, G_LOG_FATAL_MASK);
fatal_levels |= G_LOG_LEVEL_WARNING;
g_log_set_fatal_mask (G_LOG_DOMAIN, fatal_levels);
(*argv)[i] = NULL;
}
else if (strcmp ("--g-fatal-checks", (*argv)[i]) == 0)
{
GLogLevelFlags fatal_levels;
fatal_levels = g_log_set_fatal_mask (g_log_domain_glib, G_LOG_FATAL_MASK);
fatal_levels |= G_LOG_LEVEL_CRITICAL;
g_log_set_fatal_mask (g_log_domain_glib, fatal_levels);
(*argv)[i] = NULL;
}
else if (strcmp ("--gdk-fatal-checks", (*argv)[i]) == 0)
{
GLogLevelFlags fatal_levels;
fatal_levels = g_log_set_fatal_mask ("Gdk", G_LOG_FATAL_MASK);
fatal_levels |= G_LOG_LEVEL_CRITICAL;
g_log_set_fatal_mask ("Gdk", fatal_levels);
(*argv)[i] = NULL;
}
else if (strcmp ("--gtk-fatal-checks", (*argv)[i]) == 0)
{
GLogLevelFlags fatal_levels;
fatal_levels = g_log_set_fatal_mask (G_LOG_DOMAIN, G_LOG_FATAL_MASK);
fatal_levels |= G_LOG_LEVEL_CRITICAL;
g_log_set_fatal_mask (G_LOG_DOMAIN, fatal_levels);
fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK);
fatal_mask |= G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL;
g_log_set_always_fatal (fatal_mask);
(*argv)[i] = NULL;
}
i += 1;
......@@ -454,9 +409,10 @@ gtk_init (int *argc,
g_free (current_locale);
GTK_NOTE (MISC, g_print("%s multi-byte string functions.\n",
gtk_use_mb ? "Using" : "Not using"));
GTK_NOTE (MISC,
g_message ("%s multi-byte string functions.\n",
gtk_use_mb ? "Using" : "Not using"));
/* Initialize the default visual and colormap to be
* used in creating widgets. (We want to use the system
* defaults so as to be nice to the colormap).
......
......@@ -95,19 +95,19 @@ gtk_object_debug_foreach (gpointer key, gpointer value, gpointer user_data)
GtkObject *object;
object = (GtkObject*) value;
g_print ("GTK-DEBUG: %p: %s ref_count=%d%s%s\n",
object,
gtk_type_name (GTK_OBJECT_TYPE (object)),
object->ref_count,
GTK_OBJECT_FLOATING (object) ? " (floating)" : "",
GTK_OBJECT_DESTROYED (object) ? " (destroyed)" : "");
g_message ("[%p] %s\tref_count=%d%s%s\n",
object,
gtk_type_name (GTK_OBJECT_TYPE (object)),
object->ref_count,
GTK_OBJECT_FLOATING (object) ? " (floating)" : "",
GTK_OBJECT_DESTROYED (object) ? " (destroyed)" : "");
}
static void
gtk_object_debug (void)
{
g_hash_table_foreach (living_objs_ht, gtk_object_debug_foreach, NULL);
g_print ("GTK-DEBUG: living objects count = %d\n", obj_count);
g_message ("living objects count = %d\n", obj_count);
}
#endif /* G_ENABLE_DEBUG */
......
......@@ -1252,28 +1252,28 @@ gtk_trim_cmap (GtkPreviewClass *klass)
}
}
}
if ((nred < 2) || (ngreen < 2) || (nblue < 2) || (ngray < 2))
{
g_print ("Unable to allocate sufficient colormap entries.\n");
g_print ("Try exiting other color intensive applications.\n");
g_message ("Unable to allocate sufficient colormap entries.\n");
g_message ("Try exiting other color intensive applications.\n");
return;
}
/* If any of the shade values has changed, issue a warning */
if ((nred != klass->info.nred_shades) ||
(ngreen != klass->info.ngreen_shades) ||
(nblue != klass->info.nblue_shades) ||
(ngray != klass->info.ngray_shades))
{
g_print ("Not enough colors to satisfy requested color cube.\n");
g_print ("Reduced color cube shades from\n");
g_print ("[%d of Red, %d of Green, %d of Blue, %d of Gray] ==> [%d of Red, %d of Green, %d of Blue, %d of Gray]\n",
klass->info.nred_shades, klass->info.ngreen_shades,
klass->info.nblue_shades, klass->info.ngray_shades,
nred, ngreen, nblue, ngray);
g_message ("Not enough colors to satisfy requested color cube.\n");
g_message ("Reduced color cube shades from\n");