/pidgin/main: 7804dd798227: Fix warnings by marking two function...

[Mark Doliner]

Changeset: 7804dd798227e05b0697ee22a935e057f8de8957
Author:	 Mark Doliner <mark at kingant.net>
Date:	 2014-01-08 22:58 -0800
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/7804dd798227

Description:

Fix warnings by marking two functions as static.

The warnings were:
multilogon.c:131:1: warning: no previous prototype for 'ggp_multilogon_fill_sessions' [-Wmissing-prototypes]
multilogon.c:187:1: warning: no previous prototype for 'ggp_multilogon_disconnect' [-Wmissing-prototypes]

diffstat:

 finch/plugins/gnttinyurl.c          |  5 ++++-
 libpurple/account.c                 |  5 +++++
 libpurple/protocols/gg/multilogon.c |  4 ++--
 pidgin/gtkdialogs.c                 |  1 +
 4 files changed, 12 insertions(+), 3 deletions(-)

diffs (63 lines):

diff --git a/finch/plugins/gnttinyurl.c b/finch/plugins/gnttinyurl.c
--- a/finch/plugins/gnttinyurl.c
+++ b/finch/plugins/gnttinyurl.c
@@ -286,8 +286,11 @@ static gboolean writing_msg(PurpleAccoun
 	}
 	*message = t->str;
 	g_string_free(t, FALSE);
-	if (conv == NULL)
+	if (conv == NULL) {
+		/* TODO: Does this ever happen? It seems like it shouldn't. Also it
+		   seems wrong to always create an IM conversations. */
 		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,6 +78,11 @@ 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/libpurple/protocols/gg/multilogon.c b/libpurple/protocols/gg/multilogon.c
--- a/libpurple/protocols/gg/multilogon.c
+++ b/libpurple/protocols/gg/multilogon.c
@@ -127,7 +127,7 @@ ggp_multilogon_sid_to_libgadu(uint64_t s
 	return lsid;
 }
 
-void
+static void
 ggp_multilogon_fill_sessions(PurpleRequestDatasheet *sheet,
 	PurpleConnection *gc)
 {
@@ -183,7 +183,7 @@ ggp_multilogon_info(PurpleConnection *gc
 		ggp_multilogon_fill_sessions(mldata->sheet_handle, gc);
 }
 
-void
+static void
 ggp_multilogon_disconnect(PurpleRequestDatasheetRecord *rec, gpointer _gc)
 {
 	PurpleConnection *gc = _gc;
diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c
+++ b/pidgin/gtkdialogs.c
@@ -106,6 +106,7 @@ 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}
 };