--- gnome-core-1.4.2/panel/gnome-panel-screenshot.c.orig 2006-10-25 03:49:24.000000000 +0200 +++ gnome-core-1.4.2/panel/gnome-panel-screenshot.c 2006-10-25 03:49:24.000000000 +0200 @@ -40,6 +40,7 @@ #include #include #include +#include #ifdef HAVE_GNOME_PRINT #include #include --- gnome-core-1.4.2/panel/gstc.c.orig 2006-10-25 11:02:34.000000000 +0200 +++ gnome-core-1.4.2/panel/gstc.c 2006-10-25 11:03:19.000000000 +0200 @@ -172,8 +172,8 @@ gstc_parent_add_child (GstcParent *spare } if (ci >= 0) { - g_warning (G_GNUC_PRETTY_FUNCTION "(): can't add known window %ld to %ld", - xchild, + g_warning ("%s(): can't add known window %ld to %ld", + G_GNUC_PRETTY_FUNCTION, xchild, GSTC_PARENT_XWINDOW (sparent)); return; } @@ -207,8 +207,8 @@ gstc_parent_remove_child (GstcParent *sp /* sanity checks */ if (ci < 0) { - g_warning (G_GNUC_PRETTY_FUNCTION "(): can't remove unknown window %ld", - xchild); + g_warning ("%s(): can't remove unknown window %ld", + G_GNUC_PRETTY_FUNCTION, xchild); return; } @@ -249,14 +249,14 @@ gstc_parent_restack_child (GstcParent *s /* sanity checks */ if (ci < 0) { - g_warning (G_GNUC_PRETTY_FUNCTION "(): can't restack unknown window %ld", - xchild); + g_warning ("%s(): can't restack unknown window %ld", + G_GNUC_PRETTY_FUNCTION, xchild); return; } if (xbelow && bi < 0) { - g_warning (G_GNUC_PRETTY_FUNCTION "(): can't restack window %ld on top of unknown window %ld", - xchild, + g_warning ("%s(): can't restack window %ld on top of unknown window %ld", + G_GNUC_PRETTY_FUNCTION, xchild, xbelow); return; } @@ -297,10 +297,10 @@ gstc_parent_event_monitor (GdkXEvent *gd { case CreateNotify: if (xevent->xcreatewindow.parent != xparent) - g_warning (G_GNUC_PRETTY_FUNCTION "(): now what is THIS? " + g_warning ("%s(): now what is THIS? " "i receive a SubstructureNotify XCreateWindowEvent " "for a *foreign* child (%ld)??? X is on drugs!", - xevent->xcreatewindow.window); + G_GNUC_PRETTY_FUNCTION, xevent->xcreatewindow.window); else gstc_parent_add_child (sparent, xevent->xcreatewindow.window); break; --- gnome-core-1.4.2/panel/gwmh.c.orig 2006-10-25 10:59:19.000000000 +0200 +++ gnome-core-1.4.2/panel/gwmh.c 2006-10-25 11:01:00.000000000 +0200 @@ -230,8 +230,8 @@ gwmh_init (void) /* setup the root window event monitor */ window = gdk_window_ref_from_xid (GDK_ROOT_WINDOW ()); if (!window) - g_error (G_GNUC_PRETTY_FUNCTION "(): root window id %ld invalid? bad bad...", - GDK_ROOT_WINDOW ()); + g_error ("%s(): root window id %ld invalid? bad bad...", + G_GNUC_PRETTY_FUNCTION, GDK_ROOT_WINDOW ()); gdk_window_add_filter (window, root_event_monitor, window); @@ -390,14 +390,14 @@ get_typed_property_data (Display *xdispl } if (!abort && bytes_after_return) { - g_warning (G_GNUC_PRETTY_FUNCTION "(): Eeek, property has more than %u bytes, stored on harddisk?", - prop_buffer_lengh); + g_warning ("%s(): Eeek, property has more than %u bytes, stored on harddisk?", + G_GNUC_PRETTY_FUNCTION, prop_buffer_lengh); abort++; } if (!abort && expected_format && expected_format != format_returned) { - g_warning (G_GNUC_PRETTY_FUNCTION "(): Expected format (%u) unmatched (%d), programmer was drunk?", - expected_format, format_returned); + g_warning ("%s(): Expected format (%u) unmatched (%d), programmer was drunk?", + G_GNUC_PRETTY_FUNCTION, expected_format, format_returned); abort++; } if (!abort && prop_data && nitems_return && format_returned) @@ -648,7 +648,8 @@ get_task_root_and_frame (GwmhTask *task) xframe = None; /* aparently this can happen if a window is destructed shortly after * creation, just be silent. - * g_warning (G_GNUC_PRETTY_FUNCTION "(): task window id %ld invalid?", task->xwin); + * g_warning ("%s(): task window id %ld invalid?", + * G_GNUC_PRETTY_FUNCTION, task->xwin); */ } @@ -1586,8 +1587,8 @@ gwmh_desk_notifier_remove (guint id) g_return_if_fail (id > 0); if (!g_hook_destroy (&gwmh_desk_hook_list, id)) - g_warning (G_GNUC_PRETTY_FUNCTION "(): unable to remove notifier (%d)", - id); + g_warning ("%s(): unable to remove notifier (%d)", + G_GNUC_PRETTY_FUNCTION, id); } void @@ -1596,8 +1597,8 @@ gwmh_task_notifier_remove (guint id) g_return_if_fail (id > 0); if (!g_hook_destroy (&gwmh_task_hook_list, id)) - g_warning (G_GNUC_PRETTY_FUNCTION "(): unable to remove notifier (%d)", - id); + g_warning ("%s(): unable to remove notifier (%d)", + G_GNUC_PRETTY_FUNCTION, id); } static gboolean @@ -1624,8 +1625,8 @@ gwmh_desk_notifier_remove_func (GwmhDesk if (hook) g_hook_destroy_link (&gwmh_desk_hook_list, hook); else - g_warning (G_GNUC_PRETTY_FUNCTION "(): unable to remove notifier <%p> (%p)", - func, func_data); + g_warning ("%s(): unable to remove notifier <%p> (%p)", + G_GNUC_PRETTY_FUNCTION, func, func_data); } void @@ -1643,8 +1644,8 @@ gwmh_task_notifier_remove_func (GwmhTask if (hook) g_hook_destroy_link (&gwmh_task_hook_list, hook); else - g_warning (G_GNUC_PRETTY_FUNCTION "(): unable to remove notifier <%p> (%p)", - func, func_data); + g_warning ("%s(): unable to remove notifier <%p> (%p)", + G_GNUC_PRETTY_FUNCTION, func, func_data); } static gboolean --- gnome-core-1.4.2/panel/xstuff.c.orig 2006-10-25 11:04:07.000000000 +0200 +++ gnome-core-1.4.2/panel/xstuff.c 2006-10-25 11:04:46.000000000 +0200 @@ -322,19 +322,20 @@ get_typed_property_data (Display *xdispl requested_type != AnyPropertyType && requested_type != type_returned) { - g_warning (G_GNUC_PRETTY_FUNCTION "(): Property has wrong type, probably on crack"); + g_warning ("%s(): Property has wrong type, probably on crack", + G_GNUC_PRETTY_FUNCTION); abort++; } if (!abort && bytes_after_return) { - g_warning (G_GNUC_PRETTY_FUNCTION "(): Eeek, property has more than %u bytes, stored on harddisk?", - prop_buffer_lengh); + g_warning ("%s(): Eeek, property has more than %u bytes, stored on harddisk?", + G_GNUC_PRETTY_FUNCTION, prop_buffer_lengh); abort++; } if (!abort && expected_format && expected_format != format_returned) { - g_warning (G_GNUC_PRETTY_FUNCTION "(): Expected format (%u) unmatched (%d), programmer was drunk?", - expected_format, format_returned); + g_warning ("%s(): Expected format (%u) unmatched (%d), programmer was drunk?", + G_GNUC_PRETTY_FUNCTION, expected_format, format_returned); abort++; } if (!abort && prop_data && nitems_return && format_returned)