Changeset b79308b for lib/events_glib.c

Timestamp:

2008-04-14T13:10:53Z (17 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

0cab388

Parents:

6cac643 (diff), aa31117 (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:

merged in upstream r379 (somewhere after 1.2-3).
Just one trivial conflict in the jabber Makefile, went smoothly.

File:

• lib/events_glib.c (modified) (1 diff)

lib/events_glib.c

@@ -51 +51 @@
 } GaimIOClosure;
 
-static GMainLoop *loop;
+static GMainLoop *loop = NULL;
 
 void b_main_init()
 {
-        loop = g_main_new( FALSE );
+        if( loop == NULL )
+                loop = g_main_new( FALSE );
 }