changeset 16780:588968d4b2c1

merge of '1222310dce4224af3958f2c83c4894f4f32d7ebc' and '86cac2dc203232252ecd8979cebf0415e5395359'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Wed, 02 May 2007 03:41:22 +0000
parents 52342adf4303 (diff) 1de66d5d1de8 (current diff)
children 8a5fe6db7750
files
diffstat 3 files changed, 19 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog.API	Wed May 02 03:20:20 2007 +0000
+++ b/ChangeLog.API	Wed May 02 03:41:22 2007 +0000
@@ -390,6 +390,7 @@
 	* GtkGaimScrollBook and its functions.
 	* purple_markup_unescape_entity()
 	* purple_markup_get_css_property()
+	* purple_group_get_name()
 
 	Signals - Changed:  (See the Doxygen docs for details on all signals.)
 	* Signal propagation now stops after a handler returns a non-NULL value.
--- a/libpurple/blist.c	Wed May 02 03:20:20 2007 +0000
+++ b/libpurple/blist.c	Wed May 02 03:41:22 2007 +0000
@@ -2042,6 +2042,8 @@
 
 	if ((chat->alias != NULL) && (*chat->alias != '\0'))
 		return chat->alias;
+	if (chat->account->gc == NULL)
+		return NULL;
 
 	parts = PURPLE_PLUGIN_PROTOCOL_INFO(chat->account->gc->prpl)->chat_info(chat->account->gc);
 	pce = parts->data;
@@ -2406,6 +2408,13 @@
 	return FALSE;
 }
 
+const char *purple_group_get_name(PurpleGroup *group)
+{
+	g_return_val_if_fail(group != NULL, NULL);
+
+	return group->name;
+}
+
 void
 purple_blist_request_add_buddy(PurpleAccount *account, const char *username,
 							 const char *group, const char *alias)
--- a/libpurple/blist.h	Wed May 02 03:20:20 2007 +0000
+++ b/libpurple/blist.h	Wed May 02 03:41:22 2007 +0000
@@ -686,6 +686,15 @@
 gboolean purple_group_on_account(PurpleGroup *g, PurpleAccount *account);
 
 /**
+ * Returns the name of a group.
+ *
+ * @param group The group.
+ *
+ * @return The name of the group.
+ */
+const char *purple_group_get_name(PurpleGroup *group);
+
+/**
  * Called when an account gets signed on.  Tells the UI to update all the
  * buddies.
  *