pidgin: 71ccb593: Hide struct PurpleNotifySearchColumn.

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: 71ccb59309ec24190bbee1ade04453dea6d94ef0
Parent:   0f1724b8c6824cf136b85e70960bb00cf17aaa75
Author:   andrew.victor at mxit.com
Date:     10/21/11 17:29:33
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/71ccb59309ec24190bbee1ade04453dea6d94ef0

Changelog: 

Hide struct PurpleNotifySearchColumn.


Changes against parent 0f1724b8c6824cf136b85e70960bb00cf17aaa75

  patched  ChangeLog.API
  patched  finch/gntnotify.c
  patched  libpurple/notify.c
  patched  libpurple/notify.h
  patched  pidgin/gtknotify.c

-------------- next part --------------
============================================================
--- pidgin/gtknotify.c	b3e45bae1388cb3904d2a57d5cc58c6aca31cb9e
+++ pidgin/gtknotify.c	d0865086087c64dfddea68afcdb210d745841621
@@ -1017,7 +1017,7 @@ pidgin_notify_searchresults(PurpleConnec
 		renderer = gtk_cell_renderer_text_new();
 
 		gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), -1,
-				column->title, renderer, "text", i, NULL);
+				purple_notify_searchresult_column_get_title(column), renderer, "text", i, NULL);
 
 		if (!purple_notify_searchresult_column_is_visible(column))
 			gtk_tree_view_column_set_visible(gtk_tree_view_get_column(GTK_TREE_VIEW(treeview), i), FALSE);
============================================================
--- libpurple/notify.c	08e10f6f929bf17b0348613541b5689e4d14f3b2
+++ libpurple/notify.c	83687c994a16239c96d3bb0e344e03351a457cc3
@@ -56,6 +56,16 @@ struct _PurpleNotifyUserInfo
 	GQueue entries;
 };
 
+/**
+ * Single column of a search result.
+ */
+struct _PurpleNotifySearchColumn
+{
+	char *title;           /**< Title of the column. */
+	gboolean visible;      /**< Should the column be visible to the user. Defaults to TRUE. */
+
+};
+
 void *
 purple_notify_message(void *handle, PurpleNotifyMsgType type,
 					const char *title, const char *primary,
@@ -368,6 +378,13 @@ purple_notify_searchresults_column_new(c
 	return sc;
 }
 
+const char *purple_notify_searchresult_column_get_title(const PurpleNotifySearchColumn *column)
+{
+	g_return_val_if_fail(column != NULL, NULL);
+	
+	return column->title;
+}
+
 void purple_notify_searchresult_column_set_visible(PurpleNotifySearchColumn *column, gboolean visible)
 {
 	g_return_if_fail(column != NULL);
============================================================
--- libpurple/notify.h	3d479c8dbbc3c0f8c74d41112014c1ce79900bc4
+++ libpurple/notify.h	5c94bb2a3af6824ca4d0cda1fe44c233511bae6c
@@ -32,10 +32,13 @@ typedef struct _PurpleNotifyUserInfoEntr
 #include <glib.h>
 
 typedef struct _PurpleNotifyUserInfoEntry	PurpleNotifyUserInfoEntry;
-typedef struct _PurpleNotifyUserInfo	PurpleNotifyUserInfo;
+typedef struct _PurpleNotifyUserInfo		PurpleNotifyUserInfo;
+/** @copydoc _PurpleNotifySearchColumn */
+typedef struct _PurpleNotifySearchColumn	PurpleNotifySearchColumn;
 
 #include "connection.h"
 
+
 /**
  * Notification close callbacks.
  */
@@ -106,17 +109,8 @@ typedef enum
 	PURPLE_NOTIFY_USER_INFO_ENTRY_SECTION_HEADER
 } PurpleNotifyUserInfoEntryType;
 
-/**
- * Single column of a search result.
- */
-typedef struct
-{
-	char *title;           /**< Title of the column. */
-	gboolean visible;      /**< Should the column be visible to the user. Defaults to TRUE. */
 
-} PurpleNotifySearchColumn;
 
-
 /**
  * Callback for a button in a search result.
  *
@@ -277,6 +271,15 @@ PurpleNotifySearchColumn *purple_notify_
 PurpleNotifySearchColumn *purple_notify_searchresults_column_new(const char *title);
 
 /**
+ * Returns the title of the column
+ *
+ * @param column The search column object.
+ *
+ * @return The title of the column
+ */
+const char *purple_notify_searchresult_column_get_title(const PurpleNotifySearchColumn *column);
+
+/**
  * Sets whether or not a search result column is visible.
  *
  * @param column  The search column object.
============================================================
--- ChangeLog.API	95970f53f1d668b17ca43794cd1e5aa386bca350
+++ ChangeLog.API	6eb02652a82553263f8c1583a5cf3be284a0c46d
@@ -18,6 +18,7 @@ version 3.0.0 (??/??/????):
 		* purple_conversation_set_ui_data
 		* purple_conversation_message_get_alias
 		* purple_conversation_message_get_conv
+		* purple_notify_searchresult_column_get_title
 		* purple_notify_searchresult_column_is_visible
 		* purple_notify_searchresult_column_set_visible
 		* purple_notify_user_info_prepend_pair_plaintext
@@ -228,6 +229,7 @@ version 3.0.0 (??/??/????):
 		* struct _PurpleRoomlistRoom
 		* struct PurpleAccountOption
 		* struct PurpleAccountUserSplit
+		* struct PurpleNotifySearchColumn
 		* wpurple_g_access
 		* xmlnode_set_attrib_with_namespace
 		* xmlnode_set_attrib_with_prefix
============================================================
--- finch/gntnotify.c	ca4b536f8cb0e2f5416945986a6722d30f9ddad6
+++ finch/gntnotify.c	226d2f86c1ec6a4276849f99a560304a3ba29bf7
@@ -429,7 +429,7 @@ finch_notify_searchresults(PurpleConnect
 	for (iter = results->columns; iter; iter = iter->next)
 	{
 		PurpleNotifySearchColumn *column = iter->data;
-		gnt_tree_set_column_title(GNT_TREE(tree), i, column->title);
+		gnt_tree_set_column_title(GNT_TREE(tree), i, purple_notify_searchresult_column_get_title(column));
 
 		if (!purple_notify_searchresult_column_is_visible(column))
 			gnt_tree_set_column_visible(GNT_TREE(tree), i, FALSE);