/pidgin/main: 97ab97b06a39: Revert changes I accidentally commit...

[Mark Doliner]

Changeset: 97ab97b06a390a391f994697422676d0f5834947
Author:	 Mark Doliner <mark at kingant.net>
Date:	 2014-01-08 23:06 -0800
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/97ab97b06a39

Description:

Revert changes I accidentally committed in my previous commit.

diffstat:

 finch/plugins/gnttinyurl.c |  5 +----
 libpurple/account.c        |  5 -----
 pidgin/gtkdialogs.c        |  1 -
 3 files changed, 1 insertions(+), 10 deletions(-)

diffs (42 lines):

diff --git a/finch/plugins/gnttinyurl.c b/finch/plugins/gnttinyurl.c
--- a/finch/plugins/gnttinyurl.c
+++ b/finch/plugins/gnttinyurl.c
@@ -286,11 +286,8 @@ static gboolean writing_msg(PurpleAccoun
 	}
 	*message = t->str;
 	g_string_free(t, FALSE);
-	if (conv == NULL) {
-		/* TODO: Does this ever happen? It seems like it shouldn't. Also it
-		   seems wrong to always create an IM conversations. */
+	if (conv == NULL)
 		conv = PURPLE_CONVERSATION(purple_im_conversation_new(account, sender));
-	}
 	g_object_set_data(G_OBJECT(conv), "TinyURLs", urls);
 	return FALSE;
 }
diff --git a/libpurple/account.c b/libpurple/account.c
--- a/libpurple/account.c
+++ b/libpurple/account.c
@@ -78,11 +78,6 @@ typedef struct
 	 * is permitted or denied.  We should do this for 3.0.0.
 	 * Or maybe use a GTree.
 	 */
-	/*
-	 * Change that comment to say we should use either GHashTable (if we
-	 * don't iterate through these very often and we're happy with the
-	 * speed of iterating through a GHashTable) or a GTree.
-	 */
 	GSList *permit;             /**< Permit list.                           */
 	GSList *deny;               /**< Deny list.                             */
 	PurpleAccountPrivacyType privacy_type;  /**< The permit/deny setting.   */
diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c
+++ b/pidgin/gtkdialogs.c
@@ -106,7 +106,6 @@ static const struct developer patch_writ
 	{"Jakub 'haakon' Adam",            NULL,                        NULL},
 	{"Krzysztof Klinikowski",          NULL,                        NULL},
 	{"Eion Robb",                      NULL,                        NULL},
-	{"Ankit",                      NULL,                        NULL},
 	{NULL, NULL, NULL}
 };