Commit 10474e6a authored by Tim Janik's avatar Tim Janik

more debugging fixes.

hey yosh, you beated me at gdk.c ;)
-timj
parent c87244dd
...@@ -269,7 +269,7 @@ gdk_init (int *argc, ...@@ -269,7 +269,7 @@ gdk_init (int *argc,
#ifdef G_ENABLE_DEBUG #ifdef G_ENABLE_DEBUG
gboolean debug_set = FALSE; gboolean debug_set = FALSE;
#endif #endif /* G_ENABLE_DEBUG */
argv_orig = malloc ((argc_orig + 1) * sizeof (char*)); argv_orig = malloc ((argc_orig + 1) * sizeof (char*));
for (i = 0; i < argc_orig; i++) for (i = 0; i < argc_orig; i++)
...@@ -447,7 +447,7 @@ gdk_init (int *argc, ...@@ -447,7 +447,7 @@ gdk_init (int *argc,
gdk_debug_keys, gdk_debug_keys,
sizeof(gdk_debug_keys) / sizeof(GDebugKey)); sizeof(gdk_debug_keys) / sizeof(GDebugKey));
} }
#endif #endif /* G_ENABLE_DEBUG */
gdk_display = XOpenDisplay (gdk_display_name); gdk_display = XOpenDisplay (gdk_display_name);
if (!gdk_display) if (!gdk_display)
......
...@@ -231,7 +231,7 @@ extern gint gdk_error_warnings; ...@@ -231,7 +231,7 @@ extern gint gdk_error_warnings;
#define GDK_NOTE(type,action) G_STMT_START { \ #define GDK_NOTE(type,action) G_STMT_START { \
if (gdk_debug_flags & GDK_DEBUG_##type) \ if (gdk_debug_flags & GDK_DEBUG_##type) \
action; } G_STMT_END { action; }; } G_STMT_END
#else /* !G_ENABLE_DEBUG */ #else /* !G_ENABLE_DEBUG */
......
...@@ -269,7 +269,7 @@ gdk_init (int *argc, ...@@ -269,7 +269,7 @@ gdk_init (int *argc,
#ifdef G_ENABLE_DEBUG #ifdef G_ENABLE_DEBUG
gboolean debug_set = FALSE; gboolean debug_set = FALSE;
#endif #endif /* G_ENABLE_DEBUG */
argv_orig = malloc ((argc_orig + 1) * sizeof (char*)); argv_orig = malloc ((argc_orig + 1) * sizeof (char*));
for (i = 0; i < argc_orig; i++) for (i = 0; i < argc_orig; i++)
...@@ -447,7 +447,7 @@ gdk_init (int *argc, ...@@ -447,7 +447,7 @@ gdk_init (int *argc,
gdk_debug_keys, gdk_debug_keys,
sizeof(gdk_debug_keys) / sizeof(GDebugKey)); sizeof(gdk_debug_keys) / sizeof(GDebugKey));
} }
#endif #endif /* G_ENABLE_DEBUG */
gdk_display = XOpenDisplay (gdk_display_name); gdk_display = XOpenDisplay (gdk_display_name);
if (!gdk_display) if (!gdk_display)
......
...@@ -30,7 +30,7 @@ typedef enum { ...@@ -30,7 +30,7 @@ typedef enum {
#define GTK_NOTE(type,action) G_STMT_START { \ #define GTK_NOTE(type,action) G_STMT_START { \
if (gtk_debug_flags & GTK_DEBUG_##type) \ if (gtk_debug_flags & GTK_DEBUG_##type) \
action; } G_STMT_END { action; }; } G_STMT_END
#else /* !G_ENABLE_DEBUG */ #else /* !G_ENABLE_DEBUG */
......
...@@ -246,8 +246,8 @@ void gtk_object_setv (GtkObject *object, ...@@ -246,8 +246,8 @@ void gtk_object_setv (GtkObject *object,
/* Allocate a GtkArg array of size nargs that hold the /* Allocate a GtkArg array of size nargs that hold the
* names and types of the args that can be used with * names and types of the args that can be used with
* gtk_object_set/gtk_object_get. if (*acess_masks!=NULL) * gtk_object_set/gtk_object_get. if (acess_masks!=NULL),
* the pointer will be set to point to a newly allocated * (*access_mask) will be set to point to a newly allocated
* guint array that holds the access masks of the args. * guint array that holds the access masks of the args.
* It is the callers response to do a * It is the callers response to do a
* g_free (returned_args); g_free (*acess_masks). * g_free (returned_args); g_free (*acess_masks).
...@@ -300,7 +300,7 @@ void gtk_object_set_user_data (GtkObject *object, ...@@ -300,7 +300,7 @@ void gtk_object_set_user_data (GtkObject *object,
gpointer data); gpointer data);
/* Get the "user_data" object data field of "object". It should /* Get the "user_data" object data field of "object". It should
* be noted that this is no different than calling 'gtk_object_data_find' * be noted that this is no different than calling 'gtk_object_get_data'
* with a key of "user_data". It is merely provided as a convenience. * with a key of "user_data". It is merely provided as a convenience.
*/ */
gpointer gtk_object_get_user_data (GtkObject *object); gpointer gtk_object_get_user_data (GtkObject *object);
...@@ -320,7 +320,7 @@ void gtk_trace_referencing (gpointer *object, ...@@ -320,7 +320,7 @@ void gtk_trace_referencing (gpointer *object,
#if G_ENABLE_DEBUG && defined (__GNUC__) #if G_ENABLE_DEBUG && defined (__GNUC__)
# define gtk_object_ref(o) G_STMT_START{static guint f=0;gtk_trace_referencing((gpointer)o,__PRETTY_FUNCTION__,++f,__LINE__, 1);f--;}G_STMT_END # define gtk_object_ref(o) G_STMT_START{static guint f=0;gtk_trace_referencing((gpointer)o,__PRETTY_FUNCTION__,++f,__LINE__, 1);f--;}G_STMT_END
# define gtk_object_unref(o) G_STMT_START{static guint f=0;gtk_trace_referencing((gpointer)o,__PRETTY_FUNCTION__,++f,__LINE__, 0);f--;}G_STMT_END # define gtk_object_unref(o) G_STMT_START{static guint f=0;gtk_trace_referencing((gpointer)o,__PRETTY_FUNCTION__,++f,__LINE__, 0);f--;}G_STMT_END
#endif /* GTK_TRACE_OBJECTS && __GNUC__ */ #endif /* G_ENABLE_DEBUG && __GNUC__ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment