Changeset b8c336b for lib/events_glib.c

Timestamp:

2015-05-09T19:50:30Z (10 years ago)

Author:

dequis <dx@…>

Children:

ec8b369

Parents:

356e2dd (diff), 5014380 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'develop' into feat/hip-cat

Conflicts:

protocols/jabber/hipchat.c
protocols/jabber/iq.c
protocols/jabber/jabber.h

File:

• lib/events_glib.c (modified) (4 diffs)

lib/events_glib.c

@@ -82 +82 @@
         }
 
-        event_debug("gaim_io_invoke( %d, %d, 0x%x )\n", g_io_channel_unix_get_fd(source), condition, data);
+        event_debug("gaim_io_invoke( %d, %d, %p )\n", g_io_channel_unix_get_fd(source), condition, data);
 
         st = closure->function(closure->data, g_io_channel_unix_get_fd(source), gaim_cond);
@@ -101 +101 @@
 static void gaim_io_destroy(gpointer data)
 {
-        event_debug("gaim_io_destroy( 0x%x )\n", data);
+        event_debug("gaim_io_destroy( 0%p )\n", data);
         g_free(data);
 }
@@ -127 +127 @@
                                  gaim_io_invoke, closure, gaim_io_destroy);
 
-        event_debug("b_input_add( %d, %d, 0x%x, 0x%x ) = %d (%p)\n", source, condition, function, data, st, closure);
+        event_debug("b_input_add( %d, %d, %p, %p ) = %d (%p)\n", source, condition, function, data, st, closure);
 
         g_io_channel_unref(channel);
@@ -140 +140 @@
         gint st = g_timeout_add(timeout, (GSourceFunc) func, data);
 
-        event_debug("b_timeout_add( %d, %d, %d ) = %d\n", timeout, func, data, st);
+        event_debug("b_timeout_add( %d, %p, %p ) = %d\n", timeout, func, data, st);
 
         return st;