[banshee] Revert "libbanshee: Work-around Mono crash under FreeBSD"



commit 47550f0d1515daa85778adb67974450039fcc02d
Author: Alexander Kojevnikov <alexander kojevnikov com>
Date:   Mon Oct 18 11:59:47 2010 +1100

    Revert "libbanshee: Work-around Mono crash under FreeBSD"
    
    This reverts commit 02425e05fb44b62740ed2125edd45ea901e628a2.
    
    bnc#647248 is now fixed, sorry for the noise.

 libbanshee/banshee-gst.c |   40 ++--------------------------------------
 1 files changed, 2 insertions(+), 38 deletions(-)
---
diff --git a/libbanshee/banshee-gst.c b/libbanshee/banshee-gst.c
index cfd88ca..48d8b0a 100644
--- a/libbanshee/banshee-gst.c
+++ b/libbanshee/banshee-gst.c
@@ -105,41 +105,9 @@ banshee_get_version_number ()
     return (guint)banshee_version;
 }
 
-typedef struct {
-    BansheeLogType type;
-    const gchar *component;
-    gchar *message;
-} BansheeLogHandlerData;
-
-static gboolean
-banshee_log_handler_proxy (gpointer user_data)
-{
-    BansheeLogHandlerData *data;
-
-    g_return_val_if_fail (user_data, FALSE);
-
-    data = user_data;
-    (banshee_log_handler) (data->type, data->component, data->message);
-    return FALSE;
-}
-
-static void
-banshee_log_handler_notify (gpointer user_data)
-{
-    BansheeLogHandlerData *data;
-
-    g_return_if_fail (user_data);
-
-    data = user_data;
-    g_free (data->message);
-    g_free (data);
-}
-
 static void
 banshee_log (BansheeLogType type, const gchar *component, const gchar *message)
 {
-    BansheeLogHandlerData *data;
-
     if (banshee_log_handler == NULL) {
         switch (type) {
             case BANSHEE_LOG_TYPE_WARNING: g_warning ("%s: %s", component, message); break;
@@ -148,12 +116,8 @@ banshee_log (BansheeLogType type, const gchar *component, const gchar *message)
         }
         return;
     }
-
-    data = g_new (BansheeLogHandlerData, 1);
-    data->type = type;
-    data->component = component;
-    data->message = g_strdup (message);
-    g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, banshee_log_handler_proxy, data, banshee_log_handler_notify);
+    
+    (banshee_log_handler) (type, component, message);
 }
 
 void



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]