[Galago-commits] r2426 - in trunk/libnotify: . libnotify

[galago-commits at freedesktop.org]

Author: johnp
Date: 2006-01-12 14:29:16 -0800 (Thu, 12 Jan 2006)
New Revision: 2426

Modified:
   trunk/libnotify/ChangeLog
   trunk/libnotify/libnotify/notifynotification.c
   trunk/libnotify/libnotify/notifynotification.h
Log:
Thu Jan 12 2006  John (J5) Palmieri <johnp at redhat.com>

	* libnotify/notifynotification.c (notify_notification_set_user_data):
	fix free function addition
	(notify_notification_get_user_data): added method for actually
	getting the user data (fd.o bug# 5418)
	- patches provided by Duarte Henriques 
	<duarte.henriques at gmail dot com>


Modified: trunk/libnotify/ChangeLog
===================================================================
--- trunk/libnotify/ChangeLog	2006-01-12 19:10:55 UTC (rev 2425)
+++ trunk/libnotify/ChangeLog	2006-01-12 22:29:16 UTC (rev 2426)
@@ -1,3 +1,13 @@
+Thu Jan 12 2006  John (J5) Palmieri <johnp at redhat.com>
+
+	* libnotify/notifynotification.c (notify_notification_set_user_data):
+	fix free function addition
+	(notify_notification_get_user_data): added method for actually
+	getting the user data (fd.o bug# 5418)
+	- patches provided by Duarte Henriques 
+	<duarte.henriques at gmail dot com>
+
+
 Tue Jan 10 23:33:47 PST 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* configure.ac:

Modified: trunk/libnotify/libnotify/notifynotification.c
===================================================================
--- trunk/libnotify/libnotify/notifynotification.c	2006-01-12 19:10:55 UTC (rev 2425)
+++ trunk/libnotify/libnotify/notifynotification.c	2006-01-12 22:29:16 UTC (rev 2426)
@@ -398,12 +398,22 @@
       priv->user_data_free_func (priv->user_data);
 
   priv->user_data = user_data;
-  priv->user_data_free_func = priv->user_data;
+  priv->user_data_free_func = free_func;
 
   /* TODO: return FALSE on OOM */
   return TRUE;
 }
 
+gpointer
+notify_notification_get_user_data (NotifyNotification * notification)
+{
+  NotifyNotificationPrivate *priv;
+
+  priv = notification->priv;
+
+  return priv->user_data;
+}
+
 static void 
 _close_signal_handler (DBusGProxy *proxy, 
                        guint32 id, 

Modified: trunk/libnotify/libnotify/notifynotification.h
===================================================================
--- trunk/libnotify/libnotify/notifynotification.h	2006-01-12 19:10:55 UTC (rev 2425)
+++ trunk/libnotify/libnotify/notifynotification.h	2006-01-12 22:29:16 UTC (rev 2426)
@@ -68,6 +68,8 @@
                                             void *user_data,
                                             GFreeFunc free_func);
 
+gpointer notify_notification_get_user_data (NotifyNotification *notification);
+
 gboolean notify_notification_show (NotifyNotification *notification, 
                                    GError **error);