cpw.nader.asynclogging-3: ad8a3ab6: Added purple_logs_get_log_sets_finish wh...

morshed.nader at gmail.com morshed.nader at gmail.com
Fri Jan 14 00:32:04 EST 2011


----------------------------------------------------------------------
Revision: ad8a3ab62472e8b65fee2dbde58c5f2981eceaf2
Parent:   478cf141ace4757db199885aaafd56ec123ea19b
Author:   morshed.nader at gmail.com
Date:     01/14/11 00:06:55
Branch:   im.pidgin.cpw.nader.asynclogging-3
URL: http://d.pidgin.im/viewmtn/revision/info/ad8a3ab62472e8b65fee2dbde58c5f2981eceaf2

Changelog: 

Added purple_logs_get_log_sets_finish which was accidentally missing

Changes against parent 478cf141ace4757db199885aaafd56ec123ea19b

  patched  libpurple/log.c
  patched  libpurple/log.h

-------------- next part --------------
============================================================
--- libpurple/log.c	b3fd3e5e0c141c99f992caa5c31ced90275ea6a4
+++ libpurple/log.c	99d1e0458398c220f97c6c8a2d932361f16534fc
@@ -2273,6 +2273,21 @@ GHashTable *
 }
 
 GHashTable *
+purple_logs_get_log_sets_finish(GAsyncResult *res, GError **error)
+{
+	GSimpleAsyncResult *simple;
+
+	g_return_val_if_fail(G_IS_SIMPLE_ASYNC_RESULT(res), NULL);
+
+	simple = G_SIMPLE_ASYNC_RESULT(res);
+
+	if (g_simple_async_result_propagate_error(simple, error))
+		return NULL;
+
+	return g_hash_table_ref(g_simple_async_result_get_op_res_gpointer(simple));
+}
+
+GHashTable *
 purple_log_get_log_sets_finish(PurpleLog *log, GAsyncResult *res, GError **error)
 {
 	g_return_val_if_fail(log == NULL || PURPLE_IS_LOG(log), NULL);
============================================================
--- libpurple/log.h	b04587886b1503cbef63701a37e8fec56a46fd82
+++ libpurple/log.h	97098cd5c1809b7b04b22e6e8de3cf3a5d265276
@@ -444,8 +444,8 @@ void purple_logs_get_log_sets_async(gint
  * @since 2.8.0
  */
 void purple_logs_get_log_sets_async(gint io_priority, GCancellable *cancellable, GAsyncReadyCallback cb, gpointer userdata);
+void purple_log_get_log_sets_async(PurpleLog *log, gint io_priority, GCancellable *cancellable, GAsyncReadyCallback cb, gpointer userdata);
 
-void purple_log_get_log_sets_async(PurpleLog *log, gint io_priority, GCancellable *cancellable, GAsyncReadyCallback cb, gpointer userdata);
 /**
  * Finishes asynchronously getting a hash table of log sets
  *
@@ -456,6 +456,7 @@ void purple_log_get_log_sets_async(Purpl
  *
  * @since 2.8.0
  */
+GHashTable *purple_logs_get_log_sets_finish(GAsyncResult *res, GError **error);
 GHashTable *purple_log_get_log_sets_finish(PurpleLog *log, GAsyncResult *res, GError **error);
 
 /**


More information about the Commits mailing list